when enable_debug is turned off, these tests were failing.

Raise the level of 3 underlying messages to verbose to avoid debug mode.

diff --git a/examples/s4u/comm-dependent/s4u-comm-dependent.tesh b/examples/s4u/comm-dependent/s4u-comm-dependent.tesh
index c5b4225..94a4001 100644 (file)
--- a/examples/s4u/comm-dependent/s4u-comm-dependent.tesh
+++ b/examples/s4u/comm-dependent/s4u-comm-dependent.tesh
@@ -2,7 +2,7 @@
 
 p Testing with default compound
 
-$ ${bindir:=.}/s4u-comm-dependent ${platfdir}/small_platform.xml  --log=s4u_activity.t:debug "--log=root.fmt:[%6.2r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-comm-dependent ${platfdir}/small_platform.xml  --log=s4u_activity.t:verbose "--log=root.fmt:[%6.2r]%e(%i:%P@%h)%e%m%n"
 > [  2.00] (1:sender@Tremblay) Remove a dependency from 'exec on sender' on 'comm to receiver'
 > [  2.00] (1:sender@Tremblay) All dependencies are solved, let's start 'comm to receiver'
 > [  3.07] (2:receiver@Jupiter) Remove a dependency from 'comm from sender' on 'exec on receiver'

diff --git a/examples/s4u/exec-dependent/s4u-exec-dependent.tesh b/examples/s4u/exec-dependent/s4u-exec-dependent.tesh
index dab01ae..f915f71 100644 (file)
--- a/examples/s4u/exec-dependent/s4u-exec-dependent.tesh
+++ b/examples/s4u/exec-dependent/s4u-exec-dependent.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 ! output sort
-$ ${bindir:=.}/s4u-exec-dependent ${platfdir}/small_platform.xml --log=s4u_activity.t:debug "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-exec-dependent ${platfdir}/small_platform.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  2.000000] (1:worker@Fafard) Remove a dependency from 'parent 1' on 'child'
 > [  2.000000] (1:worker@Fafard) Exec 'parent 1' is complete
 > [  3.000000] (1:worker@Fafard) Remove a dependency from 'parent 2' on 'child'

diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
index fdf031d..f4ee2b8 100644 (file)
--- a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
+++ b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${bindir:=.}/s4u-exec-ptask ${platfdir}/energy_platform.xml --cfg=host/model:ptask_L07 --cfg=tracing:yes --cfg=tracing/uncategorized:yes --log=instr_resource.t:debug --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-exec-ptask ${platfdir}/energy_platform.xml --cfg=host/model:ptask_L07 --cfg=tracing:yes --cfg=tracing/uncategorized:yes --log=instr_resource.t:verbose --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07'
 > [  0.000000] (0:maestro@) Configuration change: Set 'tracing' to 'yes'
 > [  0.000000] (0:maestro@) Configuration change: Set 'tracing/uncategorized' to 'yes'

diff --git a/examples/s4u/io-dependent/s4u-io-dependent.tesh b/examples/s4u/io-dependent/s4u-io-dependent.tesh
index 93e86b6..7a7e537 100644 (file)
--- a/examples/s4u/io-dependent/s4u-io-dependent.tesh
+++ b/examples/s4u/io-dependent/s4u-io-dependent.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 ! output sort
-$ ${bindir:=.}/s4u-io-dependent ${platfdir}/hosts_with_disks.xml --log=s4u_activity.t:debug "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-io-dependent ${platfdir}/hosts_with_disks.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  1.000000] (1:bob@bob) All dependencies are solved, let's start 'bob write'
 > [  1.000000] (1:bob@bob) Remove a dependency from 'bob compute' on 'bob write'
 > [  1.100000] (1:bob@bob) All dependencies are solved, let's start 'carl read'

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 27ab723..fbf8993 100644 (file)
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -37,7 +37,7 @@ protected:
   {
     while (not successors_.empty()) {
       ActivityPtr b = successors_.back();
-      XBT_CDEBUG(s4u_activity, "Remove a dependency from '%s' on '%s'", get_cname(), b->get_cname());
+      XBT_CVERB(s4u_activity, "Remove a dependency from '%s' on '%s'", get_cname(), b->get_cname());
       b->dependencies_.erase(this);
       if (b->dependencies_.empty()) {
         b->vetoable_start();
@@ -57,7 +57,7 @@ public:
   {
     state_ = State::STARTING;
     if (dependencies_.empty()) {
-      XBT_CDEBUG(s4u_activity, "All dependencies are solved, let's start '%s'", get_cname());
+      XBT_CVERB(s4u_activity, "All dependencies are solved, let's start '%s'", get_cname());
       start();
     }
   }

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index f67b618..1e52e69 100644 (file)
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -21,7 +21,7 @@ void resource_set_utilization(const char* type, const char* name, const char* re
 
   // trace uncategorized resource utilization
   if (TRACE_uncategorized()){
-    XBT_DEBUG("UNCAT %s [%f - %f] %s %s %f", type, now, now + delta, resource, name, value);
+    XBT_VERB("UNCAT %s [%f - %f] %s %s %f", type, now, now + delta, resource, name, value);
     container->get_variable(name)->instr_event(now, delta, resource, value);
   }