[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22560 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22560 - gnunet/src/transport |
Date: |
Mon, 9 Jul 2012 13:23:49 +0200 |
Author: wachs
Date: 2012-07-09 13:23:49 +0200 (Mon, 09 Jul 2012)
New Revision: 22560
Modified:
gnunet/src/transport/gnunet-transport.c
Log:
- check if service is running
Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c 2012-07-09 11:19:47 UTC (rev
22559)
+++ gnunet/src/transport/gnunet-transport.c 2012-07-09 11:23:49 UTC (rev
22560)
@@ -607,24 +607,18 @@
}
}
-
-
-/**
- * Main function that will be run by the 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,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+testservice_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (test_configuration)
+ struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
{
- do_test_configuration (cfg);
+ FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
+ return;
}
+
if (benchmark_send && (NULL == cpid))
{
FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
@@ -684,9 +678,35 @@
NULL);
}
}
+
+
}
+/**
+ * Main function that will be run by the 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,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ if (test_configuration)
+ {
+ do_test_configuration (cfg);
+ }
+
+ GNUNET_CLIENT_service_test ("transport", cfg,
+ GNUNET_TIME_UNIT_SECONDS,
+ &testservice_task,
+ (void *) cfg);
+}
+
+
int
main (int argc, char *const *argv)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22560 - gnunet/src/transport,
gnunet <=