[GNUnet-SVN] r1863 - in GNUnet/src/applications/fs: ecrs lib

[grothoff]

Author: grothoff
Date: 2005-08-23 00:36:27 -0700 (Tue, 23 Aug 2005)
New Revision: 1863

Modified:
   GNUnet/src/applications/fs/ecrs/check.conf
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/ecrs/ecrstest.c
   GNUnet/src/applications/fs/lib/fslib.c
Log:
bugfix

Modified: GNUnet/src/applications/fs/ecrs/check.conf
===================================================================
--- GNUnet/src/applications/fs/ecrs/check.conf  2005-08-23 07:21:05 UTC (rev 
1862)
+++ GNUnet/src/applications/fs/ecrs/check.conf  2005-08-23 07:36:27 UTC (rev 
1863)
@@ -20,7 +20,7 @@
 topology = "topology_default"
 
 [NETWORK]
-PORT = 2087
+PORT = 42207
 INTERFACE = eth0
 HELOEXCHANGE = NO
 TRUSTED = 127.0.0.0/8;

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2005-08-23 07:21:05 UTC (rev 
1862)
+++ GNUnet/src/applications/fs/ecrs/download.c  2005-08-23 07:36:27 UTC (rev 
1863)
@@ -31,7 +31,7 @@
 #include "ecrs.h"
 #include "tree.h"
 
-#define DEBUG_DOWNLOAD NO
+#define DEBUG_DOWNLOAD YES
 
 /**
  * Highest TTL allowed? (equivalent of 25-50 HOPS distance!)
@@ -439,6 +439,11 @@
     = 1; /* RSS is 1 */
   rm->ssthresh
     = 65535;
+#ifdef DEBUG_DOWNLOAD
+  LOG(LOG_DEBUG,
+      "created request manager %p\n",
+      rm);
+#endif
   return rm;
 }
 
@@ -452,6 +457,12 @@
 static void destroyRequestManager(RequestManager * rm) {
   int i;
 
+#ifdef DEBUG_DOWNLOAD
+  LOG(LOG_DEBUG,
+      "destroying request manager %p\n",
+      rm);
+#endif
+  MUTEX_LOCK(&rm->lock);
   for (i=0;i<rm->requestListIndex;i++) {
     if (rm->requestList[i]->searchHandle != NULL)
       FS_stop_search(rm->sctx,
@@ -462,6 +473,7 @@
   GROW(rm->requestList,
        rm->requestListSize,
        0);
+  MUTEX_UNLOCK(&rm->lock);
   FS_SEARCH_destroyContext(rm->sctx);
   MUTEX_DESTROY(&rm->lock);
   PTHREAD_REL_SELF(&rm->requestThread);
@@ -521,6 +533,7 @@
   entry->searchHandle
     = NULL;
   MUTEX_LOCK(&rm->lock);
+  GNUNET_ASSERT(rm->requestListSize > 0);
   if (rm->requestListSize == rm->requestListIndex)
     GROW(rm->requestList,
         rm->requestListSize,

Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c  2005-08-23 07:21:05 UTC (rev 
1862)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c  2005-08-23 07:36:27 UTC (rev 
1863)
@@ -254,7 +254,6 @@
     0
   };
   pid_t daemon;
-  int status;
   int ok;
   GNUNET_TCP_SOCKET * sock;
   struct ECRS_URI * uri;

Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c      2005-08-23 07:21:05 UTC (rev 
1862)
+++ GNUnet/src/applications/fs/lib/fslib.c      2005-08-23 07:36:27 UTC (rev 
1863)
@@ -229,7 +229,7 @@
        hash2enc(&req->query[0],
                 &enc));
   LOG(LOG_DEBUG,
-      "FS initiating search for %s of type %u\n",
+      "FSLIB: initiating search for `%s' of type %u\n",
       &enc,
       type);
 #endif