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/plugin_datastore_sqlite.c | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/datastore/plugin_datastore_sqlite.c')
-rw-r--r-- | src/datastore/plugin_datastore_sqlite.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 01df7b670..b9edb4e57 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c | |||
@@ -623,8 +623,7 @@ sqlite_next_request (void *next_cls, | |||
623 | if (GNUNET_YES == end_it) | 623 | if (GNUNET_YES == end_it) |
624 | nc->end_it = GNUNET_YES; | 624 | nc->end_it = GNUNET_YES; |
625 | nc->plugin->next_task_nc = nc; | 625 | nc->plugin->next_task_nc = nc; |
626 | nc->plugin->next_task = GNUNET_SCHEDULER_add_now (nc->plugin->env->sched, | 626 | nc->plugin->next_task = GNUNET_SCHEDULER_add_now (&sqlite_next_request_cont, |
627 | &sqlite_next_request_cont, | ||
628 | nc); | 627 | nc); |
629 | } | 628 | } |
630 | 629 | ||
@@ -1598,8 +1597,7 @@ libgnunet_plugin_datastore_sqlite_done (void *cls) | |||
1598 | 1597 | ||
1599 | if (plugin->next_task != GNUNET_SCHEDULER_NO_TASK) | 1598 | if (plugin->next_task != GNUNET_SCHEDULER_NO_TASK) |
1600 | { | 1599 | { |
1601 | GNUNET_SCHEDULER_cancel (plugin->env->sched, | 1600 | GNUNET_SCHEDULER_cancel (plugin->next_task); |
1602 | plugin->next_task); | ||
1603 | plugin->next_task = GNUNET_SCHEDULER_NO_TASK; | 1601 | plugin->next_task = GNUNET_SCHEDULER_NO_TASK; |
1604 | plugin->next_task_nc->prep (plugin->next_task_nc->prep_cls, NULL); | 1602 | plugin->next_task_nc->prep (plugin->next_task_nc->prep_cls, NULL); |
1605 | GNUNET_free (plugin->next_task_nc); | 1603 | GNUNET_free (plugin->next_task_nc); |