Changeset 4125

Timestamp:

03/04/08 16:19:45 (9 months ago)

Author:

pmoura

Message:

Corrected a Logtalk compiler bug that allowed a predicate to be declared both dynamic and synchronized. Improved error checking when compiling dynamic predicate directives. Improved documentation of some internal multi-threading support predicates.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (6 diffs)
• manuals/index.html (modified) (1 diff)
• manuals/refman/directives/dynamic1.html (modified) (2 diffs)
• manuals/refman/directives/synchronized1.html (modified) (2 diffs)
• manuals/refman/index.html (modified) (1 diff)
• manuals/refman/refman.header (modified) (1 diff)
• manuals/userman/index.html (modified) (1 diff)
• manuals/userman/threads.html (modified) (2 diffs)
• manuals/userman/userman.header (modified) (1 diff)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/compiler/logtalk.pl

@@ -5537 +5537 @@
     '$lgt_valid_pred_ind'(Pred, Functor, Arity),
     !,
-    functor(Head, Functor, Arity),
-    (   '$lgt_pp_calls_pred_'(Functor, Arity, _, _) ->
+    (   '$lgt_pp_dynamic_'(Functor, Arity) ->
         throw(permission_error(modify, predicate_interpretation, Pred))
-    ;   assertz('$lgt_pp_synchronized_'(Head, Mutex)),
+    ;   '$lgt_pp_calls_pred_'(Functor, Arity, _, _) ->
+        throw(permission_error(modify, predicate_interpretation, Pred))
+    ;   functor(Head, Functor, Arity),
+        assertz('$lgt_pp_synchronized_'(Head, Mutex)),
         '$lgt_tr_synchronized_directive'(Preds, Mutex)
     ).
@@ -5547 +5549 @@
     '$lgt_valid_gr_ind'(Pred, Functor, Arity, Arity2),
     !,
-    functor(Head, Functor, Arity2),
-    (   '$lgt_pp_calls_nt_'(Functor, Arity) ->
+    (   '$lgt_pp_dynamic_'(Functor, Arity2) ->
+        throw(permission_error(modify, predicate_interpretation, Pred))
+    ;   '$lgt_pp_calls_nt_'(Functor, Arity) ->
         throw(permission_error(modify, non_terminal_interpretation, Pred))
-    ;   assertz('$lgt_pp_synchronized_'(Head, Mutex)),
+    ;   functor(Head, Functor, Arity2),
+        assertz('$lgt_pp_synchronized_'(Head, Mutex)),
         '$lgt_tr_synchronized_directive'(Preds, Mutex)
     ).
@@ -5667 +5671 @@
     throw(instantiation_error).
 
-'$lgt_tr_dynamic_directive'([Pred| _]) :-
-    functor(Pred, Functor, Arity),
-    '$lgt_pp_calls_pred_'(Functor, Arity, _, _),
-    throw(permission_error(modify, predicate_interpretation, Pred)).
-
 '$lgt_tr_dynamic_directive'([Pred| Preds]) :-
     '$lgt_valid_pred_ind'(Pred, Functor, Arity),
     !,
-    assertz('$lgt_pp_dynamic_'(Functor, Arity)),
-    '$lgt_tr_dynamic_directive'(Preds).
+    (   functor(Head, Functor, Arity),
+        '$lgt_pp_synchronized_'(Head, _) ->
+        throw(permission_error(modify, predicate_interpretation, Pred))
+    ;   '$lgt_pp_calls_pred_'(Functor, Arity, _, _) ->
+        throw(permission_error(modify, predicate_interpretation, Pred))
+    ;   assertz('$lgt_pp_dynamic_'(Functor, Arity)),
+        '$lgt_tr_dynamic_directive'(Preds)
+    ).
 
 '$lgt_tr_dynamic_directive'([Pred| Preds]) :-
-    '$lgt_valid_gr_ind'(Pred, Functor, _, Arity2),
-    !,
-    assertz('$lgt_pp_dynamic_'(Functor, Arity2)),
-    '$lgt_tr_dynamic_directive'(Preds).
+    '$lgt_valid_gr_ind'(Pred, Functor, Arity, Arity2),
+    !,
+    (   functor(Head, Functor, Arity2),
+        '$lgt_pp_synchronized_'(Head, _) ->
+        throw(permission_error(modify, predicate_interpretation, Pred))
+    ;   '$lgt_pp_calls_nt_'(Functor, Arity) ->
+        throw(permission_error(modify, predicate_interpretation, Pred))
+    ;   assertz('$lgt_pp_dynamic_'(Functor, Arity2)),
+        '$lgt_tr_dynamic_directive'(Preds)
+    ).
 
 '$lgt_tr_dynamic_directive'([Pred| _]) :-
@@ -12934 +12945 @@
 
 
-% '$lgt_mt_check_threads'(@list, @list)
-%
-% checks sucesseful creation of working "or" threads
+% '$lgt_mt_check_threads'(@list, +message_queue_identifier)
+%
+% checks sucesseful creation of working threads; failure to create a thread
+% usually results from exhaustion of virtual memory address space or exceeding 
+% the maximum number of threads allowed by the back-end Prolog compiler
 
 '$lgt_mt_check_threads'([], _).
@@ -12951 +12964 @@
 % '$lgt_mt_threaded_and_exit'(+callable, +message_queue_identifier, +list)
 %
-% retrieves the result of proving a conjunction of goals using a threaded/1 predicate call
+% retrieves the result of proving a conjunction of goals using a threaded/1 predicate
+% call by collecting the individual thread results posted to the call message queue
 
 '$lgt_mt_threaded_and_exit'(TGoals, Queue, Results) :-
@@ -13046 +13060 @@
 % '$lgt_mt_threaded_or_exit'(+callable, +message_queue_identifier, +list)
 %
-% retrieves the result of proving a disjunction of goals using a threaded/1 predicate call
+% retrieves the result of proving a disjunction of goals using a threaded/1 predicate
+% call by collecting the individual thread results posted to the call message queue
 
 '$lgt_mt_threaded_or_exit'(TGoals, Queue, Results) :-

trunk/manuals/index.html

@@ -32 +32 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: February 11, 2008</span>
+        <span>Last updated on: March 5, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/directives/dynamic1.html

@@ -32 +32 @@
 dynamic([Functor1//Arity1, Functor2//Arity2, ...])</pre>
 <p>
-Declares dynamic predicates and dynamic grammar rule non-terminals. Note that an object can be static and have both static and dynamic predicates/non-terminals.
+Declares dynamic predicates and dynamic grammar rule non-terminals. Note that an object can be static and have both static and dynamic predicates/non-terminals. Dynamic predicates cannot be declared as synchronized.
 </p>
 
@@ -52 +52 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: October 26, 2006</span>
+        <span>Last updated on: March 5, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/directives/synchronized1.html

@@ -35 +35 @@
 </p>
 <p>
-Synchronized predicates are silently compiled as normal predicates when using back-end Prolog compilers that don't support multi-threading programming.
+Synchronized predicates are silently compiled as normal predicates when using back-end Prolog compilers that don't support multi-threading programming. Note that synchronized predicates cannot be declared dynamic.
 </p>
 
@@ -55 +55 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: January 2, 2007</span>
+        <span>Last updated on: March 5, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/index.html

@@ -319 +319 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: January 21, 2008</span>
+        <span>Last updated on: March 5, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/refman.header

@@ -36 +36 @@
         <span>http://logtalk.org/</span>
     </p>
-    <p class="date">Last updated on January 21, 2008</p>
+    <p class="date">Last updated on March 5, 2008</p>
 </div>
 

trunk/manuals/userman/index.html

@@ -301 +301 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/>
-        <span>Last updated on: February 11, 2008</span>
+        <span>Last updated on: March 5, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/userman/threads.html

@@ -211 +211 @@
 
 <p>
-The <code>synchronized/1</code> directive must precede any local calls to the synchronized predicate (or synchronized non-terminal) in order to ensure proper compilation. In addition, as each Logtalk entity is independently compiled, this directive must be included in every object or category that contains a definition for the described predicate, even if the predicate declaration is inherited from another entity, in order to ensure proper compilation.
+The <code>synchronized/1</code> directive must precede any local calls to the synchronized predicate (or synchronized non-terminal) in order to ensure proper compilation. In addition, as each Logtalk entity is independently compiled, this directive must be included in every object or category that contains a definition for the described predicate, even if the predicate declaration is inherited from another entity, in order to ensure proper compilation. Note that a synchronized predicate cannot be declared dynamic. To ensure atomic updates of a dynamic predicate, declare as synchronized the predicate performing the update.
 </p>
 <p>
@@ -248 +248 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: September 15, 2007</span>
+        <span>Last updated on: March 5, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/userman/userman.header

@@ -36 +36 @@
         <span>http://logtalk.org/</span>
     </p>
-    <p class="date">Last updated on February 11, 2008</p>
+    <p class="date">Last updated on March 5, 2008</p>
 </div>
 

trunk/RELEASE_NOTES.txt

@@ -26 +26 @@
     Updated the Logtalk runtime to unlock all mutexes hold by a thread when 
     upon thread cancellation.
+
+    Corrected a Logtalk compiler bug that allowed a predicate to be declared 
+    both dynamic and synchronized.
 
     Updated the XSB config file to use the new optimized call/N predicates