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

diff --git a/examples/smpi/replay/replay.tesh b/examples/smpi/replay/replay.tesh
index 56caba5..fc9a8aa 100644 (file)
--- a/examples/smpi/replay/replay.tesh
+++ b/examples/smpi/replay/replay.tesh
@@ -169,6 +169,8 @@ $ tail -n +3 ./simgrid.trace
 > 12 0.000000 2 3 8
 > 13 0.000000 2 1
 > 12 0.000000 2 1 6
+> 5 9 2 action_reduce "0 1 0"
+> 5 10 2 smpi_replay_run_finalize "0 1 0"
 > 13 0.015036 2 2
 > 12 0.015036 2 2 6
 > 13 0.015676 2 3
@@ -179,7 +181,6 @@ $ tail -n +3 ./simgrid.trace
 > 12 5.097100 2 1 8
 > 13 5.097100 2 1
 > 12 5.097100 2 1 6
-> 5 9 2 action_reduce "0 1 0"
 > 13 5.112136 2 2
 > 12 5.112136 2 2 6
 > 13 6.569099 2 3
@@ -192,7 +193,6 @@ $ tail -n +3 ./simgrid.trace
 > 12 10.194200 2 1 9
 > 13 13.138198 2 3
 > 12 13.138198 2 3 9
-> 5 10 2 smpi_replay_run_finalize "0 1 0"
 > 13 14.286929 2 2
 > 12 14.286929 2 2 10
 > 13 18.250974 2 1

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index eeb3877..7bbf6bf 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -278,11 +278,11 @@ static void instr_on_platform_created()
   TRACE_paje_dump_buffer(true);
 }
 
-static void TRACE_actor_kill(smx_process_exit_status_t status, msg_process_t process)
+static void TRACE_actor_kill(smx_process_exit_status_t status, simgrid::s4u::Actor* actor)
 {
   if (status == SMX_EXIT_FAILURE)
     // kill means that this actor no longer exists, let's destroy it
-    simgrid::instr::Container::by_name(instr_pid(process))->remove_from_parent();
+    simgrid::instr::Container::by_name(instr_pid(actor))->remove_from_parent();
 }
 
 static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor)

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 727c602..a8b793d 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -4,7 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "cpu_interface.hpp"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
@@ -31,18 +30,6 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/)
     action->finish(kernel::resource::Action::State::FINISHED);
     XBT_CDEBUG(surf_kernel, "Action %p finished", action);
   }
-  if (TRACE_is_enabled()) {
-    //defining the last timestamp that we can safely dump to trace file
-    //without losing the event ascending order (considering all CPU's)
-    double smaller = -1;
-    for (kernel::resource::Action const& action : *get_started_action_set()) {
-      if (smaller < 0 || action.get_last_update() < smaller)
-        smaller = action.get_last_update();
-    }
-    if (smaller > 0) {
-      TRACE_last_timestamp_to_dump = smaller;
-    }
-  }
 }
 
 void CpuModel::update_actions_state_full(double now, double delta)
@@ -173,11 +160,6 @@ void CpuAction::update_remains_lazy(double now)
                get_last_update());
     update_remains(get_last_value() * delta);
 
-    if (TRACE_is_enabled()) {
-      Cpu* cpu = static_cast<Cpu*>(get_variable()->get_constraint(0)->get_id());
-      TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), get_category(), get_last_value(),
-                                          get_last_update(), now - get_last_update());
-    }
     XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update());
   }