[Teem-commit] SF.net SVN: teem: [3698] teem/trunk/src/pull/corePull.c

[<kin...@us...>]

Revision: 3698
          http://teem.svn.sourceforge.net/teem/?rev=3698&view=rev
Author:   kindlmann
Date:     2007-12-12 11:15:31 -0800 (Wed, 12 Dec 2007)

Log Message:
-----------
hacking

Modified Paths:
--------------
    teem/trunk/src/pull/corePull.c

Modified: teem/trunk/src/pull/corePull.c
===================================================================
--- teem/trunk/src/pull/corePull.c	2007-12-12 19:04:03 UTC (rev 3697)
+++ teem/trunk/src/pull/corePull.c	2007-12-12 19:15:31 UTC (rev 3698)
@@ -165,16 +165,20 @@
       fprintf(stderr, "%s: finishing workers\n", me);
     }
     airThreadBarrierWait(pctx->iterBarrierA);
-  }
-  /* worker threads now pass barrierA and see that finished is AIR_TRUE,
-     and then bail, so now we collect them */
-  for (tidx=pctx->threadNum; tidx>0; tidx--) {
-    if (tidx-1) {
-      airThreadJoin(pctx->task[tidx-1]->thread,
-                    &(pctx->task[tidx-1]->returnPtr));
+    /* worker threads now pass barrierA and see that finished is AIR_TRUE,
+       and then bail, so now we collect them */
+    for (tidx=pctx->threadNum; tidx>0; tidx--) {
+      if (tidx-1) {
+        airThreadJoin(pctx->task[tidx-1]->thread,
+                      &(pctx->task[tidx-1]->returnPtr));
+      }
     }
   }
 
+  pctx->binMutex = airThreadMutexNix(pctx->binMutex);
+  pctx->iterBarrierA = airThreadBarrierNix(pctx->iterBarrierA);
+  pctx->iterBarrierB = airThreadBarrierNix(pctx->iterBarrierB);
+
   /* no need for _pullVolumeFinish(pctx), at least not now */
   /* no need for _pullInfoFinish(pctx), at least not now */
   _pullTaskFinish(pctx);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.