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
kill the last bits about cocci
[simgrid.git]
/
src
/
simix
/
smx_host.cpp
diff --git
a/src/simix/smx_host.cpp
b/src/simix/smx_host.cpp
index
985bdcd
..
4449d49
100644
(file)
--- a/
src/simix/smx_host.cpp
+++ b/
src/simix/smx_host.cpp
@@
-5,6
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
+#include <xbt/ex.hpp>
#include "xbt/sysdep.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "xbt/sysdep.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
@@
-16,10
+17,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
-/**
- * \brief Internal function to create a SIMIX host.
- * \param name name of the host to create
- */
+/** @brief Internal function to create a SIMIX host. */
void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter
{
smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter
{
smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
@@
-32,15
+30,12
@@
void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_ho
sg_host_simix_set(host, smx_host);
}
sg_host_simix_set(host, smx_host);
}
-/**
- * \brief Start the host if it is off
- *
- */
+/** @brief Start the host if it is off */
void SIMIX_host_on(sg_host_t h)
{
smx_host_priv_t host = sg_host_simix(h);
void SIMIX_host_on(sg_host_t h)
{
smx_host_priv_t host = sg_host_simix(h);
- xbt_assert((host !=
NULL
), "Invalid parameters");
+ xbt_assert((host !=
nullptr
), "Invalid parameters");
if (h->isOff()) {
simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
if (h->isOff()) {
simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
@@
-49,31
+44,23
@@
void SIMIX_host_on(sg_host_t h)
unsigned int cpt;
smx_process_arg_t arg;
xbt_dynar_foreach(host->boot_processes,cpt,arg) {
unsigned int cpt;
smx_process_arg_t arg;
xbt_dynar_foreach(host->boot_processes,cpt,arg) {
-
- char** argv = xbt_new(char*, arg->argc);
- for (int i=0; i<arg->argc; i++)
- argv[i] = xbt_strdup(arg->argv[i]);
-
- XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname);
+ XBT_DEBUG("Booting Process %s(%s) right now",
+ arg->name.c_str(), arg->hostname);
if (simix_global->create_process_function) {
if (simix_global->create_process_function) {
- simix_global->create_process_function(arg
v[0]
,
+ simix_global->create_process_function(arg
->name.c_str()
,
arg->code,
arg->code,
-
NULL
,
+
nullptr
,
arg->hostname,
arg->kill_time,
arg->hostname,
arg->kill_time,
- arg->argc,
- argv,
arg->properties,
arg->auto_restart,
arg->properties,
arg->auto_restart,
-
NULL
);
+
nullptr
);
} else {
} else {
- simcall_process_create(arg->
argv[0]
,
+ simcall_process_create(arg->
name.c_str()
,
arg->code,
arg->code,
-
NULL
,
+
nullptr
,
arg->hostname,
arg->kill_time,
arg->hostname,
arg->kill_time,
- arg->argc,
- argv,
arg->properties,
arg->auto_restart);
}
arg->properties,
arg->auto_restart);
}
@@
-81,15
+68,12
@@
void SIMIX_host_on(sg_host_t h)
}
}
}
}
-/**
- * \brief Stop the host if it is on
- *
- */
+/** @brief Stop the host if it is on */
void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
{
smx_host_priv_t host = sg_host_simix(h);
void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
{
smx_host_priv_t host = sg_host_simix(h);
- xbt_assert((host !=
NULL
), "Invalid parameters");
+ xbt_assert((host !=
nullptr
), "Invalid parameters");
if (h->isOn()) {
simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
if (h->isOn()) {
simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
@@
-97,14
+81,16
@@
void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
- smx_process_t process =
NULL
;
+ smx_process_t process =
nullptr
;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_get_name(process->host), issuer->name);
+ XBT_DEBUG("Killing %s on %s by %s",
+ process->name.c_str(), sg_host_get_name(process->host),
+ issuer->name.c_str());
}
}
} else {
}
}
} else {
- XBT_INFO("Host %s is already off",h->name().c_str());
+ XBT_INFO("Host %s is already off",
h->name().c_str());
}
}
}
}
@@
-117,16
+103,16
@@
void SIMIX_host_destroy(void *h)
{
smx_host_priv_t host = (smx_host_priv_t) h;
{
smx_host_priv_t host = (smx_host_priv_t) h;
- xbt_assert((host !=
NULL
), "Invalid parameters");
+ xbt_assert((host !=
nullptr
), "Invalid parameters");
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
char *msg = xbt_strdup("Shutting down host, but it's not empty:");
char *tmp;
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
char *msg = xbt_strdup("Shutting down host, but it's not empty:");
char *tmp;
- smx_process_t process =
NULL
;
+ smx_process_t process =
nullptr
;
xbt_swag_foreach(process, host->process_list) {
xbt_swag_foreach(process, host->process_list) {
- tmp = bprintf("%s\n\t%s", msg, process->name);
+ tmp = bprintf("%s\n\t%s", msg, process->name
.c_str()
);
free(msg);
msg = tmp;
}
free(msg);
msg = tmp;
}
@@
-145,15
+131,14
@@
void SIMIX_host_destroy(void *h)
sg_host_t SIMIX_host_self(void)
{
smx_process_t process = SIMIX_process_self();
sg_host_t SIMIX_host_self(void)
{
smx_process_t process = SIMIX_process_self();
- return (process ==
NULL) ? NULL
: SIMIX_process_get_host(process);
+ return (process ==
nullptr) ? nullptr
: SIMIX_process_get_host(process);
}
}
-/* needs to be public and without simcall because it is called
- by exceptions and logging events */
+/* needs to be public and without simcall for exceptions and logging events */
const char* SIMIX_host_self_get_name(void)
{
sg_host_t host = SIMIX_host_self();
const char* SIMIX_host_self_get_name(void)
{
sg_host_t host = SIMIX_host_self();
- if (host ==
NULL
|| SIMIX_process_self() == simix_global->maestro_process)
+ if (host ==
nullptr
|| SIMIX_process_self() == simix_global->maestro_process)
return "";
return sg_host_get_name(host);
return "";
return sg_host_get_name(host);
@@
-162,11
+147,7
@@
const char* SIMIX_host_self_get_name(void)
void _SIMIX_host_free_process_arg(void *data)
{
smx_process_arg_t arg = *(smx_process_arg_t*)data;
void _SIMIX_host_free_process_arg(void *data)
{
smx_process_arg_t arg = *(smx_process_arg_t*)data;
- for (int i = 0; i < arg->argc; i++)
- xbt_free(arg->argv[i]);
- xbt_free(arg->argv);
- xbt_free(arg->name);
- xbt_free(arg);
+ delete arg;
}
/**
* \brief Add a process to the list of the processes that the host will restart when it comes back
}
/**
* \brief Add a process to the list of the processes that the host will restart when it comes back
@@
-175,45
+156,30
@@
void _SIMIX_host_free_process_arg(void *data)
* The processes will only be restarted once, meaning that you will have to register the process
* again to restart the process again.
*/
* The processes will only be restarted once, meaning that you will have to register the process
* again to restart the process again.
*/
-void SIMIX_host_add_auto_restart_process(sg_host_t host,
- const char *name,
- xbt_main_func_t code,
- void *data,
- const char *hostname,
- double kill_time,
- int argc, char **argv,
- xbt_dict_t properties,
- int auto_restart)
+void SIMIX_host_add_auto_restart_process(
+ sg_host_t host, const char *name, std::function<void()> code,
+ void* data, const char *hostname, double kill_time,
+ xbt_dict_t properties, int auto_restart)
{
if (!sg_host_simix(host)->auto_restart_processes) {
sg_host_simix(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
}
{
if (!sg_host_simix(host)->auto_restart_processes) {
sg_host_simix(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
}
- smx_process_arg_t arg =
xbt_new(s_smx_process_arg_t,1
);
- arg->name =
xbt_strdup(name)
;
- arg->code =
code
;
+ smx_process_arg_t arg =
new simgrid::simix::ProcessArg(
);
+ arg->name =
name
;
+ arg->code =
std::move(code)
;
arg->data = data;
arg->hostname = hostname;
arg->kill_time = kill_time;
arg->data = data;
arg->hostname = hostname;
arg->kill_time = kill_time;
- arg->argc = argc;
-
- arg->argv = xbt_new(char*,argc + 1);
-
- for (int i = 0; i < argc; i++)
- arg->argv[i] = xbt_strdup(argv[i]);
- arg->argv[argc] = NULL;
-
arg->properties = properties;
arg->auto_restart = auto_restart;
if( host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
arg->properties = properties;
arg->auto_restart = auto_restart;
if( host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
- xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,
NULL
);
+ xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,
nullptr
);
XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
}
xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg);
}
XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
}
xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg);
}
-/**
- * \brief Restart the list of processes that have been registered to the host
- */
+/** @brief Restart the list of processes that have been registered to the host */
void SIMIX_host_autorestart(sg_host_t host)
{
unsigned int cpt;
void SIMIX_host_autorestart(sg_host_t host)
{
unsigned int cpt;
@@
-224,35
+190,25
@@
void SIMIX_host_autorestart(sg_host_t host)
xbt_dynar_foreach (process_list, cpt, arg) {
xbt_dynar_foreach (process_list, cpt, arg) {
- XBT_DEBUG("Restarting Process %s(%s) right now", arg->
argv[0]
, arg->hostname);
+ XBT_DEBUG("Restarting Process %s(%s) right now", arg->
name.c_str()
, arg->hostname);
if (simix_global->create_process_function) {
if (simix_global->create_process_function) {
- simix_global->create_process_function(arg->
argv[0]
,
+ simix_global->create_process_function(arg->
name.c_str()
,
arg->code,
arg->code,
-
NULL
,
+
nullptr
,
arg->hostname,
arg->kill_time,
arg->hostname,
arg->kill_time,
- arg->argc,
- arg->argv,
arg->properties,
arg->auto_restart,
arg->properties,
arg->auto_restart,
-
NULL
);
+
nullptr
);
} else {
} else {
- simcall_process_create(arg->
argv[0]
,
-
(xbt_main_func_t)
arg->code,
-
NULL
,
+ simcall_process_create(arg->
name.c_str()
,
+ arg->code,
+
nullptr
,
arg->hostname,
arg->kill_time,
arg->hostname,
arg->kill_time,
- arg->argc,
- arg->argv,
arg->properties,
arg->auto_restart);
arg->properties,
arg->auto_restart);
-
}
}
- /* arg->argv is used by the process created above. Hide it to
- * _SIMIX_host_free_process_arg() which is called by xbt_dynar_reset()
- * below. */
- arg->argc = 0;
- arg->argv = NULL;
}
xbt_dynar_reset(process_list);
}
}
xbt_dynar_reset(process_list);
}
@@
-265,10
+221,7
@@
smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name,
double flops_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
double flops_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
- simgrid::simix::Exec *exec = new simgrid::simix::Exec();
- exec->name = xbt_strdup(name);
- exec->state = SIMIX_RUNNING;
- exec->host = issuer->host;
+ simgrid::simix::Exec *exec = new simgrid::simix::Exec(name, issuer->host);
/* set surf's action */
if (!MC_is_active() && !MC_record_replay_is_active()) {
/* set surf's action */
if (!MC_is_active() && !MC_record_replay_is_active()) {
@@
-288,7
+241,7
@@
smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name,
}
}
}
}
- XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name);
+ XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name
.c_str()
);
return exec;
}
return exec;
}
@@
-298,14
+251,11
@@
smx_synchro_t SIMIX_execution_parallel_start(const char *name,
double *flops_amount, double *bytes_amount,
double amount, double rate){
double *flops_amount, double *bytes_amount,
double amount, double rate){
- sg_host_t *host_list_cpy =
NULL
;
+ sg_host_t *host_list_cpy =
nullptr
;
int i;
/* alloc structures and initialize */
int i;
/* alloc structures and initialize */
- simgrid::simix::Exec *exec = new simgrid::simix::Exec();
- exec->name = xbt_strdup(name);
- exec->state = SIMIX_RUNNING;
- exec->host = nullptr; /* FIXME: do we need the list of hosts? */
+ simgrid::simix::Exec *exec = new simgrid::simix::Exec(name, nullptr);
/* set surf's synchro */
host_list_cpy = xbt_new0(sg_host_t, host_nb);
/* set surf's synchro */
host_list_cpy = xbt_new0(sg_host_t, host_nb);
@@
-369,7
+319,7
@@
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
/* Associate this simcall to the synchro */
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
/* Associate this simcall to the synchro */
-
xbt_fifo_push(synchro->simcalls,
simcall);
+
synchro->simcalls.push_back(
simcall);
simcall->issuer->waiting_synchro = synchro;
/* set surf's synchro */
simcall->issuer->waiting_synchro = synchro;
/* set surf's synchro */
@@
-386,11
+336,7
@@
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro
void SIMIX_execution_finish(simgrid::simix::Exec *exec)
{
void SIMIX_execution_finish(simgrid::simix::Exec *exec)
{
- xbt_fifo_item_t item;
- smx_simcall_t simcall;
-
- xbt_fifo_foreach(exec->simcalls, item, simcall, smx_simcall_t) {
-
+ for (smx_simcall_t simcall : exec->simcalls) {
switch (exec->state) {
case SIMIX_DONE:
switch (exec->state) {
case SIMIX_DONE:
@@
-417,7
+363,7
@@
void SIMIX_execution_finish(simgrid::simix::Exec *exec)
if (simcall->issuer->host->isOff())
simcall->issuer->context->iwannadie = 1;
if (simcall->issuer->host->isOff())
simcall->issuer->context->iwannadie = 1;
- simcall->issuer->waiting_synchro =
NULL
;
+ simcall->issuer->waiting_synchro =
nullptr
;
simcall_execution_wait__set__result(simcall, exec->state);
SIMIX_simcall_answer(simcall);
}
simcall_execution_wait__set__result(simcall, exec->state);
SIMIX_simcall_answer(simcall);
}