/* */
/* This is somehow the "libc" of SimGrid */
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
return simcall_BODY_execution_waitany_for(execs, count, timeout);
}
-void simcall_process_join(smx_actor_t process, double timeout) // XBT_DEPRECATED_v328
+void simcall_process_join(smx_actor_t process, double timeout) // XBT_ATTRIB_DEPRECATED_v328
{
simgrid::kernel::actor::ActorImpl::self()->join(process, timeout);
}
-void simcall_process_suspend(smx_actor_t process) // XBT_DEPRECATED_v328
+void simcall_process_suspend(smx_actor_t process) // XBT_ATTRIB_DEPRECATED_v328
{
- process->iface()->suspend();
+ process->get_iface()->suspend();
}
simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB_DEPRECATED_v329
unsigned int simcall_comm_waitany(simgrid::kernel::activity::ActivityImplPtr comms[], size_t count,
double timeout) // XBT_ATTRIB_DEPRECATED_v330
{
- auto rcomms = std::make_unique<simgrid::kernel::activity::CommImpl*[]>(count);
- std::transform(comms, comms + count, rcomms.get(), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
+ std::vector<simgrid::kernel::activity::CommImpl*> rcomms(count);
+ std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
});
- return simcall_BODY_comm_waitany(rcomms.get(), count, timeout);
+ return simcall_BODY_comm_waitany(rcomms.data(), rcomms.size(), timeout);
}
unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout)
{
if (count == 0)
return -1;
- auto rcomms = std::make_unique<simgrid::kernel::activity::CommImpl*[]>(count);
- std::transform(comms, comms + count, rcomms.get(), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
+ std::vector<simgrid::kernel::activity::CommImpl*> rcomms(count);
+ std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
});
- return simcall_BODY_comm_testany(rcomms.get(), count);
+ return simcall_BODY_comm_testany(rcomms.data(), rcomms.size());
}
int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count)
/* ************************************************************************** */
/** @brief returns a printable string representing a simcall */
-const char *SIMIX_simcall_name(e_smx_simcall_t kind) {
- return simcall_names[kind];
+const char* SIMIX_simcall_name(Simcall kind)
+{
+ return simcall_names[static_cast<int>(kind)];
}
namespace simgrid {