summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-12-23 23:52:53 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-12-23 23:52:53 +0000
commite473ba1a256b6b38a7ac567ae5b77612e1781a82 (patch)
tree4e544d2889d53566a4c6ad7ae2e752232ec8ced4
parent72da54c1c2a4f4b59d852e79adaee3348c4874ad (diff)
We can't log in SocketEngine::DelFd(), because the fd we're removing might just be that of the logger!
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6082 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/socketengine_epoll.cpp5
-rw-r--r--src/socketengine_kqueue.cpp2
-rw-r--r--src/socketengine_select.cpp5
3 files changed, 0 insertions, 12 deletions
diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index b3c30b8c8..0be3b25c8 100644
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -93,8 +93,6 @@ void EPollEngine::WantWrite(EventHandler* eh)
bool EPollEngine::DelFd(EventHandler* eh)
{
- ServerInstance->Log(DEBUG,"EPollEngine::DelFd(%d)",eh->GetFd());
-
int fd = eh->GetFd();
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return false;
@@ -106,10 +104,7 @@ bool EPollEngine::DelFd(EventHandler* eh)
int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
if (i < 0)
- {
- ServerInstance->Log(DEBUG,"epoll: List deletion failure: %s",strerror(errno));
return false;
- }
CurrentSetSize--;
ref[fd] = NULL;
diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp
index 469f5908d..bbc36ea7f 100644
--- a/src/socketengine_kqueue.cpp
+++ b/src/socketengine_kqueue.cpp
@@ -84,8 +84,6 @@ bool KQueueEngine::DelFd(EventHandler* eh)
{
int fd = eh->GetFd();
- ServerInstance->Log(DEBUG,"KQueueEngine::DelFd(%d)",fd);
-
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return false;
diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index 80c8646af..f1960f09d 100644
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -64,17 +64,12 @@ bool SelectEngine::DelFd(EventHandler* eh)
{
int fd = eh->GetFd();
- ServerInstance->Log(DEBUG,"SelectEngine::DelFd(%d)",fd);
-
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return false;
std::map<int,int>::iterator t = fds.find(fd);
if (t != fds.end())
- {
fds.erase(t);
- ServerInstance->Log(DEBUG,"Deleted fd %d",fd);
- }
CurrentSetSize--;
ref[fd] = NULL;