moving/hiding resource_object where it is needed.

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 8459660..fc3af0b 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -10,6 +10,7 @@
 
 #include "xbt/swag.h"
 #include "xbt/dynar.h"
+#include "xbt/dict.h"
 
 /* Actions and resources are higly connected structures... */
 typedef struct surf_action *surf_action_t;
@@ -46,7 +47,7 @@ typedef struct surf_action {
   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 */
+  void *data;                  /* for your convenience */
   surf_resource_t resource_type;
 } s_surf_action_t;
 
@@ -66,6 +67,10 @@ 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);
+  void (*action_set_data) (surf_action_t action, void *data);
+  void (*suspend) (surf_action_t action);
+  void (*resume) (surf_action_t action);
+  int (*is_suspended) (surf_action_t action);
   const char *name;
 } s_surf_resource_public_t, *surf_resource_public_t;
 
@@ -74,10 +79,6 @@ typedef struct surf_resource {
   surf_resource_public_t common_public;
 } s_surf_resource_t;
 
-typedef struct surf_resource_object {
-  surf_resource_t resource;
-} s_surf_resource_object_t, *surf_resource_object_t;
-
 /**************************************/
 /* Implementations of resource object */
 /**************************************/
@@ -92,10 +93,7 @@ typedef struct surf_cpu_resource_extension_private
 typedef struct surf_cpu_resource_extension_public {
   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);
+  e_surf_cpu_state_t(*get_state) (void *cpu);
 } s_surf_cpu_resource_extension_public_t,
     *surf_cpu_resource_extension_public_t;
 
@@ -105,13 +103,14 @@ typedef struct surf_cpu_resource {
   surf_cpu_resource_extension_public_t extension_public;
 } s_surf_cpu_resource_t, *surf_cpu_resource_t;
 extern surf_cpu_resource_t surf_cpu_resource;
-void surf_cpu_resource_init(const char *filename);
+void surf_cpu_resource_init_Cas01(const char *filename);
 
 /* Network resource */
 typedef struct surf_network_resource_extension_private
 *surf_network_resource_extension_private_t;
 typedef struct surf_network_resource_extension_public {
-  surf_action_t(*communicate) (void *src, void *dst, double size);
+  surf_action_t(*communicate) (void *src, void *dst, double size,
+                              double max_rate);
 } s_surf_network_resource_extension_public_t,
     *surf_network_resource_extension_public_t;
 
@@ -122,7 +121,7 @@ typedef struct surf_network_resource {
 } s_surf_network_resource_t, *surf_network_resource_t;
 
 extern surf_network_resource_t surf_network_resource;
-void surf_network_resource_init(const char *filename);
+void surf_network_resource_init_CM02(const char *filename);
 
 /* Workstation resource */
 typedef struct surf_workstation_resource_extension_private
@@ -130,12 +129,10 @@ typedef struct surf_workstation_resource_extension_private
 typedef struct surf_workstation_resource_extension_public {
   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);
+  e_surf_cpu_state_t(*get_state) (void *workstation);
+  surf_action_t(*communicate) (void *workstation_src,
+                              void *workstation_dst, double size,
+                              double max_rate);
 } s_surf_workstation_resource_extension_public_t,
     *surf_workstation_resource_extension_public_t;
 
@@ -146,7 +143,9 @@ typedef struct surf_workstation_resource {
 } s_surf_workstation_resource_t, *surf_workstation_resource_t;
 
 extern surf_workstation_resource_t surf_workstation_resource;
-void surf_workstation_resource_init(const char *filename);
+void surf_workstation_resource_init_CLM03(const char *filename);
+void surf_workstation_resource_init_KCCFLN05(const char *filename);
+extern xbt_dict_t workstation_set;
 
 /*******************************************/
 /*** SURF Globals **************************/