#include "jmsg_host.h"
#include "jxbt_utilities.hpp"
#include "simgrid/Exception.hpp"
-#include "src/simix/ActorImpl.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
#define SIMGRID_KERNEL_ACTIVITY_COMM_HPP
#include "src/kernel/activity/ActivityImpl.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "surf/surf.hpp"
#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP
#include "simgrid/s4u/ConditionVariable.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include <boost/intrusive/list.hpp>
namespace simgrid {
#include "simgrid/s4u/Mailbox.hpp"
#include "src/kernel/activity/CommImpl.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
namespace simgrid {
namespace kernel {
#define SIMIX_MUTEXIMPL_HPP
#include "simgrid/s4u/ConditionVariable.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include <boost/intrusive/list.hpp>
namespace simgrid {
#include <boost/intrusive/list.hpp>
#include "simgrid/s4u/Semaphore.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
namespace simgrid {
namespace kernel {
#include "simgrid/kernel/resource/Action.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "src/simix/popping_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/cpu_interface.hpp"
#include "simgrid/Exception.hpp"
#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Exec.hpp"
-#include "smx_private.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.hpp"
+#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
* @return true if there are asynchronous communications in this process
* @deprecated
*/
-int SIMIX_process_has_pending_comms(smx_actor_t process) {
+int SIMIX_process_has_pending_comms(smx_actor_t process)
+{
return process->comms.size() > 0;
}
ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this)
{
- pid_ = simix_process_maxpid++;
+ pid_ = simix_process_maxpid++;
simcall.issuer = this;
}
} // namespace actor
} // namespace kernel
-}
+} // namespace simgrid
void SIMIX_process_detach()
{
/* If we are suspending ourselves, then just do not finish the simcall now */
}
-int SIMIX_process_get_maxpid() {
+int SIMIX_process_get_maxpid()
+{
return simix_process_maxpid;
}
SIMIX_process_self()->set_user_data(data);
}
-
/* needs to be public and without simcall because it is called
by exceptions and logging events */
-const char* SIMIX_process_self_get_name() {
+const char* SIMIX_process_self_get_name()
+{
smx_actor_t process = SIMIX_process_self();
if (process == nullptr || process == simix_global->maestro_process)
struct s_smx_process_exit_fun_t {
std::function<void(bool, void*)> fun;
- void *arg;
+ void* arg;
};
namespace simgrid {
#include "simgrid/Exception.hpp"
#include "simgrid/modelchecker.h"
#include "src/internal_config.h"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/context/context_private.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_private.hpp"
#include "xbt/parmap.hpp"
#include "mc/mc.h"
#include "simgrid/Exception.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/mc/mc_ignore.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_private.hpp"
#include "ContextUnix.hpp"
#include <sys/time.h>
#endif
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
#include "src/mc/Transition.hpp"
#include "src/mc/mc_base.h"
#include "src/mc/mc_replay.hpp"
-#include "src/simix/ActorImpl.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/include/surf/surf.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "xbt/asserts.h" // xbt_log_no_loc
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/s4u/VirtualMachine.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/surf/HostImpl.hpp"
#include <algorithm>
#include <deque>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/msg/msg_private.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "xbt/log.h"
#include "simgrid/Exception.hpp"
#define SIMIX_PRIVATE_HPP
#include "simgrid/s4u/Actor.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
#include <boost/intrusive/list.hpp>
#include <mutex>
#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
#include "smpi_status.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/smpi/include/smpi_actor.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)");
#include "smpi_comm.hpp"
#include "src/internal_config.h"
#include "src/mc/mc_replay.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "xbt/config.hpp"
#include "src/smpi/include/smpi_actor.hpp"
#include "smpi_op.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "src/smpi/include/smpi_actor.hpp"
#include "xbt/config.hpp"
#include <xbt/replay.hpp>
#include "src/kernel/activity/ExecImpl.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/smpi/plugins/load_balancer/load_balancer.hpp" // This is not yet ready to be public
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(plugin_load_balancer, smpi, "Logging specific to the SMPI load balancing plugin");
#ifndef SURF_HOST_INTERFACE_HPP_
#define SURF_HOST_INTERFACE_HPP_
-#include "StorageImpl.hpp"
-#include "cpu_interface.hpp"
-#include "network_interface.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/surf/PropertyHolder.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/network_interface.hpp"
#include <vector>
src/simix/smx_deployment.cpp
src/simix/smx_environment.cpp
src/simix/smx_global.cpp
- src/simix/ActorImpl.cpp
- src/simix/ActorImpl.hpp
src/simix/popping.cpp
src/kernel/activity/ActivityImpl.cpp
src/kernel/activity/ActivityImpl.hpp
src/kernel/activity/SleepImpl.hpp
src/kernel/activity/SynchroRaw.cpp
src/kernel/activity/SynchroRaw.hpp
+ src/kernel/actor/ActorImpl.cpp
+ src/kernel/actor/ActorImpl.hpp
${SIMIX_GENERATED_SRC}
)