X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d68dcbd4cd142d73e90ab9376c34a435c10e1dc6..3d5008e81ac9ae0a0a94334202996cf7249e97e9:/teshsuite/s4u/pid/pid.cpp diff --git a/teshsuite/s4u/pid/pid.cpp b/teshsuite/s4u/pid/pid.cpp index 1d70216cbd..e0831e2660 100644 --- a/teshsuite/s4u/pid/pid.cpp +++ b/teshsuite/s4u/pid/pid.cpp @@ -7,18 +7,12 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this msg example"); -static int my_onexit(smx_process_exit_status_t /*status*/, int* pid) -{ - XBT_INFO("Process \"%d\" killed.", *pid); - return 0; -} - static void sendpid() { - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName("mailbox"); - int pid = simgrid::s4u::this_actor::getPid(); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name("mailbox"); + int pid = simgrid::s4u::this_actor::get_pid(); double comm_size = 100000; - simgrid::s4u::this_actor::onExit((int_f_pvoid_pvoid_t)my_onexit, &pid); + simgrid::s4u::this_actor::on_exit([](int, void* pid) { XBT_INFO("Process \"%d\" killed.", *(int*)pid); }, &pid); XBT_INFO("Sending pid of \"%d\".", pid); mailbox->put(&pid, comm_size); @@ -29,7 +23,7 @@ static void sendpid() static void killall() { - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName("mailbox"); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name("mailbox"); for (int i = 0; i < 3; i++) { int* pid = static_cast(mailbox->get()); XBT_INFO("Killing process \"%d\".", *pid); @@ -40,7 +34,7 @@ static void killall() int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); - e.loadPlatform(argv[1]); + e.load_platform(argv[1]); simgrid::s4u::Actor::kill_all();