if (EngineHandle == -1)
{
- ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
- ServerInstance->Log(SPARSE,"ERROR: this is a fatal error, exiting now.");
- printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
- printf("ERROR: this is a fatal error, exiting now.");
- InspIRCd::Exit(EXIT_STATUS_SOCKETENGINE);
+ ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno));
+ ServerInstance->Log(SPARSE,"ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.");
+ printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno));
+ printf("ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.\n");
+ ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
}
CurrentSetSize = 0;
}
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
- {
- ServerInstance->Log(DEBUG,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
return false;
- }
+
if (GetRemainingFds() <= 1)
- {
- ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
return false;
- }
+
if (ref[fd])
- {
- ServerInstance->Log(DEBUG,"Slot %d already occupied",fd);
return false;
- }
ref[fd] = eh;
-
- ServerInstance->Log(DEBUG,"***** Add socket %d",fd);
-
struct epoll_event ev;
memset(&ev,0,sizeof(struct epoll_event));
- ServerInstance->Log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
ev.data.fd = fd;
int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
if (i < 0)
{
- ServerInstance->Log(DEBUG,"epoll: List insertion failure!");
return false;
}
+ ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
CurrentSetSize++;
return true;
}
memset(&ev,0,sizeof(struct epoll_event));
ev.events = EPOLLOUT;
ev.data.fd = eh->GetFd();
- int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
- if (i < 0)
- {
- ServerInstance->Log(DEBUG,"epoll: Could not set want write on fd %d!",eh->GetFd());
- }
+ epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
}
-bool EPollEngine::DelFd(EventHandler* eh)
+bool EPollEngine::DelFd(EventHandler* eh, bool force)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
ev.data.fd = fd;
int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
- if (i < 0)
+ if (i < 0 && !force)
return false;
CurrentSetSize--;
ref[fd] = NULL;
+ ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
return true;
}
{
if (events[j].events & EPOLLHUP)
{
- ServerInstance->Log(DEBUG,"Handle error event on fd %d", events[j].data.fd);
if (ref[events[j].data.fd])
ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
continue;
/* Get error number */
if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
errcode = errno;
- ServerInstance->Log(DEBUG,"Handle error event on fd %d: %s", events[j].data.fd, strerror(errcode));
if (ref[events[j].data.fd])
ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
continue;
memset(&ev,0,sizeof(struct epoll_event));
ev.events = EPOLLIN;
ev.data.fd = events[j].data.fd;
- int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);
- if (i < 0)
- {
- ServerInstance->Log(DEBUG,"epoll: Could not reset fd %d!", events[j].data.fd);
- }
+ epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);
if (ref[events[j].data.fd])
ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
}