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/fs/fs_list_indexed.c | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/fs/fs_list_indexed.c')
-rw-r--r-- | src/fs/fs_list_indexed.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c index 5850fd94e..fec127763 100644 --- a/src/fs/fs_list_indexed.c +++ b/src/fs/fs_list_indexed.c | |||
@@ -90,8 +90,7 @@ handle_index_info (void *cls, | |||
90 | _("Failed to receive response for `%s' request from `%s' service.\n"), | 90 | _("Failed to receive response for `%s' request from `%s' service.\n"), |
91 | "GET_INDEXED", | 91 | "GET_INDEXED", |
92 | "fs"); | 92 | "fs"); |
93 | GNUNET_SCHEDULER_add_continuation (gic->h->sched, | 93 | GNUNET_SCHEDULER_add_continuation (gic->cont, |
94 | gic->cont, | ||
95 | gic->cont_cls, | 94 | gic->cont_cls, |
96 | GNUNET_SCHEDULER_REASON_TIMEOUT); | 95 | GNUNET_SCHEDULER_REASON_TIMEOUT); |
97 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); | 96 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); |
@@ -101,8 +100,7 @@ handle_index_info (void *cls, | |||
101 | if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END) | 100 | if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END) |
102 | { | 101 | { |
103 | /* normal end-of-list */ | 102 | /* normal end-of-list */ |
104 | GNUNET_SCHEDULER_add_continuation (gic->h->sched, | 103 | GNUNET_SCHEDULER_add_continuation (gic->cont, |
105 | gic->cont, | ||
106 | gic->cont_cls, | 104 | gic->cont_cls, |
107 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 105 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
108 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); | 106 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); |
@@ -121,8 +119,7 @@ handle_index_info (void *cls, | |||
121 | _("Failed to receive valid response for `%s' request from `%s' service.\n"), | 119 | _("Failed to receive valid response for `%s' request from `%s' service.\n"), |
122 | "GET_INDEXED", | 120 | "GET_INDEXED", |
123 | "fs"); | 121 | "fs"); |
124 | GNUNET_SCHEDULER_add_continuation (gic->h->sched, | 122 | GNUNET_SCHEDULER_add_continuation (gic->cont, |
125 | gic->cont, | ||
126 | gic->cont_cls, | 123 | gic->cont_cls, |
127 | GNUNET_SCHEDULER_REASON_TIMEOUT); | 124 | GNUNET_SCHEDULER_REASON_TIMEOUT); |
128 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); | 125 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); |
@@ -134,8 +131,7 @@ handle_index_info (void *cls, | |||
134 | filename, | 131 | filename, |
135 | &iim->file_id)) | 132 | &iim->file_id)) |
136 | { | 133 | { |
137 | GNUNET_SCHEDULER_add_continuation (gic->h->sched, | 134 | GNUNET_SCHEDULER_add_continuation (gic->cont, |
138 | gic->cont, | ||
139 | gic->cont_cls, | 135 | gic->cont_cls, |
140 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 136 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
141 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); | 137 | GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO); |
@@ -172,16 +168,14 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h, | |||
172 | struct GetIndexedContext *gic; | 168 | struct GetIndexedContext *gic; |
173 | struct GNUNET_MessageHeader msg; | 169 | struct GNUNET_MessageHeader msg; |
174 | 170 | ||
175 | client = GNUNET_CLIENT_connect (h->sched, | 171 | client = GNUNET_CLIENT_connect ("fs", |
176 | "fs", | ||
177 | h->cfg); | 172 | h->cfg); |
178 | if (NULL == client) | 173 | if (NULL == client) |
179 | { | 174 | { |
180 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 175 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
181 | _("Failed to not connect to `%s' service.\n"), | 176 | _("Failed to not connect to `%s' service.\n"), |
182 | "fs"); | 177 | "fs"); |
183 | GNUNET_SCHEDULER_add_continuation (h->sched, | 178 | GNUNET_SCHEDULER_add_continuation (cont, |
184 | cont, | ||
185 | cont_cls, | 179 | cont_cls, |
186 | GNUNET_SCHEDULER_REASON_TIMEOUT); | 180 | GNUNET_SCHEDULER_REASON_TIMEOUT); |
187 | return; | 181 | return; |