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
try again to fix out of source lua test
[simgrid.git]
/
src
/
surf
/
surf_routing.cpp
diff --git
a/src/surf/surf_routing.cpp
b/src/surf/surf_routing.cpp
index
b9a584f
..
f5cb8aa
100644
(file)
--- a/
src/surf/surf_routing.cpp
+++ b/
src/surf/surf_routing.cpp
@@
-13,7
+13,7
@@
#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "simgrid/sg_config.h"
#include "storage_interface.hpp"
#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "simgrid/sg_config.h"
#include "storage_interface.hpp"
-
+#include "src/surf/platform.hpp"
#include "surf/surfxml_parse_values.h"
/*************
#include "surf/surfxml_parse_values.h"
/*************
@@
-206,20
+206,17
@@
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
tmgr_trace_t tmgr_trace;
if (!trace->file || strcmp(trace->file, "") != 0) {
tmgr_trace = tmgr_trace_new_from_file(trace->file);
tmgr_trace_t tmgr_trace;
if (!trace->file || strcmp(trace->file, "") != 0) {
tmgr_trace = tmgr_trace_new_from_file(trace->file);
- } else if (strcmp(trace->pc_data, "") == 0) {
- tmgr_trace = NULL;
} else {
} else {
- tmgr_trace =
- tmgr_trace_new_from_string(trace->id, trace->pc_data,
-
trace->periodicity);
+ xbt_assert(strcmp(trace->pc_data, ""),
+ "Trace '%s' must have either a content, or point to a file on disk.",trace->id);
+
tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data,
trace->periodicity);
}
xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL);
}
void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
{
}
xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, 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),
+ 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);
"Cannot connect trace %s to %s: trace unknown",
trace_connect->trace,
trace_connect->element);
@@
-545,7
+542,7
@@
namespace surf {
*/
void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t* route, double *latency)
{
*/
void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t* route, double *latency)
{
- XBT_DEBUG("
routing_get_route_and_l
atency from %s to %s", src->getName(), dst->getName());
+ XBT_DEBUG("
getRouteAndL
atency from %s to %s", src->getName(), dst->getName());
if (NULL == *route) {
xbt_dynar_reset(routing_platf->p_lastRoute);
*route = routing_platf->p_lastRoute;
if (NULL == *route) {
xbt_dynar_reset(routing_platf->p_lastRoute);
*route = routing_platf->p_lastRoute;
@@
-1226,8
+1223,8
@@
static void check_disk_attachment()
void routing_register_callbacks()
{
void routing_register_callbacks()
{
- s
g_platf_postparse_add_cb
(routing_parse_postparse);
- s
g_platf_postparse_add_cb
(check_disk_attachment);
+ s
imgrid::surf::on_postparse.connect
(routing_parse_postparse);
+ s
imgrid::surf::on_postparse.connect
(check_disk_attachment);
instr_routing_define_callbacks();
}
instr_routing_define_callbacks();
}