Add more macros for input validation for colls.

[simgrid.git] / src / smpi / bindings / smpi_pmpi_win.cpp

diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp
index 32abd4e..eda4b56 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_win.cpp
+++ b/src/smpi/bindings/smpi_pmpi_win.cpp
@@ -64,10 +64,10 @@ int PMPI_Win_allocate_shared( MPI_Aint size, int disp_unit, MPI_Info info, MPI_C
        if(ptr==nullptr)
          return MPI_ERR_NO_MEM;
     }
-    
-    simgrid::smpi::Colls::bcast(&ptr, sizeof(void*), MPI_BYTE, 0, comm);
-    simgrid::smpi::Colls::barrier(comm);
-    
+
+    simgrid::smpi::colls::bcast(&ptr, sizeof(void*), MPI_BYTE, 0, comm);
+    simgrid::smpi::colls::barrier(comm);
+
     *static_cast<void**>(base) = (char*)ptr+rank*size;
     *win = new simgrid::smpi::Win( ptr, size, disp_unit, info, comm,rank==0);
     retval = MPI_SUCCESS;
@@ -775,7 +775,7 @@ int PMPI_Win_flush_local_all(MPI_Win win){
 
 int PMPI_Win_shared_query (MPI_Win win, int rank, MPI_Aint* size, int* disp_unit, void* baseptr)
 {
-  if (win==MPI_WIN_NULL)
+  if (win == MPI_WIN_NULL)
     return MPI_ERR_TYPE;
   else
     return win->shared_query(rank, size, disp_unit, baseptr);
@@ -785,31 +785,30 @@ int PMPI_Win_get_attr (MPI_Win win, int keyval, void *attribute_val, int* flag)
 {
   static MPI_Aint size;
   static MPI_Aint disp_unit;
-  if (win==MPI_WIN_NULL)
+  if (win == MPI_WIN_NULL)
     return MPI_ERR_TYPE;
   else{
-  switch (keyval) {
-    case MPI_WIN_BASE :
-      *static_cast<void**>(attribute_val)  = win->base();
-      *flag = 1;
-      return MPI_SUCCESS;
-    case MPI_WIN_SIZE :
-      size = win->size();
-      *static_cast<MPI_Aint**>(attribute_val)  = &size;
-      *flag = 1;
-      return MPI_SUCCESS;
-    case MPI_WIN_DISP_UNIT :
-      disp_unit=win->disp_unit();
-      *static_cast<MPI_Aint**>(attribute_val)  = &disp_unit;
-      *flag = 1;
-      return MPI_SUCCESS;
-    default:
-      return win->attr_get<simgrid::smpi::Win>(keyval, attribute_val, flag);
+    switch (keyval) {
+      case MPI_WIN_BASE:
+        *static_cast<void**>(attribute_val) = win->base();
+        *flag                               = 1;
+        return MPI_SUCCESS;
+      case MPI_WIN_SIZE:
+        size                                    = win->size();
+        *static_cast<MPI_Aint**>(attribute_val) = &size;
+        *flag                                   = 1;
+        return MPI_SUCCESS;
+      case MPI_WIN_DISP_UNIT:
+        disp_unit                               = win->disp_unit();
+        *static_cast<MPI_Aint**>(attribute_val) = &disp_unit;
+        *flag                                   = 1;
+        return MPI_SUCCESS;
+      default:
+        return win->attr_get<simgrid::smpi::Win>(keyval, attribute_val, flag);
+    }
   }
 }
 
-}
-
 int PMPI_Win_set_attr (MPI_Win win, int type_keyval, void *attribute_val)
 {
   if (win==MPI_WIN_NULL)