Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index de27e4f..28e8664 100644 (file)
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -7,8 +7,6 @@
 #ifndef SIMDAG_PRIVATE_H
 #define SIMDAG_PRIVATE_H
 
-#include "xbt/base.h"
-#include "xbt/dict.h"
 #include "xbt/dynar.h"
 #include "simgrid/simdag.h"
 #include "surf/surf.h"
@@ -20,41 +18,20 @@ SG_BEGIN_DECL()
 /* Global variables */
 
 typedef struct SD_global {
-  SD_workstation_t *workstation_list;   /* array of workstations, created only if
-                                           necessary in SD_workstation_get_list */
-  SD_link_t *link_list;         /* array of links */
-  SD_link_t *recyclable_route;  /* array returned by SD_route_get_list
-                                   and mallocated only once */
-
   xbt_mallocator_t task_mallocator; /* to not remalloc new tasks */
 
-  int watch_point_reached;      /* has a task just reached a watch point? */
+  bool watch_point_reached;      /* has a task just reached a watch point? */
 
   xbt_dynar_t initial_task_set;
   xbt_dynar_t executable_task_set;
   xbt_dynar_t completed_task_set;
 
   xbt_dynar_t return_set;
-  int task_number;
 
 } s_SD_global_t, *SD_global_t;
 
 extern XBT_PRIVATE SD_global_t sd_global;
 
-/* Workstation */
-typedef s_xbt_dictelm_t s_SD_workstation_t;
-
-/* Storage */
-typedef s_xbt_dictelm_t s_SD_storage_t;
-typedef struct SD_storage {
-  void *data;                   /* user data */
-  const char *host;
-} s_SD_storage_priv_t, *SD_storage_priv_t;
-
-static inline SD_storage_priv_t SD_storage_priv(SD_storage_t storage){
-  return (SD_storage_priv_t)xbt_lib_get_level(storage, SD_STORAGE_LEVEL);
-}
-
 /* Task */
 typedef struct SD_task {
   e_SD_task_state_t state;
@@ -78,8 +55,8 @@ typedef struct SD_task {
   unsigned int is_not_ready;
 
   /* scheduling parameters (only exist in state SD_SCHEDULED) */
-  int workstation_nb;
-  SD_workstation_t *workstation_list;   /* surf workstations */
+  int host_count;
+  sg_host_t *host_list;
   double *flops_amount;
   double *bytes_amount;
   double rate;
@@ -108,25 +85,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;
-}
-
-/********** Storage **********/
-XBT_PRIVATE SD_storage_t __SD_storage_create(void *surf_storage, void *data);
-XBT_PRIVATE void __SD_storage_destroy(void *storage);
-
-/********** Tracing **********/
-/* declaration of instrumentation functions from sd_task_instr.c */
-XBT_PRIVATE void TRACE_sd_task_create(SD_task_t task);
-XBT_PRIVATE void TRACE_sd_task_execute_start(SD_task_t task);
-XBT_PRIVATE void TRACE_sd_task_execute_end(SD_task_t task);
-XBT_PRIVATE void TRACE_sd_task_destroy(SD_task_t task);
-
 SG_END_DECL()
-
 #endif