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
Modernize method declarations.
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Comm.hpp
diff --git
a/include/simgrid/s4u/Comm.hpp
b/include/simgrid/s4u/Comm.hpp
index
612266e
..
49b9071
100644
(file)
--- a/
include/simgrid/s4u/Comm.hpp
+++ b/
include/simgrid/s4u/Comm.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-20
20
. 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. */
@@
-9,7
+9,6
@@
#include <simgrid/forward.h>
#include <simgrid/s4u/Activity.hpp>
#include <simgrid/forward.h>
#include <simgrid/s4u/Activity.hpp>
-#include <atomic>
#include <string>
#include <vector>
#include <string>
#include <vector>
@@
-29,10
+28,9
@@
class XBT_PUBLIC Comm : public Activity_T<Comm> {
void* src_buff_ = nullptr;
size_t src_buff_size_ = sizeof(void*);
std::string tracing_category_ = "";
void* src_buff_ = nullptr;
size_t src_buff_size_ = sizeof(void*);
std::string tracing_category_ = "";
- std::atomic_int_fast32_t refcount_{0};
/* FIXME: expose these elements in the API */
bool detached_ = false;
/* FIXME: expose these elements in the API */
bool detached_ = false;
-
int (*match_fun_)(void*, void*, kernel::activity::CommImpl*)
= nullptr;
+
bool (*match_fun_)(void*, void*, kernel::activity::CommImpl*)
= nullptr;
void (*clean_fun_)(void*) = nullptr;
void (*copy_data_function_)(kernel::activity::CommImpl*, void*, size_t) = nullptr;
void (*clean_fun_)(void*) = nullptr;
void (*copy_data_function_)(kernel::activity::CommImpl*, void*, size_t) = nullptr;
@@
-40,12
+38,10
@@
class XBT_PUBLIC Comm : public Activity_T<Comm> {
public:
#ifndef DOXYGEN
public:
#ifndef DOXYGEN
- friend XBT_PUBLIC void intrusive_ptr_release(Comm* c);
- friend XBT_PUBLIC void intrusive_ptr_add_ref(Comm* c);
friend Mailbox; // Factory of comms
#endif
friend Mailbox; // Factory of comms
#endif
-
virtual ~Comm()
;
+
~Comm() override
;
static xbt::signal<void(Actor const&)> on_sender_start;
static xbt::signal<void(Actor const&)> on_receiver_start;
static xbt::signal<void(Actor const&)> on_sender_start;
static xbt::signal<void(Actor const&)> on_receiver_start;
@@
-53,14
+49,14
@@
public:
/*! take a vector s4u::CommPtr and return when one of them is finished.
* The return value is the rank of the first finished CommPtr. */
/*! take a vector s4u::CommPtr and return when one of them is finished.
* The return value is the rank of the first finished CommPtr. */
- static int wait_any(
std::vector<CommPtr>
* comms) { return wait_any_for(comms, -1); }
+ static int wait_any(
const std::vector<CommPtr>
* comms) { return wait_any_for(comms, -1); }
/*! Same as wait_any, but with a timeout. If the timeout occurs, parameter last is returned.*/
/*! Same as wait_any, but with a timeout. If the timeout occurs, parameter last is returned.*/
- static int wait_any_for(std::vector<CommPtr>* comms_in, double timeout);
+ static int wait_any_for(
const
std::vector<CommPtr>* comms_in, double timeout);
/*! take a vector s4u::CommPtr and return when all of them is finished. */
/*! take a vector s4u::CommPtr and return when all of them is finished. */
- static void wait_all(std::vector<CommPtr>* comms);
+ static void wait_all(
const
std::vector<CommPtr>* comms);
/*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */
/*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */
- static int test_any(
std::vector<CommPtr>
* comms);
+ static int test_any(
const std::vector<CommPtr>
* comms);
Comm* start() override;
Comm* wait() override;
Comm* start() override;
Comm* wait() override;
@@
-117,11
+113,11
@@
public:
CommPtr set_tracing_category(const std::string& category);
/** Retrieve the mailbox on which this comm acts */
CommPtr set_tracing_category(const std::string& category);
/** Retrieve the mailbox on which this comm acts */
- Mailbox* get_mailbox();
+ Mailbox* get_mailbox()
const
;
/** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining() */
/** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining() */
- size_t get_dst_data_size();
+ size_t get_dst_data_size()
const
;
- Actor* get_sender();
+ Actor* get_sender()
const
;
};
} // namespace s4u
} // namespace simgrid
};
} // namespace s4u
} // namespace simgrid