breeze/CppNet
1
0
Fork 0
mirror of https://github.com/caozhiyi/CppNet.git synced 2026-01-26 16:30:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

modify timer interface and export header files.

Browse Source
This commit is contained in:
caozhiyi
2021-06-04 17:23:56 +08:00
parent 2e65c30e46
commit c238d4cc8d
9 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
cppnet/socket/rw_socket.cpp
View File

@@ -27,12 +27,19 @@ RWSocket::RWSocket(std::shared_ptr<AlloterWrap> alloter):
RWSocket::RWSocket(uint64_t sock, std::shared_ptr<AlloterWrap> alloter):
Socket(sock),
_timer_id(0),
_alloter(alloter) {
_block_pool = _alloter->PoolNewSharePtr<BlockMemoryPool>(__mem_block_size, __mem_block_add_step);
}
RWSocket::~RWSocket() {
if (_timer_id > 0) {
auto dispatcher = GetDispatcher();
if (dispatcher) {
dispatcher->StopTimer(_timer_id);
}
_timer_id = 0;
}
}
bool RWSocket::GetAddress(std::string& ip, uint16_t& port) {
@@ -41,9 +48,15 @@ bool RWSocket::GetAddress(std::string& ip, uint16_t& port) {
return true;
}
bool RWSocket::Close() {
void RWSocket::Close() {
Disconnect();
return true;
if (_timer_id > 0) {
auto dispatcher = GetDispatcher();
if (dispatcher) {
dispatcher->StopTimer(_timer_id);
}
_timer_id = 0;
}
}
void RWSocket::OnTimer() {
@@ -54,18 +67,26 @@ void RWSocket::OnTimer() {
cppnet_base->OnTimer(shared_from_this());
}
uint64_t RWSocket::AddTimer(uint32_t interval, bool always) {
void RWSocket::AddTimer(uint32_t interval, bool always) {
if (_timer_id > 0) {
return;
}
auto dispatcher = GetDispatcher();
if (dispatcher) {
return dispatcher->AddTimer(shared_from_this(), interval, always);
_timer_id = dispatcher->AddTimer(shared_from_this(), interval, always);
}
return 0;
}
void RWSocket::StopTimer(uint64_t timer_id) {
void RWSocket::StopTimer() {
if (_timer_id == 0) {
return;
}
auto dispatcher = GetDispatcher();
if (dispatcher) {
dispatcher->StopTimer(timer_id);
dispatcher->StopTimer(_timer_id);
_timer_id = 0;
}
}

7
cppnet/socket/rw_socket.h
View File

@@ -31,15 +31,15 @@ public:
virtual uint64_t GetSocket() { return _sock; }
virtual bool GetAddress(std::string& ip, uint16_t& port);
virtual bool Close();
virtual void Close();
virtual void Read() {}
virtual bool Write(const char* src, uint32_t len) { return false; }
virtual void Connect(const std::string& ip, uint16_t port) {}
virtual void Disconnect() {}
virtual uint64_t AddTimer(uint32_t interval, bool always = false);
virtual void StopTimer(uint64_t timer_id);
virtual void AddTimer(uint32_t interval, bool always = false);
virtual void StopTimer();
virtual void OnTimer();
virtual void OnRead(Event* event, uint32_t len = 0) {}
@@ -55,6 +55,7 @@ public:
std::shared_ptr<AlloterWrap> GetAlloter() { return _alloter; }
protected:
uint32_t _timer_id;
std::shared_ptr<AlloterWrap> _alloter;
std::shared_ptr<BlockMemoryPool> _block_pool;
};