A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow units in smpi factors.
[simgrid.git]
/
src
/
surf
/
xml
/
surfxml_sax_cb.cpp
diff --git
a/src/surf/xml/surfxml_sax_cb.cpp
b/src/surf/xml/surfxml_sax_cb.cpp
index
7d7bf77
..
e57ae9f
100644
(file)
--- a/
src/surf/xml/surfxml_sax_cb.cpp
+++ b/
src/surf/xml/surfxml_sax_cb.cpp
@@
-53,7
+53,7
@@
void surf_parse_error(const std::string& msg)
void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post)
{
void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post)
{
- if (s
g_netpoint_by_name_or_null(hostname.c_str()
) != nullptr) // found
+ if (s
imgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(hostname
) != nullptr) // found
return;
std::string msg = pre + hostname + post + " Existing netpoints: \n";
return;
std::string msg = pre + hostname + post + " Existing netpoints: \n";
@@
-88,7
+88,6
@@
double surf_parse_get_double(const std::string& s)
return std::stod(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
return std::stod(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
- return -1;
}
}
}
}
@@
-98,7
+97,6
@@
int surf_parse_get_int(const std::string& s)
return std::stoi(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
return std::stoi(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
- return -1;
}
}
}
}
@@
-127,7
+125,6
@@
std::vector<int>* explodesRadical(const std::string& radicals)
break;
default:
surf_parse_error(std::string("Malformed radical: ") + group);
break;
default:
surf_parse_error(std::string("Malformed radical: ") + group);
- break;
}
for (int i = start; i <= end; i++)
exploded->push_back(i);
}
for (int i = start; i <= end; i++)
exploded->push_back(i);
@@
-186,10
+183,6
@@
double surf_parse_get_value_with_unit(const char* string, const unit_scale& unit
if (ptr == string)
surf_parse_error(std::string("cannot parse number:") + string);
if (ptr[0] == '\0') {
if (ptr == string)
surf_parse_error(std::string("cannot parse number:") + string);
if (ptr[0] == '\0') {
- if (res == 0)
- return res; // Ok, 0 can be unit-less
-
- XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s", string, entity_kind, name.c_str(), error_msg);
ptr = (char*)default_unit;
}
auto u = units.find(ptr);
ptr = (char*)default_unit;
}
auto u = units.find(ptr);
@@
-499,7
+492,6
@@
void ETag_surfxml_cluster(){
break;
default:
surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
break;
default:
surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
- break;
}
cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
cluster.router_id = A_surfxml_cluster_router___id;
}
cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
cluster.router_id = A_surfxml_cluster_router___id;
@@
-520,7
+512,6
@@
void ETag_surfxml_cluster(){
break;
default:
surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id);
break;
default:
surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id);
- break;
}
switch (AX_surfxml_cluster_bb___sharing___policy) {
case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
}
switch (AX_surfxml_cluster_bb___sharing___policy) {
case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
@@
-531,7
+522,6
@@
void ETag_surfxml_cluster(){
break;
default:
surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id);
break;
default:
surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id);
- break;
}
sg_platf_new_cluster(&cluster);
}
sg_platf_new_cluster(&cluster);
@@
-621,7
+611,6
@@
void ETag_surfxml_link(){
break;
default:
surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
break;
default:
surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
- break;
}
sg_platf_new_link(&link);
}
sg_platf_new_link(&link);
@@
-643,7
+632,6
@@
void STag_surfxml_link___ctn()
break;
default:
surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
break;
default:
surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
- break;
}
const char* dirname = "";
}
const char* dirname = "";
@@
-836,7
+824,6
@@
void STag_surfxml_trace___connect()
break;
default:
surf_parse_error("Invalid trace kind");
break;
default:
surf_parse_error("Invalid trace kind");
- break;
}
sg_platf_trace_connect(&trace_connect);
}
}
sg_platf_trace_connect(&trace_connect);
}
@@
-950,7
+937,6
@@
void ETag_surfxml_actor()
break;
default:
surf_parse_error("Invalid on failure behavior");
break;
default:
surf_parse_error("Invalid on failure behavior");
- break;
}
sg_platf_new_actor(&actor);
}
sg_platf_new_actor(&actor);
@@
-991,11
+977,12
@@
void surf_parse_open(const std::string& file)
surf_parsed_filename = file;
std::string dir = simgrid::xbt::Path(file).get_dir_name();
surf_path.push_back(dir);
surf_parsed_filename = file;
std::string dir = simgrid::xbt::Path(file).get_dir_name();
surf_path.push_back(dir);
- std::string cwd = simgrid::xbt::Path().get_dir_name();
surf_file_to_parse = surf_fopen(file, "r");
surf_file_to_parse = surf_fopen(file, "r");
- if (surf_file_to_parse == nullptr)
+ if (surf_file_to_parse == nullptr) {
+ std::string cwd = simgrid::xbt::Path().get_name();
xbt_die("Unable to open '%s' from '%s'\n", file.c_str(), cwd.c_str());
xbt_die("Unable to open '%s' from '%s'\n", file.c_str(), cwd.c_str());
+ }
surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse__switch_to_buffer(surf_input_buffer);
surf_parse_lineno = 1;
surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse__switch_to_buffer(surf_input_buffer);
surf_parse_lineno = 1;