#include "xbt/str.h"
#include "xbt/file.h"
#include "xbt/dict.h"
-#include "surf/surfxml_parse.h"
#include "src/surf/surf_private.h"
-#include "surf/random_mgr.h"
#include "simgrid/sg_config.h"
+#include "surfxml_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
"Logging specific to the SURF parsing module");
XBT_DEBUG("Buffer: %s", buf);
host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
if (strchr(buf, ',') == NULL){
- double speed = get_cpu_speed(A_surfxml_host_power);
+ double speed = parse_cpu_speed(A_surfxml_host_power);
xbt_dynar_push_as(host.speed_peak,double, speed);
}
else {
xbt_dynar_get_cpy(pstate_list, i, &speed_str);
xbt_str_trim(speed_str, NULL);
- speed = get_cpu_speed(speed_str);
+ speed = parse_cpu_speed(speed_str);
xbt_dynar_push_as(host.speed_peak, double, speed);
XBT_DEBUG("Speed value: %f", speed);
}
xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
(A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state");
if (A_surfxml_host_state == A_surfxml_host_state_ON)
- host.initial_state = SURF_RESOURCE_ON;
+ host.initiallyOn = 1;
if (A_surfxml_host_state == A_surfxml_host_state_OFF)
- host.initial_state = SURF_RESOURCE_OFF;
+ host.initiallyOn = 1;
host.coord = A_surfxml_host_coordinates;
sg_platf_new_host(&host);
switch (A_surfxml_link_state) {
case A_surfxml_link_state_ON:
- link.state = SURF_RESOURCE_ON;
+ link.initiallyOn = 1;
break;
case A_surfxml_link_state_OFF:
- link.state = SURF_RESOURCE_OFF;
+ link.initiallyOn = 0;
break;
default:
surf_parse_error("invalid state for link %s", link.id);
link.id = A_surfxml_backbone_id;
link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth);
link.latency = surf_parse_get_time(A_surfxml_backbone_latency);
- link.state = SURF_RESOURCE_ON;
+ link.initiallyOn = 1;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
* With XML parser
*/
-double get_cpu_speed(const char *str_speed)
-{
- double speed = 0.0;
- const char *p, *q;
- char *generator;
- random_data_t random = NULL;
- /* randomness is inserted like this: power="$rand(my_random)" */
- if (((p = strstr(str_speed, "$rand(")) != NULL)
- && ((q = strstr(str_speed, ")")) != NULL)) {
- if (p < q) {
- generator = xbt_malloc(q - (p + 6) + 1);
- memcpy(generator, p + 6, q - (p + 6));
- generator[q - (p + 6)] = '\0';
- random = xbt_dict_get_or_null(random_data_list, generator);
- xbt_assert(random, "Random generator %s undefined", generator);
- speed = random_generate(random);
- }
- } else {
- speed = surf_parse_get_speed(str_speed);
- }
- return speed;
+double parse_cpu_speed(const char *str_speed)
+{ // FIXME deadcode
+ return surf_parse_get_speed(str_speed);
}
-double random_min, random_max, random_mean, random_std_deviation;
-e_random_generator_t random_generator;
-char *random_id;
-
xbt_dict_t get_as_router_properties(const char* name)
{
return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);