fix

diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index eaab539365ccc7f0e9546f54cb69594cba84b5be..2aef1811cf15f5622479ed8e8673f1e3cccc1aee 100644 (file)
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -44,6 +44,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 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 

diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c
index c2375620a39a40dcebaa2583928b445ff79bed4f..e8e1ad0f60feeb9d7d54dda63a0a7572f42c666b 100644 (file)
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -39,10 +39,17 @@
 
 #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 unsigned long long total_bytes;
 
 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;

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index e44514ea4195f990b411dc8ee39fa2d87d046c98..2a0778b344438c8fd0e34b3f986b0d345a016153 100644 (file)
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -279,7 +279,7 @@ publish_sblocks_cont (void *cls,
       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 @@ finish_reserve (void *cls,
                const char *msg)
 {
   struct GNUNET_FS_PublishContext *pc = cls;
-  struct GNUNET_FS_ProgressInfo pi;
 
   pc->qre = NULL;
   if ( (msg != NULL) ||
@@ -1180,11 +1179,11 @@ finish_reserve (void *cls,
       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);
 }