From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 28 Jan 2016 09:03:42 +0000 (+0100)
Subject: remove dummy test function
X-Git-Tag: v3_13~1050
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/700126b7e7290121b5b716b4bf926a7a5cbb6746

remove dummy test function
---

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 9309197d37..278ee1abfb 100644
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -220,8 +220,8 @@ void SD_task_destroy(SD_task_t task)
   XBT_DEBUG("Destroying task %s...", SD_task_get_name(task));
 
   __SD_task_remove_dependencies(task);
-  /* if the task was scheduled or runnable we have to free the scheduling parameters */
-  if (__SD_task_is_scheduled_or_runnable(task))
+
+  if (task->state == SD_SCHEDULED || task->state == SD_RUNNABLE)
     __SD_task_destroy_scheduling_data(task);
 
   idx = xbt_dynar_search_or_negative(sd_global->return_set, &task);
@@ -635,14 +635,14 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src,
 
   state = SD_task_get_state(src);
   if (state != SD_NOT_SCHEDULED && state != SD_SCHEDULABLE &&
-      state != SD_RUNNING && !__SD_task_is_scheduled_or_runnable(src))
+      state != SD_RUNNING && state != SD_SCHEDULED && state != SD_RUNNABLE)
     THROWF(arg_error, 0,
            "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED,"
            " SD_RUNNABLE or SD_RUNNING", SD_task_get_name(src));
 
   state = SD_task_get_state(dst);
   if (state != SD_NOT_SCHEDULED && state != SD_SCHEDULABLE &&
-      !__SD_task_is_scheduled_or_runnable(dst))
+      state != SD_SCHEDULED && state != SD_RUNNABLE)
     THROWF(arg_error, 0,
            "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED,"
            "or SD_RUNNABLE", SD_task_get_name(dst));
@@ -1008,7 +1008,8 @@ void SD_task_unschedule(SD_task_t task)
            "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED",
            SD_task_get_name(task));
 
-  if (__SD_task_is_scheduled_or_runnable(task)  /* if the task is scheduled or runnable */
+  if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE)
+      /* if the task is scheduled or runnable */
       && ((task->kind == SD_TASK_COMP_PAR_AMDAHL) ||
           (task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK))) { /* Don't free scheduling data for typed tasks */
     __SD_task_destroy_scheduling_data(task);
@@ -1035,7 +1036,7 @@ void SD_task_unschedule(SD_task_t task)
  */
 static void __SD_task_destroy_scheduling_data(SD_task_t task)
 {
-  if (!__SD_task_is_scheduled_or_runnable(task))
+  if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE)
     THROWF(arg_error, 0,
            "Task '%s' must be SD_SCHEDULED or SD_RUNNABLE",
            SD_task_get_name(task));
diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index 4a1bdff10b..2c3355eb51 100644
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -8,7 +8,6 @@
 #define SIMDAG_PRIVATE_H
 
 #include "xbt/base.h"
-#include "xbt/dict.h"
 #include "xbt/dynar.h"
 #include "simgrid/simdag.h"
 #include "surf/surf.h"
@@ -88,14 +87,5 @@ XBT_PRIVATE void* SD_task_new_f(void);
 XBT_PRIVATE void SD_task_recycle_f(void *t);
 XBT_PRIVATE void SD_task_free_f(void *t);
 
-/* Functions to test if the task is in a given state. */
-
-/* Returns whether the given task is scheduled or runnable. */
-static XBT_INLINE int __SD_task_is_scheduled_or_runnable(SD_task_t task)
-{
-  return task->state == SD_SCHEDULED || task->state == SD_RUNNABLE;
-}
-
 SG_END_DECL()
-
 #endif