Skip to content

Commit

Permalink
Remove very verbose debugging of event system
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5589 e03df62e-2008-0410-955e-edbf42e46eb7
  • Loading branch information
braindigitalis committed Oct 30, 2006
1 parent f7379df commit ce82b3b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
8 changes: 3 additions & 5 deletions src/socketengine_epoll.cpp
Expand Up @@ -79,6 +79,9 @@ bool EPollEngine::AddFd(EventHandler* eh)

void EPollEngine::WantWrite(EventHandler* eh)
{
/** Use oneshot so that the system removes the writeable
* status for us and saves us a call.
*/
struct epoll_event ev;
ev.events = EPOLLOUT | EPOLLONESHOT;
ev.data.fd = eh->GetFd();
Expand All @@ -87,10 +90,6 @@ void EPollEngine::WantWrite(EventHandler* eh)
{
ServerInstance->Log(DEBUG,"epoll: Could not set want write on fd %d!",eh->GetFd());
}
else
{
ServerInstance->Log(DEBUG,"epoll: WantWrite set on %d",eh->GetFd());
}
}

bool EPollEngine::DelFd(EventHandler* eh)
Expand Down Expand Up @@ -137,7 +136,6 @@ int EPollEngine::DispatchEvents()
ServerInstance->Log(DEBUG,"Handle %s event on fd %d",events[j].events & EPOLLOUT ? "write" : "read", events[j].data.fd);
if (events[j].events & EPOLLOUT)
{
ServerInstance->Log(DEBUG,"One shot, we should EPOLL_CTL_MOD here to set it read only.");
struct epoll_event ev;
ev.events = EPOLLIN;
ev.data.fd = events[j].data.fd;
Expand Down
9 changes: 4 additions & 5 deletions src/socketengine_kqueue.cpp
Expand Up @@ -109,17 +109,17 @@ bool KQueueEngine::DelFd(EventHandler* eh)

void KQueueEngine::WantWrite(EventHandler* eh)
{
/** When changing an item in a kqueue, there is no 'modify' call
* as in epoll. Instead, we add the item again, and this overwrites
* the original setting rather than adding it twice. See man kqueue.
*/
struct kevent ke;
EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
if (i == -1)
{
ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d for wanting write", eh->GetFd());
}
else
{
ServerInstance->Log(DEBUG,"kqueue: Set fd %d for want write", eh->GetFd());
}
}

int KQueueEngine::GetMaxFds()
Expand All @@ -142,7 +142,6 @@ int KQueueEngine::DispatchEvents()
ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ke_list[j].flags & EVFILT_WRITE ? "write" : "read", ke_list[j].ident);
if (ke_list[j].flags & EVFILT_WRITE)
{
ServerInstance->Log(DEBUG,"kqueue: Write socket wants to be set back to read");
struct kevent ke;
EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
Expand Down
6 changes: 1 addition & 5 deletions src/socketengine_select.cpp
Expand Up @@ -60,11 +60,7 @@ bool SelectEngine::AddFd(EventHandler* eh)

void SelectEngine::WantWrite(EventHandler* eh)
{
int fd = eh->GetFd();

writeable[fd] = true;

ServerInstance->Log(DEBUG,"Set %d to writeable", fd);
writeable[eh->GetFd()] = true;
}

bool SelectEngine::DelFd(EventHandler* eh)
Expand Down

0 comments on commit ce82b3b

Please sign in to comment.