X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..005eb0fdbd85bacfbdb5ab2cc26567c6a43df31f:/src/msg/task.c

diff --git a/src/msg/task.c b/src/msg/task.c
index d5d094443a..2a9a5c09d9 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -23,12 +23,6 @@
  *  <em>message size</em> and some <em>private data</em>.
  */
 
-#ifdef HAVE_RUBY                /* FIXME: KILLME */
-XBT_LOG_EXTERNAL_CATEGORY(ruby);
-#endif
-
-
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg,
                                 "Logging specific to MSG (task)");
 
@@ -68,7 +62,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   simdata->message_size = message_size;
   simdata->rate = -1.0;
   simdata->priority = 1.0;
-  simdata->refcount = 1;
+  simdata->isused = 0;
   simdata->sender = NULL;
   simdata->receiver = NULL;
   simdata->compute = NULL;
@@ -92,7 +86,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
  */
 void *MSG_task_get_data(m_task_t task)
 {
-  xbt_assert0((task != NULL), "Invalid parameter");
+  xbt_assert((task != NULL), "Invalid parameter");
 
   return (task->data);
 }
@@ -105,7 +99,7 @@ void *MSG_task_get_data(m_task_t task)
  */
 void MSG_task_set_data(m_task_t task, void *data)
 {
-  xbt_assert0((task != NULL), "Invalid parameter");
+  xbt_assert((task != NULL), "Invalid parameter");
 
   task->data = data;
 }
@@ -117,7 +111,7 @@ void MSG_task_set_data(m_task_t task, void *data)
  */
 m_process_t MSG_task_get_sender(m_task_t task)
 {
-  xbt_assert0(task, "Invalid parameters");
+  xbt_assert(task, "Invalid parameters");
   return ((simdata_task_t) task->simdata)->sender;
 }
 
@@ -128,7 +122,7 @@ m_process_t MSG_task_get_sender(m_task_t task)
  */
 m_host_t MSG_task_get_source(m_task_t task)
 {
-  xbt_assert0(task, "Invalid parameters");
+  xbt_assert(task, "Invalid parameters");
   return ((simdata_task_t) task->simdata)->source;
 }
 
@@ -139,7 +133,7 @@ m_host_t MSG_task_get_source(m_task_t task)
  */
 const char *MSG_task_get_name(m_task_t task)
 {
-  xbt_assert0(task, "Invalid parameters");
+  xbt_assert(task, "Invalid parameters");
   return task->name;
 }
 
@@ -150,16 +144,10 @@ const char *MSG_task_get_name(m_task_t task)
  */
 void MSG_task_set_name(m_task_t task, const char *name)
 {
-  xbt_assert0(task, "Invalid parameters");
+  xbt_assert(task, "Invalid parameters");
   task->name = xbt_strdup(name);
 }
 
-
-void MSG_task_refcount_dec(m_task_t task)
-{
-  task->simdata->refcount--;
-}
-
 /** \ingroup m_task_management
  * \brief Destroy a #m_task_t.
  *
@@ -169,12 +157,13 @@ void MSG_task_refcount_dec(m_task_t task)
 MSG_error_t MSG_task_destroy(m_task_t task)
 {
   smx_action_t action = NULL;
-  xbt_assert0((task != NULL), "Invalid parameter");
+  xbt_assert((task != NULL), "Invalid parameter");
 
   /* why? if somebody is using, then you can't free! ok... but will return MSG_OK? when this task will be destroyed? isn't the user code wrong? */
-  task->simdata->refcount--;
-  if (task->simdata->refcount > 0)
+  if (task->simdata->isused > 0) {
+    XBT_DEBUG("Cannot destroy task %p since somebody is using it", task);
     return MSG_OK;
+  }
 #ifdef HAVE_TRACING
   TRACE_msg_task_destroy(task);
 #endif
@@ -200,22 +189,27 @@ MSG_error_t MSG_task_destroy(m_task_t task)
 
 /** \ingroup m_task_management
  * \brief Cancel a #m_task_t.
- * \param task the taskt to cancel. If it was executed or transfered, it 
+ * \param task the task to cancel. If it was executed or transfered, it
           stops the process that were working on it.
  */
 MSG_error_t MSG_task_cancel(m_task_t task)
 {
-  xbt_assert0((task != NULL), "Invalid parameter");
+  xbt_assert((task != NULL), "Invalid parameter");
 
   if (task->simdata->compute) {
     SIMIX_req_host_execution_cancel(task->simdata->compute);
-    return MSG_OK;
   }
-  if (task->simdata->comm) {
+  else if (task->simdata->comm) {
     SIMIX_req_comm_cancel(task->simdata->comm);
-    return MSG_OK;
   }
-  THROW_IMPOSSIBLE;
+  else {
+    static int warned = 0;
+    if (!warned) {
+      XBT_WARN("Cannot cancel a non-running task");
+      warned = 1;
+    }
+  }
+  return MSG_OK;
 }
 
 /** \ingroup m_task_management
@@ -224,7 +218,7 @@ MSG_error_t MSG_task_cancel(m_task_t task)
  */
 double MSG_task_get_compute_duration(m_task_t task)
 {
-  xbt_assert0((task != NULL)
+  xbt_assert((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
 
   return task->simdata->computation_amount;
@@ -238,7 +232,7 @@ double MSG_task_get_compute_duration(m_task_t task)
 void MSG_task_set_compute_duration(m_task_t task,
                                    double computation_amount)
 {
-  xbt_assert0(task, "Invalid parameter");
+  xbt_assert(task, "Invalid parameter");
   task->simdata->computation_amount = computation_amount;
 
 }
@@ -249,7 +243,7 @@ void MSG_task_set_compute_duration(m_task_t task,
  */
 double MSG_task_get_remaining_computation(m_task_t task)
 {
-  xbt_assert0((task != NULL)
+  xbt_assert((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
 
   if (task->simdata->compute) {
@@ -267,9 +261,9 @@ double MSG_task_get_remaining_computation(m_task_t task)
  */
 double MSG_task_get_remaining_communication(m_task_t task)
 {
-  xbt_assert0((task != NULL)
+  xbt_assert((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
-  DEBUG1("calling SIMIX_req_communication_get_remains(%p)",
+  XBT_DEBUG("calling SIMIX_req_communication_get_remains(%p)",
          task->simdata->comm);
   return SIMIX_req_comm_get_remains(task->simdata->comm);
 }
@@ -281,9 +275,9 @@ double MSG_task_get_remaining_communication(m_task_t task)
  */
 int MSG_task_is_latency_bounded(m_task_t task)
 {
-  xbt_assert0((task != NULL)
+  xbt_assert((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
-  DEBUG1("calling SIMIX_req_communication_is_latency_bounded(%p)",
+  XBT_DEBUG("calling SIMIX_req_communication_is_latency_bounded(%p)",
          task->simdata->comm);
   return SIMIX_req_comm_is_latency_bounded(task->simdata->comm);
 }
@@ -295,7 +289,7 @@ int MSG_task_is_latency_bounded(m_task_t task)
  */
 double MSG_task_get_data_size(m_task_t task)
 {
-  xbt_assert0((task != NULL)
+  xbt_assert((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
 
   return task->simdata->message_size;
@@ -311,7 +305,7 @@ double MSG_task_get_data_size(m_task_t task)
  */
 void MSG_task_set_priority(m_task_t task, double priority)
 {
-  xbt_assert0((task != NULL)
+  xbt_assert((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
 
   task->simdata->priority = 1 / priority;