X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a13d43daf0284cec291d65f0585fd2a44e9d87fd..c987f60dfea775b1675a01e76f05bd723aa3e992:/src/surf/xml/surfxml_parseplatf.cpp

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 02f8ccdeda..95a8a103e6 100644
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -14,7 +14,7 @@
 
 #include "src/surf/xml/platf.hpp"
 
-#ifdef HAVE_LUA
+#if HAVE_LUA
 extern "C" {
 #include "src/bindings/lua/simgrid_lua.h"
 
@@ -32,10 +32,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
  */
 
 /* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the cluster tag */
-static xbt_dynar_t surfxml_bufferstack_stack = NULL;
+static xbt_dynar_t surfxml_bufferstack_stack = nullptr;
 int surfxml_bufferstack_size = 2048;
 
-static char *old_buff = NULL;
+static char *old_buff = nullptr;
 
 XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack_ptr;
 XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack[1024];
@@ -64,12 +64,12 @@ void surfxml_bufferstack_pop(int new_one)
  * Trace related stuff
  */
 
-xbt_dict_t traces_set_list = NULL;
-XBT_PRIVATE xbt_dict_t trace_connect_list_host_avail = NULL;
-XBT_PRIVATE xbt_dict_t trace_connect_list_host_speed = NULL;
-XBT_PRIVATE xbt_dict_t trace_connect_list_link_avail = NULL;
-XBT_PRIVATE xbt_dict_t trace_connect_list_link_bw = NULL;
-XBT_PRIVATE xbt_dict_t trace_connect_list_link_lat = NULL;
+xbt_dict_t traces_set_list = nullptr;
+XBT_PRIVATE xbt_dict_t trace_connect_list_host_avail = nullptr;
+XBT_PRIVATE xbt_dict_t trace_connect_list_host_speed = nullptr;
+XBT_PRIVATE xbt_dict_t trace_connect_list_link_avail = nullptr;
+XBT_PRIVATE xbt_dict_t trace_connect_list_link_bw = nullptr;
+XBT_PRIVATE xbt_dict_t trace_connect_list_link_lat = nullptr;
 
 void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
 {
@@ -82,25 +82,25 @@ void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
   case SURF_TRACE_CONNECT_KIND_HOST_AVAIL:
     xbt_dict_set(trace_connect_list_host_avail,
         trace_connect->trace,
-        xbt_strdup(trace_connect->element), NULL);
+        xbt_strdup(trace_connect->element), nullptr);
     break;
   case SURF_TRACE_CONNECT_KIND_SPEED:
     xbt_dict_set(trace_connect_list_host_speed, trace_connect->trace,
-        xbt_strdup(trace_connect->element), NULL);
+        xbt_strdup(trace_connect->element), nullptr);
     break;
   case SURF_TRACE_CONNECT_KIND_LINK_AVAIL:
     xbt_dict_set(trace_connect_list_link_avail,
         trace_connect->trace,
-        xbt_strdup(trace_connect->element), NULL);
+        xbt_strdup(trace_connect->element), nullptr);
     break;
   case SURF_TRACE_CONNECT_KIND_BANDWIDTH:
     xbt_dict_set(trace_connect_list_link_bw,
         trace_connect->trace,
-        xbt_strdup(trace_connect->element), NULL);
+        xbt_strdup(trace_connect->element), nullptr);
     break;
   case SURF_TRACE_CONNECT_KIND_LATENCY:
     xbt_dict_set(trace_connect_list_link_lat, trace_connect->trace,
-        xbt_strdup(trace_connect->element), NULL);
+        xbt_strdup(trace_connect->element), nullptr);
     break;
   default:
   surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown",
@@ -128,14 +128,14 @@ void parse_after_config() {
 /* This function acts as a main in the parsing area. */
 void parse_platform_file(const char *file)
 {
-#ifdef HAVE_LUA
-  int is_lua = (file != NULL && strlen(file) > 3 && file[strlen(file)-3] == 'l' && file[strlen(file)-2] == 'u'
+#if HAVE_LUA
+  int is_lua = (file != nullptr && strlen(file) > 3 && file[strlen(file)-3] == 'l' && file[strlen(file)-2] == 'u'
         && file[strlen(file)-1] == 'a');
 #endif
 
   sg_platf_init();
 
-#ifdef HAVE_LUA
+#if HAVE_LUA
   /* Check if file extension is "lua". If so, we will use
    * the lua bindings to parse the platform file (since it is
    * written in lua). If not, we will use the (old?) XML parser
@@ -164,7 +164,7 @@ void parse_platform_file(const char *file)
     after_config_done = 0;
     surf_parse_open(file);
 
-    traces_set_list = xbt_dict_new_homogeneous(NULL);
+    traces_set_list = xbt_dict_new_homogeneous(nullptr);
     trace_connect_list_host_avail = xbt_dict_new_homogeneous(free);
     trace_connect_list_host_speed = xbt_dict_new_homogeneous(free);
     trace_connect_list_link_avail = xbt_dict_new_homogeneous(free);
@@ -173,13 +173,13 @@ void parse_platform_file(const char *file)
 
     /* Init my data */
     if (!surfxml_bufferstack_stack)
-      surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL);
+      surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), nullptr);
 
     /* Do the actual parsing */
     parse_status = surf_parse();
 
     /* connect all traces relative to hosts */
-    xbt_dict_cursor_t cursor = NULL;
+    xbt_dict_cursor_t cursor = nullptr;
     char *trace_name, *elm;
 
     xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
@@ -190,7 +190,7 @@ void parse_platform_file(const char *file)
       xbt_assert(host, "Host %s undefined", elm);
       simgrid::surf::Cpu *cpu = host->pimpl_cpu;
 
-      cpu->set_state_trace(trace);
+      cpu->setStateTrace(trace);
     }
     xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
       tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
@@ -200,14 +200,14 @@ void parse_platform_file(const char *file)
       xbt_assert(host, "Host %s undefined", elm);
       simgrid::surf::Cpu *cpu = host->pimpl_cpu;
 
-      cpu->set_speed_trace(trace);
+      cpu->setSpeedTrace(trace);
     }
     xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
       tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
       xbt_assert(trace, "Trace %s undefined", trace_name);
       Link *link = Link::byName(elm);
       xbt_assert(link, "Link %s undefined", elm);
-      link->set_state_trace(trace);
+      link->setStateTrace(trace);
     }
 
     xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
@@ -215,7 +215,7 @@ void parse_platform_file(const char *file)
       xbt_assert(trace, "Trace %s undefined", trace_name);
       Link *link = Link::byName(elm);
       xbt_assert(link, "Link %s undefined", elm);
-      link->set_bandwidth_trace(trace);
+      link->setBandwidthTrace(trace);
     }
 
     xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
@@ -223,7 +223,7 @@ void parse_platform_file(const char *file)
       xbt_assert(trace, "Trace %s undefined", trace_name);
       Link *link = Link::byName(elm);
       xbt_assert(link, "Link %s undefined", elm);
-      link->set_latency_trace(trace);
+      link->setLatencyTrace(trace);
     }
 
     /* Free my data */