[GNUnet-SVN] r25253 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-12-05 14:56:23 +0100 (Wed, 05 Dec 2012)
New Revision: 25253

Added:
   gnunet/src/testbed/ll_monitor.c
   gnunet/src/testbed/sample.job
Modified:
   gnunet/src/testbed/
   gnunet/src/testbed/Makefile.am
   gnunet/src/testbed/ll_master.c
Log:
- Loadleveler code

Index: gnunet/src/testbed
===================================================================
--- gnunet/src/testbed  2012-12-05 13:04:50 UTC (rev 25252)
+++ gnunet/src/testbed  2012-12-05 13:56:23 UTC (rev 25253)

Property changes on: gnunet/src/testbed
___________________________________________________________________
Modified: svn:ignore
## -30,3 +30,4 ##
 test_testbed_api_testbed_run_topologyfromfile
 test_testbed_api_testbed_run_topologyscalefree
 ll-master
+ll-monitor
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am      2012-12-05 13:04:50 UTC (rev 25252)
+++ gnunet/src/testbed/Makefile.am      2012-12-05 13:56:23 UTC (rev 25253)
@@ -10,7 +10,9 @@
 endif
 
 if WITH_LL
-  ll_binaries = ll-master
+  ll_binaries = \
+    ll-master \
+    ll-monitor
 endif
 
 libexecdir= $(pkglibdir)/libexec/
@@ -61,8 +63,14 @@
 ll_master_SOURCES = \
   ll_master.c
 ll_master_LDADD = $(XLIB) \
- $(LTLIBINTL) -lz
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL) -lz -lllapi
 
+ll_monitor_SOURCES = \
+  ll_monitor.c
+ll_monitor_LDADD = $(XLIB) \
+ $(LTLIBINTL) -lz -lllapi
+
 lib_LTLIBRARIES = \
   libgnunettestbed.la
 
@@ -272,4 +280,5 @@
   test_testbed_api_testbed_run_topologyfromfile.conf \
   test_testbed_api_testbed_run_topologyscalefree.conf \
   overlay_topology.txt \
-  sample_hosts.txt
+  sample_hosts.txt \
+  sample.job

Modified: gnunet/src/testbed/ll_master.c
===================================================================
--- gnunet/src/testbed/ll_master.c      2012-12-05 13:04:50 UTC (rev 25252)
+++ gnunet/src/testbed/ll_master.c      2012-12-05 13:56:23 UTC (rev 25253)
@@ -1,6 +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>
 
-int main()
+/**
+ * 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)
 {
-  return 0;
+  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;
+}

Added: gnunet/src/testbed/ll_monitor.c
===================================================================
--- gnunet/src/testbed/ll_monitor.c                             (rev 0)
+++ gnunet/src/testbed/ll_monitor.c     2012-12-05 13:56:23 UTC (rev 25253)
@@ -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;
+}

Added: gnunet/src/testbed/sample.job
===================================================================
--- gnunet/src/testbed/sample.job                               (rev 0)
+++ gnunet/src/testbed/sample.job       2012-12-05 13:56:23 UTC (rev 25253)
@@ -0,0 +1,16 @@
+#!/bin/bash
+# This job command file is called job.cmd
+#@ job_type = parallel
+#@ class = general
+#@ node = 1
+#@ output = job$(jobid).out
+#@ error = job$(jobid).err
+#@ total_tasks=16
+#@ wall_clock_limit = 0:0:1
+#@ network.MPI = sn_all,not_shared,us
+##@ ... other LoadLeveler keywords (see below)
+#@ notification = always
+#@ notify_user = address@hidden
+#@ queue
+
+#@ executable = /bin/bash


Property changes on: gnunet/src/testbed/sample.job
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property