-/* Copyright (c) 2006-2014. The SimGrid Team.
+/* Copyright (c) 2006-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <errno.h>
#include <math.h>
#include <stdarg.h> /* va_arg */
-#include <libgen.h>
#include "xbt/misc.h"
#include "xbt/log.h"
#include "xbt/str.h"
+#include "xbt/file.h"
#include "xbt/dict.h"
#include "surf/surfxml_parse.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
#include "surf/random_mgr.h"
#include "simgrid/sg_config.h"
return surf_parse_get_value_with_unit(string, units);
}
-double surf_parse_get_power(const char *string)
+double surf_parse_get_speed(const char *string)
{
const struct unit_scale units[] = {
{ "yottaflops", 1e24 },
}
void ETag_surfxml_storage(void)
{
- s_sg_platf_storage_cbarg_t storage;
+ s_sg_platf_storage_cbarg_t storage = SG_PLATF_STORAGE_INITIALIZER;
memset(&storage,0,sizeof(storage));
storage.id = A_surfxml_storage_id;
}
void ETag_surfxml_storage___type(void)
{
- s_sg_platf_storage_type_cbarg_t storage_type;
+ s_sg_platf_storage_type_cbarg_t storage_type = SG_PLATF_STORAGE_TYPE_INITIALIZER;
memset(&storage_type,0,sizeof(storage_type));
storage_type.content = A_surfxml_storage___type_content;
}
void ETag_surfxml_mstorage(void)
{
- s_sg_platf_mstorage_cbarg_t mstorage;
+ s_sg_platf_mstorage_cbarg_t mstorage = SG_PLATF_MSTORAGE_INITIALIZER;
memset(&mstorage,0,sizeof(mstorage));
mstorage.name = A_surfxml_mstorage_name;
}
void ETag_surfxml_mount(void)
{
- s_sg_platf_mount_cbarg_t mount;
+ s_sg_platf_mount_cbarg_t mount = SG_PLATF_MOUNT_INITIALIZER;
memset(&mount,0,sizeof(mount));
mount.name = A_surfxml_mount_name;
/** @brief When reaching EOF, check whether we are in an include tag, and behave accordingly if yes
*
- * This function is called automatically by sedding the parser in buildtools/Cmake/MaintainerMode.cmake
+ * This function is called automatically by sedding the parser in tools/cmake/MaintainerMode.cmake
* Every FAIL on "Premature EOF" is preceded by a call to this function, which role is to restore the
* previous buffer if we reached the EOF /of an include file/. Its return code is used to avoid the
* error message in that case.
/* Stag and Etag parse functions */
void STag_surfxml_platform(void) {
- _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
+ XBT_ATTRIB_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
"You're using an ancient XML file.\n"
}
void ETag_surfxml_host(void) {
- s_sg_platf_host_cbarg_t host;
+ s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
char* buf;
memset(&host,0,sizeof(host));
buf = A_surfxml_host_power;
XBT_DEBUG("Buffer: %s", buf);
- host.power_peak = xbt_dynar_new(sizeof(double), NULL);
+ host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
if (strchr(buf, ',') == NULL){
- double power_value = get_cpu_power(A_surfxml_host_power);
- xbt_dynar_push_as(host.power_peak,double, power_value);
+ double speed = parse_cpu_speed(A_surfxml_host_power);
+ xbt_dynar_push_as(host.speed_peak,double, speed);
}
else {
xbt_dynar_t pstate_list = xbt_str_split(buf, ",");
int i;
for (i = 0; i < xbt_dynar_length(pstate_list); i++) {
- double power_value;
- char* power_value_str;
-
- xbt_dynar_get_cpy(pstate_list, i, &power_value_str);
- xbt_str_trim(power_value_str, NULL);
- power_value = get_cpu_power(power_value_str);
- xbt_dynar_push_as(host.power_peak, double, power_value);
- XBT_DEBUG("Power value: %f", power_value);
+ double speed;
+ char* speed_str;
+
+ xbt_dynar_get_cpy(pstate_list, i, &speed_str);
+ xbt_str_trim(speed_str, NULL);
+ speed = parse_cpu_speed(speed_str);
+ xbt_dynar_push_as(host.speed_peak, double, speed);
+ XBT_DEBUG("Speed value: %f", speed);
}
xbt_dynar_free(&pstate_list);
}
XBT_DEBUG("pstate: %s", A_surfxml_host_pstate);
- //host.power_peak = get_cpu_power(A_surfxml_host_power);
- host.power_scale = surf_parse_get_double( A_surfxml_host_availability);
+ host.speed_scale = surf_parse_get_double( A_surfxml_host_availability);
host.core_amount = surf_parse_get_int(A_surfxml_host_core);
- host.power_trace = tmgr_trace_new_from_file(A_surfxml_host_availability___file);
+ host.speed_trace = tmgr_trace_new_from_file(A_surfxml_host_availability___file);
host.state_trace = tmgr_trace_new_from_file(A_surfxml_host_state___file);
host.pstate = surf_parse_get_int(A_surfxml_host_pstate);
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);
+ xbt_dynar_free(&host.speed_peak);
current_property_set = NULL;
}
void STag_surfxml_host___link(void){
XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id);
- s_sg_platf_host_link_cbarg_t host_link;
+ s_sg_platf_host_link_cbarg_t host_link = SG_PLATF_HOST_LINK_INITIALIZER;
memset(&host_link,0,sizeof(host_link));
host_link.id = A_surfxml_host___link_id;
host_link.link_up = A_surfxml_host___link_up;
host_link.link_down = A_surfxml_host___link_down;
- sg_platf_new_host_link(&host_link);
+ sg_platf_new_netcard(&host_link);
}
void STag_surfxml_router(void){
- s_sg_platf_router_cbarg_t router;
+ s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
memset(&router, 0, sizeof(router));
router.id = A_surfxml_router_id;
}
void ETag_surfxml_cluster(void){
- s_sg_platf_cluster_cbarg_t cluster;
+ s_sg_platf_cluster_cbarg_t cluster = SG_PLATF_CLUSTER_INITIALIZER;
memset(&cluster,0,sizeof(cluster));
cluster.properties = as_current_property_set;
cluster.prefix = A_surfxml_cluster_prefix;
cluster.suffix = A_surfxml_cluster_suffix;
cluster.radical = A_surfxml_cluster_radical;
- cluster.power = surf_parse_get_power(A_surfxml_cluster_power);
+ cluster.speed = surf_parse_get_speed(A_surfxml_cluster_power);
cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
cluster.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw);
cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat);
void STag_surfxml_cabinet(void){
parse_after_config();
- s_sg_platf_cabinet_cbarg_t cabinet;
+ s_sg_platf_cabinet_cbarg_t cabinet = SG_PLATF_CABINET_INITIALIZER;
memset(&cabinet,0,sizeof(cabinet));
cabinet.id = A_surfxml_cabinet_id;
cabinet.prefix = A_surfxml_cabinet_prefix;
cabinet.suffix = A_surfxml_cabinet_suffix;
- cabinet.power = surf_parse_get_power(A_surfxml_cabinet_power);
+ cabinet.speed = surf_parse_get_speed(A_surfxml_cabinet_power);
cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw);
cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat);
cabinet.radical = A_surfxml_cabinet_radical;
void STag_surfxml_peer(void){
parse_after_config();
- s_sg_platf_peer_cbarg_t peer;
+ s_sg_platf_peer_cbarg_t peer = SG_PLATF_PEER_INITIALIZER;
memset(&peer,0,sizeof(peer));
peer.id = A_surfxml_peer_id;
- peer.power = surf_parse_get_power(A_surfxml_peer_power);
+ peer.speed = surf_parse_get_speed(A_surfxml_peer_power);
peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in);
peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out);
peer.lat = surf_parse_get_time(A_surfxml_peer_lat);
}
void ETag_surfxml_link(void){
- s_sg_platf_link_cbarg_t link;
+ s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link,0,sizeof(link));
link.properties = current_property_set;
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);
}
void ETag_surfxml_backbone(void){
- s_sg_platf_link_cbarg_t link;
+ s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link,0,sizeof(link));
link.properties = NULL;
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);
}
void ETag_surfxml_route(void){
- s_sg_platf_route_cbarg_t route;
+ s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER;
memset(&route,0,sizeof(route));
route.src = A_surfxml_route_src;
}
void ETag_surfxml_ASroute(void){
- s_sg_platf_route_cbarg_t ASroute;
+ s_sg_platf_route_cbarg_t ASroute = SG_PLATF_ROUTE_INITIALIZER;
memset(&ASroute,0,sizeof(ASroute));
ASroute.src = A_surfxml_ASroute_src;
ASroute.dst = A_surfxml_ASroute_dst;
- ASroute.gw_src = sg_routing_edge_by_name_or_null(A_surfxml_ASroute_gw___src);
- ASroute.gw_dst = sg_routing_edge_by_name_or_null(A_surfxml_ASroute_gw___dst);
+ ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src);
+ ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst);
if (A_surfxml_ASroute_gw___src && !ASroute.gw_src)
surf_parse_error("gw_src=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
}
void ETag_surfxml_bypassRoute(void){
- s_sg_platf_route_cbarg_t route;
+ s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER;
memset(&route,0,sizeof(route));
route.src = A_surfxml_bypassRoute_src;
}
void ETag_surfxml_bypassASroute(void){
- s_sg_platf_route_cbarg_t ASroute;
+ s_sg_platf_route_cbarg_t ASroute = SG_PLATF_ROUTE_INITIALIZER;
memset(&ASroute,0,sizeof(ASroute));
ASroute.src = A_surfxml_bypassASroute_src;
ASroute.link_list = parsed_link_list;
ASroute.symmetrical = FALSE;
- ASroute.gw_src = sg_routing_edge_by_name_or_null(A_surfxml_bypassASroute_gw___src);
- ASroute.gw_dst = sg_routing_edge_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
+ ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src);
+ ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
sg_platf_new_bypassASroute(&ASroute);
parsed_link_list = NULL;
}
void ETag_surfxml_trace(void){
- s_sg_platf_trace_cbarg_t trace;
+ s_sg_platf_trace_cbarg_t trace = SG_PLATF_TRACE_INITIALIZER;
memset(&trace,0,sizeof(trace));
trace.id = A_surfxml_trace_id;
void STag_surfxml_trace___connect(void){
parse_after_config();
- s_sg_platf_trace_connect_cbarg_t trace_connect;
+ s_sg_platf_trace_connect_cbarg_t trace_connect = SG_PLATF_TRACE_CONNECT_INITIALIZER;
memset(&trace_connect,0,sizeof(trace_connect));
trace_connect.element = A_surfxml_trace___connect_element;
}
void ETag_surfxml_process(void){
- s_sg_platf_process_cbarg_t process;
+ s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
memset(&process,0,sizeof(process));
process.argc = argc;
xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), NULL);
}
-/* ***************************************** */
-/* TUTORIAL: New TAG */
-void STag_surfxml_gpu(void)
-{
- XBT_DEBUG("STag_surfxml_gpu");
-}
-void ETag_surfxml_gpu(void)
-{
- s_sg_platf_gpu_cbarg_t gpu;
- memset(&gpu,0,sizeof(gpu));
-
- gpu.name = A_surfxml_gpu_name;
-
- sg_platf_new_gpu(&gpu);
-}
-/* ***************************************** */
+void STag_surfxml_gpu(void) {}
+void ETag_surfxml_gpu(void) {}
/* nothing to do in those functions */
void ETag_surfxml_prop(void){}
if (!surf_parsed_filename_stack)
surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+
surf_parsed_filename = xbt_strdup(file);
- char *dir = dirname(surf_parsed_filename);
+ char *dir = xbt_dirname(file);
xbt_dynar_push(surf_path, &dir);
surf_file_to_parse = surf_fopen(file, "r");
* With XML parser
*/
-double get_cpu_power(const char *power)
+double parse_cpu_speed(const char *str_speed)
{
- double power_scale = 0.0;
+ 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(power, "$rand(")) != NULL)
- && ((q = strstr(power, ")")) != NULL)) {
+ 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);
- power_scale = random_generate(random);
+ speed = random_generate(random);
}
} else {
- power_scale = surf_parse_get_power(power);
+ speed = surf_parse_get_speed(str_speed);
}
- return power_scale;
+ return speed;
}
double random_min, random_max, random_mean, random_std_deviation;