aboutsummaryrefslogtreecommitdiff
path: root/src/socketengines
diff options
context:
space:
mode:
authorGravatar Sadie Powell2019-02-07 12:14:07 +0000
committerGravatar Sadie Powell2019-02-07 12:14:07 +0000
commite862582e7e11a8badb4a92d001a3d53eae2d2401 (patch)
tree264fed5a28c45995c5d296d56622a0d0601de06e /src/socketengines
parentMerge branch 'insp3' into master. (diff)
LogManager: remove fakederef.
Diffstat (limited to 'src/socketengines')
-rw-r--r--src/socketengines/socketengine_epoll.cpp14
-rw-r--r--src/socketengines/socketengine_kqueue.cpp6
-rw-r--r--src/socketengines/socketengine_poll.cpp16
-rw-r--r--src/socketengines/socketengine_select.cpp4
4 files changed, 20 insertions, 20 deletions
diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 60b365ee1..064ee913b 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -82,13 +82,13 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
int fd = eh->GetFd();
if (fd < 0)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd);
return false;
}
if (!SocketEngine::AddFdRef(eh))
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
return false;
}
@@ -99,11 +99,11 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
if (i < 0)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Error adding fd: %d to socketengine: %s", fd, strerror(errno));
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Error adding fd: %d to socketengine: %s", fd, strerror(errno));
return false;
}
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
eh->SetEventMask(event_mask);
ResizeDouble(events);
@@ -131,7 +131,7 @@ void SocketEngine::DelFd(EventHandler* eh)
int fd = eh->GetFd();
if (fd < 0)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd);
return;
}
@@ -143,12 +143,12 @@ void SocketEngine::DelFd(EventHandler* eh)
if (i < 0)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "epoll_ctl can't remove socket: %s", strerror(errno));
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "epoll_ctl can't remove socket: %s", strerror(errno));
}
SocketEngine::DelFdRef(eh);
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
}
int SocketEngine::DispatchEvents()
diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index b23cfbd9d..ac7d6ca53 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -89,7 +89,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
struct kevent* ke = GetChangeKE();
EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, static_cast<void*>(eh));
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
eh->SetEventMask(event_mask);
OnSetEvent(eh, 0, event_mask);
@@ -104,7 +104,7 @@ void SocketEngine::DelFd(EventHandler* eh)
if (fd < 0)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "DelFd() on invalid fd: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEFAULT, "DelFd() on invalid fd: %d", fd);
return;
}
@@ -119,7 +119,7 @@ void SocketEngine::DelFd(EventHandler* eh)
SocketEngine::DelFdRef(eh);
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
}
void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 339045a8c..517d5a6e8 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -66,13 +66,13 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
int fd = eh->GetFd();
if (fd < 0)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd);
return false;
}
if (static_cast<unsigned int>(fd) < fd_mappings.size() && fd_mappings[fd] != -1)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
return false;
}
@@ -80,7 +80,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
if (!SocketEngine::AddFdRef(eh))
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
return false;
}
@@ -92,7 +92,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
events[index].fd = fd;
events[index].events = mask_to_poll(event_mask);
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d (%d; index %d)", fd, events[index].events, index);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d (%d; index %d)", fd, events[index].events, index);
eh->SetEventMask(event_mask);
return true;
}
@@ -102,7 +102,7 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
int fd = eh->GetFd();
if (fd < 0 || static_cast<unsigned int>(fd) >= fd_mappings.size() || fd_mappings[fd] == -1)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SetEvents() on unknown fd: %d", eh->GetFd());
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "SetEvents() on unknown fd: %d", eh->GetFd());
return;
}
@@ -114,13 +114,13 @@ void SocketEngine::DelFd(EventHandler* eh)
int fd = eh->GetFd();
if (fd < 0)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd);
return;
}
if (static_cast<unsigned int>(fd) >= fd_mappings.size() || fd_mappings[fd] == -1)
{
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd() on unknown fd: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "DelFd() on unknown fd: %d", fd);
return;
}
@@ -148,7 +148,7 @@ void SocketEngine::DelFd(EventHandler* eh)
SocketEngine::DelFdRef(eh);
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d (index: %d) "
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d (index: %d) "
"(Filled gap with: %d (index: %d))", fd, index, last_fd, last_index);
}
diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 03f0aca62..9d8225a24 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -69,7 +69,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
if (fd > MaxFD)
MaxFD = fd;
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
return true;
}
@@ -91,7 +91,7 @@ void SocketEngine::DelFd(EventHandler* eh)
if (fd == MaxFD)
--MaxFD;
- ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
+ ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
}
void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)