X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_api_start_only.c;h=36d96479699d71e41b2d76a14f5fd888c32ba9fb;hb=502af2167f7c218366666ca4944bd7cc54b5b19a;hp=dc4bfea98549448fc61817ad443438a59acd9164;hpb=0a217a8df1657b4334b55b0e4a6c7837a8dbcfd9;p=oweals%2Fgnunet.git diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index dc4bfea98..36d964796 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -4,7 +4,7 @@ GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but @@ -33,13 +33,9 @@ #define VERBOSE GNUNET_NO -#define START_ARM GNUNET_YES - +#define TIMEOUT 3 -/** - * How long until we give up on transmitting the message? - */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) +#define START_ARM GNUNET_YES #define MTYPE 12345 @@ -49,7 +45,7 @@ struct PeerContext struct GNUNET_CORE_Handle *ch; struct GNUNET_PeerIdentity id; #if START_ARM - pid_t arm_pid; + struct GNUNET_OS_Process *arm_proc; #endif }; @@ -57,7 +53,7 @@ static struct PeerContext p1; static struct PeerContext p2; -static struct GNUNET_SCHEDULER_Handle *sched; +static GNUNET_SCHEDULER_TaskIdentifier timeout_task_id; static int ok; @@ -72,33 +68,22 @@ static int ok; static void connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer, - unsigned int bpm, struct GNUNET_TIME_Absolute last_activity) + const struct GNUNET_TRANSPORT_ATS_Information *atsi) { } static void -disconnect_notify (void *cls, - const struct GNUNET_PeerIdentity *peer, - unsigned int bpm, - struct GNUNET_TIME_Absolute last_activity) +disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) { } -static unsigned int -bfc_callback (void *cls, - const struct GNUNET_PeerIdentity *receiver, - void *position, unsigned int padding) -{ - return 0; -} - - static int inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) + const struct GNUNET_MessageHeader *message, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) { return GNUNET_OK; } @@ -107,7 +92,8 @@ inbound_notify (void *cls, static int outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) + const struct GNUNET_MessageHeader *message, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) { return GNUNET_OK; } @@ -118,6 +104,18 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { }; +static void +shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_CORE_disconnect (p1.ch); + p1.ch = NULL; + GNUNET_CORE_disconnect (p2.ch); + p2.ch = NULL; + ok = 0; +} + + + static void init_notify (void *cls, @@ -128,32 +126,26 @@ init_notify (void *cls, struct PeerContext *p = cls; GNUNET_assert (server != NULL); - p->ch = server; + GNUNET_assert (p->ch == server); if (cls == &p1) - { - /* connect p2 */ - GNUNET_CORE_connect (sched, - p2.cfg, - TIMEOUT, - &p2, - &init_notify, - &connect_notify, - &disconnect_notify, - &bfc_callback, - &inbound_notify, - GNUNET_YES, - &outbound_notify, GNUNET_YES, handlers); - } + { + /* connect p2 */ + p2.ch = GNUNET_CORE_connect (p2.cfg, 1, + &p2, + &init_notify, + &connect_notify, + &disconnect_notify, + NULL, + &inbound_notify, + GNUNET_YES, + &outbound_notify, GNUNET_YES, handlers); + } else - { - GNUNET_assert (cls == &p2); - GNUNET_CORE_disconnect (p1.ch); - GNUNET_CORE_disconnect (p2.ch); - GNUNET_ARM_stop_service ("core", p1.cfg, sched, TIMEOUT, NULL, NULL); - GNUNET_ARM_stop_service ("core", p2.cfg, sched, TIMEOUT, NULL, NULL); - - ok = 0; - } + { + GNUNET_assert (cls == &p2); + GNUNET_SCHEDULER_cancel (timeout_task_id); + GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); + } } @@ -162,53 +154,70 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", - "gnunet-service-arm", + p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", + "gnunet-service-arm", #if VERBOSE - "-L", "DEBUG", + "-L", "DEBUG", #endif - "-c", cfgname, NULL); - sleep (1); /* allow ARM to start */ + "-c", cfgname, NULL); #endif GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); - GNUNET_ARM_start_service ("core", p->cfg, sched, TIMEOUT, NULL, NULL); } +static void +timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + fprintf (stderr, "Timeout.\n"); + if (p1.ch != NULL) + { + GNUNET_CORE_disconnect (p1.ch); + p1.ch = NULL; + } + if (p2.ch != NULL) + { + GNUNET_CORE_disconnect (p2.ch); + p2.ch = NULL; + } + ok = 42; +} + + + static void run (void *cls, - struct GNUNET_SCHEDULER_Handle *s, char *const *args, - const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg) + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { GNUNET_assert (ok == 1); OKPP; - sched = s; setup_peer (&p1, "test_core_api_peer1.conf"); setup_peer (&p2, "test_core_api_peer2.conf"); - GNUNET_CORE_connect (sched, - p1.cfg, - TIMEOUT, - &p1, - &init_notify, - &connect_notify, - &disconnect_notify, - &bfc_callback, - &inbound_notify, - GNUNET_YES, &outbound_notify, GNUNET_YES, handlers); + timeout_task_id = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_MINUTES, TIMEOUT), + &timeout_task, NULL); + p1.ch = + GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify, + &disconnect_notify, NULL, &inbound_notify, + GNUNET_YES, &outbound_notify, GNUNET_YES, handlers); } static void stop_arm (struct PeerContext *p) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peer\n"); #if START_ARM - if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) + if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - if (p->arm_pid != waitpid (p->arm_pid, NULL, 0)) + 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 %u stopped\n", p->arm_pid); + "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_CONFIGURATION_destroy (p->cfg); } @@ -217,7 +226,7 @@ stop_arm (struct PeerContext *p) static int check () { - char *const argv[] = { "test-core-api", + char *const argv[] = { "test-core-api-start-only", "-c", "test_core_api_data.conf", #if VERBOSE @@ -228,10 +237,14 @@ check () struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); ok = 1; GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, - argv, "test-core-api", "nohelp", options, &run, &ok); + argv, "test-core-api-start-only", "nohelp", options, &run, + &ok); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test finished\n"); stop_arm (&p1); stop_arm (&p2); return ok; @@ -242,7 +255,7 @@ main (int argc, char *argv[]) { int ret; - GNUNET_log_setup ("test-core-api", + GNUNET_log_setup ("test-core-api-start-only", #if VERBOSE "DEBUG", #else @@ -250,7 +263,8 @@ main (int argc, char *argv[]) #endif NULL); ret = check (); - + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); return ret; }