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
remove all the events that are called and destroyed one time
[simgrid.git]
/
src
/
simix
/
smx_deployment.cpp
diff --git
a/src/simix/smx_deployment.cpp
b/src/simix/smx_deployment.cpp
index
492e147
..
946f64b
100644
(file)
--- a/
src/simix/smx_deployment.cpp
+++ b/
src/simix/smx_deployment.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007, 2009-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-7,12
+6,9
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include "simgrid/s4u/
h
ost.hpp"
+#include "simgrid/s4u/
H
ost.hpp"
#include "smx_private.h"
#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
#include "smx_private.h"
#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
-#include "xbt/dict.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
#include <xbt/ex.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
#include <xbt/ex.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
@@
-50,7
+46,7
@@
void SIMIX_launch_application(const char *file)
try {
parse_status = surf_parse();
surf_parse_close();
try {
parse_status = surf_parse();
surf_parse_close();
- xbt_assert(
!parse_status, "Parse error at %s:%d", file,
surf_parse_lineno);
+ xbt_assert(
not parse_status, "Parse error at %s:%d", file,
surf_parse_lineno);
}
catch (xbt_ex& e) {
XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
}
catch (xbt_ex& e) {
XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
@@
-128,7
+124,7
@@
void SIMIX_process_set_function(const char *process_host,
memset(&process,0,sizeof(process));
sg_host_t host = sg_host_by_name(process_host);
memset(&process,0,sizeof(process));
sg_host_t host = sg_host_by_name(process_host);
- if (
!
host)
+ if (
not
host)
THROWF(arg_error, 0, "Host '%s' unknown", process_host);
process.host = host->cname();
THROWF(arg_error, 0, "Host '%s' unknown", process_host);
process.host = host->cname();
@@
-151,7
+147,7
@@
void SIMIX_process_set_function(const char *process_host,
process.host = process_host;
process.kill_time = process_kill_time;
process.start_time = process_start_time;
process.host = process_host;
process.kill_time = process_kill_time;
process.start_time = process_start_time;
- process.on_failure = SURF_
PROCESS
_ON_FAILURE_DIE;
+ process.on_failure = SURF_
ACTOR
_ON_FAILURE_DIE;
sg_platf_new_process(&process);
}
sg_platf_new_process(&process);
}