[GNUnet-SVN] r4845 - in GNUnet/src/applications/dht: module tools

[gnunet]

Author: grothoff
Date: 2007-05-28 20:02:49 -0600 (Mon, 28 May 2007)
New Revision: 4845

Modified:
   GNUnet/src/applications/dht/module/cs.c
   GNUnet/src/applications/dht/tools/dht_api.c
Log:
fixing deadlock

Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c     2007-05-28 22:13:46 UTC (rev 
4844)
+++ GNUnet/src/applications/dht/module/cs.c     2007-05-29 02:02:49 UTC (rev 
4845)
@@ -208,11 +208,13 @@
   for (i=0;i<getRecordsSize;i++) {
     if (getRecords[i]->client == client) {
       gr = getRecords[i];
-      dhtAPI->get_stop(gr->get_record);
       getRecords[i] = getRecords[getRecordsSize-1];
       GROW(getRecords,
           getRecordsSize,
           getRecordsSize-1);
+      MUTEX_UNLOCK(lock);
+      dhtAPI->get_stop(gr->get_record);
+      MUTEX_LOCK(lock);
     }
   }
   MUTEX_UNLOCK(lock);

Modified: GNUnet/src/applications/dht/tools/dht_api.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht_api.c 2007-05-28 22:13:46 UTC (rev 
4844)
+++ GNUnet/src/applications/dht/tools/dht_api.c 2007-05-29 02:02:49 UTC (rev 
4845)
@@ -189,7 +189,6 @@
   PTHREAD_JOIN(thread, &unused);
   PTHREAD_REL_SELF(info.parent);
   connection_destroy(sock);
-  printf("Returning %d\n", info.total);
   return info.total;
 }