A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Last Changes of CPP version of Msg
[simgrid.git]
/
src
/
cxx
/
Simulation.cxx
diff --git
a/src/cxx/Simulation.cxx
b/src/cxx/Simulation.cxx
index
b1fd89e
..
34ee0fd
100644
(file)
--- a/
src/cxx/Simulation.cxx
+++ b/
src/cxx/Simulation.cxx
@@
-15,12
+15,20
@@
\r
#include <Simulation.hpp>
\r
\r
\r
#include <Simulation.hpp>
\r
\r
+#include <Application.hpp>
\r
+#include <Environment.hpp>
\r
+
\r
+#include <MsgException.hpp>
\r
+#include <FileNotFoundException.hpp>
\r
+
\r
+#include <Msg.hpp>
\r
+
\r
+#include <msg/msg.h>
\r
+
\r
namespace SimGrid
\r
{
\r
namespace Msg
\r
{
\r
namespace SimGrid
\r
{
\r
namespace Msg
\r
{
\r
-
\r
-
\r
int Simulation::execute(int argc, char** argv)
\r
{
\r
if(argc < 3)
\r
int Simulation::execute(int argc, char** argv)
\r
{
\r
if(argc < 3)
\r
@@
-55,6
+63,7
@@
namespace SimGrid
try
\r
{
\r
app.deploy(argv[2]);
\r
try
\r
{
\r
app.deploy(argv[2]);
\r
+ }
\r
catch(FileNotFoundException e)
\r
{
\r
info(e.toString());
\r
catch(FileNotFoundException e)
\r
{
\r
info(e.toString());
\r
@@
-65,7
+74,7
@@
namespace SimGrid
//try to run the simulation the given application on the given environment
\r
try
\r
{
\r
//try to run the simulation the given application on the given environment
\r
try
\r
{
\r
-
this->
run();
\r
+ run();
\r
}
\r
catch(MsgException e)
\r
{
\r
}
\r
catch(MsgException e)
\r
{
\r
@@
-81,7
+90,7
@@
namespace SimGrid
}
\r
catch(MsgException e)
\r
{
\r
}
\r
catch(MsgException e)
\r
{
\r
- info(e.toString())
\r
+ info(e.toString())
;
\r
return 1;
\r
}
\r
\r
return 1;
\r
}
\r
\r