From 4cae4c975976b15bec2d9213fb2289e4f8ce5b9c Mon Sep 17 00:00:00 2001
From: Navarrop <Pierre.Navarro@imag.fr>
Date: Tue, 6 Dec 2011 16:28:44 +0100
Subject: [PATCH] Revert new time for token-ring

---
 examples/msg/token_ring/token_ring.tesh | 8 ++++----
 src/surf/cpu_im.c                       | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh
index 274201af95..cd5d17fb26 100644
--- a/examples/msg/token_ring/token_ring.tesh
+++ b/examples/msg/token_ring/token_ring.tesh
@@ -28,7 +28,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=coordi
 > [    0.000000] (0:@) Configuration change: Set 'coordinates' to 'yes'
 > [    0.000000] (0:@) Number of host '2'
 > [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"
-> [    0.110400] (2:1@peer_100036570) Host "1" received "Token"
-> [    0.110400] (2:1@peer_100036570) Host "1" send 'Token' to Host "0"
-> [    0.220800] (1:0@peer_100030591) Host "0" received "Token"
-> [    0.220800] (0:@) Simulation time 0.2208
\ No newline at end of file
+> [    5.221778] (2:1@peer_100036570) Host "1" received "Token"
+> [    5.221778] (2:1@peer_100036570) Host "1" send 'Token' to Host "0"
+> [   10.443556] (1:0@peer_100030591) Host "0" received "Token"
+> [   10.443556] (0:@) Simulation time 10.4436
\ No newline at end of file
diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 8088d27396..89ec8af7e5 100644
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -679,7 +679,6 @@ static void surf_cpu_im_model_init_internal(const char* name)
 
 void surf_cpu_model_init_Cas01_im()
 {
-  char* name;
   if( strcmp(xbt_cfg_get_string(_surf_cfg_set, "cpu/model"),"Cas01"))
     cpu_update_mechanism = UM_LAZY;
   else
-- 
2.20.1