X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..8ff55f23d7e8048c3e761bf270f9a24c0aa357c9:/src/smpi/include/smpi_request.hpp

diff --git a/src/smpi/include/smpi_request.hpp b/src/smpi/include/smpi_request.hpp
index cc6458393c..226094de7b 100644
--- a/src/smpi/include/smpi_request.hpp
+++ b/src/smpi/include/smpi_request.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. 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. */
@@ -9,18 +9,19 @@
 #include "smpi/smpi.h"
 #include "smpi_f2c.hpp"
 
+#include <memory>
+
 namespace simgrid{
 namespace smpi{
 
-typedef struct s_smpi_mpi_generalized_request_funcs {
+struct smpi_mpi_generalized_request_funcs_t {
   MPI_Grequest_query_function *query_fn;
   MPI_Grequest_free_function *free_fn;
   MPI_Grequest_cancel_function *cancel_fn;
   void* extra_state;
   s4u::ConditionVariablePtr cond;
   s4u::MutexPtr mutex;
-} s_smpi_mpi_generalized_request_funcs_t; 
-typedef struct s_smpi_mpi_generalized_request_funcs *smpi_mpi_generalized_request_funcs;
+};
 
 class Request : public F2C {
   void* buf_;
@@ -41,36 +42,37 @@ class Request : public F2C {
   bool truncated_;
   size_t real_size_;
   MPI_Comm comm_;
-  smx_activity_t action_;
+  simgrid::kernel::activity::ActivityImplPtr action_;
   unsigned flags_;
   bool detached_;
   MPI_Request detached_sender_;
   int refcount_;
   MPI_Op op_;
-  int cancelled_; // tri-state
-  smpi_mpi_generalized_request_funcs generalized_funcs;
+  std::unique_ptr<smpi_mpi_generalized_request_funcs_t> generalized_funcs;
   MPI_Request* nbc_requests_;
   int nbc_requests_size_;
+  static bool match_common(MPI_Request req, MPI_Request sender, MPI_Request receiver);
 
 public:
   Request() = default;
   Request(const void* buf, int count, MPI_Datatype datatype, int src, int dst, int tag, MPI_Comm comm, unsigned flags, MPI_Op op = MPI_REPLACE);
-  MPI_Comm comm() { return comm_; }
-  size_t size() { return size_; }
-  size_t real_size() { return real_size_; }
-  int src() { return src_; }
-  int dst() { return dst_; }
-  int tag() { return tag_; }
-  int flags() { return flags_; }
-  bool detached() { return detached_; }
-  MPI_Datatype type() { return old_type_; }
-  void print_request(const char* message);
+  MPI_Comm comm() const { return comm_; }
+  size_t size() const { return size_; }
+  size_t real_size() const { return real_size_; }
+  int src() const { return src_; }
+  int dst() const { return dst_; }
+  int tag() const { return tag_; }
+  int flags() const { return flags_; }
+  bool detached() const { return detached_; }
+  MPI_Datatype type() const { return old_type_; }
+  void print_request(const char* message) const;
   void start();
   void cancel();
+  void init_buffer(int count);
   void ref();
   void set_nbc_requests(MPI_Request* reqs, int size);
-  int get_nbc_requests_size();
-  MPI_Request* get_nbc_requests();
+  int get_nbc_requests_size() const;
+  MPI_Request* get_nbc_requests() const;
   static void finish_wait(MPI_Request* request, MPI_Status* status);
   static void unref(MPI_Request* request);
   static int wait(MPI_Request* req, MPI_Status* status);
@@ -89,7 +91,7 @@ public:
   static MPI_Request issend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm);
   static MPI_Request irecv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm);
 
-  static void recv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status* status);
+  static int recv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status* status);
   static void bsend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm);
   static void send(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm);
   static void ssend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm);
@@ -111,12 +113,12 @@ public:
   static int waitall(int count, MPI_Request requests[], MPI_Status status[]);
   static int waitsome(int incount, MPI_Request requests[], int* indices, MPI_Status status[]);
 
-  static int match_send(void* a, void* b, kernel::activity::CommImpl* ignored);
-  static int match_recv(void* a, void* b, kernel::activity::CommImpl* ignored);
+  static bool match_send(void* a, void* b, kernel::activity::CommImpl* ignored);
+  static bool match_recv(void* a, void* b, kernel::activity::CommImpl* ignored);
 
   static int grequest_start( MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, void *extra_state, MPI_Request *request);
   static int grequest_complete( MPI_Request request);
-  static int get_status(MPI_Request req, int* flag, MPI_Status * status);
+  static int get_status(const Request* req, int* flag, MPI_Status* status);
 
   static void free_f(int id);
   static Request* f2c(int);