pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 20:46:39 +02:00
Code Activity

Merge usefulness of Flags and Extensible classes into Extensible, made most flags we have juse strings instead of defines/enums

Browse Source
This commit is contained in:
Adam
2013-01-21 22:31:16 -05:00
parent 51c049e1a7
commit ddaa001daf
128 changed files with 1857 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/socketengines/socketengine_epoll.cpp
+9 -12
View File
@@ -40,23 +40,20 @@ void SocketEngine::Shutdown()
void SocketEngine::Change(Socket *s, bool set, SocketFlag flag)
{
if (set == s->HasFlag(flag))
if (set == s->flags[flag])
return;
bool before_registered = s->HasFlag(SF_READABLE) || s->HasFlag(SF_WRITABLE);
bool before_registered = s->flags[SF_READABLE] || s->flags[SF_WRITABLE];
if (set)
s->SetFlag(flag);
else
s->UnsetFlag(flag);
s->flags[flag] = set;
bool now_registered = s->HasFlag(SF_READABLE) || s->HasFlag(SF_WRITABLE);
bool now_registered = s->flags[SF_READABLE] || s->flags[SF_WRITABLE];
epoll_event ev;
memset(&ev, 0, sizeof(ev));
ev.events = (s->HasFlag(SF_READABLE) ? EPOLLIN : 0) | (s->HasFlag(SF_WRITABLE) ? EPOLLOUT : 0);
ev.events = (s->flags[SF_READABLE] ? EPOLLIN : 0) | (s->flags[SF_WRITABLE] ? EPOLLOUT : 0);
ev.data.fd = s->GetFD();
int mod;
@@ -107,18 +104,18 @@ void SocketEngine::Process()
if (!s->Process())
{
if (s->HasFlag(SF_DEAD))
if (s->flags[SF_DEAD])
delete s;
continue;
}
if ((ev.events & EPOLLIN) && !s->ProcessRead())
s->SetFlag(SF_DEAD);
s->flags[SF_DEAD] = true;
if ((ev.events & EPOLLOUT) && !s->ProcessWrite())
s->SetFlag(SF_DEAD);
s->flags[SF_DEAD] = true;
if (s->HasFlag(SF_DEAD))
if (s->flags[SF_DEAD])
delete s;
}
}