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
Merge branch 'master' of github.com:simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
808f19a
..
68d6465
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-44,6
+44,7
@@
#if HAVE_SMPI
#include "src/smpi/private.h"
#if HAVE_SMPI
#include "src/smpi/private.h"
+#include "src/smpi/private.hpp"
#endif
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
#endif
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
@@
-340,8
+341,8
@@
static int process_syscall_color(void *p)
case SIMCALL_NONE:
case SIMCALL_PROCESS_KILL:
return 2;
case SIMCALL_NONE:
case SIMCALL_PROCESS_KILL:
return 2;
- case SIMCALL_PROCESS_RESUME:
- return 1;
+
//
case SIMCALL_PROCESS_RESUME:
+
//
return 1;
default:
return 0;
}
default:
return 0;
}
@@
-540,7
+541,7
@@
void SIMIX_run()
/* Autorestart all process */
for (auto host: host_that_restart) {
/* Autorestart all process */
for (auto host: host_that_restart) {
- XBT_INFO("Restart processes on host %s", host->
c
name());
+ XBT_INFO("Restart processes on host %s", host->
getC
name());
SIMIX_host_autorestart(host);
}
host_that_restart.clear();
SIMIX_host_autorestart(host);
}
host_that_restart.clear();
@@
-578,7
+579,7
@@
void SIMIX_run()
*/
smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
{
*/
smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
{
- smx_timer_t timer = new s_smx_timer_t(date, [
=]()
{ callback(arg); });
+ smx_timer_t timer = new s_smx_timer_t(date, [
callback, arg]()
{ callback(arg); });
xbt_heap_push(simix_timers, timer, date);
return timer;
}
xbt_heap_push(simix_timers, timer, date);
return timer;
}
@@
-668,24
+669,12
@@
void SIMIX_display_process_status()
if (boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro) != nullptr)
synchro_description = "I/O";
if (boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro) != nullptr)
synchro_description = "I/O";
-
- /*
- switch (process->waiting_synchro->type) {
- case SIMIX_SYNC_PARALLEL_EXECUTE:
- synchro_description = "parallel execution";
- break;
-
- case SIMIX_SYNC_JOIN:
- synchro_description = "joining";
- break;
-*/
-
XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
- process->cname(), process->host->
cname(), synchro_description, process->waiting_synchro
,
+ process->cname(), process->host->
getCname(), synchro_description, process->waiting_synchro.get()
,
process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
}
else {
process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
}
else {
- XBT_INFO("Process %lu (%s@%s)", process->pid, process->cname(), process->host->
c
name());
+ XBT_INFO("Process %lu (%s@%s)", process->pid, process->cname(), process->host->
getC
name());
}
}
}
}
}
}