uniformization of the conversion of task state to string

[simgrid.git] / src / simdag / simdag_private.h

diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index 906205e..380ca67 100644 (file)
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -7,21 +7,22 @@
 #ifndef SIMDAG_PRIVATE_H
 #define SIMDAG_PRIVATE_H
 #include <set>
+#include <string>
+#include <vector>
 #include "xbt/dynar.h"
 #include "simgrid/simdag.h"
 #include "surf/surf.h"
-#include "xbt/mallocator.h"
 #include <stdbool.h>
+#if HAVE_JEDULE
+#include "simgrid/jedule/jedule_sd_binding.h"
+#endif
 
 SG_BEGIN_DECL()
 
 /* Global variables */
 
 typedef struct SD_global {
-  xbt_mallocator_t task_mallocator; /* to not remalloc new tasks */
-
   bool watch_point_reached;      /* has a task just reached a watch point? */
-
   std::set<SD_task_t> *initial_tasks;
   std::set<SD_task_t> *runnable_tasks;
   std::set<SD_task_t> *completed_tasks;
@@ -40,7 +41,6 @@ typedef struct SD_task {
   e_SD_task_kind_t kind;
   double amount;
   double alpha;          /* used by typed parallel tasks */
-  double remains;
   double start_time;
   double finish_time;
   surf_action_t surf_action;
@@ -55,8 +55,7 @@ typedef struct SD_task {
   std::set<SD_task_t> *successors;
 
   /* scheduling parameters (only exist in state SD_SCHEDULED) */
-  int host_count;
-  sg_host_t *host_list;
+  std::vector<sg_host_t> *allocation;
   double *flops_amount;
   double *bytes_amount;
   double rate;
@@ -67,11 +66,7 @@ XBT_PRIVATE void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state);
 XBT_PRIVATE void SD_task_run(SD_task_t task);
 XBT_PRIVATE bool acyclic_graph_detail(xbt_dynar_t dag);
 XBT_PRIVATE void uniq_transfer_task_name(SD_task_t task);
-
-/* Task mallocator functions */
-XBT_PRIVATE void* SD_task_new_f();
-XBT_PRIVATE void SD_task_recycle_f(void *t);
-XBT_PRIVATE void SD_task_free_f(void *t);
+XBT_PRIVATE const char *__get_state_name(e_SD_task_state_t state);
 
 SG_END_DECL()
 #endif