aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-07-09 12:24:18 +0000
committerChristian Grothoff <christian@grothoff.org>2010-07-09 12:24:18 +0000
commit1820c8cd5075a78f1766be607f938f7a77d61e00 (patch)
treef1d75f690245d84d33a15d45c392f3ecae39462b
parent0469252aa72449600e92cea94c16f9fb44eab059 (diff)
downloadgnunet-1820c8cd5075a78f1766be607f938f7a77d61e00.tar.gz
gnunet-1820c8cd5075a78f1766be607f938f7a77d61e00.zip
fix
-rw-r--r--src/core/test_core_api_peer1.conf1
-rw-r--r--src/core/test_core_api_reliability.c16
-rw-r--r--src/fs/fs_publish.c9
3 files changed, 13 insertions, 13 deletions
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index eaab53936..2aef1811c 100644
--- 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
44PORT = 12470 44PORT = 12470
45UNIXPATH = /tmp/gnunet-p1-service-core.sock 45UNIXPATH = /tmp/gnunet-p1-service-core.sock
46#PREFIX = valgrind --tool=memcheck 46#PREFIX = valgrind --tool=memcheck
47#PREFIX = valgrind --tool=callgrind
47#OPTIONS = -l log-core-1 48#OPTIONS = -l log-core-1
48#PREFIX = xterm -e xterm -T core1 -e gdb --args 49#PREFIX = xterm -e xterm -T core1 -e gdb --args
49#PREFIX = xterm -T core1 -e 50#PREFIX = xterm -T core1 -e
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c
index c2375620a..e8e1ad0f6 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -40,9 +40,16 @@
40#define START_ARM GNUNET_YES 40#define START_ARM GNUNET_YES
41 41
42/** 42/**
43 * Note that this value must not significantly exceed
44 * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
45 * messages may be dropped even for a reliable transport.
46 */
47#define TOTAL_MSGS (600 * 200)
48
49/**
43 * How long until we give up on transmitting the message? 50 * How long until we give up on transmitting the message?
44 */ 51 */
45#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) 52#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 6000)
46 53
47/** 54/**
48 * What delay do we request from the core service for transmission? 55 * What delay do we request from the core service for transmission?
@@ -58,13 +65,6 @@ static unsigned long long total_bytes;
58 65
59static struct GNUNET_TIME_Absolute start_time; 66static struct GNUNET_TIME_Absolute start_time;
60 67
61/**
62 * Note that this value must not significantly exceed
63 * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
64 * messages may be dropped even for a reliable transport.
65 */
66#define TOTAL_MSGS (600 * 2)
67
68struct PeerContext 68struct PeerContext
69{ 69{
70 struct GNUNET_CONFIGURATION_Handle *cfg; 70 struct GNUNET_CONFIGURATION_Handle *cfg;
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index e44514ea4..2a0778b34 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -279,7 +279,7 @@ publish_sblocks_cont (void *cls,
279 pc->qre = GNUNET_DATASTORE_release_reserve (pc->dsh, 279 pc->qre = GNUNET_DATASTORE_release_reserve (pc->dsh,
280 pc->rid, 280 pc->rid,
281 UINT_MAX, 281 UINT_MAX,
282 UNIT_MAX, 282 UINT_MAX,
283 GNUNET_TIME_UNIT_FOREVER_REL, 283 GNUNET_TIME_UNIT_FOREVER_REL,
284 &finish_release_reserve, 284 &finish_release_reserve,
285 pc); 285 pc);
@@ -1165,7 +1165,6 @@ finish_reserve (void *cls,
1165 const char *msg) 1165 const char *msg)
1166{ 1166{
1167 struct GNUNET_FS_PublishContext *pc = cls; 1167 struct GNUNET_FS_PublishContext *pc = cls;
1168 struct GNUNET_FS_ProgressInfo pi;
1169 1168
1170 pc->qre = NULL; 1169 pc->qre = NULL;
1171 if ( (msg != NULL) || 1170 if ( (msg != NULL) ||
@@ -1180,11 +1179,11 @@ finish_reserve (void *cls,
1180 return; 1179 return;
1181 } 1180 }
1182 pc->rid = success; 1181 pc->rid = success;
1183 ret->upload_task 1182 pc->upload_task
1184 = GNUNET_SCHEDULER_add_with_priority (h->sched, 1183 = GNUNET_SCHEDULER_add_with_priority (pc->h->sched,
1185 GNUNET_SCHEDULER_PRIORITY_BACKGROUND, 1184 GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
1186 &GNUNET_FS_publish_main_, 1185 &GNUNET_FS_publish_main_,
1187 ret); 1186 pc);
1188} 1187}
1189 1188
1190 1189