All of the examples use now the StringHelp class to simplify the string manipulation.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5864 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/cxx/autoDestination/Forwarder.cxx b/examples/cxx/autoDestination/Forwarder.cxx
index 24e2372..7953686 100644 (file)
--- a/examples/cxx/autoDestination/Forwarder.cxx
+++ b/examples/cxx/autoDestination/Forwarder.cxx
@@ -5,15 +5,13 @@
 #include <Host.hpp>\r
 #include <HostNotFoundException.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Forwarder, Process);\r
 \r
-\r
 int Forwarder::main(int argc, char** argv)\r
 {\r
-       cout << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        int aliasCount = argc;\r
        \r
@@ -29,7 +27,7 @@ int Forwarder::main(int argc, char** argv)
        \r
                if(taskReceived->isInstanceOf("FinalizeTask")) \r
                {\r
-                       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "All tasks have been dispatched. Let's tell everybody the computation is over." << endl;\r
+                       info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
        \r
                        for (int i = 0; i < aliasCount; i++) \r
                        {\r
@@ -44,9 +42,9 @@ int Forwarder::main(int argc, char** argv)
        \r
                basicTask = reinterpret_cast<BasicTask*>(taskReceived);\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received \"" << basicTask->getName() << "\" " << endl;\r
+               info(TEXT_("Received \"") + TEXT_(basicTask->getName()) + TEXT_("\" "));\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Sending \"" << basicTask->getName() << "\" to \"" << argv[taskCount % aliasCount] << "\"" << endl;\r
+               info(TEXT_("Sending \"") + TEXT_(basicTask->getName()) + TEXT_("\" to \"") + TEXT_(argv[taskCount % aliasCount]));\r
        \r
                basicTask->send(argv[taskCount % aliasCount]);\r
        \r
@@ -54,7 +52,7 @@ int Forwarder::main(int argc, char** argv)
        }\r
        \r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "I'm done. See you!" << endl;\r
+       info("I'm done. See you!");\r
 \r
        delete this;\r
        \r

diff --git a/examples/cxx/autoDestination/Master.cxx b/examples/cxx/autoDestination/Master.cxx
index 9a2d915..0fc3a1b 100644 (file)
--- a/examples/cxx/autoDestination/Master.cxx
+++ b/examples/cxx/autoDestination/Master.cxx
@@ -5,29 +5,26 @@
 #include <Host.hpp>\r
 #include <HostNotFoundException.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
+\r
+\r
 \r
 \r
-#ifndef BUFFMAX\r
-#define BUFFMAX 260\r
-#endif\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Master, Process);\r
 \r
 int Master::main(int argc, char** argv)\r
 {\r
-       char buff[BUFFMAX + 1] = {0};\r
        int taskCount;          \r
        double taskComputeSize;         \r
        double taskCommunicateSize;\r
        \r
-       cout << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "argc=" << argc << endl;\r
+       info(TEXT_("argc=") + TEXT_(argc));\r
                \r
        for (int i = 0; i< argc; i++)       \r
-               cout << "argv:" << argv[i] << endl;\r
+               info(TEXT_("argv:") + TEXT_(argv[i]));\r
        \r
        sscanf(argv[0],"%d", &taskCount);\r
        sscanf(argv[1],"%lg", &taskComputeSize);\r
@@ -36,11 +33,7 @@ int Master::main(int argc, char** argv)
        BasicTaskPtr* basicTasks = new BasicTaskPtr[taskCount];\r
                \r
        for (int i = 0; i < taskCount; i++) \r
-       {\r
-               sprintf(buff,"Task_%d",i);\r
-               basicTasks[i] = new BasicTask(buff, taskComputeSize, taskCommunicateSize);\r
-               memset(buff, 0 , BUFFMAX + 1); \r
-       }               \r
+               basicTasks[i] = new BasicTask((TEXT_("Task_") + TEXT_(i)), taskComputeSize, taskCommunicateSize);               \r
        \r
        int aliasCount = argc - 3;\r
                \r
@@ -49,27 +42,27 @@ int Master::main(int argc, char** argv)
        for(int i = 3; i < argc ; i++) \r
                aliases[i - 3] = _strdup(argv[i]);\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got "<<  aliasCount << " alias(es) :" << endl;\r
+       info(TEXT_("Got ") + TEXT_(aliasCount) + TEXT_(" alias(es) :"));\r
                \r
        for (int i = 0; i < aliasCount; i++)\r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "\t" << aliases[i] << endl;\r
+               info(TEXT_("\t") + TEXT_(aliases[i]));\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got "<< taskCount << " task to process." << endl;\r
+       info(TEXT_("Got ") + TEXT_(taskCount) + TEXT_(" task to process."));\r
                \r
        for (int i = 0; i < taskCount; i++) \r
        {       \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Sending \"" << basicTasks[i]->getName() << "\" to \"" << aliases[i % aliasCount] << "\"" << endl;\r
+               info(TEXT_("Sending \"") + TEXT_(basicTasks[i]->getName()) + TEXT_("\" to \"") + TEXT_(aliases[i % aliasCount]) + TEXT_("\""));\r
                \r
                /*if((Host::currentHost().getName()).equals((aliases[i % aliasCount].split(":"))[0]))\r
-                       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hey ! It's me ! ";\r
+                       info("Hey ! It's me ! ");\r
                */\r
                        \r
                basicTasks[i]->send(aliases[i % aliasCount]);\r
        }\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Send completed" << endl;\r
+       info("Send completed");\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "All tasks have been dispatched. Let's tell everybody the computation is over." << endl;\r
+       info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
        \r
        FinalizeTask* finalizeTask;\r
        \r
@@ -80,7 +73,7 @@ int Master::main(int argc, char** argv)
                \r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Goodbye now!" << endl;\r
+       info("Goodbye now!");\r
 \r
        delete[] basicTasks;\r
        delete[] aliases;\r

diff --git a/examples/cxx/autoDestination/Slave.cxx b/examples/cxx/autoDestination/Slave.cxx
index 8df4712..31316d5 100644 (file)
--- a/examples/cxx/autoDestination/Slave.cxx
+++ b/examples/cxx/autoDestination/Slave.cxx
@@ -5,14 +5,13 @@
 #include <Host.hpp>\r
 #include <HostNotFoundException.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Slave, Process);\r
 \r
 int Slave::main(int argc, char** argv)\r
 {\r
-       cout <<"[" << getName() << ":" << getHost().getName() << ": PID " << getPID() << "] " << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        Task* receivedTask;\r
        BasicTask* basicTask;\r
@@ -29,18 +28,18 @@ int Slave::main(int argc, char** argv)
        \r
                basicTask = reinterpret_cast<BasicTask*>(receivedTask);\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << ": PID " << getPID() << "] " << "Received \"" << basicTask->getName() << "\" " << endl;\r
+               info(TEXT_("Received \"") + TEXT_(basicTask->getName()) + TEXT_("\" "));\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << ": PID " << getPID() << "] " << "Processing \"" << basicTask->getName() <<  "\" " << endl;      \r
+               info(TEXT_("Processing \"") + TEXT_(basicTask->getName()) + TEXT_("\" "));\r
                \r
                basicTask->execute();\r
                \r
-               cout <<"[" << getName() << ":" << getHost().getName() << ": PID " << getPID() << "] " << "\"" << basicTask->getName() << "\" done " << endl;\r
+               info(TEXT_("\"") + TEXT_(basicTask->getName()) + TEXT_("\" done "));\r
        \r
                delete basicTask;\r
        }\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << ": PID " << getPID() << "] " << "Received Finalize. I'm done. See you!" << endl;\r
+       info("Received Finalize. I'm done. See you!");\r
        \r
        delete this;\r
 \r

diff --git a/examples/cxx/basic/Forwarder.cxx b/examples/cxx/basic/Forwarder.cxx
index d5fcdec..8767ff7 100644 (file)
--- a/examples/cxx/basic/Forwarder.cxx
+++ b/examples/cxx/basic/Forwarder.cxx
@@ -4,15 +4,14 @@
 #include <Host.hpp>\r
 #include <HostNotFoundException.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Forwarder, Process);\r
 \r
 \r
 int Forwarder::main(int argc, char** argv)\r
 {\r
-       cout << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        int slavesCount = argc;\r
        \r
@@ -26,8 +25,8 @@ int Forwarder::main(int argc, char** argv)
                } \r
                catch (HostNotFoundException e) \r
                {\r
-                       cerr << e.toString() << endl;\r
-                       cerr << "Buggy deployment file" << endl;\r
+                       error(TEXT_(e.toString()));\r
+                       error("Buggy deployment file");\r
                        exit(1);\r
                }\r
        }\r
@@ -40,21 +39,19 @@ int Forwarder::main(int argc, char** argv)
        \r
                if(t->isInstanceOf("FinalizeTask")) \r
                {\r
-                       cout << getName() << ":" << getHost().getName() << "All tasks have been dispatched. Let's tell everybody the computation is over." << endl;\r
+                       info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
        \r
                        for (int cpt = 0; cpt< slavesCount; cpt++) \r
-                       {\r
                                slaves[cpt].put(0, new FinalizeTask());\r
-                       }\r
 \r
                        delete t;\r
 \r
                        break;\r
                }\r
 \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received \"" << t->getName() << "\" " << endl;\r
+               info(TEXT_("Received \"") + TEXT_(t->getName()) + TEXT_("\" "));\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Sending \"" << t->getName() << "\" to \"" << slaves[taskCount % slavesCount].getName() <<"\"" << endl;\r
+               info(TEXT_("Sending \"") + TEXT_(t->getName()) + TEXT_("\" to \"") + TEXT_(slaves[taskCount % slavesCount].getName()) + TEXT_("\""));\r
                \r
                slaves[taskCount % slavesCount].put(0, t);\r
        \r
@@ -62,7 +59,7 @@ int Forwarder::main(int argc, char** argv)
        }\r
        \r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "I'm done. See you!" << endl;\r
+       info("I'm done. See you!");\r
        \r
        delete[] slaves;\r
 \r

diff --git a/examples/cxx/basic/Main.cxx b/examples/cxx/basic/Main.cxx
index dbda264..9f399a8 100644 (file)
--- a/examples/cxx/basic/Main.cxx
+++ b/examples/cxx/basic/Main.cxx
@@ -8,5 +8,5 @@ main(int argc, char* argv[])
        Simulation s;\r
        \r
        return s.execute(argc, argv);\r
-       \r
+\r
 }\r

