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
Clean callbacks for the host parsing.
[simgrid.git]
/
src
/
surf
/
network_constant.c
diff --git
a/src/surf/network_constant.c
b/src/surf/network_constant.c
index
a6978a2
..
f4251f0
100644
(file)
--- a/
src/surf/network_constant.c
+++ b/
src/surf/network_constant.c
@@
-21,14
+21,14
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
static random_data_t random_latency = NULL;
static int host_number_int = 0;
static random_data_t random_latency = NULL;
static int host_number_int = 0;
-static void netcste_count_hosts(
void
)
+static void netcste_count_hosts(
surf_parsing_host_arg_t h
)
{
host_number_int++;
}
{
host_number_int++;
}
-static void netcste_define_callbacks(
const char *file
)
+static void netcste_define_callbacks(
void
)
{
{
- surf
xml_add_callback(STag_surfxml_host_cb_list, &
netcste_count_hosts);
+ surf
_parse_host_add_cb(
netcste_count_hosts);
}
static int netcste_resource_used(void *resource_id)
}
static int netcste_resource_used(void *resource_id)
@@
-117,7
+117,7
@@
static surf_action_t netcste_communicate(const char *src_name,
{
surf_action_network_Constant_t action = NULL;
{
surf_action_network_Constant_t action = NULL;
- XBT_IN
4
("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
+ XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
action =
surf_action_new(sizeof(s_surf_action_network_Constant_t), size,
action =
surf_action_new(sizeof(s_surf_action_network_Constant_t), size,
@@
-125,7
+125,7
@@
static surf_action_t netcste_communicate(const char *src_name,
action->suspended = 0;
action->suspended = 0;
- action->latency =
1
; //random_generate(random_latency);
+ action->latency =
sg_latency_factor
; //random_generate(random_latency);
action->lat_init = action->latency;
if (action->latency <= 0.0) {
action->lat_init = action->latency;
if (action->latency <= 0.0) {
@@
-134,11
+134,18
@@
static surf_action_t netcste_communicate(const char *src_name,
xbt_swag_insert(action, action->generic_action.state_set);
}
xbt_swag_insert(action, action->generic_action.state_set);
}
- XBT_OUT;
+ XBT_OUT
()
;
return (surf_action_t) action;
}
return (surf_action_t) action;
}
+#ifdef HAVE_TRACING
+static void netcste_action_set_category(surf_action_t action, const char *category)
+{
+ //ignore completely the categories in constant model, they are not traced
+}
+#endif
+
/* returns an array of link_Constant_t */
static xbt_dynar_t netcste_get_route(void *src, void *dst)
{
/* returns an array of link_Constant_t */
static xbt_dynar_t netcste_get_route(void *src, void *dst)
{
@@
-184,7
+191,7
@@
static void netcste_finalize(void)
-void surf_network_model_init_Constant(
const char *filename
)
+void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == NULL);
if (surf_network_model)
{
xbt_assert(surf_network_model == NULL);
if (surf_network_model)
@@
-220,10
+227,13
@@
void surf_network_model_init_Constant(const char *filename)
surf_network_model->extension.network.get_link_latency =
netcste_get_link_latency;
surf_network_model->extension.network.link_shared = link_shared;
surf_network_model->extension.network.get_link_latency =
netcste_get_link_latency;
surf_network_model->extension.network.link_shared = link_shared;
+#ifdef HAVE_TRACING
+ surf_network_model->set_category = netcste_action_set_category;
+#endif
if (!random_latency)
random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
if (!random_latency)
random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
- netcste_define_callbacks(
filename
);
+ netcste_define_callbacks();
xbt_dynar_push(model_list, &surf_network_model);
update_model_description(surf_network_model_description,
xbt_dynar_push(model_list, &surf_network_model);
update_model_description(surf_network_model_description,