[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37585 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37585 - gnunet/src/core |
Date: |
Tue, 26 Jul 2016 12:16:55 +0200 |
Author: grothoff
Date: 2016-07-26 12:16:55 +0200 (Tue, 26 Jul 2016)
New Revision: 37585
Modified:
gnunet/src/core/test_core_api_reliability.c
Log:
fix testcase shutdown
Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2016-07-25 21:35:36 UTC (rev
37584)
+++ gnunet/src/core/test_core_api_reliability.c 2016-07-26 10:16:55 UTC (rev
37585)
@@ -84,7 +84,7 @@
struct TestMessage
{
struct GNUNET_MessageHeader header;
- uint32_t num;
+ uint32_t num GNUNET_PACKED;
};
@@ -136,8 +136,6 @@
{
unsigned long long delta;
- terminate_peer (&p1);
- terminate_peer (&p2);
delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
FPRINTF (stderr,
"\nThroughput was %llu kb/s\n",
@@ -146,6 +144,7 @@
"Core throughput/s",
total_bytes * 1000000LL / 1024 / delta,
"kb/s");
+ GNUNET_SCHEDULER_shutdown ();
ok = 0;
}
@@ -153,10 +152,23 @@
static void
terminate_task_error (void *cls)
{
+ err_task = NULL;
GNUNET_break (0);
+ GNUNET_SCHEDULER_shutdown ();
+ ok = 42;
+}
+
+
+static void
+do_shutdown (void *cls)
+{
+ if (NULL != err_task)
+ {
+ GNUNET_SCHEDULER_cancel (err_task);
+ err_task = NULL;
+ }
terminate_peer (&p1);
terminate_peer (&p2);
- ok = 42;
}
@@ -462,7 +474,9 @@
binary,
"gnunet-service-arm",
"-c", cfgname, NULL);
- GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_load (p->cfg,
+ cfgname));
p->ats = GNUNET_ATS_connectivity_init (p->cfg);
GNUNET_assert (NULL != p->ats);
p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg,
@@ -486,14 +500,19 @@
GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&terminate_task_error,
NULL);
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
- GNUNET_assert (NULL != (p1.ch = GNUNET_CORE_connect (p1.cfg, &p1,
- &init_notify,
- &connect_notify,
- &disconnect_notify,
- &inbound_notify,
GNUNET_YES,
- &outbound_notify,
GNUNET_YES,
- handlers)));
+ GNUNET_assert (NULL !=
+ (p1.ch = GNUNET_CORE_connect (p1.cfg, &p1,
+ &init_notify,
+ &connect_notify,
+ &disconnect_notify,
+ &inbound_notify,
+ GNUNET_YES,
+ &outbound_notify,
+ GNUNET_YES,
+ handlers)));
}
@@ -500,10 +519,11 @@
static void
stop_arm (struct PeerContext *p)
{
- if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG))
+ if (0 != GNUNET_OS_process_kill (p->arm_proc,
+ GNUNET_TERM_SIG))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
"kill");
- if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
+ if (GNUNET_OK != GNUNET_OS_process_wait (p->arm_proc))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
"waitpid");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -531,8 +551,12 @@
GNUNET_log_setup ("test-core-api-reliability",
"WARNING",
NULL);
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-core-api-reliability", "nohelp", options, &run,
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+ argv,
+ "test-core-api-reliability",
+ "nohelp",
+ options,
+ &run,
&ok);
stop_arm (&p1);
stop_arm (&p2);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37585 - gnunet/src/core,
gnunet <=