-/* Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team.
+/* Copyright (c) 2006 - 2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
sd_global->task_number++;
#ifdef HAVE_TRACING
- task->category = NULL;
+ TRACE_sd_task_create(task);
#endif
return task;
SD_task_t res = SD_task_create_sized(name, data, amount, 2);
res->communication_amount[2] = amount;
res->kind = SD_TASK_COMM_E2E;
+
+#ifdef HAVE_TRACING
+ TRACE_category("COMM_E2E");
+ TRACE_sd_set_task_category(res, "COMM_E2E");
+#endif
+
return res;
}
SD_task_t res = SD_task_create_sized(name, data, amount, 1);
res->computation_amount[0] = amount;
res->kind = SD_TASK_COMP_SEQ;
- return res;
+
+#ifdef HAVE_TRACING
+ TRACE_category("COMP_SEQ");
+ TRACE_sd_set_task_category(res, "COMP_SEQ");
+#endif
+
+return res;
}
/** @brief create a parallel computation task that can then be auto-scheduled
SD_task_t res = SD_task_create(name, data, amount);
res->alpha = alpha;
res->kind = SD_TASK_COMP_PAR_AMDAHL;
+
+#ifdef HAVE_TRACING
+ TRACE_category("COMP_PAR_AMDAHL");
+ TRACE_sd_set_task_category(res, "COMP_PAR_AMDAHL");
+#endif
+
return res;
}
SD_task_t res = SD_task_create(name, data, amount);
res->workstation_list=NULL;
res->kind = SD_TASK_COMM_PAR_MXN_1D_BLOCK;
+
+#ifdef HAVE_TRACING
+ TRACE_category("COMM_PAR_MXN_1D_BLOCK");
+ TRACE_sd_set_task_category(res, "COMM_PAR_MXN_1D_BLOCK");
+#endif
+
return res;
}
xbt_free(task->computation_amount);
#ifdef HAVE_TRACING
- if (task->category) xbt_free(task->category);
+ TRACE_sd_task_destroy(task);
#endif
xbt_mallocator_release(sd_global->task_mallocator,task);
XBT_INFO("Displaying task %s", SD_task_get_name(task));
statename = bprintf("%s %s %s %s %s %s %s %s",
- (task->state & SD_NOT_SCHEDULED ? "not scheduled" :
+ (task->state == SD_NOT_SCHEDULED ? "not scheduled" :
""),
- (task->state & SD_SCHEDULABLE ? "schedulable" : ""),
- (task->state & SD_SCHEDULED ? "scheduled" : ""),
- (task->state & SD_RUNNABLE ? "runnable" :
+ (task->state == SD_SCHEDULABLE ? "schedulable" : ""),
+ (task->state == SD_SCHEDULED ? "scheduled" : ""),
+ (task->state == SD_RUNNABLE ? "runnable" :
"not runnable"),
- (task->state & SD_IN_FIFO ? "in fifo" : ""),
- (task->state & SD_RUNNING ? "running" : ""),
- (task->state & SD_DONE ? "done" : ""),
- (task->state & SD_FAILED ? "failed" : ""));
+ (task->state == SD_IN_FIFO ? "in fifo" : ""),
+ (task->state == SD_RUNNING ? "running" : ""),
+ (task->state == SD_DONE ? "done" : ""),
+ (task->state == SD_FAILED ? "failed" : ""));
XBT_INFO(" - state: %s", statename);
free(statename);
XBT_INFO(" - (unknown kind %d)", task->kind);
}
}
+
+#ifdef HAVE_TRACING
+ if (task->category)
+ XBT_INFO(" - tracing category: %s", task->category);
+#endif
+
XBT_INFO(" - amount: %.0f", SD_task_get_amount(task));
if (task->kind == SD_TASK_COMP_PAR_AMDAHL)
XBT_INFO(" - alpha: %.2f", task->alpha);
SD_task_t dst)
{
xbt_dynar_t dynar;
- int length;
+ unsigned long length;
int found = 0;
- int i;
+ unsigned long i;
SD_dependency_t dependency;
dynar = src->tasks_after;
for (i = 0; i < length && !found; i++) {
xbt_dynar_get_cpy(dynar, i, &dependency);
found = (dependency->dst == dst);
- XBT_DEBUG("Dependency %d: dependency->dst = %s", i,
+ XBT_DEBUG("Dependency %lu: dependency->dst = %s", i,
SD_task_get_name(dependency->dst));
}
{
xbt_dynar_t dynar;
- int length;
+ unsigned long length;
int found = 0;
- int i;
+ unsigned long i;
SD_dependency_t dependency;
/* remove the dependency from src->tasks_after */
{
xbt_dynar_t dynar;
- int length;
+ unsigned long length;
int found = 0;
- int i;
+ unsigned long i;
SD_dependency_t dependency;
dynar = src->tasks_after;
&& ((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);
+ xbt_free(task->workstation_list);
task->workstation_list=NULL;
task->workstation_nb = 0;
}
"Task %s is not a SD_TASK_COMP_PAR_AMDAHL typed task."
"Cannot use this function.",
SD_task_get_name(task));
-
task->computation_amount = xbt_new0(double, ws_count);
task->communication_amount = xbt_new0(double, ws_count * ws_count);
+ xbt_free(task->workstation_list);
task->workstation_nb = ws_count;
task->workstation_list = xbt_new0(SD_workstation_t, ws_count);
task->workstation_list[i];
before->workstation_nb += count;
-
+ xbt_free(before->computation_amount);
+ xbt_free(before->communication_amount);
before->computation_amount = xbt_new0(double,
before->workstation_nb);
before->communication_amount = xbt_new0(double,
after->workstation_nb += count;
+ xbt_free(after->computation_amount);
+ xbt_free(after->communication_amount);
+
after->computation_amount = xbt_new0(double, after->workstation_nb);
after->communication_amount = xbt_new0(double,
after->workstation_nb*
SD_task_schedulev(task, count, list);
free(list);
}
-
-/**
- * \brief Sets the tracing category of a task.
- *
- * This function should be called after the creation of a
- * SimDAG task, to define the category of that task. The first
- * parameter must contain a task that was created with the
- * function #SD_task_create. The second parameter must contain
- * a category that was previously declared with the function
- * #TRACE_category.
- *
- * \param task The task to be considered
- * \param category the name of the category to be associated to the task
- *
- * \see SD_task_get_category, TRACE_category, TRACE_category_with_color
- */
-void SD_task_set_category (SD_task_t task, const char *category)
-{
-#ifdef HAVE_TRACING
- if (!TRACE_is_enabled()) return;
- if (task == NULL) return;
- if (category == NULL){
- if (task->category) xbt_free (task->category);
- task->category = NULL;
- }else{
- task->category = xbt_strdup (category);
- }
-#endif
-}
-
-/**
- * \brief Gets the current tracing category of a task.
- *
- * \param task The task to be considered
- *
- * \see SD_task_set_category
- *
- * \return Returns the name of the tracing category of the given task, NULL otherwise
- */
-const char *SD_task_get_category (SD_task_t task)
-{
-#ifdef HAVE_TRACING
- return task->category;
-#else
- return NULL;
-#endif
-}