diff --git a/examples/cxx/basic/Master.cxx b/examples/cxx/basic/Master.cxx
index cec35f1..f49f4b9 100644 (file)
--- a/examples/cxx/basic/Master.cxx
+++ b/examples/cxx/basic/Master.cxx
@@ -23,22 +23,24 @@ int Master::main(int argc, char** argv)
        int numberOfTasks;              \r
        double taskComputeSize;         \r
        double taskCommunicateSize;\r
+       StringHelper s;\r
 \r
        if (argc < 3) \r
        {\r
-               cerr <<"Master needs 3 arguments" << endl;\r
+               error("Master needs 3 arguments");\r
                exit(1);\r
        }\r
        \r
-       cout << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        int slaveCount = 0;\r
        Host* slaves = NULL;\r
+\r
        \r
-       cout << "argc=" <<  argc << endl;\r
+       info( TEXT_("argc=") + TEXT_(argc));\r
        \r
        for (int i = 0; i< argc; i++)       \r
-               cout << "argv:" << argv[i] << endl;\r
+               info(TEXT_("argv:") + TEXT_(argv[i]));\r
        \r
        sscanf(argv[0],"%d", &numberOfTasks);\r
        \r
@@ -49,11 +51,7 @@ int Master::main(int argc, char** argv)
        BasicTaskPtr* todo = new BasicTaskPtr[numberOfTasks];\r
        \r
        for (int i = 0; i < numberOfTasks; i++) \r
