From 6ee48b39a42f77628d1ae9091da4ddaf44e22988 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 2 Jul 2007 14:30:05 +0000 Subject: [PATCH] Simix does not display event occuring at the same timestamp than the old version, but that's perfectly ok (plus regeneration of autogenerated) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3640 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/gras/all2all/Makefile.in | 14 ++- examples/gras/all2all/test_sg_64 | 96 +++++++++---------- examples/gras/chrono/Makefile.in | 14 ++- examples/gras/mmrpc/Makefile.in | 14 ++- examples/gras/mmrpc/test_sg_64 | 2 +- .../mutual_exclusion/simple_token/Makefile.in | 14 ++- .../mutual_exclusion/simple_token/test_sg_64 | 2 +- examples/gras/ping/Makefile.in | 14 ++- examples/gras/ping/test_sg_64 | 8 +- examples/gras/pmm/Makefile.in | 14 ++- examples/gras/pmm/test_sg_64 | 80 ++++++++-------- examples/gras/rpc/Makefile.in | 14 ++- examples/gras/rpc/test_sg_64 | 10 +- examples/gras/timer/Makefile.in | 14 ++- 14 files changed, 171 insertions(+), 139 deletions(-) diff --git a/examples/gras/all2all/Makefile.in b/examples/gras/all2all/Makefile.in index adf46a406c..89e2a6ce11 100644 --- a/examples/gras/all2all/Makefile.in +++ b/examples/gras/all2all/Makefile.in @@ -251,8 +251,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = all2all.xml test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh all2all_simulator_SOURCES = _all2all_simulator.c all2all.c all2all_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -603,14 +603,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml diff --git a/examples/gras/all2all/test_sg_64 b/examples/gras/all2all/test_sg_64 index 1fea21594f..9535efa8d0 100755 --- a/examples/gras/all2all/test_sg_64 +++ b/examples/gras/all2all/test_sg_64 @@ -9,53 +9,53 @@ $ $SG_TEST_EXENV ./all2all_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platfor > [Ginette:receiver:(8) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages) > [Bourassa:sender:(9) 0.000000] [all2all/INFO] Launch current node > [Bourassa:receiver:(10) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages) -> [Jupiter:sender:(3) 0.011604] [all2all/INFO] Sent Data from Jupiter to Tremblay +> [Jupiter:receiver:(4) 0.011604] [all2all/INFO] Got Data from Tremblay:0 (still 3 to go) > [Tremblay:sender:(1) 0.011604] [all2all/INFO] Sent Data from Tremblay to Jupiter > [Tremblay:receiver:(2) 0.011604] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go) -> [Jupiter:receiver:(4) 0.011604] [all2all/INFO] Got Data from Tremblay:0 (still 3 to go) -> [Fafard:sender:(5) 0.013681] [all2all/INFO] Sent Data from Fafard to Tremblay -> [Tremblay:receiver:(2) 0.013681] [all2all/INFO] Got Data from Fafard:0 (still 2 to go) -> [Ginette:sender:(7) 0.015019] [all2all/INFO] Sent Data from Ginette to Tremblay -> [Tremblay:receiver:(2) 0.015019] [all2all/INFO] Got Data from Ginette:0 (still 1 to go) -> [Jupiter:sender:(3) 0.015218] [all2all/INFO] Sent Data from Jupiter to Fafard -> [Fafard:receiver:(6) 0.015218] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go) -> [Bourassa:sender:(9) 0.017074] [all2all/INFO] Sent Data from Bourassa to Tremblay -> [Tremblay:receiver:(2) 0.017074] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) -> [Tremblay:receiver:(2) 0.017074] [gras/INFO] Exiting GRAS -> [Fafard:sender:(5) 0.017295] [all2all/INFO] Sent Data from Fafard to Jupiter -> [Tremblay:sender:(1) 0.017295] [all2all/INFO] Sent Data from Tremblay to Fafard -> [Jupiter:receiver:(4) 0.017295] [all2all/INFO] Got Data from Fafard:0 (still 2 to go) -> [Fafard:receiver:(6) 0.017295] [all2all/INFO] Got Data from Tremblay:0 (still 2 to go) -> [Jupiter:sender:(3) 0.018092] [all2all/INFO] Sent Data from Jupiter to Ginette -> [Ginette:receiver:(8) 0.018092] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go) -> [Fafard:sender:(5) 0.019416] [all2all/INFO] Sent Data from Fafard to Ginette -> [Ginette:receiver:(8) 0.019416] [all2all/INFO] Got Data from Fafard:0 (still 2 to go) -> [Ginette:sender:(7) 0.020169] [all2all/INFO] Sent Data from Ginette to Jupiter -> [Jupiter:receiver:(4) 0.020169] [all2all/INFO] Got Data from Ginette:0 (still 1 to go) -> [Tremblay:sender:(1) 0.020754] [all2all/INFO] Sent Data from Tremblay to Ginette -> [Ginette:receiver:(8) 0.020754] [all2all/INFO] Got Data from Tremblay:0 (still 1 to go) -> [Ginette:sender:(7) 0.021494] [all2all/INFO] Sent Data from Ginette to Fafard -> [Fafard:receiver:(6) 0.021494] [all2all/INFO] Got Data from Ginette:0 (still 1 to go) -> [Jupiter:sender:(3) 0.021684] [all2all/INFO] Sent Data from Jupiter to Bourassa -> [Jupiter:sender:(3) 0.021684] [gras/INFO] Exiting GRAS -> [Bourassa:receiver:(10) 0.021684] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go) -> [Fafard:sender:(5) 0.022267] [all2all/INFO] Sent Data from Fafard to Bourassa -> [Fafard:sender:(5) 0.022267] [gras/INFO] Exiting GRAS -> [Bourassa:receiver:(10) 0.022267] [all2all/INFO] Got Data from Fafard:0 (still 2 to go) -> [Bourassa:sender:(9) 0.023761] [all2all/INFO] Sent Data from Bourassa to Jupiter -> [Jupiter:receiver:(4) 0.023761] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) -> [Jupiter:receiver:(4) 0.023761] [gras/INFO] Exiting GRAS -> [Tremblay:sender:(1) 0.024343] [all2all/INFO] Sent Data from Tremblay to Bourassa -> [Tremblay:sender:(1) 0.024343] [gras/INFO] Exiting GRAS -> [Bourassa:receiver:(10) 0.024343] [all2all/INFO] Got Data from Tremblay:0 (still 1 to go) -> [Bourassa:sender:(9) 0.024345] [all2all/INFO] Sent Data from Bourassa to Fafard -> [Fafard:receiver:(6) 0.024345] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) -> [Fafard:receiver:(6) 0.024345] [gras/INFO] Exiting GRAS -> [Ginette:sender:(7) 0.025670] [all2all/INFO] Sent Data from Ginette to Bourassa -> [Ginette:sender:(7) 0.025670] [gras/INFO] Exiting GRAS -> [Bourassa:sender:(9) 0.025670] [all2all/INFO] Sent Data from Bourassa to Ginette -> [Bourassa:sender:(9) 0.025670] [gras/INFO] Exiting GRAS -> [Bourassa:receiver:(10) 0.025670] [all2all/INFO] Got Data from Ginette:0 (still 0 to go) -> [Bourassa:receiver:(10) 0.025670] [gras/INFO] Exiting GRAS -> [Ginette:receiver:(8) 0.025670] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) -> [Ginette:receiver:(8) 0.025670] [gras/INFO] Exiting GRAS +> [Jupiter:sender:(3) 0.011604] [all2all/INFO] Sent Data from Jupiter to Tremblay +> [Tremblay:receiver:(2) 0.013706] [all2all/INFO] Got Data from Fafard:0 (still 2 to go) +> [Fafard:sender:(5) 0.013706] [all2all/INFO] Sent Data from Fafard to Tremblay +> [Fafard:receiver:(6) 0.013706] [all2all/INFO] Got Data from Tremblay:0 (still 3 to go) +> [Tremblay:sender:(1) 0.013706] [all2all/INFO] Sent Data from Tremblay to Fafard +> [Tremblay:receiver:(2) 0.015079] [all2all/INFO] Got Data from Ginette:0 (still 1 to go) +> [Ginette:sender:(7) 0.015079] [all2all/INFO] Sent Data from Ginette to Tremblay +> [Ginette:receiver:(8) 0.015079] [all2all/INFO] Got Data from Tremblay:0 (still 3 to go) +> [Tremblay:sender:(1) 0.015079] [all2all/INFO] Sent Data from Tremblay to Ginette +> [Tremblay:receiver:(2) 0.017136] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) +> [Tremblay:receiver:(2) 0.017136] [gras/INFO] Exiting GRAS +> [Bourassa:sender:(9) 0.017136] [all2all/INFO] Sent Data from Bourassa to Tremblay +> [Bourassa:receiver:(10) 0.017136] [all2all/INFO] Got Data from Tremblay:0 (still 3 to go) +> [Tremblay:sender:(1) 0.017136] [all2all/INFO] Sent Data from Tremblay to Bourassa +> [Tremblay:sender:(1) 0.017136] [gras/INFO] Exiting GRAS +> [Fafard:receiver:(6) 0.017313] [all2all/INFO] Got Data from Jupiter:0 (still 2 to go) +> [Jupiter:sender:(3) 0.017313] [all2all/INFO] Sent Data from Jupiter to Fafard +> [Jupiter:receiver:(4) 0.017313] [all2all/INFO] Got Data from Fafard:0 (still 2 to go) +> [Fafard:sender:(5) 0.017313] [all2all/INFO] Sent Data from Fafard to Jupiter +> [Jupiter:receiver:(4) 0.020189] [all2all/INFO] Got Data from Ginette:0 (still 1 to go) +> [Ginette:sender:(7) 0.020189] [all2all/INFO] Sent Data from Ginette to Jupiter +> [Ginette:receiver:(8) 0.020189] [all2all/INFO] Got Data from Jupiter:0 (still 2 to go) +> [Jupiter:sender:(3) 0.020189] [all2all/INFO] Sent Data from Jupiter to Ginette +> [Ginette:receiver:(8) 0.021575] [all2all/INFO] Got Data from Fafard:0 (still 1 to go) +> [Fafard:sender:(5) 0.021575] [all2all/INFO] Sent Data from Fafard to Ginette +> [Fafard:receiver:(6) 0.021575] [all2all/INFO] Got Data from Ginette:0 (still 1 to go) +> [Ginette:sender:(7) 0.021575] [all2all/INFO] Sent Data from Ginette to Fafard +> [Jupiter:receiver:(4) 0.023781] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) +> [Jupiter:receiver:(4) 0.023781] [gras/INFO] Exiting GRAS +> [Bourassa:sender:(9) 0.023781] [all2all/INFO] Sent Data from Bourassa to Jupiter +> [Bourassa:receiver:(10) 0.023781] [all2all/INFO] Got Data from Jupiter:0 (still 2 to go) +> [Jupiter:sender:(3) 0.023781] [all2all/INFO] Sent Data from Jupiter to Bourassa +> [Jupiter:sender:(3) 0.023781] [gras/INFO] Exiting GRAS +> [Bourassa:receiver:(10) 0.024427] [all2all/INFO] Got Data from Fafard:0 (still 1 to go) +> [Fafard:sender:(5) 0.024427] [all2all/INFO] Sent Data from Fafard to Bourassa +> [Fafard:sender:(5) 0.024427] [gras/INFO] Exiting GRAS +> [Fafard:receiver:(6) 0.024427] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) +> [Fafard:receiver:(6) 0.024427] [gras/INFO] Exiting GRAS +> [Bourassa:sender:(9) 0.024427] [all2all/INFO] Sent Data from Bourassa to Fafard +> [Bourassa:receiver:(10) 0.025755] [all2all/INFO] Got Data from Ginette:0 (still 0 to go) +> [Bourassa:receiver:(10) 0.025755] [gras/INFO] Exiting GRAS +> [Ginette:sender:(7) 0.025755] [all2all/INFO] Sent Data from Ginette to Bourassa +> [Ginette:sender:(7) 0.025755] [gras/INFO] Exiting GRAS +> [Ginette:receiver:(8) 0.025755] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go) +> [Ginette:receiver:(8) 0.025755] [gras/INFO] Exiting GRAS +> [Bourassa:sender:(9) 0.025755] [all2all/INFO] Sent Data from Bourassa to Ginette +> [Bourassa:sender:(9) 0.025755] [gras/INFO] Exiting GRAS diff --git a/examples/gras/chrono/Makefile.in b/examples/gras/chrono/Makefile.in index 3d21b782fc..17e1506428 100644 --- a/examples/gras/chrono/Makefile.in +++ b/examples/gras/chrono/Makefile.in @@ -245,8 +245,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = chrono.xml test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh chrono_simulator_SOURCES = _chrono_simulator.c chrono.c chrono_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -591,14 +591,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml diff --git a/examples/gras/mmrpc/Makefile.in b/examples/gras/mmrpc/Makefile.in index a5c1c9d071..b60e582618 100644 --- a/examples/gras/mmrpc/Makefile.in +++ b/examples/gras/mmrpc/Makefile.in @@ -252,8 +252,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = mmrpc.xml mmrpc.h test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh mmrpc_simulator_SOURCES = _mmrpc_simulator.c mmrpc_common.c mmrpc_client.c mmrpc_server.c mmrpc_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -606,14 +606,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml diff --git a/examples/gras/mmrpc/test_sg_64 b/examples/gras/mmrpc/test_sg_64 index 4b7154ab5b..5f76137417 100755 --- a/examples/gras/mmrpc/test_sg_64 +++ b/examples/gras/mmrpc/test_sg_64 @@ -4,7 +4,7 @@ $ $SG_TEST_EXENV ./mmrpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform. > [Fafard:client:(2) 1.000000] [MatMult/INFO] Connected to Tremblay:4000. > [Fafard:client:(2) 1.000000] [MatMult/INFO] >>>>>>>> Connected to server which is on Tremblay:4000 <<<<<<<< > [Fafard:client:(2) 1.053786] [MatMult/INFO] >>>>>>>> Request sent to Tremblay:4000 <<<<<<<< -> [Tremblay:server:(1) 1.081667] [gras/INFO] Exiting GRAS > [Fafard:client:(2) 1.081667] [MatMult/INFO] >>>>>>>> Got answer from Tremblay:4000 (values are right) <<<<<<<< > [Fafard:client:(2) 1.081667] [gras/INFO] Exiting GRAS +> [Tremblay:server:(1) 1.081667] [gras/INFO] Exiting GRAS diff --git a/examples/gras/mutual_exclusion/simple_token/Makefile.in b/examples/gras/mutual_exclusion/simple_token/Makefile.in index cf9f24f005..746bcb0910 100644 --- a/examples/gras/mutual_exclusion/simple_token/Makefile.in +++ b/examples/gras/mutual_exclusion/simple_token/Makefile.in @@ -248,8 +248,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = simple_token.xml test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh simple_token_simulator_SOURCES = _simple_token_simulator.c simple_token.c simple_token_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -594,14 +594,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg_64 b/examples/gras/mutual_exclusion/simple_token/test_sg_64 index 9a017877f0..752400c66c 100755 --- a/examples/gras/mutual_exclusion/simple_token/test_sg_64 +++ b/examples/gras/mutual_exclusion/simple_token/test_sg_64 @@ -7,6 +7,6 @@ $ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small > [Fafard:node:(2) 1.028109] [gras/INFO] Exiting GRAS > [Jupiter:node:(3) 1.030844] [gras/INFO] Exiting GRAS > [Ginette:node:(4) 1.032083] [gras/INFO] Exiting GRAS -> [Bourassa:node:(5) 1.034039] [gras/INFO] Exiting GRAS > [Tremblay:node:(1) 1.034039] [gras/INFO] Exiting GRAS +> [Bourassa:node:(5) 1.034039] [gras/INFO] Exiting GRAS diff --git a/examples/gras/ping/Makefile.in b/examples/gras/ping/Makefile.in index 72be8e63e9..41131b5baf 100644 --- a/examples/gras/ping/Makefile.in +++ b/examples/gras/ping/Makefile.in @@ -252,8 +252,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = ping.xml ping.h test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh ping_simulator_SOURCES = _ping_simulator.c ping_server.c ping_client.c ping_common.c ping_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -606,14 +606,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml diff --git a/examples/gras/ping/test_sg_64 b/examples/gras/ping/test_sg_64 index 61e8dc8c02..1eda675f56 100755 --- a/examples/gras/ping/test_sg_64 +++ b/examples/gras/ping/test_sg_64 @@ -9,11 +9,11 @@ $ $SG_TEST_EXENV ./ping_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platfo > [Fafard:client:(2) 1.000000] [Ping/INFO] Connected to Tremblay:4000. > [Fafard:client:(2) 1.000000] [Ping/INFO] Messages registered > [Fafard:client:(2) 1.000000] [Ping/INFO] >>>>>>>> Connected to server which is on Tremblay:4000 <<<<<<<< -> [Fafard:client:(2) 1.001977] [Ping/INFO] >>>>>>>> Message PING(1234) sent to Tremblay:4000 <<<<<<<< > [Tremblay:server:(1) 1.001977] [Ping/INFO] >>>>>>>> Got message PING(1234) from Fafard:0 <<<<<<<< -> [Tremblay:server:(1) 1.003954] [Ping/INFO] >>>>>>>> Answered with PONG(4321) <<<<<<<< -> [Tremblay:server:(1) 1.003954] [Ping/INFO] Done. -> [Tremblay:server:(1) 1.003954] [gras/INFO] Exiting GRAS +> [Fafard:client:(2) 1.001977] [Ping/INFO] >>>>>>>> Message PING(1234) sent to Tremblay:4000 <<<<<<<< > [Fafard:client:(2) 1.003954] [Ping/INFO] >>>>>>>> Got PONG(4321) from Tremblay:4000 <<<<<<<< > [Fafard:client:(2) 1.003954] [Ping/INFO] Done. > [Fafard:client:(2) 1.003954] [gras/INFO] Exiting GRAS +> [Tremblay:server:(1) 1.003954] [Ping/INFO] >>>>>>>> Answered with PONG(4321) <<<<<<<< +> [Tremblay:server:(1) 1.003954] [Ping/INFO] Done. +> [Tremblay:server:(1) 1.003954] [gras/INFO] Exiting GRAS diff --git a/examples/gras/pmm/Makefile.in b/examples/gras/pmm/Makefile.in index 91a96cf2c6..252e238142 100644 --- a/examples/gras/pmm/Makefile.in +++ b/examples/gras/pmm/Makefile.in @@ -248,8 +248,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = pmm.xml test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh pmm_simulator_SOURCES = _pmm_simulator.c pmm.c pmm_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -600,14 +600,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml diff --git a/examples/gras/pmm/test_sg_64 b/examples/gras/pmm/test_sg_64 index 9d0ff26a08..63b04ade3f 100755 --- a/examples/gras/pmm/test_sg_64 +++ b/examples/gras/pmm/test_sg_64 @@ -22,26 +22,26 @@ $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml > [Jill:slave:(20) 1.000000] [pmm/INFO] Sensor starting (on port 3000) > [Jacquelin:master:(1) 5.082948] [pmm/INFO] Got 19 pals > [Jacquelin:master:(1) 5.082948] [pmm/INFO] Too much slaves. Killing Tanguay:3000 -> [Jacquelin:master:(1) 5.159107] [pmm/INFO] Too much slaves. Killing Morin:3000 > [Tanguay:slave:(11) 5.159107] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.302399] [pmm/INFO] Too much slaves. Killing Ethernet:3000 +> [Jacquelin:master:(1) 5.159107] [pmm/INFO] Too much slaves. Killing Morin:3000 > [Morin:slave:(12) 5.302399] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.383890] [pmm/INFO] Too much slaves. Killing Bellemarre:3000 +> [Jacquelin:master:(1) 5.302399] [pmm/INFO] Too much slaves. Killing Ethernet:3000 > [Ethernet:slave:(13) 5.383890] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.523063] [pmm/INFO] Too much slaves. Killing Kuenning:3000 +> [Jacquelin:master:(1) 5.383890] [pmm/INFO] Too much slaves. Killing Bellemarre:3000 > [Bellemarre:slave:(14) 5.523063] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.588959] [pmm/INFO] Too much slaves. Killing Gaston:3000 +> [Jacquelin:master:(1) 5.523063] [pmm/INFO] Too much slaves. Killing Kuenning:3000 > [Kuenning:slave:(15) 5.588959] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.662429] [pmm/INFO] Too much slaves. Killing Bousquet:3000 +> [Jacquelin:master:(1) 5.588959] [pmm/INFO] Too much slaves. Killing Gaston:3000 > [Gaston:slave:(16) 5.662429] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.740421] [pmm/INFO] Too much slaves. Killing Paul:3000 +> [Jacquelin:master:(1) 5.662429] [pmm/INFO] Too much slaves. Killing Bousquet:3000 > [Bousquet:slave:(17) 5.740421] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.844574] [pmm/INFO] Too much slaves. Killing St_Jean:3000 +> [Jacquelin:master:(1) 5.740421] [pmm/INFO] Too much slaves. Killing Paul:3000 > [Paul:slave:(18) 5.844574] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 5.983872] [pmm/INFO] Too much slaves. Killing Jill:3000 +> [Jacquelin:master:(1) 5.844574] [pmm/INFO] Too much slaves. Killing St_Jean:3000 > [St_Jean:slave:(19) 5.983872] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 6.136256] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX begin Multiplication +> [Jacquelin:master:(1) 5.983872] [pmm/INFO] Too much slaves. Killing Jill:3000 > [Jill:slave:(20) 6.136256] [gras/INFO] Exiting GRAS +> [Jacquelin:master:(1) 6.136256] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX begin Multiplication > [Boivin:slave:(2) 7.222311] [pmm/INFO] Receive my pos (0,0) and assignment > [Boivin:slave:(2) 7.222311] [pmm/INFO] LINE: step(0) = Myline(0). Broadcast my data (myport=3000). > [Boivin:slave:(2) 7.222311] [pmm/INFO] LINE: Send to Geoff:3000 @@ -52,104 +52,103 @@ $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml > [TeX:slave:(4) 7.446971] [pmm/INFO] LINE: step(0) = Myline(0). Broadcast my data (myport=3000). > [TeX:slave:(4) 7.446971] [pmm/INFO] LINE: Send to iRMX:3000 > [Geoff:slave:(5) 7.447642] [pmm/INFO] Receive my pos (1,0) and assignment -> [Boivin:slave:(2) 7.530355] [pmm/INFO] LINE: Send to McGee:3000 > [Geoff:slave:(5) 7.530355] [pmm/INFO] LINE: step(0) <> Myline(1). Receive data from Boivin:3000 > [Geoff:slave:(5) 7.530355] [pmm/INFO] ROW: step(0)=myrow(0). Broadcast my data > [Geoff:slave:(5) 7.530355] [pmm/INFO] ROW: Send to Disney:3000 +> [Boivin:slave:(2) 7.530355] [pmm/INFO] LINE: Send to McGee:3000 > [Disney:slave:(6) 7.597281] [pmm/INFO] Receive my pos (1,1) and assignment -> [Jean_Yves:slave:(3) 7.813532] [pmm/INFO] LINE: Send to Gatien:3000 > [Disney:slave:(6) 7.813532] [pmm/INFO] LINE: step(0) <> Myline(1). Receive data from Jean_Yves:3000 +> [Jean_Yves:slave:(3) 7.813532] [pmm/INFO] LINE: Send to Gatien:3000 > [iRMX:slave:(7) 7.846973] [pmm/INFO] Receive my pos (1,2) and assignment > [McGee:slave:(8) 7.919871] [pmm/INFO] Receive my pos (2,0) and assignment -> [Boivin:slave:(2) 7.928178] [pmm/INFO] ROW: step(0)=myrow(0). Broadcast my data -> [Boivin:slave:(2) 7.928178] [pmm/INFO] ROW: Send to Jean_Yves:3000 > [McGee:slave:(8) 7.928178] [pmm/INFO] LINE: step(0) <> Myline(2). Receive data from Boivin:3000 > [McGee:slave:(8) 7.928178] [pmm/INFO] ROW: step(0)=myrow(0). Broadcast my data > [McGee:slave:(8) 7.928178] [pmm/INFO] ROW: Send to Gatien:3000 -> [Geoff:slave:(5) 7.957646] [pmm/INFO] ROW: Send to iRMX:3000 +> [Boivin:slave:(2) 7.928178] [pmm/INFO] ROW: step(0)=myrow(0). Broadcast my data +> [Boivin:slave:(2) 7.928178] [pmm/INFO] ROW: Send to Jean_Yves:3000 > [Disney:slave:(6) 7.957646] [pmm/INFO] ROW: step(0)<>myrow(1). Receive data from Geoff > [Disney:slave:(6) 7.957646] [pmm/INFO] LINE: step(1) = Myline(1). Broadcast my data (myport=3000). > [Disney:slave:(6) 7.957646] [pmm/INFO] LINE: Send to Jean_Yves:3000 +> [Geoff:slave:(5) 7.957646] [pmm/INFO] ROW: Send to iRMX:3000 > [Gatien:slave:(9) 8.024481] [pmm/INFO] Receive my pos (2,1) and assignment -> [TeX:slave:(4) 8.100017] [pmm/INFO] LINE: Send to Laroche:3000 > [iRMX:slave:(7) 8.100017] [pmm/INFO] LINE: step(0) <> Myline(1). Receive data from TeX:3000 +> [TeX:slave:(4) 8.100017] [pmm/INFO] LINE: Send to Laroche:3000 > [Laroche:slave:(10) 8.172158] [pmm/INFO] Receive my pos (2,2) and assignment > [Gatien:slave:(9) 8.197209] [pmm/INFO] LINE: step(0) <> Myline(2). Receive data from Jean_Yves:3000 -> [McGee:slave:(8) 8.228872] [pmm/INFO] ROW: Send to Laroche:3000 > [Gatien:slave:(9) 8.228872] [pmm/INFO] ROW: step(0)<>myrow(1). Receive data from McGee +> [McGee:slave:(8) 8.228872] [pmm/INFO] ROW: Send to Laroche:3000 > [Laroche:slave:(10) 8.326677] [pmm/INFO] LINE: step(0) <> Myline(2). Receive data from TeX:3000 -> [Geoff:slave:(5) 8.340840] [pmm/INFO] LINE: step(1) = Myline(1). Broadcast my data (myport=3000). -> [Geoff:slave:(5) 8.340840] [pmm/INFO] LINE: Send to Boivin:3000 > [iRMX:slave:(7) 8.340840] [pmm/INFO] ROW: step(0)<>myrow(2). Receive data from Geoff > [iRMX:slave:(7) 8.340840] [pmm/INFO] LINE: step(1) = Myline(1). Broadcast my data (myport=3000). > [iRMX:slave:(7) 8.340840] [pmm/INFO] LINE: Send to TeX:3000 -> [Boivin:slave:(2) 8.352058] [pmm/INFO] ROW: Send to TeX:3000 +> [Geoff:slave:(5) 8.340840] [pmm/INFO] LINE: step(1) = Myline(1). Broadcast my data (myport=3000). +> [Geoff:slave:(5) 8.340840] [pmm/INFO] LINE: Send to Boivin:3000 > [Jean_Yves:slave:(3) 8.352058] [pmm/INFO] ROW: step(0)<>myrow(1). Receive data from Boivin +> [Boivin:slave:(2) 8.352058] [pmm/INFO] ROW: Send to TeX:3000 > [Laroche:slave:(10) 8.401356] [pmm/INFO] ROW: step(0)<>myrow(2). Receive data from McGee -> [Disney:slave:(6) 8.568309] [pmm/INFO] LINE: Send to Gatien:3000 > [Jean_Yves:slave:(3) 8.568309] [pmm/INFO] LINE: step(1) <> Myline(0). Receive data from Disney:3000 > [Jean_Yves:slave:(3) 8.568309] [pmm/INFO] ROW: step(1)=myrow(1). Broadcast my data > [Jean_Yves:slave:(3) 8.568309] [pmm/INFO] ROW: Send to Boivin:3000 +> [Disney:slave:(6) 8.568309] [pmm/INFO] LINE: Send to Gatien:3000 > [iRMX:slave:(7) 8.593883] [pmm/INFO] LINE: Send to Laroche:3000 -> [Disney:slave:(6) 8.675405] [pmm/INFO] ROW: step(1)=myrow(1). Broadcast my data -> [Disney:slave:(6) 8.675405] [pmm/INFO] ROW: Send to Geoff:3000 > [Gatien:slave:(9) 8.675405] [pmm/INFO] LINE: step(1) <> Myline(2). Receive data from Disney:3000 > [Gatien:slave:(9) 8.675405] [pmm/INFO] ROW: step(1)=myrow(1). Broadcast my data > [Gatien:slave:(9) 8.675405] [pmm/INFO] ROW: Send to McGee:3000 +> [Disney:slave:(6) 8.675405] [pmm/INFO] ROW: step(1)=myrow(1). Broadcast my data +> [Disney:slave:(6) 8.675405] [pmm/INFO] ROW: Send to Geoff:3000 > [TeX:slave:(4) 8.683294] [pmm/INFO] ROW: step(0)<>myrow(2). Receive data from Boivin > [TeX:slave:(4) 8.683294] [pmm/INFO] LINE: step(1) <> Myline(0). Receive data from iRMX:3000 > [Laroche:slave:(10) 8.692729] [pmm/INFO] LINE: step(1) <> Myline(2). Receive data from iRMX:3000 > [Gatien:slave:(9) 8.707068] [pmm/INFO] ROW: Send to Laroche:3000 -> [Geoff:slave:(5) 8.766007] [pmm/INFO] LINE: Send to McGee:3000 > [Boivin:slave:(2) 8.766007] [pmm/INFO] LINE: step(1) <> Myline(0). Receive data from Geoff:3000 -> [Gatien:slave:(9) 8.812348] [pmm/INFO] LINE: step(2) = Myline(2). Broadcast my data (myport=3000). -> [Gatien:slave:(9) 8.812348] [pmm/INFO] LINE: Send to Jean_Yves:3000 +> [Geoff:slave:(5) 8.766007] [pmm/INFO] LINE: Send to McGee:3000 > [Laroche:slave:(10) 8.812348] [pmm/INFO] ROW: step(1)<>myrow(2). Receive data from Gatien > [Laroche:slave:(10) 8.812348] [pmm/INFO] LINE: step(2) = Myline(2). Broadcast my data (myport=3000). > [Laroche:slave:(10) 8.812348] [pmm/INFO] LINE: Send to TeX:3000 +> [Gatien:slave:(9) 8.812348] [pmm/INFO] LINE: step(2) = Myline(2). Broadcast my data (myport=3000). +> [Gatien:slave:(9) 8.812348] [pmm/INFO] LINE: Send to Jean_Yves:3000 > [McGee:slave:(8) 8.835997] [pmm/INFO] LINE: step(1) <> Myline(2). Receive data from Geoff:3000 > [McGee:slave:(8) 8.835997] [pmm/INFO] ROW: step(1)<>myrow(0). Receive data from Gatien > [McGee:slave:(8) 8.835997] [pmm/INFO] LINE: step(2) = Myline(2). Broadcast my data (myport=3000). > [McGee:slave:(8) 8.835997] [pmm/INFO] LINE: Send to Boivin:3000 -> [Jean_Yves:slave:(3) 8.920857] [pmm/INFO] ROW: Send to TeX:3000 > [Boivin:slave:(2) 8.920857] [pmm/INFO] ROW: step(1)<>myrow(0). Receive data from Jean_Yves -> [McGee:slave:(8) 8.929164] [pmm/INFO] LINE: Send to Geoff:3000 +> [Jean_Yves:slave:(3) 8.920857] [pmm/INFO] ROW: Send to TeX:3000 > [Boivin:slave:(2) 8.929164] [pmm/INFO] LINE: step(2) <> Myline(0). Receive data from McGee:3000 +> [McGee:slave:(8) 8.929164] [pmm/INFO] LINE: Send to Geoff:3000 > [Laroche:slave:(10) 8.966867] [pmm/INFO] LINE: Send to iRMX:3000 -> [Disney:slave:(6) 8.980111] [pmm/INFO] ROW: Send to iRMX:3000 > [Geoff:slave:(5) 8.980111] [pmm/INFO] ROW: step(1)<>myrow(0). Receive data from Disney +> [Disney:slave:(6) 8.980111] [pmm/INFO] ROW: Send to iRMX:3000 > [Geoff:slave:(5) 9.050100] [pmm/INFO] LINE: step(2) <> Myline(1). Receive data from McGee:3000 > [Laroche:slave:(10) 9.065713] [pmm/INFO] ROW: step(2)=myrow(2). Broadcast my data > [Laroche:slave:(10) 9.065713] [pmm/INFO] ROW: Send to McGee:3000 -> [Laroche:slave:(10) 9.140392] [pmm/INFO] ROW: Send to Gatien:3000 > [McGee:slave:(8) 9.140392] [pmm/INFO] ROW: step(2)<>myrow(0). Receive data from Laroche +> [Laroche:slave:(10) 9.140392] [pmm/INFO] ROW: Send to Gatien:3000 > [TeX:slave:(4) 9.182250] [pmm/INFO] ROW: step(1)<>myrow(2). Receive data from Jean_Yves > [TeX:slave:(4) 9.182250] [pmm/INFO] LINE: step(2) <> Myline(0). Receive data from Laroche:3000 > [TeX:slave:(4) 9.182250] [pmm/INFO] ROW: step(2)=myrow(2). Broadcast my data > [TeX:slave:(4) 9.182250] [pmm/INFO] ROW: Send to Boivin:3000 > [McGee:slave:(8) 9.210859] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< -> [TeX:slave:(4) 9.271661] [pmm/INFO] ROW: Send to Jean_Yves:3000 > [Boivin:slave:(2) 9.271661] [pmm/INFO] ROW: step(2)<>myrow(0). Receive data from TeX +> [TeX:slave:(4) 9.271661] [pmm/INFO] ROW: Send to Jean_Yves:3000 > [iRMX:slave:(7) 9.319625] [pmm/INFO] ROW: step(1)<>myrow(2). Receive data from Disney > [iRMX:slave:(7) 9.319625] [pmm/INFO] LINE: step(2) <> Myline(1). Receive data from Laroche:3000 > [iRMX:slave:(7) 9.319625] [pmm/INFO] ROW: step(2)=myrow(2). Broadcast my data > [iRMX:slave:(7) 9.319625] [pmm/INFO] ROW: Send to Geoff:3000 > [Boivin:slave:(2) 9.354862] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< -> [Gatien:slave:(9) 9.354978] [pmm/INFO] LINE: Send to Disney:3000 > [Jean_Yves:slave:(3) 9.354978] [pmm/INFO] LINE: step(2) <> Myline(0). Receive data from Gatien:3000 +> [Gatien:slave:(9) 9.354978] [pmm/INFO] LINE: Send to Disney:3000 > [Disney:slave:(6) 9.462073] [pmm/INFO] LINE: step(2) <> Myline(1). Receive data from Gatien:3000 -> [iRMX:slave:(7) 9.560448] [pmm/INFO] ROW: Send to Disney:3000 > [Geoff:slave:(5) 9.560448] [pmm/INFO] ROW: step(2)<>myrow(0). Receive data from iRMX +> [iRMX:slave:(7) 9.560448] [pmm/INFO] ROW: Send to Disney:3000 > [Geoff:slave:(5) 9.560982] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< > [Gatien:slave:(9) 9.567354] [pmm/INFO] ROW: step(2)<>myrow(1). Receive data from Laroche > [Jean_Yves:slave:(3) 9.570360] [pmm/INFO] ROW: step(2)<>myrow(1). Receive data from TeX -> [Laroche:slave:(10) 9.710187] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< -> [Gatien:slave:(9) 9.811280] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< +> [Gatien:slave:(9) 9.668447] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< +> [Laroche:slave:(10) 9.811280] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< > [Disney:slave:(6) 9.814359] [pmm/INFO] ROW: step(2)<>myrow(1). Receive data from iRMX -> [TeX:slave:(4) 9.955061] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< -> [Jean_Yves:slave:(3) 10.028442] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< -> [iRMX:slave:(7) 10.269876] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< -> [Disney:slave:(6) 10.414526] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< +> [Jean_Yves:slave:(3) 9.884661] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< +> [TeX:slave:(4) 10.028442] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< +> [Disney:slave:(6) 10.173092] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< > [Jacquelin:master:(1) 10.414526] [pmm/INFO] The Result of Multiplication is : > >>> Matrix C:res dump (18 x 18) > 0.00 18.00 36.00 54.00 72.00 90.00 108.00 126.00 144.00 162.00 180.00 198.00 216.00 234.00 252.00 270.00 288.00 306.00 @@ -171,6 +170,7 @@ $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml > 16.00 34.00 52.00 70.00 88.00 106.00 124.00 142.00 160.00 178.00 196.00 214.00 232.00 250.00 268.00 286.00 304.00 322.00 > 17.00 35.00 53.00 71.00 89.00 107.00 125.00 143.00 161.00 179.00 197.00 215.00 233.00 251.00 269.00 287.00 305.00 323.00 > <<< end_of_matrix C:res dump +> [iRMX:slave:(7) 10.414526] [pmm/INFO] >>>>>>>> Result sent to Jacquelin:4242 <<<<<<<< > [Boivin:slave:(2) 10.495147] [gras/INFO] Exiting GRAS > [Jean_Yves:slave:(3) 10.566253] [gras/INFO] Exiting GRAS > [TeX:slave:(4) 10.705575] [gras/INFO] Exiting GRAS @@ -179,5 +179,5 @@ $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml > [iRMX:slave:(7) 11.080098] [gras/INFO] Exiting GRAS > [McGee:slave:(8) 11.148380] [gras/INFO] Exiting GRAS > [Gatien:slave:(9) 11.246338] [gras/INFO] Exiting GRAS -> [Jacquelin:master:(1) 11.384742] [gras/INFO] Exiting GRAS > [Laroche:slave:(10) 11.384742] [gras/INFO] Exiting GRAS +> [Jacquelin:master:(1) 11.384742] [gras/INFO] Exiting GRAS diff --git a/examples/gras/rpc/Makefile.in b/examples/gras/rpc/Makefile.in index 15eb6d0a62..746f1b530e 100644 --- a/examples/gras/rpc/Makefile.in +++ b/examples/gras/rpc/Makefile.in @@ -251,8 +251,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = rpc.xml test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh rpc_simulator_SOURCES = _rpc_simulator.c rpc.c rpc_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -609,14 +609,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml diff --git a/examples/gras/rpc/test_sg_64 b/examples/gras/rpc/test_sg_64 index dc1aacba22..ce0b2fd464 100755 --- a/examples/gras/rpc/test_sg_64 +++ b/examples/gras/rpc/test_sg_64 @@ -6,9 +6,9 @@ $ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xm > [Fafard:client:(3) 2.00] [Rpc/INFO] Connected to Tremblay:4000. > [Fafard:client:(3) 2.00] [Rpc/INFO] Connected to server which is on Tremblay:4000 > [Tremblay:server:(1) 2.00] [Rpc/INFO] Got message PING(1234) from Fafard:0 -> [Tremblay:server:(1) 2.00] [Rpc/INFO] Answered with PONG(4321) > [Fafard:client:(3) 2.00] [Rpc/INFO] The answer to PING(1234) on Tremblay:4000 is PONG(4321) > [Fafard:client:(3) 2.00] [Rpc/INFO] Call the exception raising RPC +> [Tremblay:server:(1) 2.00] [Rpc/INFO] Answered with PONG(4321) > [Fafard:client:(3) 2.01] [Rpc/INFO] Got the expected exception when calling the exception raising RPC > [Fafard:client:(3) 2.01] [Rpc/INFO] Called the exception raising RPC > [Fafard:client:(3) 2.01] [Rpc/INFO] Call the exception raising RPC (i=0) @@ -26,18 +26,18 @@ $ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xm > [Ginette:forwarder:(2) 2.04] [Rpc/INFO] Forward a request > [Fafard:client:(3) 2.04] [Rpc/INFO] Got the expected exception when calling the exception raising RPC > [Fafard:client:(3) 2.04] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=3) -> [Ginette:forwarder:(2) 2.04] [Rpc/INFO] Forward a request +> [Ginette:forwarder:(2) 2.05] [Rpc/INFO] Forward a request > [Fafard:client:(3) 2.05] [Rpc/INFO] Got the expected exception when calling the exception raising RPC > [Fafard:client:(3) 2.05] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=4) > [Ginette:forwarder:(2) 2.05] [Rpc/INFO] Forward a request > [Fafard:client:(3) 2.05] [Rpc/INFO] Got the expected exception when calling the exception raising RPC > [Fafard:client:(3) 2.05] [Rpc/INFO] Ask Ginette:4000 to die -> [Fafard:client:(3) 2.06] [Rpc/INFO] Ask Tremblay:4000 to die > [Ginette:forwarder:(2) 2.06] [Rpc/INFO] Asked to die by Fafard:0 > [Ginette:forwarder:(2) 2.06] [Rpc/INFO] Done. > [Ginette:forwarder:(2) 2.06] [gras/INFO] Exiting GRAS -> [Fafard:client:(3) 2.06] [Rpc/INFO] Done. -> [Fafard:client:(3) 2.06] [gras/INFO] Exiting GRAS +> [Fafard:client:(3) 2.06] [Rpc/INFO] Ask Tremblay:4000 to die > [Tremblay:server:(1) 2.06] [Rpc/INFO] Asked to die by Fafard:0 > [Tremblay:server:(1) 2.06] [Rpc/INFO] Done. > [Tremblay:server:(1) 2.06] [gras/INFO] Exiting GRAS +> [Fafard:client:(3) 2.06] [Rpc/INFO] Done. +> [Fafard:client:(3) 2.06] [gras/INFO] Exiting GRAS diff --git a/examples/gras/timer/Makefile.in b/examples/gras/timer/Makefile.in index c5f102bc22..d75d546008 100644 --- a/examples/gras/timer/Makefile.in +++ b/examples/gras/timer/Makefile.in @@ -243,8 +243,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = $(NAME).xml $(TESTS) test_rl test_sg_32 test_sg_64 -@GRAS_ARCH_32_BITS_FALSE@TESTS = test_rl test_sg_64 -@GRAS_ARCH_32_BITS_TRUE@TESTS = test_rl test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@TESTS = test_sg_64 test_rl +@GRAS_ARCH_32_BITS_TRUE@TESTS = test_sg_32 test_rl TESTS_ENVIRONMENT = srcdir=$(srcdir) EXEEXT=$(EXEEXT) @top_builddir@/tools/tesh/tesh timer_simulator_SOURCES = _timer_simulator.c timer.c timer_simulator_LDADD = $(top_builddir)/src/libsimgrid.la @@ -589,14 +589,18 @@ uninstall-am: uninstall-info-am mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -@GRAS_ARCH_32_BITS_TRUE@test-sg: +@GRAS_ARCH_32_BITS_TRUE@test-sg: force @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 -@GRAS_ARCH_32_BITS_FALSE@test-sg: +@GRAS_ARCH_32_BITS_FALSE@test-sg: force @GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 -test-rl: +test-rl: force $(TESTS_ENVIRONMENT) test_rl +force: + +.PHONY: test_sg_32 test_SG_64 test_rl force + $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml -- 2.20.1