Dockerfile: fix a syntax error

[simgrid.git] / src / simix / libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index b327f59938637f50d54fd74feacb5aa34db3604e..06cdf2881c84e757d58c2baa846846b18dec2688 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -28,6 +28,7 @@
 #include <boost/core/demangle.hpp>
 #include <string>
 #include <typeinfo>
+XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
 
 /**
  * @ingroup simix_host_management
@@ -75,12 +76,6 @@ unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl*
       &observer);
 }
 
-simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB_DEPRECATED_v329
-{
-  simgrid::kernel::actor::ActorImpl::self()->sleep(duration);
-  return simgrid::kernel::activity::State::DONE;
-}
-
 /**
  * @ingroup simix_comm_management
  */
@@ -191,10 +186,10 @@ unsigned int simcall_comm_waitany(simgrid::kernel::activity::ActivityImplPtr com
   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.data(), rcomms.size(), timeout);
+  return static_cast<unsigned int>(simcall_BODY_comm_waitany(rcomms.data(), rcomms.size(), timeout));
 }
 
-unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout)
+ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout)
 {
   return simcall_BODY_comm_waitany(comms, count, timeout);
 }
@@ -244,11 +239,6 @@ bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm)
  */
 smx_mutex_t simcall_mutex_init() // XBT_ATTRIB_DEPRECATED_v330
 {
-  if (simix_global == nullptr) {
-    fprintf(stderr, "You must initialize the SimGrid engine before using it\n"); // We can't use xbt_die since we may
-                                                                                 // get there before the initialization
-    xbt_abort();
-  }
   return simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::MutexImpl(); });
 }
 
@@ -392,7 +382,7 @@ namespace simix {
 
 void unblock(smx_actor_t actor)
 {
-  xbt_assert(SIMIX_is_maestro());
+  xbt_assert(s4u::Actor::is_maestro());
   actor->simcall_answer();
 }
 } // namespace simix