X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..9453a72a7bca10ac53797ce67f9310c800541934:/src/surf/xml/platf_private.hpp

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index db80cd7ca2..2a62c6db05 100644
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -23,13 +23,6 @@ extern "C" {
 typedef size_t yy_size_t;
 #endif
 
-enum e_surf_cluster_topology_t {
-  SURF_CLUSTER_DRAGONFLY = 3,
-  SURF_CLUSTER_FAT_TREE  = 2,
-  SURF_CLUSTER_FLAT      = 1,
-  SURF_CLUSTER_TORUS     = 0
-};
-
 /* ***************************************** */
 /*
  * Platform creation functions. Instead of passing 123 arguments to the creation functions
@@ -42,14 +35,14 @@ enum e_surf_cluster_topology_t {
  */
 
 struct s_sg_platf_host_cbarg_t {
-  const char* id;
+  const char* id = nullptr;
   std::vector<double> speed_per_pstate;
-  int pstate;
-  int core_amount;
-  tmgr_trace_t speed_trace;
-  tmgr_trace_t state_trace;
-  const char* coord;
-  std::map<std::string, std::string>* properties;
+  int pstate               = 0;
+  int core_amount          = 0;
+  tmgr_trace_t speed_trace = nullptr;
+  tmgr_trace_t state_trace = nullptr;
+  const char* coord        = nullptr;
+  std::map<std::string, std::string>* properties = nullptr;
 };
 typedef s_sg_platf_host_cbarg_t* sg_platf_host_cbarg_t;
 
@@ -83,15 +76,17 @@ public:
   tmgr_trace_t state_trace;
 };
 
-struct s_sg_platf_route_cbarg_t {
-  bool symmetrical                                 = false;
-  sg_netpoint_t src                                = nullptr;
-  sg_netpoint_t dst                                = nullptr;
-  sg_netpoint_t gw_src                             = nullptr;
-  sg_netpoint_t gw_dst                             = nullptr;
-  std::vector<simgrid::surf::LinkImpl*>* link_list = nullptr;
+class RouteCreationArgs {
+public:
+  bool symmetrical     = false;
+  sg_netpoint_t src    = nullptr;
+  sg_netpoint_t dst    = nullptr;
+  sg_netpoint_t gw_src = nullptr;
+  sg_netpoint_t gw_dst = nullptr;
+  std::vector<simgrid::surf::LinkImpl*> link_list;
 };
-typedef s_sg_platf_route_cbarg_t* sg_platf_route_cbarg_t;
+
+enum class ClusterTopology { DRAGONFLY = 3, FAT_TREE = 2, FLAT = 1, TORUS = 0 };
 
 class ClusterCreationArgs {
 public:
@@ -108,7 +103,7 @@ public:
   double loopback_bw  = 0;
   double loopback_lat = 0;
   double limiter_link = 0;
-  e_surf_cluster_topology_t topology;
+  ClusterTopology topology;
   std::string topo_parameters;
   std::map<std::string, std::string>* properties;
   std::string router_id;
@@ -152,12 +147,6 @@ public:
   std::string name;
 };
 
-struct s_sg_platf_prop_cbarg_t {
-  const char *id;
-  const char *value;
-};
-typedef s_sg_platf_prop_cbarg_t* sg_platf_prop_cbarg_t;
-
 class TraceCreationArgs {
 public:
   std::string id;
@@ -166,24 +155,27 @@ public:
   std::string pc_data;
 };
 
+enum class TraceConnectKind { HOST_AVAIL, SPEED, LINK_AVAIL, BANDWIDTH, LATENCY };
+
 class TraceConnectCreationArgs {
 public:
-  e_surf_trace_connect_kind_t kind;
+  TraceConnectKind kind;
   std::string trace;
   std::string element;
 };
 
-struct s_sg_platf_process_cbarg_t {
-  const char **argv;
-  int argc;
-  std::map<std::string, std::string>* properties;
-  const char *host;
-  const char *function;
-  double start_time;
-  double kill_time;
-  e_surf_process_on_failure_t on_failure;
+enum class ActorOnFailure { DIE, RESTART };
+
+class ActorCreationArgs {
+public:
+  std::vector<std::string> args;
+  std::map<std::string, std::string>* properties = nullptr;
+  const char* host                       = nullptr;
+  const char* function                   = nullptr;
+  double start_time                      = 0.0;
+  double kill_time                       = 0.0;
+  ActorOnFailure on_failure;
 };
-typedef s_sg_platf_process_cbarg_t* sg_platf_process_cbarg_t;
 
 class ZoneCreationArgs {
 public:
@@ -210,8 +202,8 @@ XBT_PUBLIC(void) sg_platf_new_cabinet(CabinetCreationArgs* cabinet);   // Add a
 XBT_PUBLIC(simgrid::kernel::routing::NetPoint*)                        // Add a router    to the current Zone
 sg_platf_new_router(std::string, const char* coords);
 
-XBT_PUBLIC(void) sg_platf_new_route (sg_platf_route_cbarg_t route); // Add a route
-XBT_PUBLIC(void) sg_platf_new_bypassRoute (sg_platf_route_cbarg_t bypassroute); // Add a bypassRoute
+XBT_PUBLIC(void) sg_platf_new_route(RouteCreationArgs* route);             // Add a route
+XBT_PUBLIC(void) sg_platf_new_bypassRoute(RouteCreationArgs* bypassroute); // Add a bypassRoute
 
 XBT_PUBLIC(void) sg_platf_new_trace(TraceCreationArgs* trace);
 
@@ -219,7 +211,7 @@ XBT_PUBLIC(void) sg_platf_new_storage(StorageCreationArgs* storage); // Add a st
 XBT_PUBLIC(void) sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type);
 XBT_PUBLIC(void) sg_platf_new_mount(MountCreationArgs* mount);
 
-XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process);
+XBT_PUBLIC(void) sg_platf_new_actor(ActorCreationArgs* actor);
 XBT_PRIVATE void sg_platf_trace_connect(TraceConnectCreationArgs* trace_connect);
 
 /* Prototypes of the functions offered by flex */
@@ -235,8 +227,6 @@ XBT_PUBLIC(void) surf_parse_set_out(FILE * out_str);
 XBT_PUBLIC(int) surf_parse_get_debug();
 XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
 XBT_PUBLIC(int) surf_parse_lex_destroy();
-
-XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
 }
 
 namespace simgrid {