* ---------------------------------------------------
*/
-#include "inspircd_config.h"
-#include "globals.h"
#include "inspircd.h"
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
-#include <vector>
-#include <string>
#include "socketengine_kqueue.h"
bool KQueueEngine::AddFd(EventHandler* eh)
{
int fd = eh->GetFd();
+
+ ServerInstance->Log(DEBUG,"KQueueEngine::AddFd(%d)",fd);
+
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
{
ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
}
if (ref[fd])
+ {
+ ServerInstance->Log(DEFAULT,"ERROR: Slot already occupied");
return false;
+ }
ref[fd] = eh;
ServerInstance->Log(DEBUG,"Add socket %d",fd);
struct kevent ke;
ServerInstance->Log(DEBUG,"kqueue: Add socket to events, kq=%d socket=%d",EngineHandle,fd);
EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
if (i == -1)
{
struct kevent ke;
EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
if (i == -1)
{
- ServerInstance->Log(DEBUG,"kqueue: Failed to remove socket from queue!");
+ ServerInstance->Log(DEBUG,"kqueue: Failed to remove socket from queue: %s",strerror(errno));
return false;
}
CurrentSetSize--;
ref[fd] = NULL;
+
return true;
}