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

[simgrid.git] / examples / cxx / comm_time / Master.cxx

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