diff options
| author | Christian Grothoff <christian@grothoff.org> | 2012-04-19 15:23:44 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2012-04-19 15:23:44 +0000 |
| commit | 99c66999a525b2783982ffa7590c988529184482 (patch) | |
| tree | 902df4ae92d4a6d6f6244f01ade448e050955cb5 /src/fs | |
| parent | 44b9867d329a7046a4c9c3ac5628847e174abb9d (diff) | |
| download | gnunet-99c66999a525b2783982ffa7590c988529184482.tar.gz gnunet-99c66999a525b2783982ffa7590c988529184482.zip | |
-do not test for prereq done, almost always set now
Diffstat (limited to 'src/fs')
| -rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.c | 2 | ||||
| -rw-r--r-- | src/fs/test_gnunet_service_fs_migration.c | 4 | ||||
| -rw-r--r-- | src/fs/test_gnunet_service_fs_p2p.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index 32dcffa72..7b2c04407 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c | |||
| @@ -191,7 +191,7 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
| 191 | char *fancy; | 191 | char *fancy; |
| 192 | struct StatMaster *sm; | 192 | struct StatMaster *sm; |
| 193 | 193 | ||
| 194 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) | 194 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) |
| 195 | { | 195 | { |
| 196 | del = GNUNET_TIME_absolute_get_duration (start_time); | 196 | del = GNUNET_TIME_absolute_get_duration (start_time); |
| 197 | if (del.rel_value == 0) | 197 | if (del.rel_value == 0) |
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 8b85e5e73..00aab4f42 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c | |||
| @@ -66,7 +66,7 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
| 66 | cc = NULL; | 66 | cc = NULL; |
| 67 | } | 67 | } |
| 68 | GNUNET_FS_TEST_daemons_stop (2, daemons); | 68 | GNUNET_FS_TEST_daemons_stop (2, daemons); |
| 69 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) | 69 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) |
| 70 | { | 70 | { |
| 71 | del = GNUNET_TIME_absolute_get_duration (start_time); | 71 | del = GNUNET_TIME_absolute_get_duration (start_time); |
| 72 | if (del.rel_value == 0) | 72 | if (del.rel_value == 0) |
| @@ -146,7 +146,7 @@ static void | |||
| 146 | do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 146 | do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
| 147 | { | 147 | { |
| 148 | cc = NULL; | 148 | cc = NULL; |
| 149 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) | 149 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) |
| 150 | { | 150 | { |
| 151 | GNUNET_FS_TEST_daemons_stop (2, daemons); | 151 | GNUNET_FS_TEST_daemons_stop (2, daemons); |
| 152 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 152 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index a853897b2..7ca786ed2 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c | |||
| @@ -62,7 +62,7 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
| 62 | cc = NULL; | 62 | cc = NULL; |
| 63 | } | 63 | } |
| 64 | GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons); | 64 | GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons); |
| 65 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) | 65 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) |
| 66 | { | 66 | { |
| 67 | del = GNUNET_TIME_absolute_get_duration (start_time); | 67 | del = GNUNET_TIME_absolute_get_duration (start_time); |
| 68 | if (del.rel_value == 0) | 68 | if (del.rel_value == 0) |