Remove a few more commented lines of code.

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 6db6d88..88cd15b 100644 (file)
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -34,7 +34,6 @@ void simgrid::kernel::activity::SleepImpl::post()
     switch (surf_sleep->getState()) {
       case simgrid::surf::Action::State::failed:
         simcall->issuer->context->iwannadie = 1;
-        // SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
         state = SIMIX_SRC_HOST_FAILURE;
         break;
 

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index f672a50..c300f94 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -95,8 +95,6 @@ double VMModel::nextOccuringEvent(double now)
                               ->value; // this is X1 in comment above, what this VM got in the sharing on the PM
     XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getCname(), ws_vm->pimpl_vm_->getPm()->getCname());
 
-    // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution.
-    // cpu_cas01->constraint->bound = solved_value;
     xbt_assert(cpu->model() == surf_cpu_model_vm);
     lmm_system_t vcpu_system = cpu->model()->getMaxminSystem();
     lmm_update_constraint_bound(vcpu_system, cpu->constraint(), virt_overhead * solved_value);

diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp
index baac105..095d6e0 100644 (file)
--- a/src/surf/maxmin.cpp
+++ b/src/surf/maxmin.cpp
@@ -1221,11 +1221,11 @@ static void lmm_update_modified_set(lmm_system_t sys, lmm_constraint_t cnst)
  */
 static void lmm_remove_all_modified_set(lmm_system_t sys)
 {
-  //We cleverly un-flag all variables just by incrementing sys->visited_counter
-  //In effect, the var->visited value will no more be equal to sys->visited counter
-  //To be clean, when visited counter has wrapped around, we force these var->visited values so that variables that
-  //were in the modified a long (long long) time ago are not wrongly skipped here, which would lead to very nasty bugs
-  //(i.e. not readibily reproducible, and requiring a lot of run time before happening).
+  // We cleverly un-flag all variables just by incrementing sys->visited_counter
+  // In effect, the var->visited value will no more be equal to sys->visited counter
+  // To be clean, when visited counter has wrapped around, we force these var->visited values so that variables that
+  // were in the modified a long long time ago are not wrongly skipped here, which would lead to very nasty bugs
+  // (i.e. not readibily reproducible, and requiring a lot of run time before happening).
   if (++sys->visited_counter == 1) {
     /* the counter wrapped around, reset each variable->visited */
   void *_var;

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 5e8cdd1..ce083fb 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -280,12 +280,6 @@ void xbt_log_init(int *argc, char **argv)
   unsigned help_requested = 0;  /* 1: logs; 2: categories */
   int j                   = 1;
 
-  /* uncomment to set the LOG category to debug directly */
-  if (0) {
-    _XBT_LOGV(log).threshold = xbt_log_priority_debug;
-  }
-  xbt_log_connect_categories();
-
   /* Set logs and init log submodule */
   for (int i = 1; i < *argc; i++) {
     if (!strncmp(argv[i], "--log=", strlen("--log="))) {