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
Merge pull request #200 from Takishipp/clear_fct
[simgrid.git]
/
src
/
mc
/
remote
/
Client.hpp
diff --git
a/src/mc/remote/Client.hpp
b/src/mc/remote/Client.hpp
index
7974601
..
b9059a3
100644
(file)
--- a/
src/mc/remote/Client.hpp
+++ b/
src/mc/remote/Client.hpp
@@
-30,12
+30,20
@@
class XBT_PUBLIC() Client {
private:
bool active_ = false;
Channel channel_;
private:
bool active_ = false;
Channel channel_;
- static std::unique_ptr<Client>
client
_;
+ static std::unique_ptr<Client>
instance
_;
public:
Client();
explicit Client(int fd) : active_(true), channel_(fd) {}
void handleMessages();
public:
Client();
explicit Client(int fd) : active_(true), channel_(fd) {}
void handleMessages();
+
+private:
+ void handleDeadlockCheck(mc_message_t* msg);
+ void handleContinue(mc_message_t* msg);
+ void handleSimcall(s_mc_message_simcall_handle_t* message);
+ void handleRestore(s_mc_message_restore_t* msg);
+
+public:
Channel const& getChannel() const { return channel_; }
Channel& getChannel() { return channel_; }
void mainLoop();
Channel const& getChannel() const { return channel_; }
Channel& getChannel() { return channel_; }
void mainLoop();
@@
-51,17
+59,9
@@
public:
// Singleton :/
// TODO, remove the singleton antipattern.
static Client* initialize();
// Singleton :/
// TODO, remove the singleton antipattern.
static Client* initialize();
- static Client* get() { return
client
_.get(); }
+ static Client* get() { return
instance
_.get(); }
};
}
}
};
}
}
-SG_BEGIN_DECL()
-
-#if SIMGRID_HAVE_MC
-void MC_ignore(void* addr, std::size_t size);
-#endif
-
-SG_END_DECL()
-
#endif
#endif