diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-06-24 20:17:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-06-24 20:17:39 +0000 |
commit | 3140154d46212e08e0d73ed891a66213a6813075 (patch) | |
tree | 018a55a3899207664b388fcf47a679ca54ca6fbf /src/fs/gnunet-service-fs_pr.c | |
parent | d5fd881c2a044474b54ddf03b6ab8be8d2b75927 (diff) | |
download | gnunet-3140154d46212e08e0d73ed891a66213a6813075.tar.gz gnunet-3140154d46212e08e0d73ed891a66213a6813075.zip |
refactoring datastore API to use MQ API, also fixing misc. bugs in new mysql backend
Diffstat (limited to 'src/fs/gnunet-service-fs_pr.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index a7a62a743..d82b2a954 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -1149,7 +1149,6 @@ handle_dht_reply (void *cls, | |||
1149 | 1 /* anonymity */ , | 1149 | 1 /* anonymity */ , |
1150 | 0 /* replication */ , | 1150 | 0 /* replication */ , |
1151 | exp, 1 + prq.priority, MAX_DATASTORE_QUEUE, | 1151 | exp, 1 + prq.priority, MAX_DATASTORE_QUEUE, |
1152 | GNUNET_CONSTANTS_SERVICE_TIMEOUT, | ||
1153 | &put_migration_continuation, pmc)) | 1152 | &put_migration_continuation, pmc)) |
1154 | { | 1153 | { |
1155 | put_migration_continuation (pmc, | 1154 | put_migration_continuation (pmc, |
@@ -1472,7 +1471,6 @@ process_local_reply (void *cls, | |||
1472 | pr->public_data.options)) ? UINT_MAX : | 1471 | pr->public_data.options)) ? UINT_MAX : |
1473 | GSF_datastore_queue_size | 1472 | GSF_datastore_queue_size |
1474 | /* max queue size */ , | 1473 | /* max queue size */ , |
1475 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
1476 | &process_local_reply, pr); | 1474 | &process_local_reply, pr); |
1477 | if (NULL != pr->qe) | 1475 | if (NULL != pr->qe) |
1478 | return; /* we're done */ | 1476 | return; /* we're done */ |
@@ -1492,7 +1490,7 @@ process_local_reply (void *cls, | |||
1492 | { | 1490 | { |
1493 | GNUNET_break (0); | 1491 | GNUNET_break (0); |
1494 | GNUNET_DATASTORE_remove (GSF_dsh, key, size, data, -1, -1, | 1492 | GNUNET_DATASTORE_remove (GSF_dsh, key, size, data, -1, -1, |
1495 | GNUNET_TIME_UNIT_FOREVER_REL, NULL, NULL); | 1493 | NULL, NULL); |
1496 | pr->qe_start = GNUNET_TIME_absolute_get (); | 1494 | pr->qe_start = GNUNET_TIME_absolute_get (); |
1497 | pr->warn_task = | 1495 | pr->warn_task = |
1498 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, | 1496 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, |
@@ -1512,7 +1510,6 @@ process_local_reply (void *cls, | |||
1512 | pr->public_data.options)) ? UINT_MAX : | 1510 | pr->public_data.options)) ? UINT_MAX : |
1513 | GSF_datastore_queue_size | 1511 | GSF_datastore_queue_size |
1514 | /* max queue size */ , | 1512 | /* max queue size */ , |
1515 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
1516 | &process_local_reply, pr); | 1513 | &process_local_reply, pr); |
1517 | if (NULL == pr->qe) | 1514 | if (NULL == pr->qe) |
1518 | { | 1515 | { |
@@ -1574,7 +1571,6 @@ process_local_reply (void *cls, | |||
1574 | public_data.options)) ? UINT_MAX : | 1571 | public_data.options)) ? UINT_MAX : |
1575 | GSF_datastore_queue_size | 1572 | GSF_datastore_queue_size |
1576 | /* max queue size */ , | 1573 | /* max queue size */ , |
1577 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
1578 | &process_local_reply, pr); | 1574 | &process_local_reply, pr); |
1579 | /* check if we successfully queued another datastore request; | 1575 | /* check if we successfully queued another datastore request; |
1580 | * if so, return, otherwise call our continuation (if we have | 1576 | * if so, return, otherwise call our continuation (if we have |
@@ -1681,7 +1677,6 @@ GSF_local_lookup_ (struct GSF_PendingRequest *pr, | |||
1681 | public_data.options)) ? UINT_MAX : | 1677 | public_data.options)) ? UINT_MAX : |
1682 | GSF_datastore_queue_size | 1678 | GSF_datastore_queue_size |
1683 | /* max queue size */ , | 1679 | /* max queue size */ , |
1684 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
1685 | &process_local_reply, pr); | 1680 | &process_local_reply, pr); |
1686 | if (NULL != pr->qe) | 1681 | if (NULL != pr->qe) |
1687 | return; | 1682 | return; |
@@ -1795,7 +1790,6 @@ GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp, | |||
1795 | prq.priority, 1 /* anonymity */ , | 1790 | prq.priority, 1 /* anonymity */ , |
1796 | 0 /* replication */ , | 1791 | 0 /* replication */ , |
1797 | expiration, 1 + prq.priority, MAX_DATASTORE_QUEUE, | 1792 | expiration, 1 + prq.priority, MAX_DATASTORE_QUEUE, |
1798 | GNUNET_CONSTANTS_SERVICE_TIMEOUT, | ||
1799 | &put_migration_continuation, pmc)) | 1793 | &put_migration_continuation, pmc)) |
1800 | { | 1794 | { |
1801 | put_migration_continuation (pmc, | 1795 | put_migration_continuation (pmc, |