-       {\r
-               sprintf(buff,"Task_%d",i);\r
-               todo[i] = new BasicTask(buff, taskComputeSize, taskCommunicateSize);\r
-               memset(buff, 0 , BUFFMAX + 1); \r
-       }\r
+               todo[i] = new BasicTask((TEXT_("Task_") + TEXT_(i)), taskComputeSize, taskCommunicateSize);\r
        \r
        slaveCount = argc - 3;\r
        slaves = new Host[slaveCount];\r
@@ -71,27 +69,27 @@ int Master::main(int argc, char** argv)
                        exit(1);\r
                }\r
        }\r
-       \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got slave(s) :"  << slaveCount << endl;\r
+\r
+       info(TEXT_("Got slave(s) :") + TEXT_(slaveCount));\r
        \r
        for (int i = 0; i < slaveCount; i++)\r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "\t" << slaves[i].getName() << endl;\r
+               info(TEXT_("\t") + TEXT_(slaves[i].getName()));\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got " << numberOfTasks << " task to process." << endl;\r
+        info(TEXT_("Got ") + TEXT_(numberOfTasks) + TEXT_(" task to process."));\r
        \r
        for (int i = 0; i < numberOfTasks; i++) \r
        {\r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Sending \"" << todo[i]->getName() << "\" to \"" << slaves[i % slaveCount].getName() << "\"" << endl;\r
+               info(TEXT_("Sending \"") + TEXT_(todo[i]->getName()) + TEXT_("\" to \"") + TEXT_(slaves[i % slaveCount].getName()) + TEXT_("\""));\r
        \r
                if(!strcmp(Host::currentHost().getName(), slaves[i % slaveCount].getName())) \r
-                       cout <<"[" <<  getName() << ":" << getHost().getName() << "] " << "Hey ! It's me ! ";\r
+                       info("Hey ! It's me ! ");\r
 \r
                slaves[i % slaveCount].put(channel, todo[i]);\r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Send completed" << endl;\r
+       info("Send completed");\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "All tasks have been dispatched. Let's tell everybody the computation is over." << endl;\r
+       info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
        \r
        for (int i = 0; i < slaveCount; i++) \r
                        slaves[i].put(channel, new FinalizeTask());\r
@@ -99,7 +97,7 @@ int Master::main(int argc, char** argv)
        delete[] todo;\r
        delete[] slaves;\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Goodbye now!" << endl;\r
+       info("Goodbye now!");\r
 \r
        delete this;\r
 \r

diff --git a/examples/cxx/basic/Slave.cxx b/examples/cxx/basic/Slave.cxx
index 10be8fc..b1a914e 100644 (file)
--- a/examples/cxx/basic/Slave.cxx
+++ b/examples/cxx/basic/Slave.cxx
@@ -6,11 +6,13 @@
 #include <iostream>\r
 using namespace std;\r
 \r
+#include <Msg.hpp>\r
+\r
 MSG_IMPLEMENT_DYNAMIC(Slave, Process);\r
 \r
 int Slave::main(int argc, char** argv)\r
 {\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");;\r
        \r
        while(true) \r
        { \r
@@ -22,18 +24,18 @@ int Slave::main(int argc, char** argv)
                        break;\r
                }\r
                \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received \"" << t->getName() << "\" " << endl;\r
+               info(TEXT_("Received \"") + TEXT_(t->getName()) + TEXT_("\" "));\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Processing \"" << t->getName() <<  "\" " << endl;\r
+               info(TEXT_("Processing \"") + TEXT_(t->getName()));\r
 \r
                t->execute();\r
                \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "\"" << t->getName() << "\" done " << endl;\r
+               info(TEXT_("\"") + TEXT_(t->getName()) + TEXT_("\" done "));\r
 \r
                delete t;\r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received Finalize. I'm done. See you!" << endl;\r
+       info("Received Finalize. I'm done. See you!");\r
        \r
        delete this;\r
 \r

diff --git a/examples/cxx/comm_time/Master.cxx b/examples/cxx/comm_time/Master.cxx
index c68e847..662c3d2 100644 (file)
--- a/examples/cxx/comm_time/Master.cxx
+++ b/examples/cxx/comm_time/Master.cxx
@@ -5,31 +5,24 @@
 #include <HostNotFoundException.hpp>\r
 #include <Msg.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
-\r
-\r
-#ifndef BUFFMAX\r
-#define BUFFMAX 260\r
-#endif\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Master, Process);\r
 \r
 int Master::main(int argc, char** argv)\r
 {\r
        int channel = 0;\r
-       char buff[BUFFMAX + 1] = {0};\r
        int numberOfTasks;              \r
        double taskComputeSize;         \r
        double taskCommunicateSize;\r
 \r
        if (argc < 3) \r
        {\r
-               cerr <<"Master needs 3 arguments" << endl;\r
+               error("Master needs 3 arguments");\r
                exit(1);\r
        }\r
        \r
-       cout << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        int slaveCount = 0;\r
        Host* slaves = NULL;\r
@@ -53,37 +46,36 @@ int Master::main(int argc, char** argv)
                \r
                catch(HostNotFoundException e) \r
                {\r
-                       cerr << e.toString() <<". Stopping Now!" << endl;\r
+                       error(TEXT_(e.toString()) + TEXT_(". Stopping Now!"));\r
                        exit(1);\r
                }\r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got slave(s) :"  << slaveCount << endl;\r
+       info(TEXT_("Got slave(s) :" ) + TEXT_(slaveCount));\r
                        \r
        for (int i = 0; i < slaveCount; i++)\r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "\t" << slaves[i].getName() << endl;\r
+               info(TEXT_("\t") + TEXT_(slaves[i].getName()));\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got " << numberOfTasks << " task to process." << endl;\r
+       info(TEXT_("Got ") + TEXT_(numberOfTasks) + TEXT_(" task to process."));\r
        \r
        \r
        for (int i = 0; i < numberOfTasks; i++) \r
        {                       \r
-               sprintf(buff,"Task_%d",i);\r
-               CommTimeTask* task = new CommTimeTask(buff, taskComputeSize, taskCommunicateSize);\r
+               CommTimeTask* task = new CommTimeTask(TEXT_("Task_") + TEXT_(i), taskComputeSize, taskCommunicateSize);\r
                task->setTime(getClock());\r
                slaves[i % slaveCount].put(0, task);\r
-               memset(buff, 0 , BUFFMAX + 1);\r
+               \r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "All tasks have been dispatched. Let's tell everybody the computation is over." << endl;\r
+       info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
        \r
        for (int i = 0; i < slaveCount; i++) \r
        { \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Finalize host " << slaves[i].getName() <<  " [" <<  i  << "]" << endl;\r
+               info(TEXT_("Finalize host ") + TEXT_(slaves[i].getName()) + TEXT_(" [") + TEXT_(i) + TEXT_("]"));\r
                slaves[i].put(0, new FinalizeTask());\r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "All finalize messages have been dispatched. Goodbye now!" << endl;\r
+       info("All finalize messages have been dispatched. Goodbye now!");\r
        \r
 \r
        delete[] slaves;\r

diff --git a/examples/cxx/comm_time/Slave.cxx b/examples/cxx/comm_time/Slave.cxx
index 4a3a78b..e1b41e8 100644 (file)
--- a/examples/cxx/comm_time/Slave.cxx
+++ b/examples/cxx/comm_time/Slave.cxx
@@ -5,14 +5,13 @@
 #include <HostNotFoundException.hpp>\r
 #include <Msg.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Slave, Process);\r
 \r
 int Slave::main(int argc, char** argv)\r
 {\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        while(true) \r
        {\r
@@ -31,14 +30,14 @@ int Slave::main(int argc, char** argv)
                if(time1 < task->getTime())\r
                        time1 = task->getTime();\r
                        \r
-               // cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Processing \"" << task->getName() << "\" " << getHost().getName() <<  " (Communication time : " <<  (time2 - time1) << ")" << endl;\r
+               //info(TEXT_("Processing \"") + TEXT_(task->getName()) + TEXT_("\" ") + TEXT_(getHost().getName()) + TEXT_(" (Communication time : ") + TEXT_((time2 - time1)) + TEXT_(")"));\r
         \r
                task->execute();\r
                \r
                delete task;\r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received Finalize. I'm done. See you!" << endl;\r
+       info(TEXT_("Received Finalize. I'm done. See you!"));\r
        \r
        delete this;\r
        return 0;\r

diff --git a/examples/cxx/explicitDestination/Forwarder.cxx b/examples/cxx/explicitDestination/Forwarder.cxx
index 6ed093c..f7220cd 100644 (file)
--- a/examples/cxx/explicitDestination/Forwarder.cxx
+++ b/examples/cxx/explicitDestination/Forwarder.cxx
@@ -5,15 +5,15 @@
 #include <Host.hpp>\r
 #include <HostNotFoundException.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
+\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Forwarder, Process);\r
 \r
 \r
 int Forwarder::main(int argc, char** argv)\r
 {\r
-       cout << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        int aliasCount = argc;\r
        \r
@@ -29,7 +29,7 @@ int Forwarder::main(int argc, char** argv)
        \r
                if(taskReceived->isInstanceOf("FinalizeTask")) \r
                {\r
-                       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "All tasks have been dispatched. Let's tell everybody the computation is over." << endl;\r
+                       info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
        \r
                        for (int i = 0; i < aliasCount; i++) \r
                        {\r
@@ -44,9 +44,9 @@ int Forwarder::main(int argc, char** argv)
        \r
                basicTask = reinterpret_cast<BasicTask*>(taskReceived);\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received \"" << basicTask->getName() << "\" " << endl;\r
+               info(TEXT_("Received \"") + TEXT_(basicTask->getName()) + TEXT_("\" "));\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Sending \"" << basicTask->getName() << "\" to \"" << argv[taskCount % aliasCount] << "\"" << endl;\r
+               info(TEXT_("Sending \"") + TEXT_(basicTask->getName()) + TEXT_("\" to \"") + TEXT_(argv[taskCount % aliasCount]) + TEXT_("\""));\r
        \r
                basicTask->send(argv[taskCount % aliasCount]);\r
        \r
@@ -54,7 +54,7 @@ int Forwarder::main(int argc, char** argv)
        }\r
        \r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "I'm done. See you!" << endl;\r
+       info("I'm done. See you!");\r
        \r
        delete this;\r
        return 0;\r

diff --git a/examples/cxx/explicitDestination/Master.cxx b/examples/cxx/explicitDestination/Master.cxx
index 9184ee4..cd83fe6 100644 (file)
--- a/examples/cxx/explicitDestination/Master.cxx
+++ b/examples/cxx/explicitDestination/Master.cxx
@@ -5,30 +5,23 @@
 #include <Host.hpp>\r
 #include <HostNotFoundException.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
-\r
-\r
-#ifndef BUFFMAX\r
-#define BUFFMAX 260\r
-#endif\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Master, Process);\r
 \r
 int Master::main(int argc, char** argv)\r
 {\r
-       char buff[BUFFMAX + 1] = {0};\r
        int taskCount;          \r
        double taskComputeSize;         \r
        double taskCommunicateSize;\r
        \r
-       cout << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
                \r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "argc=" << argc << endl;\r
+       info(TEXT_("argc=") + TEXT_(argc));\r
                \r
        for (int i = 0; i< argc; i++)       \r
-               cout << "argv:" << argv[i] << endl;\r
+               info(TEXT_("argv:") + TEXT_(argv[i]));\r
        \r
        sscanf(argv[0],"%d", &taskCount);\r
        \r
@@ -39,41 +32,37 @@ int Master::main(int argc, char** argv)
        BasicTaskPtr* basicTasks = new BasicTaskPtr[taskCount];\r
                \r
        for (int i = 0; i < taskCount; i++) \r
-       {\r
-               sprintf(buff,"Task_%d",i);\r
-               basicTasks[i] = new BasicTask(buff, taskComputeSize, taskCommunicateSize);\r
-               memset(buff, 0 , BUFFMAX + 1); \r
-       }               \r
+               basicTasks[i] = new BasicTask(TEXT_("Task_") + TEXT_(i), taskComputeSize, taskCommunicateSize);         \r
        \r
        int aliasCount = argc - 3;\r
        \r
-               \r
        char** aliases = (char**) calloc(aliasCount, sizeof(char*));\r
                \r
        for(int i = 3; i < argc ; i++) \r
                aliases[i - 3] = _strdup(argv[i]);\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got "<<  aliasCount << " alias(es) :" << endl;\r
+       info(TEXT_("Got ") + TEXT_(aliasCount) + TEXT_(" alias(es) :"));\r
                \r
        for (int i = 0; i < aliasCount; i++)\r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "\t" << aliases[i] << endl;\r
+               info(TEXT_("\t") + TEXT_(aliases[i]));\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got "<< taskCount << " task to process." << endl;\r
+       info(TEXT_("Got ") + TEXT_(taskCount) + TEXT_(" task to process."));\r
                \r
        for (int i = 0; i < taskCount; i++) \r
        {       \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Sending \"" << basicTasks[i]->getName() << "\" to \"" << aliases[i % aliasCount] << "\"" << endl;\r
+               info(TEXT_("Sending \"") + TEXT_(basicTasks[i]->getName()) + TEXT_("\" to \"") + TEXT_(aliases[i % aliasCount]) + TEXT_("\""));\r
+\r
                \r
                /*if((Host::currentHost().getName()).equals((aliases[i % aliasCount].split(":"))[0]))\r
-                       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hey ! It's me ! ";\r
+                       info("Hey ! It's me ! ");\r
                */\r
                        \r
                basicTasks[i]->send(aliases[i % aliasCount]);\r
        }\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Send completed" << endl;\r
+       info("Send completed");\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "All tasks have been dispatched. Let's tell everybody the computation is over." << endl;\r
+       info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
        \r
        FinalizeTask* finalizeTask;\r
        \r
@@ -84,7 +73,7 @@ int Master::main(int argc, char** argv)
                \r
        }\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Goodbye now!" << endl;\r
+       info("Goodbye now!");\r
 \r
        delete[] basicTasks;\r
        delete[] aliases;\r

diff --git a/examples/cxx/explicitDestination/Slave.cxx b/examples/cxx/explicitDestination/Slave.cxx
index 6b4de50..c7ebc31 100644 (file)
--- a/examples/cxx/explicitDestination/Slave.cxx
+++ b/examples/cxx/explicitDestination/Slave.cxx
@@ -5,14 +5,14 @@
 #include <Host.hpp>\r
 #include <HostNotFoundException.hpp>\r
 \r
-#include <iostream>\r
+#include <Msg.hpp>\r
 using namespace std;\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Slave, Process);\r
 \r
 int Slave::main(int argc, char** argv)\r
 {\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        Task* receivedTask;\r
        BasicTask* basicTask;\r
@@ -29,16 +29,16 @@ int Slave::main(int argc, char** argv)
        \r
                basicTask = reinterpret_cast<BasicTask*>(receivedTask);\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received \"" << basicTask->getName() << "\" " << endl;\r
+               info(TEXT_("Received \"") + TEXT_(basicTask->getName()) + TEXT_("\" "));\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Processing \"" << basicTask->getName() <<  "\" " << endl;      \r
+               info(TEXT_("Processing \"") + TEXT_(basicTask->getName()) + TEXT_("\" "));\r
                basicTask->execute();\r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "\"" << basicTask->getName() << "\" done " << endl;\r
+               info(TEXT_("\"") + TEXT_(basicTask->getName()) + TEXT_("\" done "));\r
        \r
                delete basicTask;\r
        }\r
                \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Received Finalize. I'm done. See you!" << endl;\r
+       info("Received Finalize. I'm done. See you!");\r
        \r
        delete this;\r
        return 0;\r

diff --git a/examples/cxx/ping_pong/Receiver.cxx b/examples/cxx/ping_pong/Receiver.cxx
index fec2c36..41ad220 100644 (file)
--- a/examples/cxx/ping_pong/Receiver.cxx
+++ b/examples/cxx/ping_pong/Receiver.cxx
@@ -4,8 +4,7 @@
 #include <HostNotFoundException.hpp>\r
 #include <Msg.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(Receiver, Process);\r
 \r
@@ -14,11 +13,12 @@ const double commSizeBw = 100000000;
 \r
 int Receiver::main(int argc, char** argv)\r
 {\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        double communicationTime=0;\r
        double time = getClock();\r
+       StringHelper bw;\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "try to get a task" << endl;\r
+       info("Try to get a task");\r
        \r
        PingPongTask* task = reinterpret_cast<PingPongTask*>(Task::get(0));\r
        \r
@@ -27,18 +27,18 @@ int Receiver::main(int argc, char** argv)
        \r
        delete task;\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Got at time " << timeGot << endl;\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Was sent at time " << timeSent << endl;\r
+       info(TEXT_("Got at time ") + TEXT_(timeGot));\r
+       info(TEXT_("Was sent at time ") + TEXT_(timeSent));\r
        \r
        time = timeSent;\r
        \r
        communicationTime = timeGot - time;\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Communication time : " << communicationTime << endl;\r
+       info(TEXT_( "Communication time : ") + TEXT_(communicationTime));\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << " --- bw " << commSizeBw/communicationTime << " ----" << endl;\r
+       info(TEXT_(" --- BW ") + bw.append(commSizeBw/communicationTime,"%07lf") + TEXT_(" ----"));\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "goodbye!" << endl;\r
+       info("Goodbye!");\r
        \r
        delete this;\r
 \r

diff --git a/examples/cxx/ping_pong/Sender.cxx b/examples/cxx/ping_pong/Sender.cxx
index d0518ba..8c3f364 100644 (file)
--- a/examples/cxx/ping_pong/Sender.cxx
+++ b/examples/cxx/ping_pong/Sender.cxx
@@ -4,7 +4,7 @@
 #include <HostNotFoundException.hpp>\r
 #include <Msg.hpp>\r
 \r
-#include <iostream>\r
+#include <Msg.hpp>\r
 using namespace std;\r
 \r
 const double commSizeLat = 1;\r
@@ -14,11 +14,11 @@ MSG_IMPLEMENT_DYNAMIC(Sender, Process);
 \r
 int Sender::main(int argc, char** argv)\r
 {\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
        int hostCount = argc;\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " <<  "host count : " << hostCount << endl;\r
+       info(TEXT_("Host count : ") + TEXT_(hostCount));\r
        \r
        Host* hostTable = new Host[hostCount]; \r
        double time;\r
@@ -33,7 +33,7 @@ int Sender::main(int argc, char** argv)
                } \r
                catch(HostNotFoundException e) \r
                {\r
-                       cerr << e.toString() <<". Stopping Now!" << endl;\r
+                       error(TEXT_(e.toString()) + TEXT_(". Stopping Now!"));\r
                        exit(1);\r
                }\r
        }\r
@@ -42,7 +42,7 @@ int Sender::main(int argc, char** argv)
        { \r
                time = getClock(); \r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " <<  "sender time : " << time << endl;\r
+               info(TEXT_("Sender time : ") + TEXT_(time));\r
        \r
                task = new PingPongTask("no name",computeDuration,commSizeLat);\r
                task->setTime(time);\r
@@ -50,7 +50,8 @@ int Sender::main(int argc, char** argv)
                hostTable[pos].put(0,task);\r
        } \r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " <<  "goodbye!" << endl;\r
+       info("Goodbye!");\r
+\r
        \r
        delete[] hostTable;\r
 \r

diff --git a/examples/cxx/suspend/DreamMaster.cxx b/examples/cxx/suspend/DreamMaster.cxx
index 0bf21ec..62ed58f 100644 (file)
--- a/examples/cxx/suspend/DreamMaster.cxx
+++ b/examples/cxx/suspend/DreamMaster.cxx
@@ -4,17 +4,17 @@
 #include <HostNotFoundException.hpp>\r
 #include <Msg.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
+\r
 \r
 MSG_IMPLEMENT_DYNAMIC(DreamMaster, Process);\r
 \r
 int DreamMaster::main(int argc, char** argv)\r
 {\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hello I'm " << getName() << " on " << getHost().getName() << "!" << endl;\r
+       info("Hello");\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Let's create a lazy guy.";\r
+       info("Let's create a lazy guy.");\r
        \r
 \r
        LazyGuy* lazy;\r
@@ -23,15 +23,15 @@ int DreamMaster::main(int argc, char** argv)
        {\r
                Host currentHost = Host::currentHost();\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Current host  name : " << currentHost.getName() << endl;\r
+               info(TEXT_("Current host  name : ") + TEXT_(currentHost.getName()));\r
        \r
                lazy = new LazyGuy(currentHost,"LazyGuy");\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Let's wait a little bit..." << endl;\r
+               info("Let's wait a little bit...");\r
        \r
                Process::sleep(10.0);\r
        \r
-               cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Let's wake the lazy guy up! >:) " << endl;\r
+               info("Let's wake the lazy guy up! >:) ");\r
        \r
                lazy->resume();\r
        \r
@@ -39,13 +39,13 @@ int DreamMaster::main(int argc, char** argv)
        }\r
        catch(HostNotFoundException e)\r
        {\r
-               cerr << e.toString() <<". Stopping Now!" << endl;\r
+               error(TEXT_(e.toString()) + TEXT_(". Stopping Now!"));\r
                exit(1);\r
        }\r
        \r
        //lazy->migrate(currentHost);\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "OK, goodbye now." << endl;\r
+       info("OK, goodbye now.");\r
 \r
        delete this;\r
 \r

diff --git a/examples/cxx/suspend/LazyGuy.cxx b/examples/cxx/suspend/LazyGuy.cxx
index ba12220..7db90b7 100644 (file)
--- a/examples/cxx/suspend/LazyGuy.cxx
+++ b/examples/cxx/suspend/LazyGuy.cxx
@@ -1,21 +1,21 @@
 #include "LazyGuy.hpp"\r
 #include <Host.hpp>\r
 \r
-#include <iostream>\r
-using namespace std;\r
+#include <Msg.hpp>\r
 \r
 MSG_IMPLEMENT_DYNAMIC(LazyGuy, Process);\r
 \r
 int LazyGuy::main(int argc, char** argv)\r
 {\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Hello !" << endl;\r
+       info("Hello !");\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Nobody's watching me ? Let's go to sleep." << endl;\r
+       info("Nobody's watching me ? Let's go to sleep.");\r
        \r
        Process::currentProcess().suspend();\r
        \r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Uuuh ? Did somebody call me ?" << endl;\r
-       cout <<"[" << getName() << ":" << getHost().getName() << "] " << "Mmmh, goodbye now." << endl; \r
+       info("Uuuh ? Did somebody call me ?");\r
+       \r
+       info("Mmmh, goodbye now."); \r
 \r
 \r
        delete this;\r