[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26153 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26153 - gnunet/src/testbed |
Date: |
Mon, 18 Feb 2013 17:24:52 +0100 |
Author: harsha
Date: 2013-02-18 17:24:52 +0100 (Mon, 18 Feb 2013)
New Revision: 26153
Added:
gnunet/src/testbed/gnunet_testbed_ll_master.c
gnunet/src/testbed/gnunet_testbed_ll_monitor.c
Removed:
gnunet/src/testbed/ll_master.c
gnunet/src/testbed/ll_monitor.c
Modified:
gnunet/src/testbed/
gnunet/src/testbed/Makefile.am
Log:
- rename and install to bin
Index: gnunet/src/testbed
===================================================================
--- gnunet/src/testbed 2013-02-18 16:11:05 UTC (rev 26152)
+++ gnunet/src/testbed 2013-02-18 16:24:52 UTC (rev 26153)
Property changes on: gnunet/src/testbed
___________________________________________________________________
Modified: svn:ignore
## -30,5 +30,6 ##
test_testbed_api_testbed_run_topologysmallworld
test_testbed_api_testbed_run_topologyfromfile
test_testbed_api_testbed_run_topologyscalefree
-ll-master
-ll-monitor
+gnunet-testbed-ll-master
+gnunet-testbed-ll-monitor
+gnunet-mpi-test
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2013-02-18 16:11:05 UTC (rev 26152)
+++ gnunet/src/testbed/Makefile.am 2013-02-18 16:24:52 UTC (rev 26153)
@@ -10,12 +10,11 @@
endif
if WITH_LL
- CC = mpcc
- ll_noinst_binaries = \
- ll-master \
- ll-monitor
+ CC = mpicc
ll_binaries = \
- gnunet-mpi-test
+ gnunet-mpi-test \
+ gnunet-testbed-ll-master \
+ gnunet-testbed-ll-monitor
endif
libexecdir= $(pkglibdir)/libexec/
@@ -33,8 +32,7 @@
$(ll_binaries)
noinst_PROGRAMS = \
- gnunet-testbed-profiler \
- $(ll_noinst_binaries)
+ gnunet-testbed-profiler
gnunet_service_testbed_SOURCES = \
gnunet-service-testbed.c \
@@ -69,15 +67,15 @@
gnunet-service-testbed.$(OBJEXT) \
libgnunettestbed.la
-ll_master_SOURCES = \
- ll_master.c
-ll_master_LDADD = $(XLIB) \
+gnunet_testbed_ll_master_SOURCES = \
+ gnunet_testbed_ll_master.c
+gnunet_testbed_ll_master_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL) -lz -lllapi
-ll_monitor_SOURCES = \
- ll_monitor.c
-ll_monitor_LDADD = $(XLIB) \
+gnunet_testbed_ll_monitor_SOURCES = \
+ gnunet_testbed_ll_monitor.c
+gnunet_testbed_ll_monitor_LDADD = $(XLIB) \
$(LTLIBINTL) -lz -lllapi
gnunet_mpi_test_SOURCES = gnunet_mpi_test.c
Copied: gnunet/src/testbed/gnunet_testbed_ll_master.c (from rev 26147,
gnunet/src/testbed/ll_master.c)
===================================================================
--- gnunet/src/testbed/gnunet_testbed_ll_master.c
(rev 0)
+++ gnunet/src/testbed/gnunet_testbed_ll_master.c 2013-02-18 16:24:52 UTC
(rev 26153)
@@ -0,0 +1,94 @@
+/*
+ This file is part of GNUnet
+ (C) 2012 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 testbed/ll_master.c
+ * @brief The load level master. Creates child processes through LoadLeveler
+ * @author Sree Harsha Totakura <address@hidden>
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include <llapi.h>
+
+/**
+ * LL job information
+ */
+static struct LL_job job_info;
+
+/**
+ * Exit status
+ */
+static int status;
+
+/**
+ * Main function that will be run.
+ *
+ * @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)
+{
+ int ret;
+
+ if (NULL == args[0])
+ {
+ fprintf (stderr, _("Job command file not given. Exiting\n"));
+ return;
+ }
+ ret = llsubmit (args[0], NULL, //char *monitor_program,
+ NULL, //char *monitor_arg,
+ &job_info, LL_JOB_VERSION);
+ if (0 != ret)
+ return;
+ status = GNUNET_OK;
+ printf ("Job name: %s\n Submitted to host: %s\n", job_info.job_name,
+ job_info.submit_host);
+}
+
+
+/**
+ * Main function
+ *
+ * @param argc the number of command line arguments
+ * @param argv command line arg array
+ * @return return code
+ */
+int
+main (int argc, char **argv)
+{
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ int ret;
+
+ status = GNUNET_SYSERR;
+ ret =
+ GNUNET_PROGRAM_run (argc, argv, "ll-master",
+ "LoadLeveler master process for starting child
processes",
+ options, &run, NULL);
+ if (GNUNET_OK != ret)
+ return 1;
+ return (GNUNET_OK == status) ? 0 : 1;
+}
Copied: gnunet/src/testbed/gnunet_testbed_ll_monitor.c (from rev 26147,
gnunet/src/testbed/ll_monitor.c)
===================================================================
--- gnunet/src/testbed/gnunet_testbed_ll_monitor.c
(rev 0)
+++ gnunet/src/testbed/gnunet_testbed_ll_monitor.c 2013-02-18 16:24:52 UTC
(rev 26153)
@@ -0,0 +1,76 @@
+/*
+ This file is part of GNUnet
+ (C) 2012 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 testbed/ll_monitor.c
+ * @brief The load level monitor process. This is called whenever a job event
+ * happens. This file is called with the following syntax:
+ * "monitor_program job_id user_arg state exit_status"
+ * @author Sree Harsha Totakura <address@hidden>
+ */
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include <llapi.h>
+
+
+/**
+ * Main function
+ *
+ * @param argc the number of command line arguments
+ * @param argv command line arg array
+ * @return return code
+ */
+int
+main (int argc, char **argv)
+{
+ char *job_id;
+ char *user_arg;
+ char *state;
+ char *exit_status;
+ char *outfile;
+ FILE *out;
+
+ if (5 != argc)
+ {
+ fprintf (stderr, "Invalid number of arguments\n");
+ return 1;
+ }
+ job_id = argv[1];
+ user_arg = argv[2];
+ state = argv[3];
+ exit_status = argv[4];
+ PRINTF ("Job id: %s\n", job_id);
+ PRINTF ("\t User arg: %s \n", user_arg);
+ PRINTF ("\t Job state: %s \n", state);
+ PRINTF ("\t Exit status: %s \n", exit_status);
+
+ if (-1 == asprintf (&outfile, "job-%s.status", job_id))
+ return 1;
+ out = fopen (outfile, "a");
+ if (NULL == out)
+ return 1;
+ fprintf (out, "Job id: %s\n", job_id);
+ fprintf (out, "\t User arg: %s \n", user_arg);
+ fprintf (out, "\t Job state: %s \n", state);
+ fprintf (out, "\t Exit status: %s \n", exit_status);
+ fclose (out);
+ return 0;
+}
Deleted: gnunet/src/testbed/ll_master.c
===================================================================
--- gnunet/src/testbed/ll_master.c 2013-02-18 16:11:05 UTC (rev 26152)
+++ gnunet/src/testbed/ll_master.c 2013-02-18 16:24:52 UTC (rev 26153)
@@ -1,92 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2012 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 testbed/ll_master.c
- * @brief The load level master. Creates child processes through LoadLeveler
- * @author Sree Harsha Totakura <address@hidden>
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include <llapi.h>
-
-/**
- * LL job information
- */
-static struct LL_job job_info;
-
-/**
- * Exit status
- */
-static int status;
-
-/**
- * Main function that will be run.
- *
- * @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)
-{
- int ret;
-
- if (NULL == args[0])
- {
- fprintf (stderr, _("Job command file not given. Exiting\n"));
- return;
- }
- ret = llsubmit (args[0], NULL, //char *monitor_program,
- NULL, //char *monitor_arg,
- &job_info, LL_JOB_VERSION);
- if (0 != ret)
- return;
- status = GNUNET_OK;
-}
-
-
-/**
- * Main function
- *
- * @param argc the number of command line arguments
- * @param argv command line arg array
- * @return return code
- */
-int
-main (int argc, char **argv)
-{
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- int ret;
-
- status = GNUNET_SYSERR;
- ret =
- GNUNET_PROGRAM_run (argc, argv, "ll-master",
- "LoadLeveler master process for starting child
processes",
- options, &run, NULL);
- if (GNUNET_OK != ret)
- return 1;
- return (GNUNET_OK == status) ? 0 : 1;
-}
Deleted: gnunet/src/testbed/ll_monitor.c
===================================================================
--- gnunet/src/testbed/ll_monitor.c 2013-02-18 16:11:05 UTC (rev 26152)
+++ gnunet/src/testbed/ll_monitor.c 2013-02-18 16:24:52 UTC (rev 26153)
@@ -1,76 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2012 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 testbed/ll_monitor.c
- * @brief The load level monitor process. This is called whenever a job event
- * happens. This file is called with the following syntax:
- * "monitor_program job_id user_arg state exit_status"
- * @author Sree Harsha Totakura <address@hidden>
- */
-
-#include "platform.h"
-#include "gnunet_common.h"
-#include <llapi.h>
-
-
-/**
- * Main function
- *
- * @param argc the number of command line arguments
- * @param argv command line arg array
- * @return return code
- */
-int
-main (int argc, char **argv)
-{
- char *job_id;
- char *user_arg;
- char *state;
- char *exit_status;
- char *outfile;
- FILE *out;
-
- if (5 != argc)
- {
- fprintf (stderr, "Invalid number of arguments\n");
- return 1;
- }
- job_id = argv[1];
- user_arg = argv[2];
- state = argv[3];
- exit_status = argv[4];
- PRINTF ("Job id: %s\n", job_id);
- PRINTF ("\t User arg: %s \n", user_arg);
- PRINTF ("\t Job state: %s \n", state);
- PRINTF ("\t Exit status: %s \n", exit_status);
-
- if (-1 == asprintf (&outfile, "job-%s.status", job_id))
- return 1;
- out = fopen (outfile, "a");
- if (NULL == out)
- return 1;
- fprintf (out, "Job id: %s\n", job_id);
- fprintf (out, "\t User arg: %s \n", user_arg);
- fprintf (out, "\t Job state: %s \n", state);
- fprintf (out, "\t Exit status: %s \n", exit_status);
- fclose (out);
- return 0;
-}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26153 - gnunet/src/testbed,
gnunet <=