Merge branch 'master' of 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 300aa22..9012302 100644 (file)
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -20,11 +20,9 @@ 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 */
+  sg_host_t *host_list;   /* array of workstations, created only if
+                             necessary in sg_host_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 */
 
@@ -41,9 +39,6 @@ typedef struct SD_global {
 
 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 {
@@ -78,8 +73,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;
@@ -98,10 +93,6 @@ typedef struct SD_dependency {
 } s_SD_dependency_t, *SD_dependency_t;
 
 /* SimDag private functions */
-XBT_PRIVATE SD_workstation_t __SD_workstation_create(const char* name);
-XBT_PRIVATE void __SD_workstation_destroy(void *workstation);
-XBT_PRIVATE int __SD_workstation_is_busy(SD_workstation_t workstation);
-
 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);
@@ -120,23 +111,10 @@ static XBT_INLINE int __SD_task_is_scheduled_or_runnable(SD_task_t task)
   return task->state == SD_SCHEDULED || task->state == SD_RUNNABLE;
 }
 
-/* Returns whether the given task is scheduled or runnable. */
-static XBT_INLINE int __SD_task_is_schedulable_or_done(SD_task_t task)
-{
-  return task->state == SD_SCHEDULABLE || task->state == SD_DONE;
-}
-
 /********** 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