Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
just delete some blank lines
[simgrid.git] / examples / cxx / autoDestination / Master.cxx
index d3b11e8..c36657f 100644 (file)
@@ -5,75 +5,60 @@
 #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
        sscanf(argv[1],"%lg", &taskComputeSize);\r
-       \r
        sscanf(argv[2],"%lg", &taskCommunicateSize);\r
        \r
        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
                /*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,10 +69,12 @@ 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
 \r
+       delete this;\r
+\r
        return 0;\r
 }
\ No newline at end of file