server_common/a8
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-06-03 16:00:37 +08:00
parent e02169b042
commit c6af863cf2
3 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
a8/ioloop.h
View File

@ -1,6 +1,9 @@
#ifndef A8_IOLOOP_H #ifndef A8_IOLOOP_H
#define A8_IOLOOP_H #define A8_IOLOOP_H
#include <a8/a8.h>
#include <a8/types.h>
namespace a8 namespace a8
{ {
@ -13,13 +16,13 @@ namespace a8
public: public:
void Init(); void Init();
void UnInit(); void UnInit();
volatile int epoll_fd = a8::INVALID_FD;
private: private:
void WorkerThreadProc(); void WorkerThreadProc();
private: private:
int max_client_num_ = 1000; int max_client_num_ = 1000;
volatile int epoll_fd = a8::INVALID_FD;
volatile bool worker_thread_shutdown_ = false; volatile bool worker_thread_shutdown_ = false;
std::thread* worker_thread_ = nullptr; std::thread* worker_thread_ = nullptr;
}; };

60
a8/tcpclient2.cc
View File

@ -12,6 +12,7 @@
#include <a8/a8.h> #include <a8/a8.h>
#include <a8/tcpclient2.h> #include <a8/tcpclient2.h>
#include <a8/ioloop.h>
static const int DEFAULT_MAX_PACKET_LEN = 1024 * 10; static const int DEFAULT_MAX_PACKET_LEN = 1024 * 10;
static const int DEFAULT_MAX_RECV_BUFFERSIZE = 1024 * 64; static const int DEFAULT_MAX_RECV_BUFFERSIZE = 1024 * 64;
@ -21,6 +22,7 @@ namespace a8
TcpClient2::TcpClient2() TcpClient2::TcpClient2()
{ {
send_buffer_mutex_ = new std::mutex(); send_buffer_mutex_ = new std::mutex();
epoll_fd = a8::IoLoop::Instance()->epoll_fd;
} }
TcpClient2::~TcpClient2() TcpClient2::~TcpClient2()
@ -116,21 +118,24 @@ namespace a8
void TcpClient2::DoSend() void TcpClient2::DoSend()
{ {
if (!connected_) {
if (on_connect) {
on_connect(this);
}
}
if(socket_ == -1){ if(socket_ == -1){
return; return;
} }
#if 0
if (!work_node_) { if (!work_node_) {
send_buffer_mutex_.lock(); send_buffer_mutex_->lock();
work_node_ = top_node_; work_node_ = top_node_;
top_node_ = nullptr; top_node_ = nullptr;
bot_node_ = nullptr; bot_node_ = nullptr;
send_buffer_mutex_.unlock(); send_buffer_mutex_->unlock();
} }
if (work_node_) { if (work_node_) {
AsyncSend(); AsyncSend();
} }
#endif
} }
void TcpClient2::DoDisConnect() void TcpClient2::DoDisConnect()
@ -214,13 +219,56 @@ namespace a8
void TcpClient2::NotifyEpollSend() void TcpClient2::NotifyEpollSend()
{ {
sending_ = true; sending_ = true;
#if 0
struct epoll_event ev; struct epoll_event ev;
ev.data.fd = socket_; ev.data.fd = socket_;
ev.events = EPOLLIN | EPOLLOUT | EPOLLRDHUP; ev.events = EPOLLIN | EPOLLOUT | EPOLLRDHUP;
ev.data.ptr = this; ev.data.ptr = this;
::epoll_ctl(epoll_fd, EPOLL_CTL_MOD, socket_, &ev); ::epoll_ctl(epoll_fd, EPOLL_CTL_MOD, socket_, &ev);
#endif }
void TcpClient2::AsyncSend()
{
while (work_node_) {
int sentbytes = ::send(socket_,
work_node_->buff + work_node_->sent_bytes,
work_node_->bufflen - work_node_->sent_bytes,
0);
if (sentbytes <= 0) {
auto err_code = errno;
if (err_code == EAGAIN || err_code == EWOULDBLOCK) {
break;
} else {
Close();
break;
}
}
work_node_->sent_bytes += sentbytes;
if (work_node_->sent_bytes >= work_node_->bufflen) {
a8::SendQueueNode *pdelnode = work_node_;
work_node_ = work_node_->next;
if (!work_node_) {
send_buffer_mutex_->lock();
if (top_node_) {
work_node_ = top_node_;
top_node_ = nullptr;
bot_node_ = nullptr;
}
if (!work_node_) {
sending_ = false;
struct epoll_event ev;
ev.data.fd = socket_;
ev.events = EPOLLIN | EPOLLRDHUP;
ev.data.ptr = this;
::epoll_ctl(epoll_fd, EPOLL_CTL_MOD, socket_, &ev);
}
send_buffer_mutex_->unlock();
}
if (pdelnode->buff) {
free(pdelnode->buff);
}
free(pdelnode);
}
}
} }
} }

3
a8/tcpclient2.h
View File

@ -28,17 +28,20 @@ namespace a8
void DoDisConnect(); void DoDisConnect();
private: private:
volatile int epoll_fd = a8::INVALID_FD;
volatile int socket_ = a8::INVALID_SOCKET; volatile int socket_ = a8::INVALID_SOCKET;
volatile bool sending_ = false; volatile bool sending_ = false;
volatile bool connected_ = false; volatile bool connected_ = false;
std::mutex* send_buffer_mutex_ = nullptr; std::mutex* send_buffer_mutex_ = nullptr;
SendQueueNode *top_node_ = nullptr; SendQueueNode *top_node_ = nullptr;
SendQueueNode *bot_node_ = nullptr; SendQueueNode *bot_node_ = nullptr;
SendQueueNode *work_node_ = nullptr;
void SetActive(bool active); void SetActive(bool active);
bool ActiveStart(); bool ActiveStart();
void ActiveStop(); void ActiveStop();
void NotifyEpollSend(); void NotifyEpollSend();
void AsyncSend();
}; };
} }