Prepare optim for xbt_lib-get_or_null

diff --git a/src/surf/network.c b/src/surf/network.c
index 5156a31..ee43820 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -45,6 +45,12 @@ typedef struct s_smpi_factor {
   double value;
 } s_smpi_factor_t;
 
+typedef struct s_net_card *net_card_t;
+typedef struct s_net_card {
+  char* name;
+  void* routing_obj;
+} s_net_card_t;
+
 double sg_sender_gap = 0.0;
 double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */
 double sg_bandwidth_factor = 1.0;       /* default value; can be set by model or from command line */

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index bb7ee78..09753e3 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -162,6 +162,8 @@ typedef struct s_as {
 typedef struct s_network_element_info {
   AS_t rc_component;
   e_surf_network_element_type_t rc_type;
+  int id;
+  char *name;
 } s_network_element_info_t, *network_element_info_t;
 
 typedef int *network_element_t;

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 3b33462..88f4802 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -14,6 +14,7 @@
 typedef struct workstation_CLM03 {
   s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
   void *cpu;
+  void *net_card;
   xbt_dynar_t storage;
 } s_workstation_CLM03_t, *workstation_CLM03_t;