make trace_connect_list_host_speed private as it should

[simgrid.git] / src / surf / surfxml_parseplatf.cpp

diff --git a/src/surf/surfxml_parseplatf.cpp b/src/surf/surfxml_parseplatf.cpp
index 989e211..51ce41a 100644 (file)
--- a/src/surf/surfxml_parseplatf.cpp
+++ b/src/surf/surfxml_parseplatf.cpp
@@ -9,15 +9,18 @@
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "simgrid/platf.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "simgrid/platf.h"

-#include "surf/surfxml_parse.h"
+#include "src/surf/cpu_interface.hpp"

 #include "src/surf/surf_private.h"
 #include "src/surf/surf_private.h"

+#include "src/surf/surfxml_private.h"

 
 #ifdef HAVE_LUA
 
 #ifdef HAVE_LUA

+extern "C" {

 #include "src/bindings/lua/simgrid_lua.h"
 
 #include <lua.h>                /* Always include this when calling Lua */
 #include <lauxlib.h>            /* Always include this when calling Lua */
 #include <lualib.h>             /* Prototype for luaL_openlibs(), */
 #include "src/bindings/lua/simgrid_lua.h"
 
 #include <lua.h>                /* Always include this when calling Lua */
 #include <lauxlib.h>            /* Always include this when calling Lua */
 #include <lualib.h>             /* Prototype for luaL_openlibs(), */

+}

 #endif
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 #endif
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);


@@ -67,12 +70,51 @@ xbt_dict_t trace_connect_list_link_avail = NULL;
 xbt_dict_t trace_connect_list_link_bw = NULL;
 xbt_dict_t trace_connect_list_link_lat = NULL;
 
 xbt_dict_t trace_connect_list_link_bw = NULL;
 xbt_dict_t trace_connect_list_link_lat = NULL;
 

+void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
+{
+  xbt_assert(xbt_dict_get_or_null(traces_set_list, trace_connect->trace),
+              "Cannot connect trace %s to %s: trace unknown",
+              trace_connect->trace,
+              trace_connect->element);
+
+  switch (trace_connect->kind) {
+  case SURF_TRACE_CONNECT_KIND_HOST_AVAIL:
+    xbt_dict_set(trace_connect_list_host_avail,
+        trace_connect->trace,
+        xbt_strdup(trace_connect->element), NULL);
+    break;
+  case SURF_TRACE_CONNECT_KIND_POWER:
+    xbt_dict_set(trace_connect_list_host_speed, trace_connect->trace,
+        xbt_strdup(trace_connect->element), NULL);
+    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);
+    break;
+  case SURF_TRACE_CONNECT_KIND_BANDWIDTH:
+    xbt_dict_set(trace_connect_list_link_bw,
+        trace_connect->trace,
+        xbt_strdup(trace_connect->element), NULL);
+    break;
+  case SURF_TRACE_CONNECT_KIND_LATENCY:
+    xbt_dict_set(trace_connect_list_link_lat, trace_connect->trace,
+        xbt_strdup(trace_connect->element), NULL);
+    break;
+  default:
+  surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown",
+        trace_connect->trace, trace_connect->element);
+    break;
+  }
+}
+
+

 /* ***************************************** */
 
 static int after_config_done;
 void parse_after_config() {
   if (!after_config_done) {
 /* ***************************************** */
 
 static int after_config_done;
 void parse_after_config() {
   if (!after_config_done) {

-         TRACE_start();
+    TRACE_start();

 
     /* Register classical callbacks */
     storage_register_callbacks();
 
     /* Register classical callbacks */
     storage_register_callbacks();


@@ -135,6 +177,32 @@ void parse_platform_file(const char *file)
     /* Do the actual parsing */
     parse_status = surf_parse();
 
     /* Do the actual parsing */
     parse_status = surf_parse();
 

+    /* connect all traces relative to hosts */
+    xbt_dict_cursor_t cursor = NULL;
+    char *trace_name, *elm;
+
+    xbt_dict_foreach(trace_connect_list_host_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);
+
+      simgrid::s4u::Host *host = sg_host_by_name(elm);
+      xbt_assert(host, "Host %s undefined", elm);
+      simgrid::surf::Cpu *cpu = host->pimpl_cpu;
+
+      cpu->set_state_trace(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);
+      xbt_assert(trace, "Trace %s undefined", trace_name);
+
+      simgrid::s4u::Host *host = sg_host_by_name(elm);
+      xbt_assert(host, "Host %s undefined", elm);
+      simgrid::surf::Cpu *cpu = host->pimpl_cpu;
+
+      cpu->set_speed_trace(trace);
+    }
+
+

     /* Free my data */
     xbt_dict_free(&trace_connect_list_host_avail);
     xbt_dict_free(&trace_connect_list_host_speed);
     /* Free my data */
     xbt_dict_free(&trace_connect_list_host_avail);
     xbt_dict_free(&trace_connect_list_host_speed);


@@ -142,7 +210,6 @@ void parse_platform_file(const char *file)
     xbt_dict_free(&trace_connect_list_link_bw);
     xbt_dict_free(&trace_connect_list_link_lat);
     xbt_dict_free(&traces_set_list);
     xbt_dict_free(&trace_connect_list_link_bw);
     xbt_dict_free(&trace_connect_list_link_lat);
     xbt_dict_free(&traces_set_list);

-    xbt_dict_free(&random_data_list);

     xbt_dynar_free(&surfxml_bufferstack_stack);
 
     surf_parse_close();
     xbt_dynar_free(&surfxml_bufferstack_stack);
 
     surf_parse_close();