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
SIMIX_comm_get_remains() -> simgrid::simix::Comm::remains()
[simgrid.git]
/
src
/
simix
/
smx_process.cpp
diff --git
a/src/simix/smx_process.cpp
b/src/simix/smx_process.cpp
index
02daca1
..
1bd0a3b
100644
(file)
--- a/
src/simix/smx_process.cpp
+++ b/
src/simix/smx_process.cpp
@@
-12,7
+12,6
@@
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "src/mc/Client.hpp"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "src/mc/Client.hpp"
-#include "src/simix/smx_private.hpp"
#include "src/msg/msg_private.h"
#include "src/simix/SynchroSleep.hpp"
#include "src/msg/msg_private.h"
#include "src/simix/SynchroSleep.hpp"
@@
-73,7
+72,7
@@
void SIMIX_process_cleanup(smx_process_t process)
/* make sure no one will finish the comm after this process is destroyed,
* because src_proc or dst_proc would be an invalid pointer */
/* make sure no one will finish the comm after this process is destroyed,
* because src_proc or dst_proc would be an invalid pointer */
-
SIMIX_comm_cancel(comm
);
+
comm->cancel(
);
if (comm->src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
if (comm->src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
@@
-81,10
+80,10
@@
void SIMIX_process_cleanup(smx_process_t process)
comm->src_proc = NULL;
/* I'm not supposed to destroy a detached comm from the sender side, */
comm->src_proc = NULL;
/* I'm not supposed to destroy a detached comm from the sender side, */
- if (
!
comm->detached)
-
SIMIX_comm_destroy(comm
);
+ if (comm->detached)
+
XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender"
);
else
else
-
XBT_DEBUG("Don't destroy it since it's a detached comm"
);
+
SIMIX_comm_destroy(comm
);
}
else if (comm->dst_proc == process){
}
else if (comm->dst_proc == process){
@@
-125,7
+124,7
@@
void SIMIX_process_empty_trash(void)
while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) {
XBT_DEBUG("Getting rid of %p",process);
while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) {
XBT_DEBUG("Getting rid of %p",process);
-
SIMIX_context_free(process->context)
;
+
delete process->context
;
/* Free the exception allocated at creation time */
free(process->running_ctx);
/* Free the exception allocated at creation time */
free(process->running_ctx);
@@
-198,8
+197,7
@@
void SIMIX_process_stop(smx_process_t arg) {
arg->auto_restart);
}
XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host));
arg->auto_restart);
}
XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host));
- /* stop the context */
- SIMIX_context_stop(arg->context);
+ arg->context->stop();
}
/**
}
/**
@@
-508,7
+506,7
@@
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
} else if (comm != nullptr) {
xbt_fifo_remove(process->comms, process->waiting_synchro);
} else if (comm != nullptr) {
xbt_fifo_remove(process->comms, process->waiting_synchro);
-
SIMIX_comm_cancel(process->waiting_synchro
);
+
comm->cancel(
);
xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall);
SIMIX_comm_destroy(process->waiting_synchro);
xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall);
SIMIX_comm_destroy(process->waiting_synchro);
@@
-561,8
+559,8
@@
void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con
simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
if (comm != nullptr) {
simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
if (comm != nullptr) {
- xbt_fifo_remove(process->comms,
process->waiting_synchro
);
-
SIMIX_comm_cancel(process->waiting_synchro
);
+ xbt_fifo_remove(process->comms,
comm
);
+
comm->cancel(
);
}
simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
}
simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
@@
-925,7
+923,7
@@
void SIMIX_process_yield(smx_process_t self)
XBT_DEBUG("Yield process '%s'", self->name);
/* Go into sleep and return control to maestro */
XBT_DEBUG("Yield process '%s'", self->name);
/* Go into sleep and return control to maestro */
-
SIMIX_context_suspend(self->context
);
+
self->context->suspend(
);
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", self->name);
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", self->name);