Running GRAS on top of MSG

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@965 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 2e29c6c..c20f8da 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,2 @@
 SUBDIRS=msg gras # ping bandwidth alnem saturate
 EXTRA_DIST= modules.doc 
 SUBDIRS=msg gras # ping bandwidth alnem saturate
 EXTRA_DIST= modules.doc 

-# gras_stub_generator WAN_3.platform.txt WAN_3.platform_2.txt 

diff --git a/examples/gras/Makefile.am b/examples/gras/Makefile.am
index 250c239..33b1b6d 100644 (file)
--- a/examples/gras/Makefile.am
+++ b/examples/gras/Makefile.am
@@ -1,3 +1 @@
 SUBDIRS= ping # bandwidth alnem saturate
 SUBDIRS= ping # bandwidth alnem saturate

-EXTRA_DIST=gras_stub_generator
-# gras_stub_generator WAN_3.platform.txt WAN_3.platform_2.txt 

diff --git a/examples/gras/ping/Makefile.am b/examples/gras/ping/Makefile.am
index 675c4e6..c2b5bb6 100644 (file)
--- a/examples/gras/ping/Makefile.am
+++ b/examples/gras/ping/Makefile.am
@@ -1,19 +1,18 @@
 INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g
 INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g

-TESTS= test_rl # test_sg
-EXTRA_DIST=ping_deployment.txt $(TESTS)
+TESTS= test_rl test_sg
+EXTRA_DIST=ping_deployment.xml $(TESTS)

 
 # AUTOMAKE variable definition
 
 # AUTOMAKE variable definition

-check_PROGRAMS=ping_client ping_server 
-# ping_simulator
+check_PROGRAMS=ping_client ping_server ping_simulator

 
 

-#ping_simulator_SOURCES=_ping_simulator.c ping.c
-#ping_simulator_LDADD= $(top_builddir)/src/libsimgrid.la
+ping_simulator_SOURCES=        _ping_simulator.c ping.c
+ping_simulator_LDADD=  $(top_builddir)/src/libsimgrid.la

 
 ping_client_SOURCES=   _ping_client.c ping.c
 
 ping_client_SOURCES=   _ping_client.c ping.c

-ping_server_SOURCES=   _ping_server.c ping.c
-

 ping_client_LDADD=     $(top_builddir)/src/libgras.la
 ping_client_LDADD=     $(top_builddir)/src/libgras.la

+
+ping_server_SOURCES=   _ping_server.c ping.c

 ping_server_LDADD=     $(top_builddir)/src/libgras.la
 
 # cleanup temps
 ping_server_LDADD=     $(top_builddir)/src/libgras.la
 
 # cleanup temps


@@ -23,6 +22,6 @@ MAINTAINERCLEANFILES = _ping_simulator.c _ping_client.c _ping_server.c
 NAME=ping
 PROCESSES= client server
 
 NAME=ping
 PROCESSES= client server
 

-$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _ping_simulator.c: $(srcdir)/ping_deployment.txt $(srcdir)/../gras_stub_generator
-       $(srcdir)/../gras_stub_generator ping ping_deployment.txt >/dev/null
+$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _ping_simulator.c: $(srcdir)/ping_deployment.xml $(top_srcdir)/tools/gras/stub_generator
+       $(top_srcdir)/tools/gras/stub_generator ping ping_deployment.xml >/dev/null

 
 

diff --git a/examples/gras/ping/test_sg.in b/examples/gras/ping/test_sg.in
index b88ce16..e4e99c2 100755 (executable)
--- a/examples/gras/ping/test_sg.in
+++ b/examples/gras/ping/test_sg.in
@@ -1,5 +1,5 @@
 #! @BASH@
 if test -x ./ping_simulator ; then
 #! @BASH@
 if test -x ./ping_simulator ; then

-  exec ./ping_simulator @srcdir@/../WAN_3.platform.txt @srcdir@/ping_deployment.txt
+  exec ./ping_simulator @top_srcdir@/examples/msg/small_platform.xml @srcdir@/ping_deployment.xml

 fi
 exit 77
 fi
 exit 77