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
[platf] Kill sg_process_cb
[simgrid.git]
/
src
/
simix
/
smx_deployment.c
diff --git
a/src/simix/smx_deployment.c
b/src/simix/smx_deployment.c
index
c4ddb39
..
10574b5
100644
(file)
--- a/
src/simix/smx_deployment.c
+++ b/
src/simix/smx_deployment.c
@@
-13,25
+13,22
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
"Logging specific to SIMIX (deployment)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
"Logging specific to SIMIX (deployment)");
-static xbt_main_func_t parse_code = NULL;
-static double start_time = 0.0;
-static double kill_time = -1.0;
-
-static int auto_restart = 0;
-
extern int surf_parse_lineno;
extern int surf_parse_lineno;
-
static void parse
_process(sg_platf_process_cbarg_t process)
+
void sg_platf_new
_process(sg_platf_process_cbarg_t process)
{
{
+ if (!simix_global)
+ xbt_die("Cannot create process without SIMIX.");
+
sg_host_t host = sg_host_by_name(process->host);
if (!host)
THROWF(arg_error, 0, "Host '%s' unknown", process->host);
sg_host_t host = sg_host_by_name(process->host);
if (!host)
THROWF(arg_error, 0, "Host '%s' unknown", process->host);
- parse_code = SIMIX_get_registered_function(process->function);
+
xbt_main_func_t
parse_code = SIMIX_get_registered_function(process->function);
xbt_assert(parse_code, "Function '%s' unknown", process->function);
xbt_assert(parse_code, "Function '%s' unknown", process->function);
- start_time = process->start_time;
- kill_time = process->kill_time;
- auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1;
+
double
start_time = process->start_time;
+
double
kill_time = process->kill_time;
+
int
auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1;
smx_process_arg_t arg = NULL;
smx_process_t process_created = NULL;
smx_process_arg_t arg = NULL;
smx_process_t process_created = NULL;
@@
-93,9
+90,9
@@
static void parse_process(sg_platf_process_cbarg_t process)
current_property_set = NULL;
}
current_property_set = NULL;
}
-void SIMIX_init_application(void){
+void SIMIX_init_application(void)
+{
surf_parse_reset_callbacks();
surf_parse_reset_callbacks();
- sg_platf_process_add_cb(parse_process);
}
/**
}
/**
@@
-212,7
+209,7
@@
void SIMIX_process_set_function(const char *process_host,
}
process.argv[process.argc] = NULL;
}
process.argv[process.argc] = NULL;
- parse_code = SIMIX_get_registered_function(process_function);
+
xbt_main_func_t
parse_code = SIMIX_get_registered_function(process_function);
xbt_assert(parse_code, "Function '%s' unknown", process_function);
process.function = process_function;
xbt_assert(parse_code, "Function '%s' unknown", process_function);
process.function = process_function;