actually rename s4u::Process into s4u::Actor

[simgrid.git] / src / s4u / s4u_actor.cpp

diff --git a/src/s4u/s4u_process.cpp b/src/s4u/s4u_actor.cpp
similarity index 53%
rename from src/s4u/s4u_process.cpp
rename to src/s4u/s4u_actor.cpp
index b75cd58..8d4f299 100644 (file)
--- a/src/s4u/s4u_process.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -4,22 +4,22 @@
 /* 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. */
 
+#include "../../include/simgrid/s4u/actor.hpp"
 #include "../../include/simgrid/s4u/mailbox.hpp"
 #include "xbt/log.h"
 #include "msg/msg_private.h"
 #include "msg/msg_mailbox.h"
 
 #include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/process.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_process,"S4U processes");
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
-/* C main function of a process, running this->main */
-static int s4u_process_runner(int argc, char **argv) {
+/* C main function of a actor, running this->main */
+static int s4u_actor_runner(int argc, char **argv) {
 
        smx_process_t smx_proc = SIMIX_process_self();
-       simgrid::s4u::Process *proc = (simgrid::s4u::Process*) SIMIX_process_self_get_data(smx_proc);
-       int res= proc->main(argc,argv);
+       simgrid::s4u::Actor *actor = (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
+       int res = actor->main(argc,argv);
        return res;
 }
 
@@ -27,61 +27,61 @@ static int s4u_process_runner(int argc, char **argv) {
 
 using namespace simgrid;
 
-s4u::Process::Process(const char *procname, s4u::Host *host, int argc, char **argv)
-    : s4u::Process::Process(procname,host, argc,argv, -1) {
+s4u::Actor::Actor(const char *name, s4u::Host *host, int argc, char **argv)
+    : s4u::Actor::Actor(name,host, argc,argv, -1) {
 }
-s4u::Process::Process(const char *procname, s4u::Host *host, int argc, char **argv, double killTime) {
-       p_smx_process = simcall_process_create(procname, s4u_process_runner, this, host->getName(), killTime, argc, argv, NULL/*properties*/,0);
+s4u::Actor::Actor(const char *name, s4u::Host *host, int argc, char **argv, double killTime) {
+       p_smx_process = simcall_process_create(name, s4u_actor_runner, this, host->getName(), killTime, argc, argv, NULL/*properties*/,0);
 
-       xbt_assert(p_smx_process,"Cannot create the process");
+       xbt_assert(p_smx_process,"Cannot create the actor");
 //     TRACE_msg_process_create(procname, simcall_process_get_PID(p_smx_process), host->getInferior());
 //     simcall_process_on_exit(p_smx_process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,p_smx_process);
 }
 
-s4u::Process *s4u::Process::current() {
+s4u::Actor *s4u::Actor::current() {
        smx_process_t smx_proc = SIMIX_process_self();
-       return (simgrid::s4u::Process*) SIMIX_process_self_get_data(smx_proc);
+       return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
 }
-s4u::Process *s4u::Process::byPid(int pid) {
-       return (simgrid::s4u::Process*) SIMIX_process_self_get_data(SIMIX_process_from_PID(pid));
+s4u::Actor *s4u::Actor::byPid(int pid) {
+       return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(SIMIX_process_from_PID(pid));
 }
 
-void s4u::Process::setAutoRestart(bool autorestart) {
+void s4u::Actor::setAutoRestart(bool autorestart) {
        simcall_process_auto_restart_set(p_smx_process,autorestart);
 }
 
-s4u::Host *s4u::Process::getHost() {
+s4u::Host *s4u::Actor::getHost() {
        return s4u::Host::byName(sg_host_name(simcall_process_get_host(p_smx_process)));
 }
-const char* s4u::Process::getName() {
+const char* s4u::Actor::getName() {
        return simcall_process_get_name(p_smx_process);
 }
-int s4u::Process::getPid(){
+int s4u::Actor::getPid(){
        return simcall_process_get_PID(p_smx_process);
 }
 
-void s4u::Process::setKillTime(double time) {
+void s4u::Actor::setKillTime(double time) {
        simcall_process_set_kill_time(p_smx_process,time);
 }
-double s4u::Process::getKillTime() {
+double s4u::Actor::getKillTime() {
        return simcall_process_get_kill_time(p_smx_process);
 }
-void s4u::Process::killAll() {
+void s4u::Actor::killAll() {
        simcall_process_killall(1);
 }
-void s4u::Process::kill() {
+void s4u::Actor::kill() {
        simcall_process_kill(p_smx_process);
 }
 
-void s4u::Process::sleep(double duration) {
+void s4u::Actor::sleep(double duration) {
        simcall_process_sleep(duration);
 }
 
-void s4u::Process::execute(double flops) {
+void s4u::Actor::execute(double flops) {
        simcall_process_execute(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
 }
 
-char *s4u::Process::recvstr(Mailbox &chan) {
+char *s4u::Actor::recvstr(Mailbox &chan) {
        char *res=NULL;
        size_t res_size=sizeof(res);
 
@@ -89,7 +89,7 @@ char *s4u::Process::recvstr(Mailbox &chan) {
 
     return res;
 }
-void s4u::Process::sendstr(Mailbox &chan, const char*msg) {
+void s4u::Actor::sendstr(Mailbox &chan, const char*msg) {
        char *msg_cpy=xbt_strdup(msg);
        smx_synchro_t comm = simcall_comm_isend(p_smx_process, chan.getInferior(), strlen(msg),
                        -1/*rate*/, msg_cpy, sizeof(void *),