Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Adding an example of parallel task usage with MSG. Unfortunately, this example, altho...
authoralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 23 Aug 2007 11:35:29 +0000 (11:35 +0000)
committeralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 23 Aug 2007 11:35:29 +0000 (11:35 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4102 48e7efb5-ca39-0410-a469-dd3cf9ba447f

examples/msg/Makefile.am
examples/msg/Makefile.in
examples/msg/parallel_task/parallel_task.c [new file with mode: 0644]
examples/msg/parallel_task/parallel_task.tesh [new file with mode: 0644]

index 3cf664f..d56366e 100644 (file)
@@ -25,7 +25,8 @@ TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
         suspend/suspend.tesh \
        masterslave/masterslave.tesh \
        masterslave/masterslave_forwarder.tesh \
         suspend/suspend.tesh \
        masterslave/masterslave.tesh \
        masterslave/masterslave_forwarder.tesh \
-        masterslave/masterslave_bypass.tesh
+        masterslave/masterslave_bypass.tesh \
+        parallel_task/parallel_task.tesh
 
 if HAVE_SDP
   BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
 
 if HAVE_SDP
   BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
@@ -40,7 +41,8 @@ CLEANFILES = sendrecv/*~ \
              masterslave/*~ \
              masterslave/masterslave \
              masterslave/masterslave_forwarder \
              masterslave/*~ \
              masterslave/masterslave \
              masterslave/masterslave_forwarder \
-             masterslave/masterslave_bypass
+             masterslave/masterslave_bypass \
+             parallel_task/parallel_task
 
 if HAVE_GTNETS
              CLEANFILES += gtnets/gtnets 
 
 if HAVE_GTNETS
              CLEANFILES += gtnets/gtnets 
@@ -54,7 +56,8 @@ bin_PROGRAMS = sendrecv/sendrecv \
                masterslave/masterslave \
                masterslave/masterslave_forwarder \
                masterslave/masterslave_failure \
                masterslave/masterslave \
                masterslave/masterslave_forwarder \
                masterslave/masterslave_failure \
-               masterslave/masterslave_bypass
+               masterslave/masterslave_bypass \
+               parallel_task/parallel_task
 
 if HAVE_GTNETS
                bin_PROGRAMS += gtnets/gtnets 
 
 if HAVE_GTNETS
                bin_PROGRAMS += gtnets/gtnets 
@@ -70,6 +73,10 @@ sendrecv_sendrecv_LDADD   = $(top_builddir)/src/libsimgrid.la
 suspend_suspend_SOURCES = suspend/suspend.c
 suspend_suspend_LDADD   = $(top_builddir)/src/libsimgrid.la
 
 suspend_suspend_SOURCES = suspend/suspend.c
 suspend_suspend_LDADD   = $(top_builddir)/src/libsimgrid.la
 
+# master/slave application example
+parallel_task_parallel_task_SOURCES = parallel_task/parallel_task.c
+parallel_task_parallel_task_LDADD   = $(top_builddir)/src/libsimgrid.la
+
 # master/slave application example
 masterslave_masterslave_SOURCES = masterslave/masterslave.c
 masterslave_masterslave_LDADD   = $(top_builddir)/src/libsimgrid.la
 # master/slave application example
 masterslave_masterslave_SOURCES = masterslave/masterslave.c
 masterslave_masterslave_LDADD   = $(top_builddir)/src/libsimgrid.la
index 1dee639..2e70f5c 100644 (file)
@@ -43,7 +43,8 @@ bin_PROGRAMS = sendrecv/sendrecv$(EXEEXT) suspend/suspend$(EXEEXT) \
        masterslave/masterslave$(EXEEXT) \
        masterslave/masterslave_forwarder$(EXEEXT) \
        masterslave/masterslave_failure$(EXEEXT) \
        masterslave/masterslave$(EXEEXT) \
        masterslave/masterslave_forwarder$(EXEEXT) \
        masterslave/masterslave_failure$(EXEEXT) \
-       masterslave/masterslave_bypass$(EXEEXT) $(am__EXEEXT_1)
+       masterslave/masterslave_bypass$(EXEEXT) \
+       parallel_task/parallel_task$(EXEEXT) $(am__EXEEXT_1)
 @HAVE_GTNETS_TRUE@am__append_2 = gtnets/gtnets 
 @HAVE_GTNETS_FALSE@am__append_3 = gtnets/gtnets.c
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 @HAVE_GTNETS_TRUE@am__append_2 = gtnets/gtnets 
 @HAVE_GTNETS_FALSE@am__append_3 = gtnets/gtnets.c
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -96,6 +97,11 @@ masterslave_masterslave_forwarder_OBJECTS =  \
        $(am_masterslave_masterslave_forwarder_OBJECTS)
 masterslave_masterslave_forwarder_DEPENDENCIES =  \
        $(top_builddir)/src/libsimgrid.la
        $(am_masterslave_masterslave_forwarder_OBJECTS)
 masterslave_masterslave_forwarder_DEPENDENCIES =  \
        $(top_builddir)/src/libsimgrid.la
+am_parallel_task_parallel_task_OBJECTS = parallel_task.$(OBJEXT)
+parallel_task_parallel_task_OBJECTS =  \
+       $(am_parallel_task_parallel_task_OBJECTS)
+parallel_task_parallel_task_DEPENDENCIES =  \
+       $(top_builddir)/src/libsimgrid.la
 am_sendrecv_sendrecv_OBJECTS = sendrecv.$(OBJEXT)
 sendrecv_sendrecv_OBJECTS = $(am_sendrecv_sendrecv_OBJECTS)
 sendrecv_sendrecv_DEPENDENCIES = $(top_builddir)/src/libsimgrid.la
 am_sendrecv_sendrecv_OBJECTS = sendrecv.$(OBJEXT)
 sendrecv_sendrecv_OBJECTS = $(am_sendrecv_sendrecv_OBJECTS)
 sendrecv_sendrecv_DEPENDENCIES = $(top_builddir)/src/libsimgrid.la
@@ -118,12 +124,14 @@ SOURCES = $(gtnets_gtnets_SOURCES) $(masterslave_masterslave_SOURCES) \
        $(masterslave_masterslave_bypass_SOURCES) \
        $(masterslave_masterslave_failure_SOURCES) \
        $(masterslave_masterslave_forwarder_SOURCES) \
        $(masterslave_masterslave_bypass_SOURCES) \
        $(masterslave_masterslave_failure_SOURCES) \
        $(masterslave_masterslave_forwarder_SOURCES) \
+       $(parallel_task_parallel_task_SOURCES) \
        $(sendrecv_sendrecv_SOURCES) $(suspend_suspend_SOURCES)
 DIST_SOURCES = $(am__gtnets_gtnets_SOURCES_DIST) \
        $(masterslave_masterslave_SOURCES) \
        $(masterslave_masterslave_bypass_SOURCES) \
        $(masterslave_masterslave_failure_SOURCES) \
        $(masterslave_masterslave_forwarder_SOURCES) \
        $(sendrecv_sendrecv_SOURCES) $(suspend_suspend_SOURCES)
 DIST_SOURCES = $(am__gtnets_gtnets_SOURCES_DIST) \
        $(masterslave_masterslave_SOURCES) \
        $(masterslave_masterslave_bypass_SOURCES) \
        $(masterslave_masterslave_failure_SOURCES) \
        $(masterslave_masterslave_forwarder_SOURCES) \
+       $(parallel_task_parallel_task_SOURCES) \
        $(sendrecv_sendrecv_SOURCES) $(suspend_suspend_SOURCES)
 ETAGS = etags
 CTAGS = ctags
        $(sendrecv_sendrecv_SOURCES) $(suspend_suspend_SOURCES)
 ETAGS = etags
 CTAGS = ctags
@@ -281,13 +289,15 @@ TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
         suspend/suspend.tesh \
        masterslave/masterslave.tesh \
        masterslave/masterslave_forwarder.tesh \
         suspend/suspend.tesh \
        masterslave/masterslave.tesh \
        masterslave/masterslave_forwarder.tesh \
-        masterslave/masterslave_bypass.tesh
+        masterslave/masterslave_bypass.tesh \
+        parallel_task/parallel_task.tesh
 
 @HAVE_SDP_TRUE@BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
 CLEANFILES = sendrecv/*~ sendrecv/sendrecv suspend/*~ suspend/suspend \
        masterslave/*~ masterslave/masterslave \
        masterslave/masterslave_forwarder \
 
 @HAVE_SDP_TRUE@BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
 CLEANFILES = sendrecv/*~ sendrecv/sendrecv suspend/*~ suspend/suspend \
        masterslave/*~ masterslave/masterslave \
        masterslave/masterslave_forwarder \
-       masterslave/masterslave_bypass $(am__append_1)
+       masterslave/masterslave_bypass parallel_task/parallel_task \
+       $(am__append_1)
 
 # sendrecv simple example
 sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c
 
 # sendrecv simple example
 sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c
@@ -297,6 +307,10 @@ sendrecv_sendrecv_LDADD = $(top_builddir)/src/libsimgrid.la
 suspend_suspend_SOURCES = suspend/suspend.c
 suspend_suspend_LDADD = $(top_builddir)/src/libsimgrid.la
 
 suspend_suspend_SOURCES = suspend/suspend.c
 suspend_suspend_LDADD = $(top_builddir)/src/libsimgrid.la
 
+# master/slave application example
+parallel_task_parallel_task_SOURCES = parallel_task/parallel_task.c
+parallel_task_parallel_task_LDADD = $(top_builddir)/src/libsimgrid.la
+
 # master/slave application example
 masterslave_masterslave_SOURCES = masterslave/masterslave.c
 masterslave_masterslave_LDADD = $(top_builddir)/src/libsimgrid.la
 # master/slave application example
 masterslave_masterslave_SOURCES = masterslave/masterslave.c
 masterslave_masterslave_LDADD = $(top_builddir)/src/libsimgrid.la
@@ -398,6 +412,12 @@ masterslave/masterslave_failure$(EXEEXT): $(masterslave_masterslave_failure_OBJE
 masterslave/masterslave_forwarder$(EXEEXT): $(masterslave_masterslave_forwarder_OBJECTS) $(masterslave_masterslave_forwarder_DEPENDENCIES) masterslave/$(am__dirstamp)
        @rm -f masterslave/masterslave_forwarder$(EXEEXT)
        $(LINK) $(masterslave_masterslave_forwarder_OBJECTS) $(masterslave_masterslave_forwarder_LDADD) $(LIBS)
 masterslave/masterslave_forwarder$(EXEEXT): $(masterslave_masterslave_forwarder_OBJECTS) $(masterslave_masterslave_forwarder_DEPENDENCIES) masterslave/$(am__dirstamp)
        @rm -f masterslave/masterslave_forwarder$(EXEEXT)
        $(LINK) $(masterslave_masterslave_forwarder_OBJECTS) $(masterslave_masterslave_forwarder_LDADD) $(LIBS)
+parallel_task/$(am__dirstamp):
+       @$(MKDIR_P) parallel_task
+       @: > parallel_task/$(am__dirstamp)
+parallel_task/parallel_task$(EXEEXT): $(parallel_task_parallel_task_OBJECTS) $(parallel_task_parallel_task_DEPENDENCIES) parallel_task/$(am__dirstamp)
+       @rm -f parallel_task/parallel_task$(EXEEXT)
+       $(LINK) $(parallel_task_parallel_task_OBJECTS) $(parallel_task_parallel_task_LDADD) $(LIBS)
 sendrecv/$(am__dirstamp):
        @$(MKDIR_P) sendrecv
        @: > sendrecv/$(am__dirstamp)
 sendrecv/$(am__dirstamp):
        @$(MKDIR_P) sendrecv
        @: > sendrecv/$(am__dirstamp)
@@ -422,6 +442,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave_bypass.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave_failure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave_forwarder.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave_bypass.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave_failure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave_forwarder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel_task.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendrecv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suspend.Po@am__quote@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendrecv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suspend.Po@am__quote@
 
@@ -516,6 +537,20 @@ masterslave_forwarder.obj: masterslave/masterslave_forwarder.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o masterslave_forwarder.obj `if test -f 'masterslave/masterslave_forwarder.c'; then $(CYGPATH_W) 'masterslave/masterslave_forwarder.c'; else $(CYGPATH_W) '$(srcdir)/masterslave/masterslave_forwarder.c'; fi`
 
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o masterslave_forwarder.obj `if test -f 'masterslave/masterslave_forwarder.c'; then $(CYGPATH_W) 'masterslave/masterslave_forwarder.c'; else $(CYGPATH_W) '$(srcdir)/masterslave/masterslave_forwarder.c'; fi`
 
+parallel_task.o: parallel_task/parallel_task.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parallel_task.o -MD -MP -MF $(DEPDIR)/parallel_task.Tpo -c -o parallel_task.o `test -f 'parallel_task/parallel_task.c' || echo '$(srcdir)/'`parallel_task/parallel_task.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/parallel_task.Tpo $(DEPDIR)/parallel_task.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='parallel_task/parallel_task.c' object='parallel_task.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parallel_task.o `test -f 'parallel_task/parallel_task.c' || echo '$(srcdir)/'`parallel_task/parallel_task.c
+
+parallel_task.obj: parallel_task/parallel_task.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parallel_task.obj -MD -MP -MF $(DEPDIR)/parallel_task.Tpo -c -o parallel_task.obj `if test -f 'parallel_task/parallel_task.c'; then $(CYGPATH_W) 'parallel_task/parallel_task.c'; else $(CYGPATH_W) '$(srcdir)/parallel_task/parallel_task.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/parallel_task.Tpo $(DEPDIR)/parallel_task.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='parallel_task/parallel_task.c' object='parallel_task.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parallel_task.obj `if test -f 'parallel_task/parallel_task.c'; then $(CYGPATH_W) 'parallel_task/parallel_task.c'; else $(CYGPATH_W) '$(srcdir)/parallel_task/parallel_task.c'; fi`
+
 sendrecv.o: sendrecv/sendrecv.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sendrecv.o -MD -MP -MF $(DEPDIR)/sendrecv.Tpo -c -o sendrecv.o `test -f 'sendrecv/sendrecv.c' || echo '$(srcdir)/'`sendrecv/sendrecv.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sendrecv.Tpo $(DEPDIR)/sendrecv.Po
 sendrecv.o: sendrecv/sendrecv.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sendrecv.o -MD -MP -MF $(DEPDIR)/sendrecv.Tpo -c -o sendrecv.o `test -f 'sendrecv/sendrecv.c' || echo '$(srcdir)/'`sendrecv/sendrecv.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sendrecv.Tpo $(DEPDIR)/sendrecv.Po
@@ -728,6 +763,7 @@ distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -rm -f gtnets/$(am__dirstamp)
        -rm -f masterslave/$(am__dirstamp)
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -rm -f gtnets/$(am__dirstamp)
        -rm -f masterslave/$(am__dirstamp)
+       -rm -f parallel_task/$(am__dirstamp)
        -rm -f sendrecv/$(am__dirstamp)
        -rm -f suspend/$(am__dirstamp)
 
        -rm -f sendrecv/$(am__dirstamp)
        -rm -f suspend/$(am__dirstamp)
 
diff --git a/examples/msg/parallel_task/parallel_task.c b/examples/msg/parallel_task/parallel_task.c
new file mode 100644 (file)
index 0000000..c16de72
--- /dev/null
@@ -0,0 +1,93 @@
+/*     $Id$     */
+
+/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include <stdio.h>
+#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "xbt/sysdep.h" /* calloc, printf */
+
+/* Create a log channel to have nice outputs. */
+#include "xbt/log.h"
+#include "xbt/asserts.h"
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
+
+int test(int argc, char *argv[]);
+MSG_error_t test_all(const char *platform_file);
+
+/** Emitter function  */
+int test(int argc, char *argv[])
+{
+  int slaves_count = 0;
+  m_host_t *slaves = NULL;
+  double task_comp_size = 0;
+  double task_comm_size = 0;
+  double *computation_amount = NULL;
+  double *communication_amount = NULL;
+  m_task_t ptask = NULL;
+  int i,j;
+
+  slaves_count = MSG_get_host_number();
+  slaves = MSG_get_host_table();
+
+  computation_amount = calloc(slaves_count,sizeof(double));
+  communication_amount = calloc(slaves_count*slaves_count,sizeof(double));
+  
+  for(i=0;i<slaves_count;i++) 
+    computation_amount[i]=task_comp_size;
+
+  for(i=0;i<slaves_count;i++) 
+    for(j=i+1;j<slaves_count;j++) 
+      communication_amount[i*slaves_count+j]=task_comm_size;
+
+  ptask = MSG_parallel_task_create("parallel task",
+                                  slaves_count, slaves,
+                                  computation_amount,
+                                  communication_amount,
+                                  NULL);
+  MSG_parallel_task_execute(ptask);
+
+  
+  INFO0("Goodbye now!");
+  free(communication_amount);
+  free(computation_amount);
+  free(slaves);
+  return 0;
+} 
+
+/** Test function */
+MSG_error_t test_all(const char *platform_file)
+{
+  MSG_error_t res = MSG_OK;
+
+  /* MSG_config("workstation_model","KCCFLN05"); */
+  MSG_set_channel_number(1);
+  MSG_create_environment(platform_file);
+
+  MSG_process_create("test",test,NULL,MSG_get_host_table()[0]);
+  res = MSG_main();
+  
+  INFO1("Simulation time %g",MSG_get_clock());
+  return res;
+}
+
+int main(int argc, char *argv[])
+{
+  MSG_error_t res = MSG_OK;
+
+  MSG_global_init(&argc,argv);
+  if (argc < 2) {
+     printf ("Usage: %s platform_file\n",argv[0]);
+     printf ("example: %s msg_platform.xml\n",argv[0]);
+     exit(1);
+  }
+  res = test_all(argv[1]);
+  MSG_clean();
+
+  if(res==MSG_OK)
+    return 0;
+  else
+    return 1;
+}
diff --git a/examples/msg/parallel_task/parallel_task.tesh b/examples/msg/parallel_task/parallel_task.tesh
new file mode 100644 (file)
index 0000000..50b3711
--- /dev/null
@@ -0,0 +1,5 @@
+#! ./tesh
+
+p Testing a simple master/slave example application
+
+$ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/small_platform.xml