#include <xbt/base.h>
#include <xbt/functional.hpp>
+#include <xbt/string.hpp>
#include <simgrid/chrono.hpp>
#include <simgrid/simix.h>
namespace s4u {
/** @ingroup s4u_api
- *
+ *
* An actor is an independent stream of execution in your distributed application.
*
* You can think of an actor as a process in your distributed application, or as a thread in a multithreaded program.
- * This is the only component in SimGrid that actually does something on its own, executing its own code.
- * A resource will not get used if you don't schedule activities on them. This is the code of Actors that create and schedule these activities.
- *
+ * This is the only component in SimGrid that actually does something on its own, executing its own code.
+ * A resource will not get used if you don't schedule activities on them. This is the code of Actors that create and
+ * schedule these activities.
+ *
* An actor is located on a (simulated) host, but it can interact
* with the whole simulated platform.
- *
+ *
* The s4u::Actor API is strongly inspired from the C++11 threads.
- * The <a href="http://en.cppreference.com/w/cpp/thread">documentation
+ * The <a href="http://en.cppreference.com/w/cpp/thread">documentation
* of this standard</a> may help to understand the philosophy of the S4U
- * Actors.
- *
+ * Actors.
+ *
* @section s4u_actor_def Defining the skeleton of an Actor
- *
- * %As in the <a href="http://en.cppreference.com/w/cpp/thread">C++11
+ *
+ * As in the <a href="http://en.cppreference.com/w/cpp/thread">C++11
* standard</a>, you can declare the code of your actor either as a
* pure function or as an object. It is very simple with functions:
- *
+ *
* @code{.cpp}
* #include "s4u/actor.hpp"
- *
+ *
* // Declare the code of your worker
* void worker() {
* printf("Hello s4u");
* simgrid::s4u::this_actor::execute(5*1024*1024); // Get the worker executing a task of 5 MFlops
* };
- *
+ *
* // From your main or from another actor, create your actor on the host Jupiter
- * // The following line actually creates a new actor, even if there is no "new".
+ * // The following line actually creates a new actor, even if there is no "new".
* Actor("Alice", simgrid::s4u::Host::by_name("Jupiter"), worker);
* @endcode
- *
+ *
* But some people prefer to encapsulate their actors in classes and
* objects to save the actor state in a cleanly dedicated location.
* The syntax is slightly more complicated, but not much.
- *
+ *
* @code{.cpp}
* #include "s4u/actor.hpp"
- *
+ *
* // Declare the class representing your actors
* class Worker {
* public:
* simgrid::s4u::this_actor::execute(5*1024*1024); // Get the worker executing a task of 5 MFlops
* }
* };
- *
+ *
* // From your main or from another actor, create your actor. Note the () after Worker
* Actor("Bob", simgrid::s4u::Host::by_name("Jupiter"), Worker());
* @endcode
- *
+ *
* @section s4u_actor_flesh Fleshing your actor
- *
+ *
* The body of your actor can use the functions of the
* simgrid::s4u::this_actor namespace to interact with the world.
* This namespace contains the methods to start new activities
* (executions, communications, etc), and to get informations about
* the currently running thread (its location, etc).
- *
+ *
* Please refer to the @link simgrid::s4u::this_actor full API @endlink.
*
- *
+ *
* @section s4u_actor_deploy Using a deployment file
- *
+ *
* @warning This is currently not working with S4U. Sorry about that.
- *
+ *
* The best practice is to use an external deployment file as
* follows, because it makes it easier to test your application in
* differing settings. Load this file with
- * s4u::Engine::loadDeployment() before the simulation starts.
+ * s4u::Engine::loadDeployment() before the simulation starts.
* Refer to the @ref deployment section for more information.
- *
+ *
* @code{.xml}
* <?xml version='1.0'?>
* <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
* <platform version="4">
- *
+ *
* <!-- Start a process called 'master' on the host called 'Tremblay' -->
* <process host="Tremblay" function="master">
* <!-- Here come the parameter that you want to feed to this instance of master -->
* <argument value="1000000"/> <!-- argv[3] -->
* <argument value="5"/> <!-- argv[4] -->
* </process>
- *
+ *
* <!-- Start a process called 'worker' on the host called 'Jupiter' -->
* <process host="Jupiter" function="worker"/> <!-- Don't provide any parameter ->>
- *
+ *
* </platform>
* @endcode
- *
+ *
* @{
*/
-/** @brief Simulation Agent (see \ref s4u_actor)*/
+/** @brief Simulation Agent */
XBT_PUBLIC_CLASS Actor {
friend Mailbox;
- friend simgrid::simix::Process;
- smx_process_t pimpl_ = nullptr;
+ friend simgrid::simix::ActorImpl;
+ simix::ActorImpl* pimpl_ = nullptr;
/** Wrap a (possibly non-copyable) single-use task into a `std::function` */
template<class F, class... Args>
typedef decltype(f(std::move(args)...)) R;
auto task = std::make_shared<simgrid::xbt::Task<R()>>(
simgrid::xbt::makeTask(std::move(f), std::move(args)...));
- return [=] {
- (*task)();
- };
+ return [task] { (*task)(); };
}
- explicit Actor(smx_process_t pimpl) : pimpl_(pimpl) {}
+ explicit Actor(smx_actor_t pimpl) : pimpl_(pimpl) {}
public:
xbt_assert(actor != nullptr);
SIMIX_process_unref(actor->pimpl_);
}
- using Ptr = boost::intrusive_ptr<Actor>;
// ***** Actor creation *****
/** Retrieve a reference to myself */
- static Ptr self();
+ static ActorPtr self();
/** Create an actor using a function
*
* If the actor is restarted, the actor has a fresh copy of the function.
*/
- static Ptr createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code);
+ static ActorPtr createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code);
- static Ptr createActor(const char* name, s4u::Host *host, std::function<void()> code)
+ static ActorPtr createActor(const char* name, s4u::Host *host, std::function<void()> code)
{
return createActor(name, host, -1.0, std::move(code));
}
// This constructor is enabled only if the call code(args...) is valid:
typename = typename std::result_of<F(Args...)>::type
>
- static Ptr createActor(const char* name, s4u::Host *host, F code, Args... args)
+ static ActorPtr createActor(const char* name, s4u::Host *host, F code, Args... args)
{
return createActor(name, host, wrap_task(std::move(code), std::move(args)...));
}
// Create actor from function name:
- static Ptr createActor(const char* name, s4u::Host *host, double killTime,
+ static ActorPtr createActor(const char* name, s4u::Host *host, double killTime,
const char* function, std::vector<std::string> args);
- static Ptr createActor(const char* name, s4u::Host *host, const char* function,
+ static ActorPtr createActor(const char* name, s4u::Host *host, const char* function,
std::vector<std::string> args)
{
return createActor(name, host, -1.0, function, std::move(args));
//static Actor *byPid(int pid); not implemented
/** Retrieves the name of that actor */
- const char* getName();
+ simgrid::xbt::string getName();
/** Retrieves the host on which that actor is running */
s4u::Host *getHost();
/** Retrieves the PID of that actor */
int getPid();
+ /** Retrieves the PPID of that actor */
+ int getPpid();
/** If set to true, the actor will automatically restart when its host reboots */
void setAutoRestart(bool autorestart);
void kill();
static void kill(int pid);
- static Ptr forPid(int pid);
+ static ActorPtr forPid(int pid);
/**
* Wait for the actor to finish.
protected:
/** Returns the internal implementation of this actor */
- smx_process_t getImpl();
+ smx_actor_t getImpl();
};
-using ActorPtr = Actor::Ptr;
-
/** @ingroup s4u_api
* @brief Static methods working on the current actor (see @ref s4u::Actor) */
namespace this_actor {
*
* See \ref Comm for the full communication API (including non blocking communications).
*/
- XBT_PUBLIC(void*) recv(Mailbox &chan);
+ XBT_PUBLIC(void*) recv(MailboxPtr chan);
/** Block the actor until it delivers a message of the given simulated size to the given mailbox
*
* See \ref Comm for the full communication API (including non blocking communications).
*/
- XBT_PUBLIC(void) send(Mailbox &chan, void*payload, size_t simulatedSize);
+ XBT_PUBLIC(void) send(MailboxPtr chan, void*payload, size_t simulatedSize);
/**
* Return the PID of the current actor.
*/
XBT_PUBLIC(int) getPid();
+
+ /**
+ * Return the PPID of the current actor.
+ */
+ int getPpid();
};