Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / examples / lua / SimSplay / splay_school.lua

diff --git a/examples/lua/SimSplay/splay_school.lua b/examples/lua/SimSplay/splay_school.lua
index abaf7c9..51cd58c 100644 (file)
--- a/examples/lua/SimSplay/splay_school.lua
+++ b/examples/lua/SimSplay/splay_school.lua
@@ -1,19 +1,24 @@
-dofile 'sim_splay.lua'
+require("sim_splay")
 
 function SPLAYschool()
-    log:print("My ip is :" ..job.me.ip())
-    event.sleep(5)
-    rpc.call(job.nodes[3],{"call_me","Helloooooow"})
-    event.sleep(5)
-    os.exit()
+  log:print("My ip is: "..job.me.ip())
+  for i = 1000,10000 do
+    log:print(i)
+  end
+
+  events.sleep(5)
+
+  if job.me.ip() == job.nodes[1].ip then
+    rpc.call(job.nodes[2], {"call_me", job.me.ip()})
+  end
+  events.sleep(5)
+  os.exit()
 end
 
-function call_me(position)
-    log:print("I received an RPC from node "..position);
+function call_me(from)
+  log:print("I received an RPC from "..from)
 end
 
-event.thread("SPLAYschool")
+events.thread("SPLAYschool")
 start.loop()
 
-
-