X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e957279b0b8abc6294f0b38c0a00c1d889086a2..5e2dd3ecf166c2d82974beb220aeb8dd4200f105:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index e39025ebf1..c7a07c97f6 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -22,6 +22,11 @@ SG_BEGIN_DECL()
        SURF_RESOURCE_OFF = 0              /**< Down & broken     */
      } e_surf_resource_state_t;
 
+     typedef enum {
+       SURF_LINK_SHARED = 1,
+       SURF_LINK_FATPIPE = 0
+     } e_surf_link_sharing_policy_t;
+
 /** @Brief Specify that we use that action */
 XBT_PUBLIC(void) surf_action_ref(surf_action_t action);
 /** @brief Creates a new action.
@@ -34,13 +39,6 @@ XBT_PUBLIC(void) surf_action_ref(surf_action_t action);
 XBT_PUBLIC(void *) surf_action_new(size_t size, double cost,
                                    surf_model_t model, int failed);
 
-/**
- * FIXME : this should be done in the binding code !!
- */
-XBT_PUBLIC(void) network_create_resource(char *name,
-        double initial_bandwidth,double initial_latency);
-
-
 /** \brief Resource model description
  */
      typedef struct surf_model_description {
@@ -75,6 +73,8 @@ XBT_PUBLIC(void) model_help(const char* category, s_surf_model_description_t * t
 				   the task is completed) */
        double remains;          /**< How much of that cost remains to
 				 * be done in the currently running task */
+       int latency_limited;          /**< Set to 1 if is limited by latency, 0 otherwise */
+
        double start;            /**< start time  */
        double finish;           /**< finish time : this is modified during the run
 				 * and fluctuates until the task is completed */
@@ -128,8 +128,12 @@ XBT_PUBLIC(void) model_help(const char* category, s_surf_model_description_t * t
 /***************************/
 /* Generic model object */
 /***************************/
-     typedef struct s_routing s_routing_t, *routing_t;
-XBT_PUBLIC_DATA(routing_t) used_routing;
+//     typedef struct s_routing s_routing_t, *routing_t; // COMMENT BY DAVID
+//XBT_PUBLIC_DATA(routing_t) used_routing; // COMMENT BY DAVID
+
+     typedef struct s_routing_global s_routing_global_t, *routing_global_t; // ADDED BY DAVID
+XBT_PUBLIC_DATA(routing_global_t) global_routing; // ADDED BY DAVID
+
 
 /** \brief Private data available on all models
  *  \ingroup SURF_models
@@ -183,8 +187,17 @@ XBT_PUBLIC_DATA(routing_t) used_routing;
        double (*get_link_bandwidth) (const void *link);
        double (*get_link_latency) (const void *link);
        int (*link_shared) (const void *link);
-       void (*create_resource) (char *name,double bw_initial,double lat_initial);
        void (*add_traces)(void);
+       void (*create_resource)(char *name,
+               double bw_initial,
+               tmgr_trace_t bw_trace,
+               double lat_initial,
+               tmgr_trace_t lat_trace,
+               e_surf_resource_state_t
+               state_initial,
+               tmgr_trace_t state_trace,
+               e_surf_link_sharing_policy_t policy,
+               xbt_dict_t properties);
      } s_surf_model_extension_network_t;
 
      /** \brief Workstation model extension public
@@ -212,9 +225,30 @@ XBT_PUBLIC_DATA(routing_t) used_routing;
        double (*get_link_bandwidth) (const void *link);                                    /**< Return the current bandwidth of a network link */
        double (*get_link_latency) (const void *link);                                      /**< Return the current latency of a network link */
        int (*link_shared) (const void *link);
-         xbt_dict_t(*get_properties) (const void *resource);
+       xbt_dict_t(*get_properties) (const void *resource);
+       void (*link_create_resource) (char *name,
+									 double bw_initial,
+									 tmgr_trace_t bw_trace,
+									 double lat_initial,
+									 tmgr_trace_t lat_trace,
+									 e_surf_resource_state_t
+									 state_initial,
+									 tmgr_trace_t state_trace,
+									 e_surf_link_sharing_policy_t
+									 policy, xbt_dict_t properties);
+       void (*cpu_create_resource) (char *name, double power_peak,
+           	                        double power_scale,
+           	                        tmgr_trace_t power_trace,
+           	                        e_surf_resource_state_t state_initial,
+           	                        tmgr_trace_t state_trace,
+           	                        xbt_dict_t cpu_properties);
+       void (*add_traces) (void);
+
      } s_surf_model_extension_workstation_t;
 
+
+
+
 /** \brief Model datatype
  *  \ingroup SURF_models
  *
@@ -243,15 +277,14 @@ XBT_PUBLIC_DATA(routing_t) used_routing;
        void (*set_max_duration) (surf_action_t action, double duration);/**< Set the max duration of an action*/
        void (*set_priority) (surf_action_t action, double priority);/**< Set the priority of an action */
        double (*get_remains) (surf_action_t action);/**< Get the remains of an action */
+       int (*get_latency_limited) (surf_action_t action);/**< Return 1 if action is limited by latency, 0 otherwise */
 
        xbt_dict_t resource_set;
 
 
-
        surf_model_private_t model_private;
 
 
-
        union extension {
          s_surf_model_extension_timer_t timer;
          s_surf_model_extension_cpu_t cpu;
@@ -337,11 +370,6 @@ XBT_PUBLIC(void) surf_cpu_model_init_ti(const char *filename);
  */
 XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(const char *filename);
 
-/**brief Initialise the cpu_im model bypassing the parser
- *
- */
-XBT_PUBLIC(void) surf_cpu_model_init_bypass_im(const char*id,double power);
-
 /** \brief The list of all available cpu model models
  *  \ingroup SURF_models
  */
@@ -667,14 +695,42 @@ XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak,
         tmgr_trace_t state_trace,
         xbt_dict_t cpu_properties);
 
+/*public interface to create resource bypassing the parser via workstation_ptask_L07 model
+ *
+ * see surfxml_parse.c
+ * */
+XBT_PUBLIC(void) surf_wsL07_host_create_resource(char *name, double power_peak,
+        double power_scale,
+        tmgr_trace_t power_trace,
+        e_surf_resource_state_t state_initial,
+        tmgr_trace_t state_trace,
+        xbt_dict_t cpu_properties);
 /**
  * create link resource
- * see network.c
- * FIXME : shoudl have the same prototype as net_link_new
+ * see surfxml_parse.c
  */
-XBT_PUBLIC(void) surf_link_create_resouce(char *name,
-        double bw_initial,double lat_initial);
-
+XBT_PUBLIC(void) surf_link_create_resource(char *name,
+        double bw_initial,
+        tmgr_trace_t bw_trace,
+        double lat_initial,
+        tmgr_trace_t lat_trace,
+        e_surf_resource_state_t
+        state_initial,
+        tmgr_trace_t state_trace,
+        e_surf_link_sharing_policy_t policy,
+        xbt_dict_t properties);
+
+
+XBT_PUBLIC(void) surf_wsL07_link_create_resource(char *name,
+		  double bw_initial,
+		  tmgr_trace_t bw_trace,
+		  double lat_initial,
+		  tmgr_trace_t lat_trace,
+		  e_surf_resource_state_t
+		  state_initial,
+		  tmgr_trace_t state_trace,
+		  e_surf_link_sharing_policy_t
+		  policy, xbt_dict_t properties);
 /**
  * add route element (link_ctn) bypassing the parser
  *
@@ -686,7 +742,7 @@ XBT_PUBLIC(void) surf_add_route_element(char *link_ctn_id);
 /**
  * set route src_id,dest_id, and create a route resource
  *
- * see surf_routing.c
+ * see surf_routing.c && surfxml_parse.c
  */
 XBT_PUBLIC(void) surf_route_set_resource(char* src_id,char *dest_id,xbt_dynar_t links_id,int action);
 XBT_PUBLIC(void) surf_set_routes(void);
@@ -696,12 +752,13 @@ XBT_PUBLIC(void) surf_set_routes(void);
  */
 XBT_PUBLIC(void) surf_route_add_host(char * host_id);
 
-
 /**
  * add traces
+ * see surfxml_parse.c
  */
 XBT_PUBLIC(void) surf_add_host_traces(void);
 XBT_PUBLIC(void) surf_add_link_traces(void);
+XBT_PUBLIC(void) surf_wsL07_add_traces(void);
 
 #include "surf/surf_resource.h"
 #include "surf/surf_resource_lmm.h"