A
lgorithmique
N
umérique
D
istribuée
Private GIT Repository
projects
/
loba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename process::send() -> process::send_all().
[loba.git]
/
communicator.h
diff --git
a/communicator.h
b/communicator.h
index b04301ad87574aff718d3fc7b8539d1973183bab..66dc800b4feeea9502902348847fa85757e41682 100644
(file)
--- a/
communicator.h
+++ b/
communicator.h
@@
-9,14
+9,6
@@
#include <msg/msg.h>
#include "hostdata.h"
#include <msg/msg.h>
#include "hostdata.h"
-// Cannot include "options.h" without error, so only declare the
-// needed functions.
-namespace opt {
- bool parse_args(int* argc, char* argv[]);
- void print();
- void usage();
-}
-
class message {
public:
enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };
class message {
public:
enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };
@@
-42,8
+34,9
@@
public:
void send(const char* dest, message* msg);
// Try to get a message. Returns true on success.
void send(const char* dest, message* msg);
// Try to get a message. Returns true on success.
- // If "wait" is true, blocks until success.
- bool recv(message*& msg, m_host_t& from, bool wait);
+ // Parameter "timeout" may be 0 for non-blocking operation, -1 for
+ // infinite waiting, or any positive timeout.
+ bool recv(message*& msg, m_host_t& from, double timeout);
// Try to flush pending sending communications.
// If "wait" is true, blocks until success.
// Try to flush pending sending communications.
// If "wait" is true, blocks until success.
@@
-59,8
+52,6
@@
private:
// List of pending send communications
std::list<msg_comm_t> sent_comm;
// List of pending send communications
std::list<msg_comm_t> sent_comm;
- static int send_count_before_flush;
- int send_counter;
// Queue of received messages
std::queue<m_task_t> received;
// Queue of received messages
std::queue<m_task_t> received;
@@
-83,12
+74,6
@@
private:
// Used to test if a communication is over, and to destroy it if it is
static bool comm_test_n_destroy(msg_comm_t comm);
// Used to test if a communication is over, and to destroy it if it is
static bool comm_test_n_destroy(msg_comm_t comm);
-
- // Make opt::* functions our friends to provide them an access to
- // send_count_before_flush
- friend bool opt::parse_args(int*, char* []);
- friend void opt::print();
- friend void opt::usage();
};
#endif // !COMMUNICATOR_H
};
#endif // !COMMUNICATOR_H