diff options
| author | Nathan S. Evans <evans@in.tum.de> | 2010-11-05 18:21:50 +0000 |
|---|---|---|
| committer | Nathan S. Evans <evans@in.tum.de> | 2010-11-05 18:21:50 +0000 |
| commit | 75a33a1499cf60ea4364c9aa673816629a6c1413 (patch) | |
| tree | 0620da4312bb04de4d7b65074fdd3b0c3dd6cc0e /src/datastore/test_datastore_api.c | |
| parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/datastore/test_datastore_api.c')
| -rw-r--r-- | src/datastore/test_datastore_api.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 3b72020051..06abc0c0f7 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -125,7 +125,6 @@ struct CpsRunContext GNUNET_HashCode key; int i; int rid; - struct GNUNET_SCHEDULER_Handle *sched; const struct GNUNET_CONFIGURATION_Handle *cfg; void *data; size_t size; @@ -150,13 +149,12 @@ check_success (void *cls, ok = 42; GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", msg); - GNUNET_SCHEDULER_shutdown (crc->sched); + GNUNET_SCHEDULER_shutdown (); return; } GNUNET_free_non_null (crc->data); crc->data = NULL; - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } @@ -173,8 +171,7 @@ get_reserved (void *cls, "%s\n", msg); GNUNET_assert (0 < success); crc->rid = success; - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } @@ -201,8 +198,7 @@ check_value (void *cls, crc->phase = RP_DEL; crc->i = ITERATIONS; } - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); return; @@ -243,8 +239,7 @@ delete_value (void *cls, { crc->phase = RP_DO_DEL; } - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); return; @@ -275,8 +270,7 @@ check_nothing (void *cls, { crc->phase = RP_RESERVE; } - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } @@ -309,8 +303,7 @@ check_multiple (void *cls, { crc->phase = RP_UPDATE; } - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); return; @@ -364,8 +357,7 @@ check_update (void *cls, { crc->phase = RP_DONE; } - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); return; @@ -597,8 +589,7 @@ run_tests (void *cls, GNUNET_free (crc); return; } - GNUNET_SCHEDULER_add_continuation (crc->sched, - &run_continuation, + GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } @@ -606,7 +597,6 @@ run_tests (void *cls, static void run (void *cls, - struct GNUNET_SCHEDULER_Handle *sched, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) @@ -615,11 +605,10 @@ run (void *cls, static GNUNET_HashCode zkey; crc = GNUNET_malloc(sizeof(struct CpsRunContext)); - crc->sched = sched; crc->cfg = cfg; crc->phase = RP_PUT; now = GNUNET_TIME_absolute_get (); - datastore = GNUNET_DATASTORE_connect (cfg, sched); + datastore = GNUNET_DATASTORE_connect (cfg); if (NULL == GNUNET_DATASTORE_put (datastore, 0, &zkey, 4, "TEST", |