[GNUnet-SVN] r3587 - GNUnet/src/applications/fs/fsui

[grothoff]

Author: grothoff
Date: 2006-10-31 19:52:22 -0800 (Tue, 31 Oct 2006)
New Revision: 3587

Modified:
   GNUnet/src/applications/fs/fsui/deserialize.c
   GNUnet/src/applications/fs/fsui/serializetest.c
   GNUnet/src/applications/fs/fsui/unindex.c
Log:
fixes

Modified: GNUnet/src/applications/fs/fsui/deserialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/deserialize.c       2006-11-01 03:39:01 UTC 
(rev 3586)
+++ GNUnet/src/applications/fs/fsui/deserialize.c       2006-11-01 03:52:22 UTC 
(rev 3587)
@@ -717,6 +717,7 @@
     ul->state = big;
     ul->filename = name;
     ul->next = ctx->unindexOperations;
+    ul->ctx = ctx;
     ctx->unindexOperations = ul;
   }
   return SYSERR;

Modified: GNUnet/src/applications/fs/fsui/serializetest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest.c     2006-11-01 03:39:01 UTC 
(rev 3586)
+++ GNUnet/src/applications/fs/fsui/serializetest.c     2006-11-01 03:52:22 UTC 
(rev 3587)
@@ -31,7 +31,7 @@
 #include "gnunet_util_network_client.h"
 #include "gnunet_util_crypto.h"
 
-#define DEBUG_VERBOSE NO
+#define DEBUG_VERBOSE YES
 
 #define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
 

Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c   2006-11-01 03:39:01 UTC (rev 
3586)
+++ GNUnet/src/applications/fs/fsui/unindex.c   2006-11-01 03:52:22 UTC (rev 
3587)
@@ -110,10 +110,11 @@
     GE_BREAK(NULL,
             utc->state == FSUI_PENDING);
   }
-#if 0
+#if 1
   GE_LOG(utc->ctx->ectx,
         GE_DEBUG | GE_REQUEST | GE_USER,
-        "FSUI unindexThread exits.\n");
+        "FSUI unindexThread exits in state %u.\n",
+        utc->state);
 #endif
   return NULL;
 }
@@ -253,9 +254,14 @@
     prev->next = dl->next;
   }
   MUTEX_UNLOCK(ctx->lock);
-  PTHREAD_JOIN(dl->handle,
-              &unused);
-  event.type = FSUI_upload_stopped;
+  if ( (dl->state == FSUI_COMPLETED) ||
+       (dl->state == FSUI_ABORTED) ||
+       (dl->state == FSUI_ERROR) ) {
+    PTHREAD_JOIN(dl->handle,
+                &unused);
+    dl->state++; /* add _JOINED */
+  } 
+  event.type = FSUI_unindex_stopped;
   event.data.UnindexStopped.uc.pos = dl;
   event.data.UnindexStopped.uc.cctx = dl->cctx;
   dl->ctx->ecb(dl->ctx->ecbClosure,