[GNUnet-SVN] r2869 - in GNUnet/src/applications/fs: ecrs fsui module

[grothoff]

Author: grothoff
Date: 2006-05-20 06:41:49 -0700 (Sat, 20 May 2006)
New Revision: 2869

Modified:
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/fsui/download.c
   GNUnet/src/applications/fs/module/fs.c
   GNUnet/src/applications/fs/module/querymanager.c
Log:
dbg

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2006-05-20 12:12:12 UTC (rev 
2868)
+++ GNUnet/src/applications/fs/ecrs/download.c  2006-05-20 13:41:49 UTC (rev 
2869)
@@ -1058,7 +1058,10 @@
        hash2enc(&entry->node->chk.query,
                 &enc));
   LOG(LOG_DEBUG,
-      "Starting FS search for %s\n",
+      "Starting FS search for %s:%llu:%u `%s'\n",
+      entry->node->ctx->ioc->filename,
+      entry->node->offset,
+      entry->node->level,
       &enc);
 #endif
 

Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c  2006-05-20 12:12:12 UTC (rev 
2868)
+++ GNUnet/src/applications/fs/fsui/download.c  2006-05-20 13:41:49 UTC (rev 
2869)
@@ -330,6 +330,7 @@
       dl = dl->parent;
     }
   }
+  dl = cls;
 #if DEBUG_DTM
   LOG(LOG_DEBUG,
       "Download thread for `%s' terminated (%s)...\n",
@@ -567,7 +568,7 @@
   prev = NULL;
   while (dl != NULL) {
     if ( (ECRS_equalsUri(uri,
-                      dl->uri)) &&
+                        dl->uri)) &&
         ( (filename == NULL) ||
           (0 == strcmp(filename,
                        dl->filename)) ) ) {

Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c      2006-05-20 12:12:12 UTC (rev 
2868)
+++ GNUnet/src/applications/fs/module/fs.c      2006-05-20 13:41:49 UTC (rev 
2869)
@@ -1086,13 +1086,16 @@
     return SYSERR;
   }
   rs = (const CS_fs_request_search_MESSAGE*) req;
-#if DEBUG_FS
+#if DEBUG_FS 
   IFLOG(LOG_DEBUG,
        hash2enc(&rs->query[0],
                 &enc));
   LOG(LOG_DEBUG,
-      "FS received QUERY START (query: `%s')\n",
-      &enc);
+      "FS received QUERY START (query: `%s', ttl %llu, priority %u, anonymity 
%u)\n",
+      &enc,
+      ntohll(rs->expiration) - cronTime(NULL),
+      ntohl(rs->prio),
+      ntohl(rs->anonymityLevel));
 #endif
   type = ntohl(rs->type);
   trackQuery(&rs->query[0],
@@ -1112,7 +1115,8 @@
   if (done == YES) {
 #if DEBUG_FS
     LOG(LOG_DEBUG,
-       "FS successfully took GAP shortcut.\n");
+       "FS successfully took GAP shortcut for `%s'.\n",
+       &enc);
 #endif
     return OK; 
   }
@@ -1199,7 +1203,7 @@
   if (0 != PTHREAD_CREATE(&localGetProcessor,
                          &localGetter,
                          NULL,
-                         16 * 1024))
+                         32 * 1024))
     DIE_STRERROR("pthread_create");
   coreAPI = capi;
   ONDEMAND_init();

Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c    2006-05-20 12:12:12 UTC 
(rev 2868)
+++ GNUnet/src/applications/fs/module/querymanager.c    2006-05-20 13:41:49 UTC 
(rev 2869)
@@ -138,9 +138,17 @@
   int i;
   CS_fs_reply_content_MESSAGE * rc;
   unsigned int matchCount;
+#if DEBUG_QUERYMANAGER
+  EncName enc;
+#endif
 
   GNUNET_ASSERT(ntohl(value->size) > sizeof(Datastore_Value));
   matchCount = 0;
+#if DEBUG_QUERYMANAGER
+  IFLOG(LOG_DEBUG,
+       hash2enc(key,
+                &enc));
+#endif
   MUTEX_LOCK(&queryManagerLock);
   for (i=trackerCount-1;i>=0;i--) {
     if ( (equalsHashCode512(&trackers[i]->query,
@@ -158,7 +166,8 @@
             ntohl(value->size) - sizeof(Datastore_Value));
 #if DEBUG_QUERYMANAGER
       LOG(LOG_DEBUG,
-         "Sending reply to client waiting in slot %u.\n",
+         "Sending reply for `%s' to client waiting in slot %u.\n",
+         &enc,
          i);
 #endif
       coreAPI->sendToClient(trackers[i]->client,
@@ -166,13 +175,8 @@
       FREE(rc);
     }
   }
-#if DEBUG_QUERYMANAGER
+#if DEBUG_QUERYMANAGER && 0
   if (matchCount == 0) {
-    EncName enc;
-
-    IFLOG(LOG_DEBUG,
-         hash2enc(key,
-                  &enc));
     LOG(LOG_DEBUG,
        "Reply `%s' did not match any request.\n",
        &enc);