X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6633f5c4d1b7d52fa54306ee3fb7eb573daeb274..ea74f5d95928a521a588737e81f1de94eef25d19:/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp

diff --git a/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp b/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
index bd9906b1f2..fbd52c675f 100644
--- a/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
+++ b/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team.
+/* Copyright (c) 2013-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -19,11 +19,11 @@ int reduce_arrival_pattern_aware_segment_size_in_byte = 8192;
 namespace simgrid{
 namespace smpi{
 /* Non-topology-specific pipelined linear-reduce function */
-int Coll_reduce_arrival_pattern_aware::reduce(const void *buf, void *rbuf,
-                                                 int count,
-                                                 MPI_Datatype datatype,
-                                                 MPI_Op op, int root,
-                                                 MPI_Comm comm)
+int reduce__arrival_pattern_aware(const void *buf, void *rbuf,
+                                  int count,
+                                  MPI_Datatype datatype,
+                                  MPI_Op op, int root,
+                                  MPI_Comm comm)
 {
   int rank = comm->rank();
   int tag = -COLL_TAG_REDUCE;
@@ -85,11 +85,10 @@ int Coll_reduce_arrival_pattern_aware::reduce(const void *buf, void *rbuf,
 
         for (i = 1; i < size; i++) {
           if (already_received[i] == 0) {
-            Request::iprobe(i, MPI_ANY_TAG, comm, &flag_array[i],
-                             MPI_STATUSES_IGNORE);
-            simcall_process_sleep(0.0001);
+            Request::iprobe(i, MPI_ANY_TAG, comm, &flag_array[i], MPI_STATUSES_IGNORE);
+            simgrid::s4u::this_actor::sleep_for(0.0001);
+          }
             }
-        }
 
         header_index = 0;
         /* recv 1-byte message */
@@ -185,10 +184,10 @@ int Coll_reduce_arrival_pattern_aware::reduce(const void *buf, void *rbuf,
   else {
     //    printf("node %d start\n",rank);
 
-    MPI_Request* send_request_array = new MPI_Request[size + pipe_length];
-    MPI_Request* recv_request_array = new MPI_Request[size + pipe_length];
-    MPI_Status* send_status_array   = new MPI_Status[size + pipe_length];
-    MPI_Status* recv_status_array   = new MPI_Status[size + pipe_length];
+    auto* send_request_array = new MPI_Request[size + pipe_length];
+    auto* recv_request_array = new MPI_Request[size + pipe_length];
+    auto* send_status_array  = new MPI_Status[size + pipe_length];
+    auto* recv_status_array  = new MPI_Status[size + pipe_length];
 
     if (rank == 0) {
       sent_count = 0;
@@ -333,8 +332,8 @@ int Coll_reduce_arrival_pattern_aware::reduce(const void *buf, void *rbuf,
 
   /* when count is not divisible by block size, use default BCAST for the remainder */
   if ((remainder != 0) && (count > segment)) {
-    Coll_reduce_default::reduce((char*)buf + (pipe_length * increment), (char*)rbuf + (pipe_length * increment),
-                                remainder, datatype, op, root, comm);
+    reduce__default((char*)buf + (pipe_length * increment), (char*)rbuf + (pipe_length * increment),
+                    remainder, datatype, op, root, comm);
   }
 
   smpi_free_tmp_buffer(tmp_buf);