X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/640c2105b668b0fd6089e3d2e7b1a3031fc3ec2c..a5945452ef5b1114fd7c2fab0e865d776775c34d:/src/simdag/simdag_private.h

diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index 8b62ba25fd..b6915825de 100644
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -7,13 +7,9 @@
 #ifndef SIMDAG_PRIVATE_H
 #define SIMDAG_PRIVATE_H
 
-#include "xbt/base.h"
-#include "xbt/dict.h"
 #include "xbt/dynar.h"
-#include "xbt/fifo.h"
 #include "simgrid/simdag.h"
 #include "surf/surf.h"
-#include "xbt/swag.h"
 #include "xbt/mallocator.h"
 #include <stdbool.h>
 
@@ -22,13 +18,6 @@ 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, created only if
-                                   necessary in SD_link_get_list */
-  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? */
@@ -37,40 +26,18 @@ typedef struct SD_global {
   xbt_dynar_t executable_task_set;
   xbt_dynar_t completed_task_set;
 
-  xbt_swag_t return_set;
-  int task_number;
+  xbt_dynar_t return_set;
 
 } 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;
-typedef struct SD_workstation {
-  e_SD_workstation_access_mode_t access_mode;
-
-  xbt_fifo_t task_fifo;         /* only used in sequential mode */
-  SD_task_t current_task;       /* only used in sequential mode */
-} s_SD_workstation_priv_t, *SD_workstation_priv_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 {
-  s_xbt_swag_hookup_t return_hookup;
   e_SD_task_state_t state;
   void *data;                   /* user data */
   char *name;
-  int kind;
+  e_SD_task_kind_t kind;
   double amount;
   double alpha;          /* used by typed parallel tasks */
   double remains;
@@ -79,8 +46,6 @@ typedef struct SD_task {
   surf_action_t surf_action;
   unsigned short watch_points;  /* bit field xor()ed with masks */
 
-  int fifo_checked;             /* used by SD_task_just_done to make sure we evaluate
-                                   the task only once */
   int marked;                   /* used to check if the task DAG has some cycle*/
 
   /* dependencies */
@@ -90,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;
@@ -110,57 +75,15 @@ typedef struct SD_dependency {
 } s_SD_dependency_t, *SD_dependency_t;
 
 /* SimDag private functions */
-
-/* could be public, but you need to see the SD_task_t internals to use it */
-XBT_PRIVATE xbt_swag_t SD_simulate_swag(double how_long);
-
-
-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_really_run(SD_task_t task);
-XBT_PRIVATE void __SD_task_just_done(SD_task_t task);
-XBT_PRIVATE int __SD_task_try_to_run(SD_task_t task);
+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(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;
-}
-
-/* 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;
-}
-
-/* Returns whether the state of the given task is SD_RUNNABLE or SD_IN_FIFO. */
-static XBT_INLINE int __SD_task_is_runnable_or_in_fifo(SD_task_t task)
-{
-  return task->state == SD_RUNNABLE || task->state == SD_IN_FIFO;
-}
-
-/********** 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