X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d01caf8dec7610aed836690b66e859c8f786ae36..421aa4b3efd1134af2afa1ebb920bb562ee58973:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 0dcf20d5b8..8459660b7d 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -9,8 +9,7 @@
 #define _SURF_SURF_H
 
 #include "xbt/swag.h"
-#include "xbt/heap.h"		/* for xbt_heap_float_t only */
-#include "surf/maxmin.h"	/* for xbt_maxmin_float_t only  */
+#include "xbt/dynar.h"
 
 /* Actions and resources are higly connected structures... */
 typedef struct surf_action *surf_action_t;
@@ -39,11 +38,13 @@ typedef struct surf_action_state {
 typedef struct surf_action {
   s_xbt_swag_hookup_t state_hookup;
   xbt_swag_t state_set;
-  xbt_maxmin_float_t cost;	/* cost        */
-  xbt_maxmin_float_t remains;	/* How much of that cost remains to
+  double cost;			/* cost        */
+  double max_duration;		/* max_duration (may fluctuate until
+				   the task is completed) */
+  double remains;		/* How much of that cost remains to
 				 * be done in the currently running task */
-  xbt_heap_float_t start;	/* start time  */
-  xbt_heap_float_t finish;	/* finish time : this is modified during the run
+  double start;			/* start time  */
+  double finish;		/* finish time : this is modified during the run
 				 * and fluctuates until the task is completed */
   void *callback;		/* for your convenience */
   surf_resource_t resource_type;
@@ -65,6 +66,7 @@ typedef struct surf_resource_public {
   void (*action_recycle) (surf_action_t action);
   void (*action_change_state) (surf_action_t action,
 			       e_surf_action_state_t state);
+  const char *name;
 } s_surf_resource_public_t, *surf_resource_public_t;
 
 typedef struct surf_resource {
@@ -86,11 +88,14 @@ typedef enum {
 } e_surf_cpu_state_t;
 
 typedef struct surf_cpu_resource_extension_private
-    *surf_cpu_resource_extension_private_t;
+*surf_cpu_resource_extension_private_t;
 typedef struct surf_cpu_resource_extension_public {
-  surf_action_t(*execute) (void *cpu, xbt_maxmin_float_t size);
-  surf_action_t(*wait) (void *cpu, xbt_maxmin_float_t size);
-  e_surf_cpu_state_t(*get_state) (void *cpu);
+  surf_action_t(*execute) (void *cpu, double size);
+  surf_action_t(*sleep) (void *cpu, double duration);
+  void (*suspend) (surf_action_t action);
+  void (*resume) (surf_action_t action);
+  int (*is_suspended) (surf_action_t action);
+   e_surf_cpu_state_t(*get_state) (void *cpu);
 } s_surf_cpu_resource_extension_public_t,
     *surf_cpu_resource_extension_public_t;
 
@@ -104,10 +109,9 @@ void surf_cpu_resource_init(const char *filename);
 
 /* Network resource */
 typedef struct surf_network_resource_extension_private
-    *surf_network_resource_extension_private_t;
+*surf_network_resource_extension_private_t;
 typedef struct surf_network_resource_extension_public {
-  surf_action_t(*communicate) (void *src, void *dst,
-			       xbt_maxmin_float_t size);
+  surf_action_t(*communicate) (void *src, void *dst, double size);
 } s_surf_network_resource_extension_public_t,
     *surf_network_resource_extension_public_t;
 
@@ -122,14 +126,16 @@ void surf_network_resource_init(const char *filename);
 
 /* Workstation resource */
 typedef struct surf_workstation_resource_extension_private
-    *surf_workstation_resource_extension_private_t;
+*surf_workstation_resource_extension_private_t;
 typedef struct surf_workstation_resource_extension_public {
-  surf_action_t(*execute) (void *workstation, xbt_maxmin_float_t size);
-  surf_action_t(*wait) (void *workstation, xbt_maxmin_float_t size);
-  e_surf_cpu_state_t(*get_state) (void *workstation);
-  surf_action_t(*communicate) (void *workstation_src,
-			       void *workstation_dst,
-			       xbt_maxmin_float_t size);
+  surf_action_t(*execute) (void *workstation, double size);
+  surf_action_t(*sleep) (void *workstation, double duration);
+  void (*suspend) (surf_action_t action);
+  void (*resume) (surf_action_t action);
+  int (*is_suspended) (surf_action_t action);
+   e_surf_cpu_state_t(*get_state) (void *workstation);
+   surf_action_t(*communicate) (void *workstation_src,
+				void *workstation_dst, double size);
 } s_surf_workstation_resource_extension_public_t,
     *surf_workstation_resource_extension_public_t;
 
@@ -147,10 +153,13 @@ void surf_workstation_resource_init(const char *filename);
 /*******************************************/
 
 void surf_init(int *argc, char **argv);	/* initialize common structures */
-xbt_heap_float_t surf_solve(void);	/*  update all states and returns
-					   the time elapsed since last
-					   event */
-xbt_heap_float_t surf_get_clock(void);
+
+extern xbt_dynar_t resource_list;	/* list of initialized resources */
+
+double surf_solve(void);	/*  update all states and returns
+				   the time elapsed since last
+				   event */
+double surf_get_clock(void);
 void surf_finalize(void);	/* clean everything */
 
 #endif				/* _SURF_SURF_H */