Merge branch 'clean_events' of github.com:Takishipp/simgrid into clean_events

[simgrid.git] / src / smpi / smpi_comm.cpp

diff --git a/src/smpi/smpi_comm.cpp b/src/smpi/smpi_comm.cpp
index 9bb515e..d1e2ab0 100644 (file)
--- a/src/smpi/smpi_comm.cpp
+++ b/src/smpi/smpi_comm.cpp
@@ -1,20 +1,19 @@
-/* Copyright (c) 2010-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-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. */
 
-#include <stdlib.h>
-#include <limits.h>
+#include "simgrid/s4u/Host.hpp"
 
-#include <xbt/dict.h>
-#include <xbt/ex.h>
-#include <xbt/ex.hpp>
-
-#include <simgrid/s4u/host.hpp>
-
-#include "private.h"
 #include "src/simix/smx_private.h"
+#include "src/smpi/private.h"
+#include "src/smpi/smpi_comm.hpp"
+#include "src/smpi/smpi_coll.hpp"
+#include "src/smpi/smpi_datatype.hpp"
+#include "src/smpi/smpi_process.hpp"
+#include "src/smpi/smpi_request.hpp"
+#include "src/smpi/smpi_status.hpp"
+#include "src/smpi/smpi_win.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)");
 
@@ -80,7 +79,7 @@ int Comm::dup(MPI_Comm* newcomm){
   (*newcomm) = new  Comm(cp, this->topo());
   int ret = MPI_SUCCESS;
 
-  if(!attributes()->empty()){
+  if (not attributes()->empty()) {
     int flag;
     void* value_out;
     for(auto it : *attributes()){
@@ -172,7 +171,7 @@ MPI_Comm Comm::get_leaders_comm(){
 }
 
 MPI_Comm Comm::get_intra_comm(){
-  if (this == MPI_COMM_UNINITIALIZED || this==MPI_COMM_WORLD) 
+  if (this == MPI_COMM_UNINITIALIZED || this==MPI_COMM_WORLD)
     return smpi_process()->comm_intra();
   else return intra_comm_;
 }
@@ -252,7 +251,7 @@ MPI_Comm Comm::split(int color, int key)
         }
         if(i != 0 && group_out != MPI_COMM_WORLD->group() && group_out != MPI_GROUP_EMPTY)
           Group::unref(group_out);
-        
+
         Request::waitall(reqs, requests, MPI_STATUS_IGNORE);
         xbt_free(requests);
       }
@@ -319,8 +318,8 @@ void Comm::init_smp(){
     smpi_process()->comm_world()->init_smp();
 
   int comm_size = this->size();
-  
-  // If we are in replay - perform an ugly hack  
+
+  // If we are in replay - perform an ugly hack
   // tell SimGrid we are not in replay for a while, because we need the buffers to be copied for the following calls
   bool replaying = false; //cache data to set it back again after
   if(smpi_process()->replaying()){
@@ -470,9 +469,9 @@ void Comm::init_smp(){
     is_blocked_=global_blocked;
   }
   xbt_free(leader_list);
-  
+
   if(replaying)
-    smpi_process()->set_replaying(true); 
+    smpi_process()->set_replaying(true);
 }
 
 MPI_Comm Comm::f2c(int id) {