[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37636 - gnunet/src/core
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37636 - gnunet/src/core |
|
Date: |
Sun, 31 Jul 2016 01:27:01 +0200 |
Author: grothoff
Date: 2016-07-31 01:27:01 +0200 (Sun, 31 Jul 2016)
New Revision: 37636
Modified:
gnunet/src/core/gnunet-service-core_clients.c
gnunet/src/core/test_core_api_reliability.c
Log:
adapting next test to new MQ API
Modified: gnunet/src/core/gnunet-service-core_clients.c
===================================================================
--- gnunet/src/core/gnunet-service-core_clients.c 2016-07-30 23:07:34 UTC
(rev 37635)
+++ gnunet/src/core/gnunet-service-core_clients.c 2016-07-30 23:27:01 UTC
(rev 37636)
@@ -469,7 +469,6 @@
struct TokenizerContext tc;
uint16_t msize;
struct GNUNET_TIME_Relative delay;
- struct GNUNET_TIME_Relative overdue;
msize = ntohs (message->size);
if (msize < sizeof (struct SendMessage))
@@ -509,10 +508,9 @@
return;
}
delay = GNUNET_TIME_absolute_get_duration (tc.car->received_time);
- overdue = GNUNET_TIME_absolute_get_duration (tc.car->deadline);
tc.cork = ntohl (sm->cork);
tc.priority = (enum GNUNET_CORE_Priority) ntohl (sm->priority);
- if (overdue.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
+ if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Client waited %s for transmission of %u bytes to `%s'%s\n",
GNUNET_STRINGS_relative_time_to_string (delay,
@@ -711,7 +709,7 @@
}
delay = GNUNET_TIME_absolute_get_duration (car->received_time);
left = GNUNET_TIME_absolute_get_duration (car->deadline);
- if (left.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
+ if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Client waited %s for permission to transmit to `%s'%s
(priority %u)\n",
GNUNET_STRINGS_relative_time_to_string (delay,
Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2016-07-30 23:07:34 UTC (rev
37635)
+++ gnunet/src/core/test_core_api_reliability.c 2016-07-30 23:27:01 UTC (rev
37636)
@@ -62,6 +62,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_CORE_Handle *ch;
+ struct GNUNET_MQ_Handle *mq;
struct GNUNET_PeerIdentity id;
struct GNUNET_TRANSPORT_OfferHelloHandle *oh;
struct GNUNET_MessageHeader *hello;
@@ -76,8 +77,6 @@
static struct PeerContext p2;
-static struct GNUNET_CORE_TransmitHandle *nth;
-
static int ok;
static int32_t tr_n;
@@ -109,7 +108,7 @@
{
if (NULL != p->ch)
{
- GNUNET_CORE_disconnect (p->ch);
+ GNUNET_CORE_disconnecT (p->ch);
p->ch = NULL;
}
if (NULL != p->ghh)
@@ -163,11 +162,6 @@
GNUNET_SCHEDULER_cancel (err_task);
err_task = NULL;
}
- if (NULL != nth)
- {
- GNUNET_CORE_notify_transmit_ready_cancel (nth);
- nth = NULL;
- }
terminate_peer (&p1);
terminate_peer (&p2);
@@ -174,73 +168,44 @@
}
-static size_t
-transmit_ready (void *cls,
- size_t size,
- void *buf)
+static void
+send_message (struct GNUNET_MQ_Handle *mq,
+ int32_t num)
{
- char *cbuf = buf;
- struct TestMessage hdr;
+ struct GNUNET_MQ_Envelope *env;
+ struct TestMessage *hdr;
unsigned int s;
- unsigned int ret;
- nth = NULL;
- GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
- if (NULL == buf)
- {
- if (NULL != p1.ch)
- GNUNET_break (NULL !=
- (nth = GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO,
-
GNUNET_CORE_PRIO_BEST_EFFORT,
- FAST_TIMEOUT,
- &p2.id,
- get_size (tr_n),
- &transmit_ready,
- &p1)));
- return 0;
- }
+ GNUNET_assert (NULL != mq);
GNUNET_assert (tr_n < TOTAL_MSGS);
- ret = 0;
s = get_size (tr_n);
- GNUNET_assert (size >= s);
- GNUNET_assert (buf != NULL);
- cbuf = buf;
- do
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message %u of size %u at offset %u\n",
- tr_n,
- s,
- ret);
- hdr.header.size = htons (s);
- hdr.header.type = htons (MTYPE);
- hdr.num = htonl (tr_n);
- GNUNET_memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
- ret += sizeof (struct TestMessage);
- memset (&cbuf[ret], tr_n, s - sizeof (struct TestMessage));
- ret += s - sizeof (struct TestMessage);
- tr_n++;
- s = get_size (tr_n);
- if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
- break; /* sometimes pack buffer full, sometimes not */
- }
- while (size - ret >= s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message %u of size %u\n",
+ tr_n,
+ s);
+ env = GNUNET_MQ_msg_extra (hdr,
+ s - sizeof (struct TestMessage),
+ MTYPE);
+ hdr->num = htonl (tr_n);
+ memset (&hdr[1],
+ tr_n,
+ s - sizeof (struct TestMessage));
+ tr_n++;
GNUNET_SCHEDULER_cancel (err_task);
err_task =
GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&terminate_task_error,
NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Returning total message block of size %u\n",
- ret);
- total_bytes += ret;
- return ret;
+ total_bytes += s;
+ GNUNET_MQ_send (mq,
+ env);
}
-static void
+static void *
connect_notify (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
struct PeerContext *pc = cls;
@@ -247,7 +212,8 @@
if (0 == memcmp (&pc->id,
peer,
sizeof (struct GNUNET_PeerIdentity)))
- return;
+ return (void *) peer;
+ pc->mq = mq;
GNUNET_assert (0 == pc->connect_status);
pc->connect_status = 1;
if (pc == &p1)
@@ -264,27 +230,25 @@
&terminate_task_error,
NULL);
start_time = GNUNET_TIME_absolute_get ();
- GNUNET_break (NULL !=
- (nth = GNUNET_CORE_notify_transmit_ready (p1.ch,
- GNUNET_NO,
-
GNUNET_CORE_PRIO_BEST_EFFORT,
- TIMEOUT,
- &p2.id,
- get_size (0),
- &transmit_ready,
- &p1)));
+ send_message (mq,
+ 0);
}
+ return (void *) peer;
}
static void
disconnect_notify (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
struct PeerContext *pc = cls;
- if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (&pc->id,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
return;
+ pc->mq = NULL;
pc->connect_status = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Encrypted connection to `%s' cut\n",
@@ -292,56 +256,57 @@
}
-static size_t
-transmit_ready (void *cls,
- size_t size,
- void *buf);
+static int
+check_test (void *cls,
+ const struct TestMessage *hdr)
+{
+ return GNUNET_OK; /* accept all */
+}
-static int
-process_mtype (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+static void
+handle_test (void *cls,
+ const struct TestMessage *hdr)
{
static int n;
unsigned int s;
- const struct TestMessage *hdr;
- hdr = (const struct TestMessage *) message;
s = get_size (n);
- if (MTYPE != ntohs (message->type))
- return GNUNET_SYSERR;
- if (ntohs (message->size) != s)
+ if (ntohs (hdr->header.size) != s)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
+ n,
+ s,
+ ntohs (hdr->header.size),
ntohl (hdr->num));
GNUNET_SCHEDULER_cancel (err_task);
err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error,
NULL);
- return GNUNET_SYSERR;
+ return;
}
if (ntohl (hdr->num) != n)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
- ntohl (hdr->num));
+ n,
+ s,
+ (unsigned int) ntohs (hdr->header.size),
+ (unsigned int) ntohl (hdr->num));
GNUNET_SCHEDULER_cancel (err_task);
err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error,
NULL);
- return GNUNET_SYSERR;
+ return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Got message %u of size %u\n",
- ntohl (hdr->num),
- ntohs (message->size));
+ (unsigned int) ntohl (hdr->num),
+ (unsigned int) ntohs (hdr->header.size));
n++;
if (0 == (n % (TOTAL_MSGS / 100)))
- FPRINTF (stderr, "%s", ".");
+ FPRINTF (stderr,
+ "%s",
+ ".");
if (n == TOTAL_MSGS)
{
ok = 0;
@@ -350,30 +315,26 @@
else
{
if (n == tr_n)
- GNUNET_break (NULL !=
- GNUNET_CORE_notify_transmit_ready (p1.ch,
- GNUNET_NO /* no cork */,
-
GNUNET_CORE_PRIO_BEST_EFFORT,
- FAST_TIMEOUT /*
ignored! */,
- &p2.id,
- get_size (tr_n),
- &transmit_ready, &p1));
+ {
+ send_message (p1.mq,
+ tr_n);
+ }
}
- return GNUNET_OK;
}
-static struct GNUNET_CORE_MessageHandler handlers[] = {
- {&process_mtype, MTYPE, 0},
- {NULL, 0, 0}
-};
-
-
static void
init_notify (void *cls,
const struct GNUNET_PeerIdentity *my_identity)
{
+ GNUNET_MQ_hd_var_size (test,
+ MTYPE,
+ struct TestMessage);
struct PeerContext *p = cls;
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_test_handler (NULL),
+ GNUNET_MQ_handler_end ()
+ };
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to CORE service of `%s' established\n",
@@ -385,15 +346,11 @@
OKPP;
/* connect p2 */
GNUNET_assert (NULL !=
- (p2.ch = GNUNET_CORE_connect (p2.cfg,
+ (p2.ch = GNUNET_CORE_connecT (p2.cfg,
&p2,
&init_notify,
&connect_notify,
&disconnect_notify,
- NULL,
- GNUNET_YES,
- NULL,
- GNUNET_YES,
handlers)));
}
else
@@ -490,6 +447,14 @@
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ GNUNET_MQ_hd_fixed_size (test,
+ MTYPE,
+ struct TestMessage);
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_test_handler (NULL),
+ GNUNET_MQ_handler_end ()
+ };
+
GNUNET_assert (ok == 1);
OKPP;
setup_peer (&p1,
@@ -504,15 +469,11 @@
NULL);
GNUNET_assert (NULL !=
- (p1.ch = GNUNET_CORE_connect (p1.cfg,
+ (p1.ch = GNUNET_CORE_connecT (p1.cfg,
&p1,
&init_notify,
&connect_notify,
&disconnect_notify,
- NULL,
- GNUNET_YES,
- NULL,
- GNUNET_YES,
handlers)));
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37636 - gnunet/src/core,
gnunet <=