fix ordered join and add test

Signed-off-by: Mattias Andrée <maandree@operamail.com>

2 files changed, 72 insertions, 5 deletions

diff --git a/src/join.py b/src/join.py
index 7d4be9f..71acea5 100644
--- a/src/join.py
+++ b/src/join.py
@@ -144,16 +144,18 @@ def ordered_join(*f_groups):
                      to join-calculus) by those invocations (as a list of not exactly one fragement)
     '''
     condition = threading.Condition()
-    rc = None
+    rc, done = None, False
     index = 0
     for f_group in f_groups:
         def join_(fs, index):
+            nonlocal rc, done, condition
             params = join(*fs)
-            already_done = rc is not None
+            already_done = done
             if not already_done:
                 condition.acquire()
-            if rc is None:
-                params = (index, rc)
+            if not done:
+                rc = (index, params)
+                done = True
                 condition.notify()
                 condition.release()
             else:
@@ -167,7 +169,8 @@ def ordered_join(*f_groups):
         threading.Thread(target = join_, args = (f_group, index)).start()
         index += 1
     condition.acquire()
-    condition.wait()
+    if not done:
+        condition.wait()
     condition.release()
     return rc
 
diff --git a/src/test.py b/src/test.py
new file mode 100755
index 0000000..5bcab7b
--- /dev/null
+++ b/src/test.py
@@ -0,0 +1,64 @@
+#!/usr/bin/python3
+'''
+join python – Join-calculus for Python
+Copyright © 2014  Mattias Andrée (maandree@member.fsf.org)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+'''
+
+from join import *
+
+import time
+
+
+@fragment
+def f1():
+    pass
+
+@fragment
+def f2():
+    pass
+
+@fragment
+def f3():
+    pass
+
+
+def unordered_f123():
+    (case, (jargs, jkwargs, jrc)) = unordered_join((f1,), (f2,), (f3,))
+    return case
+
+def ordered_f123():
+    (case, (jargs, jkwargs, jrc)) = ordered_join((f1,), (f2,), (f3,))
+    return case
+
+def unordered():
+    f1()
+    f2()
+    f3()
+    return unordered_f123()
+
+def ordered():
+    f1()
+    f2()
+    f3()
+    return ordered_f123()
+
+
+print('Expecting 0,1,2 uniformally random')
+print([unordered() for _ in range(100)])
+
+print('Expecting 0 exclusively')
+print([ordered() for _ in range(100)])
+