Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
change consecutive to the renaming of the C++ wrappers
authorcherierm <cherierm@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 12 Sep 2008 13:44:17 +0000 (13:44 +0000)
committercherierm <cherierm@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 12 Sep 2008 13:44:17 +0000 (13:44 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5925 48e7efb5-ca39-0410-a469-dd3cf9ba447f

45 files changed:
examples/cxx/autoDestination/BasicTask.hpp
examples/cxx/autoDestination/FinalizeTask.hpp
examples/cxx/autoDestination/Forwarder.cxx
examples/cxx/autoDestination/Forwarder.hpp
examples/cxx/autoDestination/Main.cxx
examples/cxx/autoDestination/Master.cxx
examples/cxx/autoDestination/Master.hpp
examples/cxx/autoDestination/Slave.cxx
examples/cxx/autoDestination/Slave.hpp
examples/cxx/basic/BasicTask.hpp
examples/cxx/basic/FinalizeTask.hpp
examples/cxx/basic/Forwarder.cxx
examples/cxx/basic/Forwarder.hpp
examples/cxx/basic/Main.cxx
examples/cxx/basic/Master.cxx
examples/cxx/basic/Master.hpp
examples/cxx/basic/Slave.cxx
examples/cxx/basic/Slave.hpp
examples/cxx/comm_time/CommTimeTask.hpp
examples/cxx/comm_time/FinalizeTask.hpp
examples/cxx/comm_time/Main.cxx
examples/cxx/comm_time/Master.cxx
examples/cxx/comm_time/Master.hpp
examples/cxx/comm_time/Slave.cxx
examples/cxx/comm_time/Slave.hpp
examples/cxx/explicitDestination/BasicTask.hpp
examples/cxx/explicitDestination/FinalizeTask.hpp
examples/cxx/explicitDestination/Forwarder.cxx
examples/cxx/explicitDestination/Forwarder.hpp
examples/cxx/explicitDestination/Main.cxx
examples/cxx/explicitDestination/Master.cxx
examples/cxx/explicitDestination/Master.hpp
examples/cxx/explicitDestination/Slave.cxx
examples/cxx/explicitDestination/Slave.hpp
examples/cxx/ping_pong/Main.cxx
examples/cxx/ping_pong/PingPongTask.hpp
examples/cxx/ping_pong/Receiver.cxx
examples/cxx/ping_pong/Receiver.hpp
examples/cxx/ping_pong/Sender.cxx
examples/cxx/ping_pong/Sender.hpp
examples/cxx/suspend/DreamMaster.cxx
examples/cxx/suspend/DreamMaster.hpp
examples/cxx/suspend/LazyGuy.cxx
examples/cxx/suspend/LazyGuy.hpp
examples/cxx/suspend/Main.cxx

index bef66e2..8e2866d 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef BASIC_TASK_HPP
 #define BASIC_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class BasicTask : public Task
index a181ae3..62f7ade 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FINALIZE_TASK_HPP
 #define FINALIZE_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class FinalizeTask : public Task
index 8872e0b..052bf87 100644 (file)
@@ -2,7 +2,7 @@
 #include "BasicTask.hpp"
 #include "FinalizeTask.hpp"
 
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 767334b..b09b821 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FORWARDER_HPP
 #define FORWARDER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Forwarder : public Process
index 696bdc2..cf27e28 100644 (file)
@@ -1,4 +1,4 @@
-#include <Simulation.hpp>
+#include <MsgSimulation.hpp>
 
 using namespace SimGrid::Msg;
 
index 323d2d1..6abe58f 100644 (file)
@@ -2,7 +2,7 @@
 #include "BasicTask.hpp"
 #include "FinalizeTask.hpp"
 
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 40bb390..b3e59ab 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef MASTER_HPP
 #define MASTER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Master : public Process
index 74a7424..f0eb611 100644 (file)
@@ -2,7 +2,7 @@
 #include "FinalizeTask.hpp"
 #include "BasicTask.hpp"
 
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 21c77a1..1bb66a5 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef SLAVE_HPP
 #define SLAVE_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Slave : public Process
index 5dd3eab..e4ecb07 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef BASIC_TASK_HPP
 #define BASIC_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class BasicTask : public Task
index 09baf42..ad1b51e 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FINALIZE_TASK_HPP
 #define FINALIZE_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class FinalizeTask : public Task
index 911ff4a..368a5e4 100644 (file)
@@ -1,7 +1,7 @@
 #include "Forwarder.hpp"
 #include "BasicTask.hpp"
 #include "FinalizeTask.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 767334b..b09b821 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FORWARDER_HPP
 #define FORWARDER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Forwarder : public Process
index 7de9292..ae7324b 100644 (file)
@@ -1,4 +1,4 @@
-#include <Simulation.hpp>
+#include <MsgSimulation.hpp>
 
 using namespace SimGrid::Msg;
 
index 51b5eb1..9bf085e 100644 (file)
@@ -1,7 +1,7 @@
 #include "Master.hpp"
 #include "BasicTask.hpp"
 #include "FinalizeTask.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 40bb390..b3e59ab 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef MASTER_HPP
 #define MASTER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Master : public Process
index 3b9c5ea..02f45aa 100644 (file)
@@ -1,6 +1,6 @@
 #include "Slave.hpp"
 #include "FinalizeTask.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <iostream>
index 391e08d..d0a5607 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef SLAVE_HPP
 #define SLAVE_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Slave : public Process
index 12769d2..87a6eea 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef COMMTIME_TASK_HPP
 #define COMMTIME_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class CommTimeTask : public Task
index 2e29015..162169d 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FINALIZE_TASK_HPP
 #define FINALIZE_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class FinalizeTask : public Task
index b286b71..60dae82 100644 (file)
@@ -1,4 +1,4 @@
-#include <Simulation.hpp>
+#include <MsgSimulation.hpp>
 
 using namespace SimGrid::Msg;
 
index 3b510d1..6eee1bb 100644 (file)
@@ -1,7 +1,7 @@
 #include "Master.hpp"
 #include "CommTimeTask.hpp"
 #include "FinalizeTask.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 #include <Msg.hpp>
 
index 40bb390..b3e59ab 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef MASTER_HPP
 #define MASTER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Master : public Process
index bc97e99..c604f41 100644 (file)
@@ -1,7 +1,7 @@
 #include "Slave.hpp"
 #include "FinalizeTask.hpp"
 #include "CommTimeTask.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 #include <Msg.hpp>
 
@@ -30,7 +30,7 @@ int Slave::main(int argc, char** argv)
                if(time1 < task->getTime())
                        time1 = task->getTime();
                        
-               info(TEXT_("Processing \"") + TEXT_(task->getName()) + TEXT_("\" ") + TEXT_(getHost().getName()) + TEXT_(" (Communication time : ") + TEXT_((time2 - time1)) + TEXT_(")"));
+               //info(TEXT_("Processing \"") + TEXT_(task->getName()) + TEXT_("\" ") + TEXT_(getHost().getName()) + TEXT_(" (Communication time : ") + TEXT_((time2 - time1)) + TEXT_(")"));
         
                task->execute();
                
index c3e861b..9ec76bc 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef SLAVE_HPP
 #define SLAVE_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Slave : public Process
index 01093d7..4d5a728 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef BASIC_TASK_HPP
 #define BASIC_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class BasicTask : public Task
index 53c75db..cda3683 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FINALIZE_TASK_HPP
 #define FINALIZE_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class FinalizeTask : public Task
index 651533a..360db88 100644 (file)
@@ -2,7 +2,7 @@
 #include "BasicTask.hpp"
 #include "FinalizeTask.hpp"
 
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 767334b..b09b821 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FORWARDER_HPP
 #define FORWARDER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Forwarder : public Process
index 696bdc2..cf27e28 100644 (file)
@@ -1,4 +1,4 @@
-#include <Simulation.hpp>
+#include <MsgSimulation.hpp>
 
 using namespace SimGrid::Msg;
 
index c436a29..33f1626 100644 (file)
@@ -2,7 +2,7 @@
 #include "BasicTask.hpp"
 #include "FinalizeTask.hpp"
 
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 40bb390..b3e59ab 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef MASTER_HPP
 #define MASTER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Master : public Process
index 6bd3dd6..03c14c6 100644 (file)
@@ -2,7 +2,7 @@
 #include "FinalizeTask.hpp"
 #include "BasicTask.hpp"
 
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 
 #include <Msg.hpp>
index 391e08d..d0a5607 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef SLAVE_HPP
 #define SLAVE_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Slave : public Process
index ee113ef..c970901 100644 (file)
@@ -1,4 +1,4 @@
-#include <Simulation.hpp>
+#include <MsgSimulation.hpp>
 
 using namespace SimGrid::Msg;
 
index 405c1cb..009429d 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef PINGPONG_TASK_HPP
 #define PINGPONG_TASK_HPP
 
-#include <Task.hpp>
+#include <MsgTask.hpp>
 using namespace SimGrid::Msg;
 
 class PingPongTask : public Task
index cf58070..0147122 100644 (file)
@@ -1,6 +1,6 @@
 #include "Receiver.hpp"
 #include "PingPongTask.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 #include <Msg.hpp>
 
index e4af2de..1345973 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef RECEIVER_HPP
 #define RECEIVER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
        
 class Receiver : public Process
index 41cbd7b..e5d7968 100644 (file)
@@ -1,6 +1,6 @@
 #include "Sender.hpp"
 #include "PingPongTask.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 #include <Msg.hpp>
 
@@ -41,7 +41,7 @@ int Sender::main(int argc, char** argv)
        for (int pos = 0; pos < hostCount; pos++) 
        { 
                time = getClock(); 
-       
+               
                info(TEXT_("Sender time : ") + TEXT_(time));
        
                task = new PingPongTask("no name",computeDuration,commSizeLat);
index 0c7a647..ae73a7d 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef SENDER_HPP
 #define SENDER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class Sender : public Process
index aac7b71..a4e58b3 100644 (file)
@@ -1,6 +1,6 @@
 #include "DreamMaster.hpp"
 #include "LazyGuy.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 #include <HostNotFoundException.hpp>
 #include <Msg.hpp>
 
index f4c47b8..aee6f2b 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef DREAMMASTER_HPP
 #define DREAMMASTER_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class DreamMaster : public Process
index 0b390a9..c19db95 100644 (file)
@@ -1,5 +1,5 @@
 #include "LazyGuy.hpp"
-#include <Host.hpp>
+#include <MsgHost.hpp>
 
 #include <Msg.hpp>
 
index e7ffdcb..edd278d 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef LAZYGUY_HPP
 #define LAZYGUY_HPP
 
-#include <Process.hpp>
+#include <MsgProcess.hpp>
 using namespace SimGrid::Msg;
 
 class LazyGuy : public Process
index 5cf2050..5a0ad56 100644 (file)
@@ -1,4 +1,4 @@
-#include <Simulation.hpp>
+#include <MsgSimulation.hpp>
 
 using namespace SimGrid::Msg;