[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13692 - gnunet/src/core
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13692 - gnunet/src/core |
|
Date: |
Tue, 16 Nov 2010 15:12:41 +0100 |
Author: wachs
Date: 2010-11-16 15:12:41 +0100 (Tue, 16 Nov 2010)
New Revision: 13692
Modified:
gnunet/src/core/test_core_quota_compliance.c
Log:
rewritten test...not yet finished
Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c 2010-11-16 13:02:52 UTC
(rev 13691)
+++ gnunet/src/core/test_core_quota_compliance.c 2010-11-16 14:12:41 UTC
(rev 13692)
@@ -34,29 +34,22 @@
#include "gnunet_program_lib.h"
#include "gnunet_scheduler_lib.h"
#include "gnunet_transport_service.h"
-#include "gnunet_statistics_service.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
-#define DEBUG_CONNECTIONS GNUNET_YES
/**
* Note that this value must not significantly exceed
* 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
* messages may be dropped even for a reliable transport.
*/
-#define TOTAL_MSGS (600 * 10)
+#define TOTAL_MSGS (60 * 10)
-#define MEASUREMENT_MSG_SIZE 10240
-#define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024
-#define MEASUREMENT_MIN_QUOTA 1024
-#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5)
-
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 6000)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
/**
* What delay do we request from the core service for transmission?
@@ -66,35 +59,25 @@
#define FAST_TIMEOUT GNUNET_TIME_relative_divide
(GNUNET_CONSTANTS_MAX_CORK_DELAY, 2)
#define MTYPE 12345
+#define MSIZE 1024
+#define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5)
-static int is_asymmetric_send_constant;
-static int is_asymmetric_recv_constant;
-static unsigned long long current_quota_p1_in;
-static unsigned long long current_quota_p1_out;
-static unsigned long long current_quota_p2_in;
-static unsigned long long current_quota_p2_out;
-
static unsigned long long total_bytes;
-static unsigned long long total_bytes_sent;
-static unsigned long long total_bytes_recv;
static struct GNUNET_TIME_Absolute start_time;
static GNUNET_SCHEDULER_TaskIdentifier err_task;
-static GNUNET_SCHEDULER_TaskIdentifier send_task;
-
static GNUNET_SCHEDULER_TaskIdentifier measure_task;
+
struct PeerContext
{
struct GNUNET_CONFIGURATION_Handle *cfg;
- struct GNUNET_STATISTICS_Handle *stats;
struct GNUNET_CORE_Handle *ch;
struct GNUNET_PeerIdentity id;
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_MessageHeader *hello;
-
int connect_status;
#if START_ARM
struct GNUNET_OS_Process *arm_proc;
@@ -106,10 +89,12 @@
static struct PeerContext p2;
static int ok;
-static int measurement_running;
-struct GNUNET_CORE_TransmitHandle * ch;
+static int32_t tr_n;
+static int running;
+
+
#if VERBOSE
#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok,
__FILE__, __LINE__); } while (0)
#else
@@ -136,6 +121,9 @@
GNUNET_TRANSPORT_disconnect (p2.th);
p2.th = NULL;
delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
+ fprintf (stderr,
+ "\nThroughput was %llu kb/s\n",
+ total_bytes * 1000 / 1024 / delta);
ok = 0;
}
@@ -143,9 +131,12 @@
static void
terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timout, exit!\n");
GNUNET_break (0);
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (send_task);
+
+ if (measure_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel(measure_task);
+
GNUNET_CORE_disconnect (p1.ch);
p1.ch = NULL;
GNUNET_CORE_disconnect (p2.ch);
@@ -158,129 +149,112 @@
}
static void
-next_fin (void *cls, int success)
+measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ measure_task = GNUNET_SCHEDULER_NO_TASK;
+ fprintf(stdout,"\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "FINIIISH!\n");
+ running = GNUNET_NO;
-}
+ GNUNET_SCHEDULER_cancel (err_task);
+ GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
-
-static int
-check_2 (void *cls,
- const char *subsystem,
- const char *name, uint64_t value, int is_persistent)
-{
- fprintf(stderr, "%s %s %llu\n", subsystem, name, (long long unsigned int)
value);
- return GNUNET_OK;
}
static size_t
-transmit_ready (void *cls, size_t size, void *buf);
-
-static void
-send_tsk (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+transmit_ready (void *cls, size_t size, void *buf)
{
- send_task = GNUNET_SCHEDULER_NO_TASK;
+ char *cbuf = buf;
+ struct TestMessage hdr;
+ unsigned int s;
+ unsigned int ret;
- ch = GNUNET_CORE_notify_transmit_ready (p1.ch,
- 0,
- FAST_TIMEOUT,
- &p2.id,
- sizeof (struct TestMessage) +
MEASUREMENT_MSG_SIZE,
- &transmit_ready, &p1);
-}
-
-static void
-measurement_end (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_TIME_Relative duration;
-
- measure_task = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
- if (err_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (err_task);
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (send_task);
-
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND
requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND
requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND
requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND
requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
-
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND request
bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND request
bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND
request bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
- GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND
request bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
- measurement_running = GNUNET_NO;
- duration = GNUNET_TIME_absolute_get_difference(start_time,
GNUNET_TIME_absolute_get());
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "\nQuota compliance: \n" \
- "Receive rate: %10llu kB/s\n"
- "Send rate : %10llu kB/s\n" \
- "Quota : %10llu kB/s\n",
- (total_bytes_recv/(duration.rel_value / 1000)/1024),
- (total_bytes_sent/(duration.rel_value / 1000)/1024),
- current_quota_p1_in/1024);
- GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
-}
-
-
-static void
-measure (unsigned long long quota_p1, unsigned long long quota_p2)
-{
+ GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
+ if (buf == NULL)
+ {
+ if (p1.ch != NULL)
+ GNUNET_break (NULL !=
+ GNUNET_CORE_notify_transmit_ready (p1.ch,
+ 0,
+ FAST_TIMEOUT,
+ &p2.id,
+ MSIZE,
+ &transmit_ready, &p1));
+ return 0;
+ }
+ GNUNET_assert (tr_n < TOTAL_MSGS);
+ ret = 0;
+ s = MSIZE;
+ GNUNET_assert (size >= s);
+ GNUNET_assert (buf != NULL);
+ cbuf = buf;
+ do
+ {
#if VERBOSE
- if ((is_asymmetric_send_constant == GNUNET_YES) ||
(is_asymmetric_recv_constant == GNUNET_YES))
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Starting core level measurement for %u seconds receiving peer
quota %llu kB/s, sending peer quota %llu kB/s\n",
MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p1_in / 1024,
current_quota_p2_out / 1024);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Starting core level measurement for %u seconds, symmetric quota
%llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p2_out /
1024);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message %u of size %u at offset %u\n",
+ tr_n,
+ s,
+ ret);
#endif
-#if DEBUG_CONNECTIONS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking core (1) for transmission to peer `%4s'\n",
- GNUNET_i2s (&p2.id));
-#endif
+ hdr.header.size = htons (s);
+ hdr.header.type = htons (MTYPE);
+ hdr.num = htonl (tr_n);
+ 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 = MSIZE;
+ if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
+ break; /* sometimes pack buffer full, sometimes not */
+ }
+ while (size - ret >= s);
+ GNUNET_SCHEDULER_cancel (err_task);
err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &terminate_task_error,
- NULL);
- measure_task = GNUNET_SCHEDULER_add_delayed (MEASUREMENT_INTERVALL,
- &measurement_end,
- NULL);
- start_time = GNUNET_TIME_absolute_get ();
- measurement_running = GNUNET_YES;
- total_bytes = 0;
- total_bytes_sent = 0;
- ch = GNUNET_CORE_notify_transmit_ready (p1.ch,
- 0,
- TIMEOUT,
- &p2.id,
- sizeof (struct TestMessage) +
MEASUREMENT_MSG_SIZE,
- &transmit_ready, &p1);
+ &terminate_task_error,
+ NULL);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Returning total message block of size %u\n",
+ ret);
+ total_bytes += ret;
+ return ret;
}
-static void connect_notify (void *cls,
+
+
+static void
+connect_notify (void *cls,
const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
- struct PeerContext *pc = cls;
+ struct PeerContext *pc = cls;
- GNUNET_assert (pc->connect_status == 0);
- pc->connect_status = 1;
- if (pc == &p1)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Encrypted connection established to peer `%4s'\n",
- GNUNET_i2s (peer));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking core (1) for transmission to peer `%4s'\n",
- GNUNET_i2s (&p2.id));
- measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MIN_QUOTA);
- }
+ GNUNET_assert (pc->connect_status == 0);
+ pc->connect_status = 1;
+ if (pc == &p1)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Encrypted connection established to peer `%4s'\n",
+ GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asking core (1) for transmission to peer `%4s'\n",
+ GNUNET_i2s (&p2.id));
+ err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &terminate_task_error,
+ NULL);
+ start_time = GNUNET_TIME_absolute_get ();
+ running = GNUNET_YES;
+ measure_task = GNUNET_SCHEDULER_add_delayed(MEASUREMENT_LENGTH,
&measurement_stop, NULL);
+
+ GNUNET_break (NULL != GNUNET_CORE_notify_transmit_ready (p1.ch,
+ 0,
+ TIMEOUT,
+ &p2.id,
+ MSIZE,
+ &transmit_ready, &p1));
+ }
}
@@ -290,10 +264,8 @@
{
struct PeerContext *pc = cls;
pc->connect_status = 0;
-#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer));
-#endif
}
@@ -303,11 +275,10 @@
const struct GNUNET_MessageHeader *message,
const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
- total_bytes_recv += ntohs (message->size);
+#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core provides inbound data from `%4s' size %u.\n", GNUNET_i2s
(other), ntohs (message->size));
-#if DEBUG_CONNECTIONS
- #endif
+ "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
+#endif
return GNUNET_OK;
}
@@ -318,7 +289,7 @@
const struct GNUNET_MessageHeader *message,
const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
-#if DEBUG_CONNECTIONS
+#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core notifies about outbound data for `%4s'.\n",
GNUNET_i2s (other));
@@ -327,9 +298,9 @@
}
-static int tr_n;
+static size_t
+transmit_ready (void *cls, size_t size, void *buf);
-
static int
process_mtype (void *cls,
const struct GNUNET_PeerIdentity *peer,
@@ -341,11 +312,32 @@
const struct TestMessage *hdr;
hdr = (const struct TestMessage*) message;
- s = sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE;
+ s = MSIZE;
if (MTYPE != ntohs (message->type))
return GNUNET_SYSERR;
-
-#if DEBUG_CONNECTIONS
+ if (ntohs (message->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),
+ ntohl (hdr->num));
+ GNUNET_SCHEDULER_cancel (err_task);
+ err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
+ return GNUNET_SYSERR;
+ }
+ 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));
+ GNUNET_SCHEDULER_cancel (err_task);
+ err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
+ return GNUNET_SYSERR;
+ }
+#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Got message %u of size %u\n",
ntohl (hdr->num),
@@ -354,7 +346,22 @@
n++;
if (0 == (n % (TOTAL_MSGS/100)))
fprintf (stderr, ".");
-
+ if (n == TOTAL_MSGS)
+ {
+ GNUNET_SCHEDULER_cancel (err_task);
+ GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
+ }
+ else
+ {
+ if (running == GNUNET_YES)
+ GNUNET_break (NULL !=
+ GNUNET_CORE_notify_transmit_ready (p1.ch,
+ 0,
+ FAST_TIMEOUT,
+ &p2.id,
+ MSIZE,
+ &transmit_ready, &p1));
+ }
return GNUNET_OK;
}
@@ -365,76 +372,7 @@
};
-static size_t
-transmit_ready (void *cls, size_t size, void *buf)
-{
- char *cbuf = buf;
- struct TestMessage hdr;
- unsigned int s;
- unsigned int ret;
- if (measurement_running != GNUNET_YES)
- return 0;
-
- GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
- if (buf == NULL)
- {
- if (p1.ch != NULL)
- {
- ch = GNUNET_CORE_notify_transmit_ready (p1.ch,
- 0,
- FAST_TIMEOUT,
- &p2.id,
- sizeof (struct
TestMessage) + MEASUREMENT_MSG_SIZE,
- &transmit_ready, &p1);
- GNUNET_break (NULL != ch);
- }
- return 0;
- }
- ret = 0;
- ch = NULL;
- s = sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE;
-
- GNUNET_assert (size >= s);
- GNUNET_assert (buf != NULL);
- cbuf = buf;
- do
- {
-#if DEBUG_CONNECTIONS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message %u of size %u at offset %u\n",
- tr_n,
- s,
- ret);
-#endif
- hdr.header.size = htons (s);
- hdr.header.type = htons (MTYPE);
- hdr.num = htonl (tr_n);
- 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++;
- if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
- break; /* sometimes pack buffer full, sometimes not */
- }
- while (size - ret >= s);
- GNUNET_SCHEDULER_cancel (err_task);
- err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &terminate_task_error,
- NULL);
-
- total_bytes += ret;
- total_bytes_sent += ret;
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(send_task);
- send_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 20), &send_tsk, NULL);
-
- return ret;
-}
-
-
-
static void
init_notify (void *cls,
struct GNUNET_CORE_Handle *server,
@@ -442,11 +380,10 @@
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
{
struct PeerContext *p = cls;
-#if DEBUG_CONNECTIONS
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to CORE service of `%4s' established\n",
GNUNET_i2s (my_identity));
-#endif
GNUNET_assert (server != NULL);
p->id = *my_identity;
p->ch = server;
@@ -460,7 +397,7 @@
&init_notify,
&connect_notify,
&disconnect_notify,
- NULL,
+ NULL,
&inbound_notify,
GNUNET_YES,
&outbound_notify, GNUNET_YES, handlers);
@@ -474,7 +411,7 @@
"Asking core (1) to connect to peer `%4s'\n",
GNUNET_i2s (&p2.id));
GNUNET_CORE_peer_request_connect (p1.ch,
- GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5),
+ GNUNET_TIME_UNIT_SECONDS,
&p2.id,
NULL, NULL);
}
@@ -488,11 +425,9 @@
struct PeerContext *p = cls;
GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p);
-#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received (my) `%s' from transport service\n",
"HELLO");
-#endif
GNUNET_assert (message != NULL);
p->hello = GNUNET_malloc (ntohs (message->size));
memcpy (p->hello, message, ntohs (message->size));
@@ -522,8 +457,6 @@
"-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
- p->stats = GNUNET_STATISTICS_create ("core", p->cfg);
- GNUNET_assert (p->stats != NULL);
p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL);
GNUNET_assert (p->th != NULL);
GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
@@ -548,23 +481,6 @@
NULL,
&inbound_notify,
GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
-
- GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number
(p1.cfg,
- "CORE",
- "TOTAL_QUOTA_IN",
- ¤t_quota_p1_in));
- GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number
(p2.cfg,
- "CORE",
- "TOTAL_QUOTA_IN",
- ¤t_quota_p2_in));
- GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number
(p1.cfg,
- "CORE",
- "TOTAL_QUOTA_OUT",
- ¤t_quota_p1_out));
- GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number
(p2.cfg,
- "CORE",
- "TOTAL_QUOTA_OUT",
- ¤t_quota_p2_out));
}
@@ -573,15 +489,14 @@
{
#if START_ARM
if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"ARM process stopped\n");
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ARM process %u stopped\n", GNUNET_OS_process_get_pid
(p->arm_proc));
GNUNET_OS_process_close (p->arm_proc);
p->arm_proc = NULL;
#endif
- GNUNET_STATISTICS_destroy (p->stats, 0);
GNUNET_CONFIGURATION_destroy (p->cfg);
}
@@ -601,7 +516,7 @@
};
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test_core_quota_compliance", "nohelp", options,
&run, &ok);
+ argv, "test-core-quota-compliance", "nohelp", options,
&run, &ok);
stop_arm (&p1);
stop_arm (&p2);
return ok;
@@ -620,10 +535,9 @@
#endif
NULL);
ret = check ();
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-peer-2");
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-peer-2");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
return ret;
}
-
-/* end of test_core_quota_compliance.c */
+/* end of test_core_api_reliability.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13692 - gnunet/src/core,
gnunet <=