diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-16 17:41:13 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-16 17:41:13 +0000 |
commit | ba0bf2a585c2b59890d8f67074b74725430e86e8 (patch) | |
tree | d4f98f90560b63b632b686a5a6cb6a03c52c6d8a /src/core/core_api.c | |
parent | e6fdcba7a3f54eefde196ccbc606acd62d30fb0f (diff) | |
download | gnunet-ba0bf2a585c2b59890d8f67074b74725430e86e8.tar.gz gnunet-ba0bf2a585c2b59890d8f67074b74725430e86e8.zip |
-remove GNUNET_MQ_impl_send_commit, make it part of send_continue, to ensure calling the continuation _last_
Diffstat (limited to 'src/core/core_api.c')
-rw-r--r-- | src/core/core_api.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index 34c235bbd..f07d1ca47 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -1424,7 +1424,6 @@ core_mq_ntr (void *cls, size_t size, | |||
1424 | return 0; | 1424 | return 0; |
1425 | } | 1425 | } |
1426 | memcpy (buf, mh, msg_size); | 1426 | memcpy (buf, mh, msg_size); |
1427 | GNUNET_MQ_impl_send_commit (mq); | ||
1428 | GNUNET_MQ_impl_send_continue (mq); | 1427 | GNUNET_MQ_impl_send_continue (mq); |
1429 | return msg_size; | 1428 | return msg_size; |
1430 | } | 1429 | } |
@@ -1448,7 +1447,7 @@ core_mq_send (struct GNUNET_MQ_Handle *mq, | |||
1448 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "core-mq", "Sending queued message (size %u)\n", | 1447 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "core-mq", "Sending queued message (size %u)\n", |
1449 | ntohs (msg->size)); | 1448 | ntohs (msg->size)); |
1450 | mqs->th = GNUNET_CORE_notify_transmit_ready (mqs->core, GNUNET_YES, 0, | 1449 | mqs->th = GNUNET_CORE_notify_transmit_ready (mqs->core, GNUNET_YES, 0, |
1451 | GNUNET_TIME_UNIT_FOREVER_REL, | 1450 | GNUNET_TIME_UNIT_FOREVER_REL, |
1452 | &mqs->target, | 1451 | &mqs->target, |
1453 | ntohs (msg->size), core_mq_ntr, mq); | 1452 | ntohs (msg->size), core_mq_ntr, mq); |
1454 | } | 1453 | } |
@@ -1459,7 +1458,7 @@ core_mq_send (struct GNUNET_MQ_Handle *mq, | |||
1459 | * destruction of a message queue. | 1458 | * destruction of a message queue. |
1460 | * Implementations must not free @a mq, but should | 1459 | * Implementations must not free @a mq, but should |
1461 | * take care of @a impl_state. | 1460 | * take care of @a impl_state. |
1462 | * | 1461 | * |
1463 | * @param mq the message queue to destroy | 1462 | * @param mq the message queue to destroy |
1464 | * @param impl_state state of the implementation | 1463 | * @param impl_state state of the implementation |
1465 | */ | 1464 | */ |
@@ -1478,7 +1477,7 @@ core_mq_destroy (struct GNUNET_MQ_Handle *mq, void *impl_state) | |||
1478 | 1477 | ||
1479 | /** | 1478 | /** |
1480 | * Implementation function that cancels the currently sent message. | 1479 | * Implementation function that cancels the currently sent message. |
1481 | * | 1480 | * |
1482 | * @param mq message queue | 1481 | * @param mq message queue |
1483 | * @param impl_state state specific to the implementation | 1482 | * @param impl_state state specific to the implementation |
1484 | */ | 1483 | */ |