In smpiff/smpif90 program, make -o consume the next argument.

[simgrid.git] / src / msg / msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 9a95300..f4dd8ab 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,18 +1,13 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2015. 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. */
 
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/host.hpp"
 
-#include "simgrid/msg.h"
 #include "instr/instr_interface.h"
-#include "msg_private.h"
 #include "mc/mc.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
+#include "src/msg/msg_private.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
@@ -42,7 +37,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
   TRACE_global_init(argc, argv);
 
-  xbt_getpid = MSG_process_self_PID;
+  xbt_getpid = &MSG_process_self_PID;
   if (!msg_global) {
 
     msg_global = xbt_new0(s_MSG_Global_t, 1);
@@ -122,11 +117,7 @@ int MSG_process_killall(int reset_PIDs)
 {
   simcall_process_killall(reset_PIDs);
 
-  if (reset_PIDs > 0)
-    msg_global->session++;
-
   return 0;
-
 }
 
 static void MSG_exit() {