Tracing API has changed. Disable it until its usage is fixed.

diff --git a/communicator.cpp b/communicator.cpp
index e8411166485c7c11d48b5ea5c4f0a428cd47cd93..2ba91a01583ff498df543e571ec46f568b221cce 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -6,7 +6,6 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"

-#include "simgrid_features.h"

 #include "tracing.h"
 
 #include "communicator.h"
 #include "tracing.h"
 
 #include "communicator.h"


@@ -54,9 +53,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);

-    MSG_task_set_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 722013fbac4ad73b806bd39525de9e49c0bf7045..6c72d4545aefe0c8c6b13f121724f7cbe583afcd 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);

-        MSG_task_set_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 f407ffdc5d29a804867e639e8c3acbab4bdcbd01..458d6cfba6076242c7656269e97c991d515f2af3 100644 (file)
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -7,11 +7,6 @@
 #  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
 
 
 #endif // !SIMGRID_FEATURES_H