From 45176f410366aa94795f4e48cc6282b262a4b3dd Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 16 Feb 2017 01:54:19 +0100 Subject: [PATCH] even more C++ style --- src/msg/msg_private.h | 1 + src/msg/msg_process.cpp | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 3a67a8159c..6f225e20f6 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -75,6 +75,7 @@ typedef struct simdata_file { class MsgActorExt { public: + explicit MsgActorExt(void* d) : data(d) {} msg_error_t errno_ = MSG_OK; /* the last value returned by a MSG_function */ void* data = nullptr; /* user data */ }; diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 253e084288..5bb743ba05 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -141,10 +141,7 @@ msg_process_t MSG_process_create_with_environment( msg_host_t host, xbt_dict_t properties) { xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr"); - MsgActorExt* msgExt = new MsgActorExt(); - - /* Simulator data for MSG */ - msgExt->data = data; + MsgActorExt* msgExt = new MsgActorExt(data); /* Let's create the process: SIMIX may decide to start it right now, * even before returning the flow control to us */ @@ -170,13 +167,9 @@ msg_process_t MSG_process_create_with_environment( msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, xbt_dict_t properties) { xbt_assert(host != nullptr, "Invalid parameters: host and code params must not be nullptr"); - MsgActorExt* msgExt = new MsgActorExt(); - - /* Simulator data for MSG */ - msgExt->data = data; /* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */ - msg_process_t process = SIMIX_process_attach(name, msgExt, host->cname(), properties, nullptr); + msg_process_t process = SIMIX_process_attach(name, new MsgActorExt(data), host->cname(), properties, nullptr); if (!process) xbt_die("Could not attach"); simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process); -- 2.20.1