Take tracing API changes into account.

diff --git a/communicator.cpp b/communicator.cpp
index 2ddea5d65c0fdb16b1ec1849ce320681e8d5f2d5..e8411166485c7c11d48b5ea5c4f0a428cd47cd93 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -54,9 +54,9 @@ msg_comm_t communicator::real_send(const char* dest, message* msg)
 {
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);
     m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);
 {
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);
     m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);

-    TRACE_msg_set_task_category(task,
-                                msg->get_type() == message::DATA ?
-                                TRACE_CAT_DATA : TRACE_CAT_CTRL);
+    MSG_task_set_category(task,
+                          msg->get_type() == message::DATA ?
+                          TRACE_CAT_DATA : TRACE_CAT_CTRL);

     return MSG_task_isend(task, dest);
 }
 
     return MSG_task_isend(task, dest);
 }
 

diff --git a/process.cpp b/process.cpp
index b5531b0ce85eff0a0a20f6f5f9ce3a1276a71d5d..722013fbac4ad73b806bd39525de9e49c0bf7045 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -257,7 +257,7 @@ void process::compute_loop()
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
         m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
         m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);

-        TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
+        MSG_task_set_category(task, TRACE_CAT_COMP);

         XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
         add_comp_amount(flops);
         XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
         add_comp_amount(flops);

diff --git a/simgrid_features.h b/simgrid_features.h
index 5780d0a0a7a21954acc9dd74a595e3fdbefdaef3..f407ffdc5d29a804867e639e8c3acbab4bdcbd01 100644 (file)
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -7,6 +7,12 @@
 #  error "Unsupported SimGrid version.  Need version > 3.5"
 #endif  // ============================================================= //
 
 #  error "Unsupported SimGrid version.  Need version > 3.5"
 #endif  // ============================================================= //
 

+#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 7, 0)
+
+#define MSG_task_set_category(task, cat) TRACE_msg_set_task_category(task, cat)
+
+#endif
+

 #endif // !SIMGRID_FEATURES_H
 
 // Local variables:
 #endif // !SIMGRID_FEATURES_H
 
 // Local variables: