[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28871 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28871 - gnunet/src/testing |
Date: |
Tue, 27 Aug 2013 16:37:38 +0200 |
Author: dold
Date: 2013-08-27 16:37:38 +0200 (Tue, 27 Aug 2013)
New Revision: 28871
Removed:
gnunet/src/testing/gnunet-testing-run-service.c
Modified:
gnunet/src/testing/Makefile.am
gnunet/src/testing/gnunet-testing.c
Log:
merged 'gnunet-testing-run-service' into 'gnunet-testing'
Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am 2013-08-27 13:30:55 UTC (rev 28870)
+++ gnunet/src/testing/Makefile.am 2013-08-27 14:37:38 UTC (rev 28871)
@@ -28,20 +28,8 @@
-version-info 2:0:1
bin_PROGRAMS = \
- gnunet-testing-run-service \
gnunet-testing
-
-gnunet_testing_run_service_SOURCES = \
- gnunet-testing-run-service.c
-
-gnunet_testing_run_service_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(GN_LIBINTL)
-gnunet_testing_run_service_DEPENDENCIES = \
- libgnunettesting.la
-
gnunet_testing_SOURCES = \
gnunet-testing.c
gnunet_testing_LDADD = \
Deleted: gnunet/src/testing/gnunet-testing-run-service.c
===================================================================
--- gnunet/src/testing/gnunet-testing-run-service.c 2013-08-27 13:30:55 UTC
(rev 28870)
+++ gnunet/src/testing/gnunet-testing-run-service.c 2013-08-27 14:37:38 UTC
(rev 28871)
@@ -1,213 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and
other contributing authors)
-
- 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 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-
-/**
- * @file testing/gnunet-testing-run-service.c
- * @brief tool to start a service for testing
- * @author Florian Dold
- *
- * Start a peer, running only the service specified on the command line.
- * Outputs the path to the temporary configuration file to stdout.
- *
- * The peer will run until this program is killed,
- * or stdin is closed. When reading the character 'r' from stdin,
- * the running service is restarted with the same configuration.
- *
- * This executable is intended to be used by gnunet-java, in order to reliably
- * start and stop services for test cases.
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-#define LOG(kind,...) \
- GNUNET_log_from (kind, "gnunet-testing", __VA_ARGS__)
-
-
-/**
- * File handle to STDIN, for reading restart/quit commands.
- */
-static struct GNUNET_DISK_FileHandle *fh;
-
-/**
- * FIXME
- */
-static char *tmpfilename;
-
-/**
- * FIXME
- */
-static GNUNET_SCHEDULER_TaskIdentifier tid;
-
-/**
- * FIXME
- */
-static struct GNUNET_TESTING_Peer *my_peer;
-
-
-
-
-/**
- * Cleanup called by signal handlers and when stdin is closed.
- * Removes the temporary file.
- *
- * @param cls unused
- * @param tc scheduler context
- */
-static void
-cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- if (NULL != tmpfilename)
- {
- if (0 != UNLINK (tmpfilename))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
tmpfilename);
- }
- if (GNUNET_SCHEDULER_NO_TASK != tid)
- {
- GNUNET_SCHEDULER_cancel (tid);
- tid = GNUNET_SCHEDULER_NO_TASK;
- }
- if (NULL != fh)
- {
- GNUNET_DISK_file_close (fh);
- fh = NULL;
- }
-}
-
-
-/**
- * Called whenever we can read stdin non-blocking
- *
- * @param cls unused
- * @param tc scheduler context
- */
-static void
-stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- int c;
-
- tid = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- return;
- GNUNET_assert (0 != (GNUNET_SCHEDULER_REASON_READ_READY & tc->reason));
- c = getchar ();
- switch (c)
- {
- case EOF:
- case 'q':
- GNUNET_SCHEDULER_shutdown ();
- return;
- case 'r':
- if (GNUNET_OK != GNUNET_TESTING_peer_stop (my_peer))
- LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to stop the peer\n");
- if (GNUNET_OK != GNUNET_TESTING_peer_start (my_peer))
- LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to start the peer\n");
- printf ("restarted\n");
- fflush (stdout);
- break;
- case '\n':
- case '\r':
- /* ignore whitespace */
- break;
- default:
- fprintf (stderr, _("Unknown command, use 'q' to quit or 'r' to restart
peer\n"));
- break;
- }
- tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
- &stdin_cb, NULL);
-}
-
-
-/**
- * Main function called by the testing library.
- * Executed inside a running scheduler.
- *
- * @param cls unused
- * @param cfg configuration of the peer that was started
- * @param peer handle to the peer
- */
-static void
-testing_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
-{
- my_peer = peer;
- if (NULL == (tmpfilename = GNUNET_DISK_mktemp ("gnunet-testing")))
- {
- GNUNET_break (0);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg,
- tmpfilename))
- {
- GNUNET_break (0);
- return;
- }
- printf("ok\n%s\n", tmpfilename);
- fflush(stdout);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, NULL);
- fh = GNUNET_DISK_get_handle_from_native (stdin);
- tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
- &stdin_cb, NULL);
-}
-
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
- static char *cfg_name;
- static char *srv_name;
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'c', "config", "FILENAME",
- gettext_noop ("name of the template configuration file to use
(optional)"), GNUNET_NO,
- &GNUNET_GETOPT_set_string, &cfg_name},
- {'s', "service", "SERVICE",
- gettext_noop ("name of the service to run"), GNUNET_YES,
- &GNUNET_GETOPT_set_string, &srv_name},
- GNUNET_GETOPT_OPTION_HELP ("tool to start a service for testing"),
- GNUNET_GETOPT_OPTION_END
- };
- int ret;
-
- if (GNUNET_SYSERR ==
- GNUNET_GETOPT_run ("gnunet-testing-run-service", options, argc, argv))
- return 1;
- ret = GNUNET_TESTING_service_run ("gnunet_service_test", srv_name,
- cfg_name, &testing_main, NULL);
- if (0 != ret)
- {
- printf ("error\n");
- }
- else
- {
- printf ("bye\n");
- }
- return ret;
-}
-
Modified: gnunet/src/testing/gnunet-testing.c
===================================================================
--- gnunet/src/testing/gnunet-testing.c 2013-08-27 13:30:55 UTC (rev 28870)
+++ gnunet/src/testing/gnunet-testing.c 2013-08-27 14:37:38 UTC (rev 28871)
@@ -28,20 +28,63 @@
#include "gnunet_testing_lib.h"
+#define LOG(kind,...) \
+ GNUNET_log_from (kind, "gnunet-testing", __VA_ARGS__)
+
+
/**
* Final status code.
*/
static int ret;
+/**
+ * Filename of the hostkey file we should write,
+ * null if we should not write a hostkey file.
+ */
static char *create_hostkey;
+/**
+ * Non-zero if we should create config files.
+ */
static int create_cfg;
+/**
+ * Number of config files to create.
+ */
static unsigned int create_no;
+/**
+ * Filename of the config template to be written.
+ */
static char *create_cfg_template;
+/**
+ * Service we are supposed to run.
+ */
+static char *run_service_name;
+/**
+ * File handle to STDIN, for reading restart/quit commands.
+ */
+static struct GNUNET_DISK_FileHandle *fh;
+
+/**
+ * Temporary filename, used with '-r' to write the configuration to.
+ */
+static char *tmpfilename;
+
+/**
+ * Task identifier of the task that waits for stdin.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier tid;
+
+/**
+ * Peer started for '-r'.
+ */
+static struct GNUNET_TESTING_Peer *my_peer;
+
+
+
static int
create_unique_cfgs (const char * template, const unsigned int no)
{
@@ -150,18 +193,132 @@
/**
- * Main function that will be run by the scheduler.
+ * Cleanup called by signal handlers and when stdin is closed.
+ * Removes the temporary file.
*
+ * @param cls unused
+ * @param tc scheduler context
+ */
+static void
+cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (NULL != tmpfilename)
+ {
+ if (0 != UNLINK (tmpfilename))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
tmpfilename);
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != tid)
+ {
+ GNUNET_SCHEDULER_cancel (tid);
+ tid = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != fh)
+ {
+ GNUNET_DISK_file_close (fh);
+ fh = NULL;
+ }
+}
+
+
+/**
+ * Called whenever we can read stdin non-blocking
+ *
+ * @param cls unused
+ * @param tc scheduler context
+ */
+static void
+stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ int c;
+
+ tid = GNUNET_SCHEDULER_NO_TASK;
+ if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+ return;
+ GNUNET_assert (0 != (GNUNET_SCHEDULER_REASON_READ_READY & tc->reason));
+ c = getchar ();
+ switch (c)
+ {
+ case EOF:
+ case 'q':
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ case 'r':
+ if (GNUNET_OK != GNUNET_TESTING_peer_stop (my_peer))
+ LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to stop the peer\n");
+ if (GNUNET_OK != GNUNET_TESTING_peer_start (my_peer))
+ LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to start the peer\n");
+ printf ("restarted\n");
+ fflush (stdout);
+ break;
+ case '\n':
+ case '\r':
+ /* ignore whitespace */
+ break;
+ default:
+ fprintf (stderr, _("Unknown command, use 'q' to quit or 'r' to restart
peer\n"));
+ break;
+ }
+ tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
+ &stdin_cb, NULL);
+}
+
+
+/**
+ * Main function called by the testing library.
+ * Executed inside a running scheduler.
+ *
+ * @param cls unused
+ * @param cfg configuration of the peer that was started
+ * @param peer handle to the peer
+ */
+static void
+testing_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
+{
+ my_peer = peer;
+ if (NULL == (tmpfilename = GNUNET_DISK_mktemp ("gnunet-testing")))
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg,
+ tmpfilename))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ printf("ok\n%s\n", tmpfilename);
+ fflush(stdout);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, NULL);
+ fh = GNUNET_DISK_get_handle_from_native (stdin);
+ tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
+ &stdin_cb, NULL);
+}
+
+
+
+/**
+ * Main function that will be running without scheduler.
+ *
* @param cls closure
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be
NULL!)
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run_no_scheduler (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- /* main code here */
+ if (NULL != run_service_name)
+ {
+ printf ("testing run\n");
+ ret = GNUNET_TESTING_service_run ("gnunet_service_test", run_service_name,
+ cfgfile, &testing_main, NULL);
+ return;
+ }
+
if (GNUNET_YES == create_cfg)
{
if (create_no > 0)
@@ -204,15 +361,21 @@
GNUNET_YES, &GNUNET_GETOPT_set_uint, &create_no},
{'t', "template", "FILENAME", gettext_noop ("configuration template"),
GNUNET_YES, &GNUNET_GETOPT_set_string, &create_cfg_template},
+ {'r', "run", "SERVICE", gettext_noop ("run the given service, wait on
stdin for 'r' (restart) or 'q' (quit)"),
+ GNUNET_YES, &GNUNET_GETOPT_set_string, &run_service_name},
GNUNET_GETOPT_OPTION_END
};
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
+ /* Run without scheduler, because we may want to call
+ * GNUNET_TESTING_service_run, which starts the scheduler on its own.
+ * Furthermore, the other functionality currently does not require the
scheduler, too,
+ * but beware when extending gnunet-testing. */
ret = (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-testing",
- gettext_noop ("Command line tool to access the
testing library"), options, &run,
- NULL)) ? ret : 1;
+ GNUNET_PROGRAM_run2 (argc, argv, "gnunet-testing",
+ gettext_noop ("Command line tool to access the
testing library"), options, &run_no_scheduler,
+ NULL, GNUNET_YES)) ? ret : 1;
GNUNET_free ((void*) argv);
return ret;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28871 - gnunet/src/testing,
gnunet <=