These two certainly do not need hardcore portability bits

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index ac5da2b..8cbf635 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -12,7 +12,6 @@
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 #include "xbt/misc.h"
-#include "portable.h"
 
 SG_BEGIN_DECL()
 
@@ -44,6 +43,7 @@ typedef struct surf_model_description {
   const char *name;
   surf_model_t model;
   void (* model_init) (const char *filename);
+  void (* create_ws) (void);
 } s_surf_model_description_t, *surf_model_description_t;
 
 XBT_PUBLIC(void) update_model_description(s_surf_model_description_t *table,
@@ -277,6 +277,8 @@ typedef struct surf_network_model {
   surf_network_model_extension_public_t extension_public;
 } s_surf_network_model_t, *surf_network_model_t;
 
+XBT_PUBLIC(void) create_workstations(void);
+
 /** \brief The network model
  *  \ingroup SURF_models
  *
@@ -490,7 +492,7 @@ XBT_PUBLIC_DATA(xbt_dict_t) link_set;
  *  \see link_set
  */
 XBT_PUBLIC_DATA(xbt_dict_t)  workstation_set;
-
+XBT_PUBLIC_DATA(xbt_dict_t)  cpu_set;
 /** \brief List of initialized models
  *  \ingroup SURF_models
  */
@@ -569,15 +571,18 @@ void parse_trace_finalize(void);
 void parse_trace_c_connect(void);
 
 void manage_route(xbt_dict_t route_table, const char* route_name, int action, int isMultiRoute);
-int route_action;
+XBT_PUBLIC_DATA(int) route_action;
 
 /* This is used by all models when creating the routing table while parsing */
-xbt_dict_t route_table, route_multi_table;
-xbt_dynar_t route_link_list;
+XBT_PUBLIC_DATA(xbt_dict_t) route_table;
+XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table;
+XBT_PUBLIC_DATA(xbt_dict_t) route_table;
+XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table;
+XBT_PUBLIC_DATA(xbt_dynar_t) route_link_list;
 
 /* For the trace and trace:connect tag */
-xbt_dict_t traces_set_list;
-xbt_dynar_t traces_connect_list;
+XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) traces_connect_list;
 
 double get_cpu_power(const char* power);
 void init_randomness(void);