A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement mpi_isendrecv and mpi_isendrecv_replace
[simgrid.git]
/
src
/
smpi
/
include
/
smpi_request.hpp
diff --git
a/src/smpi/include/smpi_request.hpp
b/src/smpi/include/smpi_request.hpp
index
8027533
..
9b0a6cc
100644
(file)
--- a/
src/smpi/include/smpi_request.hpp
+++ b/
src/smpi/include/smpi_request.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-202
3
. 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. */
/* 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. */
@@
-11,8
+11,7
@@
#include <memory>
#include <memory>
-namespace simgrid{
-namespace smpi{
+namespace simgrid::smpi {
struct smpi_mpi_generalized_request_funcs_t {
MPI_Grequest_query_function *query_fn;
struct smpi_mpi_generalized_request_funcs_t {
MPI_Grequest_query_function *query_fn;
@@
-30,7
+29,7
@@
class Request : public F2C {
void* old_buf_;
/* this is especially for derived datatypes that we need to serialize/unserialize.
* It let us know how to unserialize at the end of the communication */
void* old_buf_;
/* this is especially for derived datatypes that we need to serialize/unserialize.
* It let us know how to unserialize at the end of the communication */
- MPI_Datatype
old_
type_;
+ MPI_Datatype type_;
size_t size_;
aid_t src_;
aid_t dst_;
size_t size_;
aid_t src_;
aid_t dst_;
@@
-40,6
+39,7
@@
class Request : public F2C {
aid_t real_src_;
int real_tag_;
bool truncated_;
aid_t real_src_;
int real_tag_;
bool truncated_;
+ bool unmatched_types_;
size_t real_size_;
MPI_Comm comm_;
simgrid::kernel::activity::ActivityImplPtr action_;
size_t real_size_;
MPI_Comm comm_;
simgrid::kernel::activity::ActivityImplPtr action_;
@@
-47,11
+47,13
@@
class Request : public F2C {
bool detached_;
MPI_Request detached_sender_;
int refcount_;
bool detached_;
MPI_Request detached_sender_;
int refcount_;
+ std::vector<unsigned int> message_id_;
MPI_Op op_;
std::unique_ptr<smpi_mpi_generalized_request_funcs_t> generalized_funcs;
MPI_Op op_;
std::unique_ptr<smpi_mpi_generalized_request_funcs_t> generalized_funcs;
-
MPI_Request*
nbc_requests_;
- int nbc_requests_size_;
+
std::vector<MPI_Request>
nbc_requests_;
+ s4u::Host* src_host_ = nullptr; //!< save SimGrid's source host since it can finished before the recv
static bool match_common(MPI_Request req, MPI_Request sender, MPI_Request receiver);
static bool match_common(MPI_Request req, MPI_Request sender, MPI_Request receiver);
+ static bool match_types(MPI_Datatype stype, MPI_Datatype rtype);
public:
Request() = default;
public:
Request() = default;
@@
-65,17
+67,16
@@
public:
int tag() const { return tag_; }
int flags() const { return flags_; }
bool detached() const { return detached_; }
int tag() const { return tag_; }
int flags() const { return flags_; }
bool detached() const { return detached_; }
- std::string name() const override { return
std::string("MPI_Request")
; }
- MPI_Datatype type() const { return
old_
type_; }
+ std::string name() const override { return
"MPI_Request"
; }
+ MPI_Datatype type() const { return type_; }
void print_request(const char* message) const;
void start();
void cancel();
void init_buffer(int count);
void ref();
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);
- static int finish_nbc_requests(MPI_Request* req);
- int get_nbc_requests_size() const;
- MPI_Request* get_nbc_requests() const;
+ void start_nbc_requests(std::vector<MPI_Request> reqs);
+ static int finish_nbc_requests(MPI_Request* req, int test);
+ std::vector<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);
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);
@@
-101,6
+102,8
@@
public:
static void sendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf,
int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status* status);
static void sendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf,
int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status* status);
+ static void isendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf,
+ int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Request* request);
static void startall(int count, MPI_Request* requests);
static void startall(int count, MPI_Request* requests);
@@
-127,8
+130,6
@@
public:
static Request* f2c(int);
};
static Request* f2c(int);
};
-
-}
-}
+} // namespace simgrid::smpi
#endif
#endif