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
The sed version used on macos doesn't like the I flag..
[simgrid.git]
/
src
/
simix
/
ActorImpl.cpp
diff --git
a/src/simix/ActorImpl.cpp
b/src/simix/ActorImpl.cpp
index
d283b1e
..
fe4d45b
100644
(file)
--- a/
src/simix/ActorImpl.cpp
+++ b/
src/simix/ActorImpl.cpp
@@
-218,7
+218,6
@@
void SIMIX_process_stop(smx_actor_t arg) {
if (arg->auto_restart && arg->host->isOff()) {
SIMIX_host_add_auto_restart_process(arg->host, arg->name.c_str(),
arg->code, arg->data,
if (arg->auto_restart && arg->host->isOff()) {
SIMIX_host_add_auto_restart_process(arg->host, arg->name.c_str(),
arg->code, arg->data,
- sg_host_get_name(arg->host),
SIMIX_timer_get_date(arg->kill_timer),
arg->properties,
arg->auto_restart);
SIMIX_timer_get_date(arg->kill_timer),
arg->properties,
arg->auto_restart);
@@
-241,20
+240,18
@@
smx_actor_t SIMIX_process_create(
const char *name,
std::function<void()> code,
void *data,
const char *name,
std::function<void()> code,
void *data,
-
const char *hostname
,
+
sg_host_t host
,
double kill_time,
xbt_dict_t properties,
int auto_restart,
smx_actor_t parent_process)
{
smx_actor_t process = nullptr;
double kill_time,
xbt_dict_t properties,
int auto_restart,
smx_actor_t parent_process)
{
smx_actor_t process = nullptr;
- sg_host_t host = sg_host_by_name(hostname);
- XBT_DEBUG("Start process %s on host '%s'", name, host
name
);
+ XBT_DEBUG("Start process %s on host '%s'", name, host
->name().c_str()
);
if (host->isOff()) {
if (host->isOff()) {
- XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
- hostname);
+ XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->name().c_str());
return nullptr;
}
else {
return nullptr;
}
else {
@@
-630,7
+627,6
@@
smx_activity_t SIMIX_process_suspend(smx_actor_t process, smx_actor_t issuer)
return nullptr;
} else {
return nullptr;
} else {
- /* FIXME: computation size is zero. Is it okay that bound is zero ? */
return SIMIX_execution_start(process, "suspend", 0.0, 1.0, 0.0);
}
}
return SIMIX_execution_start(process, "suspend", 0.0, 1.0, 0.0);
}
}
@@
-962,7
+958,7
@@
smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) {
simgrid::simix::ProcessArg arg;
arg.name = process->name;
arg.code = process->code;
simgrid::simix::ProcessArg arg;
arg.name = process->name;
arg.code = process->code;
- arg.host
name = sg_host_get_name(process->host)
;
+ arg.host
= process->host
;
arg.kill_time = SIMIX_timer_get_date(process->kill_timer);
arg.data = process->data;
arg.properties = nullptr;
arg.kill_time = SIMIX_timer_get_date(process->kill_timer);
arg.data = process->data;
arg.properties = nullptr;
@@
-972,7
+968,7
@@
smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) {
SIMIX_process_kill(process, issuer);
//start the new process
SIMIX_process_kill(process, issuer);
//start the new process
- return simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host
name
,
+ return simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host,
arg.kill_time, arg.properties, arg.auto_restart, nullptr);
}
arg.kill_time, arg.properties, arg.auto_restart, nullptr);
}
@@
-1000,7
+996,7
@@
void SIMIX_segment_index_set(smx_actor_t proc, int index){
smx_actor_t simcall_process_create(const char *name,
xbt_main_func_t code,
void *data,
smx_actor_t simcall_process_create(const char *name,
xbt_main_func_t code,
void *data,
-
const char *hostname
,
+
sg_host_t host
,
double kill_time,
int argc, char **argv,
xbt_dict_t properties,
double kill_time,
int argc, char **argv,
xbt_dict_t properties,
@@
-1014,19
+1010,19
@@
smx_actor_t simcall_process_create(const char *name,
xbt_free(argv);
smx_actor_t res = simcall_process_create(name,
std::move(wrapped_code),
xbt_free(argv);
smx_actor_t res = simcall_process_create(name,
std::move(wrapped_code),
- data, host
name
, kill_time, properties, auto_restart);
+ data, host, kill_time, properties, auto_restart);
return res;
}
smx_actor_t simcall_process_create(
const char *name, std::function<void()> code, void *data,
return res;
}
smx_actor_t simcall_process_create(
const char *name, std::function<void()> code, void *data,
-
const char *hostname
, double kill_time,
+
sg_host_t host
, double kill_time,
xbt_dict_t properties, int auto_restart)
{
if (name == nullptr)
name = "";
smx_actor_t self = SIMIX_process_self();
return simgrid::simix::kernelImmediate([&] {
xbt_dict_t properties, int auto_restart)
{
if (name == nullptr)
name = "";
smx_actor_t self = SIMIX_process_self();
return simgrid::simix::kernelImmediate([&] {
- return SIMIX_process_create(name, std::move(code), data, host
name
, kill_time, properties, auto_restart, self);
+ return SIMIX_process_create(name, std::move(code), data, host, kill_time, properties, auto_restart, self);
});
}
});
}