diff options
Diffstat (limited to 'src/fs/gnunet-service-fs_pr.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 7b6290bbb..e5cb1f03c 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -817,9 +817,8 @@ process_reply (void *cls, const GNUNET_HashCode * key, void *value) | |||
817 | /* short cut: stop processing early, no BF-update, etc. */ | 817 | /* short cut: stop processing early, no BF-update, etc. */ |
818 | update_request_performance_data (prq, pr); | 818 | update_request_performance_data (prq, pr); |
819 | GNUNET_LOAD_update (GSF_rt_entry_lifetime, | 819 | GNUNET_LOAD_update (GSF_rt_entry_lifetime, |
820 | GNUNET_TIME_absolute_get_duration (pr->public_data. | 820 | GNUNET_TIME_absolute_get_duration (pr-> |
821 | start_time). | 821 | public_data.start_time).rel_value); |
822 | rel_value); | ||
823 | /* pass on to other peers / local clients */ | 822 | /* pass on to other peers / local clients */ |
824 | pr->rh (pr->rh_cls, prq->eval, pr, prq->anonymity_level, prq->expiration, | 823 | pr->rh (pr->rh_cls, prq->eval, pr, prq->anonymity_level, prq->expiration, |
825 | prq->type, prq->data, prq->size); | 824 | prq->type, prq->data, prq->size); |
@@ -1101,9 +1100,8 @@ warn_delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1101 | 1100 | ||
1102 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1101 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
1103 | _("Datastore lookup already took %llu ms!\n"), | 1102 | _("Datastore lookup already took %llu ms!\n"), |
1104 | (unsigned long long) GNUNET_TIME_absolute_get_duration (pr-> | 1103 | (unsigned long long) |
1105 | qe_start). | 1104 | GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value); |
1106 | rel_value); | ||
1107 | pr->warn_task = | 1105 | pr->warn_task = |
1108 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &warn_delay_task, | 1106 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &warn_delay_task, |
1109 | pr); | 1107 | pr); |
@@ -1123,9 +1121,8 @@ odc_warn_delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1123 | 1121 | ||
1124 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1122 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
1125 | _("On-demand lookup already took %llu ms!\n"), | 1123 | _("On-demand lookup already took %llu ms!\n"), |
1126 | (unsigned long long) GNUNET_TIME_absolute_get_duration (pr-> | 1124 | (unsigned long long) |
1127 | qe_start). | 1125 | GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value); |
1128 | rel_value); | ||
1129 | pr->warn_task = | 1126 | pr->warn_task = |
1130 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, | 1127 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, |
1131 | &odc_warn_delay_task, pr); | 1128 | &odc_warn_delay_task, pr); |
@@ -1257,12 +1254,12 @@ process_local_reply (void *cls, const GNUNET_HashCode * key, size_t size, | |||
1257 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? | 1254 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? |
1258 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, | 1255 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, |
1259 | (0 != | 1256 | (0 != |
1260 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> | 1257 | (GSF_PRO_PRIORITY_UNLIMITED & |
1261 | public_data.options)) ? UINT_MAX : 1 | 1258 | pr->public_data.options)) ? UINT_MAX : 1 |
1262 | /* queue priority */ , | 1259 | /* queue priority */ , |
1263 | (0 != | 1260 | (0 != |
1264 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> | 1261 | (GSF_PRO_PRIORITY_UNLIMITED & |
1265 | public_data.options)) ? UINT_MAX : 1 | 1262 | pr->public_data.options)) ? UINT_MAX : 1 |
1266 | /* max queue size */ , | 1263 | /* max queue size */ , |
1267 | GNUNET_TIME_UNIT_FOREVER_REL, | 1264 | GNUNET_TIME_UNIT_FOREVER_REL, |
1268 | &process_local_reply, pr); | 1265 | &process_local_reply, pr); |
@@ -1298,12 +1295,12 @@ process_local_reply (void *cls, const GNUNET_HashCode * key, size_t size, | |||
1298 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? | 1295 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? |
1299 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, | 1296 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, |
1300 | (0 != | 1297 | (0 != |
1301 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> | 1298 | (GSF_PRO_PRIORITY_UNLIMITED & |
1302 | public_data.options)) ? UINT_MAX : 1 | 1299 | pr->public_data.options)) ? UINT_MAX : 1 |
1303 | /* queue priority */ , | 1300 | /* queue priority */ , |
1304 | (0 != | 1301 | (0 != |
1305 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> | 1302 | (GSF_PRO_PRIORITY_UNLIMITED & |
1306 | public_data.options)) ? UINT_MAX : 1 | 1303 | pr->public_data.options)) ? UINT_MAX : 1 |
1307 | /* max queue size */ , | 1304 | /* max queue size */ , |
1308 | GNUNET_TIME_UNIT_FOREVER_REL, | 1305 | GNUNET_TIME_UNIT_FOREVER_REL, |
1309 | &process_local_reply, pr); | 1306 | &process_local_reply, pr); |
@@ -1357,12 +1354,12 @@ process_local_reply (void *cls, const GNUNET_HashCode * key, size_t size, | |||
1357 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? | 1354 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? |
1358 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, | 1355 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, |
1359 | (0 != | 1356 | (0 != |
1360 | (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data. | 1357 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> |
1361 | options)) ? UINT_MAX : 1 | 1358 | public_data.options)) ? UINT_MAX : 1 |
1362 | /* queue priority */ , | 1359 | /* queue priority */ , |
1363 | (0 != | 1360 | (0 != |
1364 | (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data. | 1361 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> |
1365 | options)) ? UINT_MAX : 1 | 1362 | public_data.options)) ? UINT_MAX : 1 |
1366 | /* max queue size */ , | 1363 | /* max queue size */ , |
1367 | GNUNET_TIME_UNIT_FOREVER_REL, | 1364 | GNUNET_TIME_UNIT_FOREVER_REL, |
1368 | &process_local_reply, pr); | 1365 | &process_local_reply, pr); |
@@ -1413,12 +1410,12 @@ GSF_local_lookup_ (struct GSF_PendingRequest *pr, | |||
1413 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? | 1410 | GNUNET_BLOCK_TYPE_FS_DBLOCK ? |
1414 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, | 1411 | GNUNET_BLOCK_TYPE_ANY : pr->public_data.type, |
1415 | (0 != | 1412 | (0 != |
1416 | (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data. | 1413 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> |
1417 | options)) ? UINT_MAX : 1 | 1414 | public_data.options)) ? UINT_MAX : 1 |
1418 | /* queue priority */ , | 1415 | /* queue priority */ , |
1419 | (0 != | 1416 | (0 != |
1420 | (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data. | 1417 | (GSF_PRO_PRIORITY_UNLIMITED & pr-> |
1421 | options)) ? UINT_MAX : 1 | 1418 | public_data.options)) ? UINT_MAX : 1 |
1422 | /* max queue size */ , | 1419 | /* max queue size */ , |
1423 | GNUNET_TIME_UNIT_FOREVER_REL, | 1420 | GNUNET_TIME_UNIT_FOREVER_REL, |
1424 | &process_local_reply, pr); | 1421 | &process_local_reply, pr); |