bughz/predixy
1
0
Fork 0
mirror of https://github.com/joyieldInc/predixy.git synced 2025-12-24 22:46:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from joyieldInc/issue32

Browse Source 
Issue32
This commit is contained in:
fortrue 2018-07-04 23:02:37 -05:00 committed by GitHub
commit 36152f570d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AcceptConnection.h
View File

@ -29,6 +29,7 @@ public:
typedef AcceptConnection Value;
typedef ListNode<AcceptConnection, SharePtr<AcceptConnection>> ListNodeType;
typedef DequeNode<AcceptConnection, SharePtr<AcceptConnection>> DequeNodeType;
typedef Alloc<AcceptConnection, Const::AcceptConnectionAllocCacheSize> Allocator;
public:
AcceptConnection(int fd, sockaddr* addr, socklen_t len);
~AcceptConnection();
@ -97,6 +98,6 @@ private:
typedef List<AcceptConnection> AcceptConnectionList;
typedef Deque<AcceptConnection> AcceptConnectionDeque;
typedef Alloc<AcceptConnection, Const::AcceptConnectionAllocCacheSize> AcceptConnectionAlloc;
typedef AcceptConnection::Allocator AcceptConnectionAlloc;
#endif

4
src/Alloc.h
View File

@ -76,7 +76,7 @@ public:
}
UsedMemory += allocSize<T>();
if (MaxMemory == 0 || UsedMemory <= MaxMemory) {
void* p = ::operator new(allocSize<T>());
void* p = ::operator new(allocSize<T>(), std::nothrow);
if (p) {
try {
obj = new (p) T(args...);
@ -145,7 +145,7 @@ public:
{
int n = --mCnt;
if (n == 0) {
Alloc<T>::destroy(static_cast<T*>(this));
T::Allocator::destroy(static_cast<T*>(this));
} else if (n < 0) {
logError("unref object %p with cnt %d", this, n);
abort();

4
src/Buffer.h
View File

@ -23,6 +23,7 @@ class Buffer :
public RefCntObj<Buffer>
{
public:
typedef Alloc<Buffer, Const::BufferAllocCacheSize> Allocator;
static const int MaxBufFmtAppendLen = 8192;
public:
Buffer& operator=(const Buffer&);
@ -92,12 +93,13 @@ private:
};
typedef List<Buffer> BufferList;
typedef Buffer::Allocator BufferAlloc;
template<>
inline int allocSize<Buffer>()
{
return Buffer::getSize() + sizeof(Buffer);
}
typedef Alloc<Buffer, Const::BufferAllocCacheSize> BufferAlloc;
struct BufferPos
{

4
src/Common.h
View File

@ -32,8 +32,8 @@ namespace Const
static const int MaxCmdLen = 32;
static const int MaxKeyLen = 512;
static const int BufferAllocCacheSize = 64;
static const int RequestAllocCacheSize = 32;
static const int ResponseAllocCacheSize = 32;
static const int RequestAllocCacheSize = 128;
static const int ResponseAllocCacheSize = 128;
static const int AcceptConnectionAllocCacheSize = 32;
static const int ConnectConnectionAllocCacheSize = 4;
};

3
src/ConnectConnection.h
View File

@ -23,6 +23,7 @@ public:
typedef ConnectConnection Value;
typedef ListNode<ConnectConnection> ListNodeType;
typedef DequeNode<ConnectConnection> DequeNodeType;
typedef Alloc<ConnectConnection, Const::ConnectConnectionAllocCacheSize> Allocator;
public:
ConnectConnection(Server* s, bool shared);
~ConnectConnection();
@ -97,6 +98,6 @@ private:
typedef List<ConnectConnection> ConnectConnectionList;
typedef Deque<ConnectConnection> ConnectConnectionDeque;
typedef Alloc<ConnectConnection, Const::ConnectConnectionAllocCacheSize> ConnectConnectionAlloc;
typedef ConnectConnection::Allocator ConnectConnectionAlloc;
#endif

2
src/Connection.cpp
View File

@ -27,7 +27,7 @@ BufferPtr Connection::getBuffer(Handler* h, bool allowNew)
}
}
if (!mBuf || mBuf->full()) {
BufferPtr buf = Alloc<Buffer>::create();
BufferPtr buf = BufferAlloc::create();
if (mBuf) {
mBuf->concat(buf);
}

6
src/EpollMultiplexor.cpp
View File

@ -31,12 +31,9 @@ bool EpollMultiplexor::addSocket(Socket* s, int evts)
event.events |= (evts & ReadEvent) ? EPOLLIN : 0;
event.events |= (evts & WriteEvent) ? EPOLLOUT : 0;
event.events |= EPOLLET;
//event.events |= EPOLLONESHOT;
event.data.ptr = s;
int ret = epoll_ctl(mFd, EPOLL_CTL_ADD, s->fd(), &event);
if (ret == 0) {
s->setEvent(evts);
}
int ret = epoll_ctl(mFd, EPOLL_CTL_ADD, s->fd(), &event);
return ret == 0;
}
@ -61,7 +58,6 @@ bool EpollMultiplexor::addEvent(Socket* s, int evts)
}
if ((s->getEvent() | evts) != s->getEvent()) {
event.events |= EPOLLET;
//event.events |= EPOLLONESHOT;
int ret = epoll_ctl(mFd, EPOLL_CTL_MOD, s->fd(), &event);
if (ret == 0) {
s->setEvent(s->getEvent() | evts);

3
src/Handler.cpp
View File

@ -315,7 +315,6 @@ void Handler::addAcceptSocket(int fd, sockaddr* addr, socklen_t len)
AcceptConnection* c = nullptr;
try {
c = AcceptConnectionAlloc::create(fd, addr, len);
logNotice("h %d accept c %s %d", id(), c->peer(), fd);
} catch (ExceptionBase& e) {
logWarn("h %d create connection for client %d fail %s",
id(), fd, e.what());
@ -368,6 +367,8 @@ void Handler::addAcceptSocket(int fd, sockaddr* addr, socklen_t len)
logWarn("h %d destroy c %s %d with add to event loop fail:%s",
id(), c->peer(), c->fd(), StrError());
AcceptConnectionAlloc::destroy(c);
} else {
logNotice("h %d accept c %s %d assign to h %d", id(), c->peer(), fd, dst->id());
}
}

1
src/KqueueMultiplexor.h
View File

@ -67,6 +67,5 @@ int KqueueMultiplexor::wait(long usec, T* handler)
typedef KqueueMultiplexor Multiplexor;
#define _MULTIPLEXOR_ASYNC_ASSIGN_
#endif

38
src/Request.cpp
View File

@ -98,6 +98,7 @@ Request::Request(GenericCode code):
Request::~Request()
{
clear();
}
void Request::clear()
@ -155,13 +156,14 @@ void Request::set(const RequestParser& p, Request* leader)
}
mHead = r->mReq;
mReq = p.request();
mLeader = leader;
if (leader == this) {
if (mType == Command::Mset || mType == Command::Msetnx) {
mFollowers = (p.argNum() - 1) >> 1;
} else {
mFollowers = p.argNum() - 1;
}
} else {
mLeader = leader;
}
} else {
mReq = p.request();
@ -287,7 +289,7 @@ void Request::adjustScanCursor(long cursor)
void Request::follow(Request* leader)
{
++mFollowers;
leader->mFollowers += 1;
if (leader == this) {
return;
}
@ -338,49 +340,49 @@ int Request::fill(IOVec* vecs, int len)
void Request::setResponse(Response* res)
{
mDone = true;
if (mLeader) {
mLeader->mFollowersDone += 1;
if (Request* ld = leader()) {
ld->mFollowersDone += 1;
switch (mType) {
case Command::Mget:
mRes = res;
break;
case Command::Mset:
if (Response* leaderRes = mLeader->getResponse()) {
if (Response* leaderRes = ld->getResponse()) {
if (res->isError() && !leaderRes->isError()) {
mLeader->mRes = res;
ld->mRes = res;
}
} else {
mLeader->mRes = res;
ld->mRes = res;
}
break;
case Command::Msetnx:
if (Response* leaderRes = mLeader->getResponse()) {
if (Response* leaderRes = ld->getResponse()) {
if (!leaderRes->isError() &&
(res->isError() || res->integer() == 0)) {
mLeader->mRes = res;
ld->mRes = res;
}
} else {
mLeader->mRes = res;
ld->mRes = res;
}
break;
case Command::Touch:
case Command::Exists:
case Command::Del:
case Command::Unlink:
if (!mLeader->mRes) {
mLeader->mRes = res;
if (!ld->mRes) {
ld->mRes = res;
}
if (mLeader->isDone()) {
mLeader->mRes->set(mLeader->mRes->integer());
if (ld->isDone()) {
ld->mRes->set(ld->mRes->integer());
}
break;
case Command::ScriptLoad:
if (Response* leaderRes = mLeader->getResponse()) {
if (Response* leaderRes = ld->getResponse()) {
if (leaderRes->isString() && !res->isString()) {
mLeader->mRes = res;
ld->mRes = res;
}
} else {
mLeader->mRes = res;
ld->mRes = res;
}
break;
default:
@ -395,7 +397,7 @@ void Request::setResponse(Response* res)
bool Request::isDone() const
{
if (mLeader == this) {
if (isLeader()) {
switch (mType) {
case Command::Mget:
case Command::Psubscribe:

9
src/Request.h
View File

@ -25,6 +25,7 @@ class Request :
public:
typedef Request Value;
typedef ListNode<Request, SharePtr<Request>, RequestListIndex::Size> ListNodeType;
typedef Alloc<Request, Const::RequestAllocCacheSize> Allocator;
static const int MaxRedirectLimit = 3;
enum GenericCode
{
@ -70,7 +71,7 @@ public:
bool isDone() const;
AcceptConnection* connection() const
{
return mConn;
return mLeader ? mLeader->mConn : mConn;
}
void detach()
{
@ -119,11 +120,11 @@ public:
}
Request* leader() const
{
return mLeader;
return isLeader() ? const_cast<Request*>(this) : (Request*)mLeader;
}
bool isLeader() const
{
return mLeader == this;
return mFollowers > 0;
}
bool isDelivered() const
{
@ -181,6 +182,6 @@ private:
typedef List<Request, RequestListIndex::Recv> RecvRequestList;
typedef List<Request, RequestListIndex::Send> SendRequestList;
typedef Alloc<Request, Const::RequestAllocCacheSize> RequestAlloc;
typedef Request::Allocator RequestAlloc;
#endif

3
src/Response.h
View File

@ -18,6 +18,7 @@ class Response :
public:
typedef Response Value;
typedef ListNode<Response, SharePtr<Response>> ListNodeType;
typedef Alloc<Response, Const::ResponseAllocCacheSize> Allocator;
enum GenericCode
{
Pong,
@ -137,6 +138,6 @@ private:
};
typedef List<Response> ResponseList;
typedef Alloc<Response, Const::ResponseAllocCacheSize> ResponseAlloc;
typedef Response::Allocator ResponseAlloc;
#endif

5
src/ServerGroup.cpp
View File

@ -162,6 +162,9 @@ Server* ServerGroup::getReadServer(Handler* h, DC* localDC) const
continue;
}
DC* dc = s->dc();
if (!dc) {
continue;
}
int dcrp = localDC->getReadPriority(dc);
if (dcrp <= 0) {
continue;
@ -221,7 +224,7 @@ Server* ServerGroup::getReadServer(Handler* h, DC* localDC) const
dc = sdc[0];
found = true;
}
if (!found) {//dc maybe nullptr even we found
if (!found) {
return nullptr;
}
Server* deadServs[Const::MaxServInGroup];