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
Use new/delete for smx_process_arg_t
[simgrid.git]
/
src
/
simix
/
smx_process.cpp
diff --git
a/src/simix/smx_process.cpp
b/src/simix/smx_process.cpp
index
ef55883
..
f696d92
100644
(file)
--- a/
src/simix/smx_process.cpp
+++ b/
src/simix/smx_process.cpp
@@
-91,10
+91,11
@@
void SIMIX_process_cleanup(smx_process_t process)
comm, (int)comm->state, comm->src_proc, comm->dst_proc);
comm->dst_proc = NULL;
comm, (int)comm->state, comm->src_proc, comm->dst_proc);
comm->dst_proc = NULL;
- if (comm->detached &&
/* FIXME: This code should be moved within comm->unref() anyway. comm->refcount == 1 &&*/
comm->src_proc != NULL) {
+ if (comm->detached && comm->src_proc != NULL) {
/* the comm will be freed right now, remove it from the sender */
xbt_fifo_remove(comm->src_proc->comms, comm);
}
/* the comm will be freed right now, remove it from the sender */
xbt_fifo_remove(comm->src_proc->comms, comm);
}
+
comm->unref();
} else {
xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
comm->unref();
} else {
xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
@@
-135,7
+136,7
@@
void SIMIX_process_empty_trash(void)
xbt_dynar_free(&process->on_exit);
xbt_free(process->name);
xbt_dynar_free(&process->on_exit);
xbt_free(process->name);
-
xbt_free(process)
;
+
delete process
;
}
}
}
}
@@
-146,7
+147,7
@@
void create_maestro(std::function<void()> code)
{
smx_process_t maestro = NULL;
/* Create maestro process and intilialize it */
{
smx_process_t maestro = NULL;
/* Create maestro process and intilialize it */
- maestro =
xbt_new0(s_smx_process_t, 1
);
+ maestro =
new simgrid::simix::Process(
);
maestro->pid = simix_process_maxpid++;
maestro->ppid = -1;
maestro->name = (char*) "";
maestro->pid = simix_process_maxpid++;
maestro->ppid = -1;
maestro->name = (char*) "";
@@
-155,7
+156,7
@@
void create_maestro(std::function<void()> code)
XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
if (!code) {
XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
if (!code) {
- maestro->context = SIMIX_context_new(
NULL, 0, nullptr
, NULL, maestro);
+ maestro->context = SIMIX_context_new(
std::function<void()>()
, NULL, maestro);
} else {
if (!simix_global)
xbt_die("simix is not initialized, please call MSG_init first");
} else {
if (!simix_global)
xbt_die("simix is not initialized, please call MSG_init first");
@@
-218,7
+219,7
@@
smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
args->properties,
args->auto_restart,
NULL);
args->properties,
args->auto_restart,
NULL);
-
xbt_free(args)
;
+
delete args
;
return process;
}
return process;
}
@@
-276,7
+277,7
@@
smx_process_t SIMIX_process_create(
xbt_free(argv);
}
else {
xbt_free(argv);
}
else {
- process =
xbt_new0(s_smx_process_t, 1
);
+ process =
new simgrid::simix::Process(
);
xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
/* Process data */
xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
/* Process data */
@@
-314,7
+315,9
@@
smx_process_t SIMIX_process_create(
XBT_VERB("Create context %s", process->name);
XBT_VERB("Create context %s", process->name);
- process->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, process);
+ process->context = SIMIX_context_new(
+ simgrid::simix::wrap_main(code, argc, argv),
+ simix_global->cleanup_process_function, process);
process->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
XBT_RUNNING_CTX_INITIALIZE(process->running_ctx);
process->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
XBT_RUNNING_CTX_INITIALIZE(process->running_ctx);
@@
-367,7
+370,7
@@
smx_process_t SIMIX_process_attach(
return nullptr;
}
return nullptr;
}
- smx_process_t process =
xbt_new0(s_smx_process_t, 1
);
+ smx_process_t process =
new simgrid::simix::Process(
);
/* Process data */
process->pid = simix_process_maxpid++;
process->name = xbt_strdup(name);
/* Process data */
process->pid = simix_process_maxpid++;
process->name = xbt_strdup(name);
@@
-515,7
+518,7
@@
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(process, &process->simcall);
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(process, &process->simcall);
-
SIMIX_synchro_destroy(process->waiting_synchro)
;
+
delete process->waiting_synchro
;
} else if (io != nullptr) {
SIMIX_io_destroy(process->waiting_synchro);
} else if (io != nullptr) {
SIMIX_io_destroy(process->waiting_synchro);
@@
-627,15
+630,14
@@
void SIMIX_process_change_host(smx_process_t process,
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process)
{
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process)
{
- smx_synchro_t sync_suspend =
- SIMIX_process_suspend(process, simcall->issuer);
+ smx_synchro_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer);
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
} else {
xbt_fifo_push(sync_suspend->simcalls, simcall);
process->waiting_synchro = sync_suspend;
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
} else {
xbt_fifo_push(sync_suspend->simcalls, simcall);
process->waiting_synchro = sync_suspend;
-
SIMIX_execution_suspend(process->waiting_synchro
);
+
process->waiting_synchro->suspend(
);
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}