From 49faac858e711560b2ce4cccc4140a4f7a037d63 Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 17 Feb 2011 11:04:09 +0000 Subject: [PATCH] Remove unused call to MSG_process_sleep(1). git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9647 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/msg/token_ring/ring_call.c | 10 ----- examples/msg/token_ring/token_ring.tesh | 49 ++++++++++++------------- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/examples/msg/token_ring/ring_call.c b/examples/msg/token_ring/ring_call.c index 2c17529ae8..a57d856f42 100644 --- a/examples/msg/token_ring/ring_call.c +++ b/examples/msg/token_ring/ring_call.c @@ -39,15 +39,11 @@ int master(int argc, char *argv[]) task_comm_size, NULL); MSG_task_send(task_s,mailbox); - MSG_process_sleep(1); - //MSG_comm_wait(comm, -1); INFO1("Send Data to \"%s\"", mailbox); sprintf(mailbox, "host%d", num); MSG_task_receive(&(task_r), mailbox); - //res = MSG_comm_wait(res_irecv, -1); INFO1("Received \"%s\"", MSG_task_get_name(task_r)); - //MSG_comm_destroy(res_irecv); return 0; } @@ -63,12 +59,7 @@ int slave(int argc, char *argv[]) sprintf(mailbox, "host%d", num); MSG_task_receive(&(task_r), mailbox); - //res = MSG_comm_wait(res_irecv, -1); INFO1("Received \"%s\"", MSG_task_get_name(task_r)); - MSG_process_sleep(1); - //MSG_comm_destroy(res_irecv); - //Receive something now need to tell it! - sprintf(mailbox, "host%d", num+1); if(num == totalHosts-1) sprintf(mailbox, "host%d", 0); @@ -78,7 +69,6 @@ int slave(int argc, char *argv[]) task_comm_size, NULL); MSG_task_send(task_s, mailbox); - //MSG_comm_wait(comm, -1); INFO1("Send Data to \"%s\"", mailbox); return 0; diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh index 2e221f3cc6..ee7d7d6ba9 100644 --- a/examples/msg/token_ring/token_ring.tesh +++ b/examples/msg/token_ring/token_ring.tesh @@ -2,33 +2,32 @@ $ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. +> [ 0.066240] (1:master@alice1.crepe.fr) Send Data to "host1" > [ 0.066240] (2:slave@alice4.crepe.fr) Received "Token" -> [ 1.066240] (1:master@alice1.crepe.fr) Send Data to "host1" -> [ 1.132480] (3:slave@alice0.crepe.fr) Received "Token" -> [ 1.132480] (2:slave@alice4.crepe.fr) Send Data to "host2" -> [ 2.320160] (4:slave@bob4.hamburger.edu) Received "Token" -> [ 2.320160] (3:slave@alice0.crepe.fr) Send Data to "host3" -> [ 3.386400] (5:slave@bob2.hamburger.edu) Received "Token" -> [ 3.386400] (4:slave@bob4.hamburger.edu) Send Data to "host4" -> [ 4.452640] (6:slave@bob0.hamburger.edu) Received "Token" -> [ 4.452640] (5:slave@bob2.hamburger.edu) Send Data to "host5" -> [ 5.640320] (7:slave@alice3.crepe.fr) Received "Token" -> [ 5.640320] (6:slave@bob0.hamburger.edu) Send Data to "host6" -> [ 6.706560] (8:slave@alice2.crepe.fr) Received "Token" -> [ 6.706560] (7:slave@alice3.crepe.fr) Send Data to "host7" -> [ 7.894240] (9:slave@bob3.hamburger.edu) Received "Token" -> [ 7.894240] (8:slave@alice2.crepe.fr) Send Data to "host8" -> [ 8.960480] (10:slave@bob1.hamburger.edu) Received "Token" -> [ 8.960480] (9:slave@bob3.hamburger.edu) Send Data to "host9" -> [ 10.148160] (1:master@alice1.crepe.fr) Received "Token" -> [ 10.148160] (10:slave@bob1.hamburger.edu) Send Data to "host0" -> [ 10.148160] (0:@) Simulation time 10.1482 - +> [ 0.132480] (3:slave@alice0.crepe.fr) Received "Token" +> [ 0.132480] (2:slave@alice4.crepe.fr) Send Data to "host2" +> [ 0.320160] (4:slave@bob4.hamburger.edu) Received "Token" +> [ 0.320160] (3:slave@alice0.crepe.fr) Send Data to "host3" +> [ 0.386400] (5:slave@bob2.hamburger.edu) Received "Token" +> [ 0.386400] (4:slave@bob4.hamburger.edu) Send Data to "host4" +> [ 0.452640] (6:slave@bob0.hamburger.edu) Received "Token" +> [ 0.452640] (5:slave@bob2.hamburger.edu) Send Data to "host5" +> [ 0.640320] (7:slave@alice3.crepe.fr) Received "Token" +> [ 0.640320] (6:slave@bob0.hamburger.edu) Send Data to "host6" +> [ 0.706560] (8:slave@alice2.crepe.fr) Received "Token" +> [ 0.706560] (7:slave@alice3.crepe.fr) Send Data to "host7" +> [ 0.894240] (9:slave@bob3.hamburger.edu) Received "Token" +> [ 0.894240] (8:slave@alice2.crepe.fr) Send Data to "host8" +> [ 0.960480] (10:slave@bob1.hamburger.edu) Received "Token" +> [ 0.960480] (9:slave@bob3.hamburger.edu) Send Data to "host9" +> [ 1.148160] (1:master@alice1.crepe.fr) Received "Token" +> [ 1.148160] (10:slave@bob1.hamburger.edu) Send Data to "host0" +> [ 1.148160] (0:@) Simulation time 1.14816 $ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_peers.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. +> [5111.488529] [1:master@peer_100036570] Send Data to "host1" > [5111.488529] [2:slave@peer_100030591] Received "Token" -> [5112.488529] [1:master@peer_100036570] Send Data to "host1" -> [10223.977057] [1:master@peer_100036570] Received "Token" -> [10223.977057] [2:slave@peer_100030591] Send Data to "host0" -> [10223.977057] [0:@] Simulation time 10224 +> [10222.977057] [1:master@peer_100036570] Received "Token" +> [10222.977057] [2:slave@peer_100030591] Send Data to "host0" +> [10222.977057] [0:@] Simulation time 10223 -- 2.20.1