[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20508 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20508 - in gnunet/src: include util |
Date: |
Thu, 15 Mar 2012 10:02:08 +0100 |
Author: wachs
Date: 2012-03-15 10:02:08 +0100 (Thu, 15 Mar 2012)
New Revision: 20508
Modified:
gnunet/src/include/gnunet_program_lib.h
gnunet/src/util/program.c
Log:
- new program_run and run_2
Modified: gnunet/src/include/gnunet_program_lib.h
===================================================================
--- gnunet/src/include/gnunet_program_lib.h 2012-03-14 22:01:26 UTC (rev
20507)
+++ gnunet/src/include/gnunet_program_lib.h 2012-03-15 09:02:08 UTC (rev
20508)
@@ -60,6 +60,28 @@
* @param argc number of command line arguments
* @param argv command line arguments
* @param binaryName our expected name
+ * @param binaryHelp help text for the program
+ * @param options command line options
+ * @param task main function to run
+ * @param task_cls closure for task
+ * @param run_with_schedule GNUNET_YES start the scheduler, GNUNET_NO do not
+ * start the scheduler just run the main task
+ * @return GNUNET_SYSERR on error, GNUNET_OK on success
+ */
+int
+GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
+ const char *binaryHelp,
+ const struct GNUNET_GETOPT_CommandLineOption *options,
+ GNUNET_PROGRAM_Main task, void *task_cls,
+ int run_with_schedule);
+
+/**
+ * Run a standard GNUnet command startup sequence (initialize loggers
+ * and configuration, parse options).
+ *
+ * @param argc number of command line arguments
+ * @param argv command line arguments
+ * @param binaryName our expected name
* @param binaryHelp helptext for "-h" option (about the app)
* @param options command line options
* @param task main function to run
Modified: gnunet/src/util/program.c
===================================================================
--- gnunet/src/util/program.c 2012-03-14 22:01:26 UTC (rev 20507)
+++ gnunet/src/util/program.c 2012-03-15 09:02:08 UTC (rev 20508)
@@ -125,13 +125,16 @@
* @param options command line options
* @param task main function to run
* @param task_cls closure for task
+ * @param run_with_schedule GNUNET_NO start the scheduler, GNUNET_YES do not
+ * start the scheduler just run the main task
* @return GNUNET_SYSERR on error, GNUNET_OK on success
*/
int
-GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName,
+GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
const char *binaryHelp,
const struct GNUNET_GETOPT_CommandLineOption *options,
- GNUNET_PROGRAM_Main task, void *task_cls)
+ GNUNET_PROGRAM_Main task, void *task_cls,
+ int run_with_schedule)
{
struct CommandContext cc;
char *path;
@@ -247,8 +250,15 @@
}
/* run */
cc.args = &argv[ret];
- GNUNET_SCHEDULER_run (&program_main, &cc);
-
+ if (GNUNET_NO == run_with_schedule)
+ {
+ GNUNET_SCHEDULER_run (&program_main, &cc);
+ }
+ else
+ {
+ GNUNET_RESOLVER_connect (cc.cfg);
+ cc.task (cc.task_cls, cc.args, cc.cfgfile, cc.cfg);
+ }
/* clean up */
GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free_non_null (cc.cfgfile);
@@ -257,5 +267,28 @@
return GNUNET_OK;
}
+/**
+ * Run a standard GNUnet command startup sequence (initialize loggers
+ * and configuration, parse options).
+ *
+ * @param argc number of command line arguments
+ * @param argv command line arguments
+ * @param binaryName our expected name
+ * @param binaryHelp help text for the program
+ * @param options command line options
+ * @param task main function to run
+ * @param task_cls closure for task
+ * @return GNUNET_SYSERR on error, GNUNET_OK on success
+ */
+int
+GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName,
+ const char *binaryHelp,
+ const struct GNUNET_GETOPT_CommandLineOption *options,
+ GNUNET_PROGRAM_Main task, void *task_cls)
+{
+ return GNUNET_PROGRAM_run2 (argc, argv, binaryName, binaryHelp,
options, task, task_cls, GNUNET_NO);
+}
+
+
/* end of program.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20508 - in gnunet/src: include util,
gnunet <=