[GNUnet-SVN] r12192 - in gnunet/src: core fs

[gnunet]

Author: grothoff
Date: 2010-07-09 14:24:18 +0200 (Fri, 09 Jul 2010)
New Revision: 12192

Modified:
   gnunet/src/core/test_core_api_peer1.conf
   gnunet/src/core/test_core_api_reliability.c
   gnunet/src/fs/fs_publish.c
Log:
fix

Modified: gnunet/src/core/test_core_api_peer1.conf
===================================================================
--- gnunet/src/core/test_core_api_peer1.conf    2010-07-09 12:20:38 UTC (rev 
12191)
+++ gnunet/src/core/test_core_api_peer1.conf    2010-07-09 12:24:18 UTC (rev 
12192)
@@ -44,6 +44,7 @@
 PORT = 12470
 UNIXPATH = /tmp/gnunet-p1-service-core.sock
 #PREFIX = valgrind --tool=memcheck
+#PREFIX = valgrind --tool=callgrind
 #OPTIONS = -l log-core-1
 #PREFIX = xterm -e xterm -T core1 -e gdb --args
 #PREFIX = xterm -T core1 -e 

Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2010-07-09 12:20:38 UTC (rev 
12191)
+++ gnunet/src/core/test_core_api_reliability.c 2010-07-09 12:24:18 UTC (rev 
12192)
@@ -40,9 +40,16 @@
 #define START_ARM GNUNET_YES
 
 /**
+ * Note that this value must not significantly exceed
+ * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
+ * messages may be dropped even for a reliable transport.
+ */
+#define TOTAL_MSGS (600 * 200)
+
+/**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 6000)
 
 /**
  * What delay do we request from the core service for transmission?
@@ -58,13 +65,6 @@
 
 static struct GNUNET_TIME_Absolute start_time;
 
-/**
- * Note that this value must not significantly exceed
- * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
- * messages may be dropped even for a reliable transport.
- */
-#define TOTAL_MSGS (600 * 2)
-
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-07-09 12:20:38 UTC (rev 12191)
+++ gnunet/src/fs/fs_publish.c  2010-07-09 12:24:18 UTC (rev 12192)
@@ -279,7 +279,7 @@
       pc->qre = GNUNET_DATASTORE_release_reserve (pc->dsh,
                                                  pc->rid,
                                                  UINT_MAX,
-                                                 UNIT_MAX,
+                                                 UINT_MAX,
                                                  GNUNET_TIME_UNIT_FOREVER_REL,
                                                  &finish_release_reserve,
                                                  pc);
@@ -1165,7 +1165,6 @@
                const char *msg)
 {
   struct GNUNET_FS_PublishContext *pc = cls;
-  struct GNUNET_FS_ProgressInfo pi;
 
   pc->qre = NULL;
   if ( (msg != NULL) ||
@@ -1180,11 +1179,11 @@
       return;
     }
   pc->rid = success;
-  ret->upload_task 
-    = GNUNET_SCHEDULER_add_with_priority (h->sched,
+  pc->upload_task 
+    = GNUNET_SCHEDULER_add_with_priority (pc->h->sched,
                                          GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
                                          &GNUNET_FS_publish_main_,
-                                         ret);
+                                         pc);
 }