* ---------------------------------------------------
*/
-#include "inspircd_config.h"
-#include "globals.h"
#include "inspircd.h"
-#include <vector>
-#include <string>
+#include <sys/select.h>
#include "socketengine_select.h"
-#include "helperfuncs.h"
-SelectEngine::SelectEngine()
+
+SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
{
- log(DEBUG,"SelectEngine::SelectEngine()");
+ ServerInstance->Log(DEBUG,"SelectEngine::SelectEngine()");
EngineHandle = 0;
CurrentSetSize = 0;
}
SelectEngine::~SelectEngine()
{
- log(DEBUG,"SelectEngine::~SelectEngine()");
+ ServerInstance->Log(DEBUG,"SelectEngine::~SelectEngine()");
}
-bool SelectEngine::AddFd(int fd, bool readable, char type)
+bool SelectEngine::AddFd(EventHandler* eh)
{
+ int fd = eh->GetFd();
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
{
- log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+ ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
return false;
}
if (GetRemainingFds() <= 1)
{
- log(DEFAULT,"ERROR: System out of file descriptors!");
+ ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!");
return false;
}
fds[fd] = fd;
- ref[fd] = type;
- if (readable)
- {
- log(DEBUG,"Set readbit");
- ref[fd] |= X_READBIT;
- }
- log(DEBUG,"Add socket %d",fd);
+ if (ref[fd])
+ return false;
+
+ ref[fd] = eh;
+ ServerInstance->Log(DEBUG,"Add socket %d",fd);
CurrentSetSize++;
return true;
}
-bool SelectEngine::DelFd(int fd)
+bool SelectEngine::DelFd(EventHandler* eh)
{
- log(DEBUG,"SelectEngine::DelFd(%d)",fd);
+ int fd = eh->GetFd();
+
+ ServerInstance->Log(DEBUG,"SelectEngine::DelFd(%d)",fd);
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return false;
if (t != fds.end())
{
fds.erase(t);
- log(DEBUG,"Deleted fd %d",fd);
+ ServerInstance->Log(DEBUG,"Deleted fd %d",fd);
}
CurrentSetSize--;
- ref[fd] = 0;
+ ref[fd] = NULL;
return true;
}
return FD_SETSIZE - CurrentSetSize;
}
-int SelectEngine::Wait(int* fdlist)
+int SelectEngine::DispatchEvents()
{
int result = 0;
+ timeval tval;
+ int sresult = 0;
+ EventHandler* ev[MAX_DESCRIPTOR];
FD_ZERO(&wfdset);
FD_ZERO(&rfdset);
- timeval tval;
- int sresult;
+
for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
{
- if (ref[a->second] & X_READBIT)
+ if (ref[a->second]->Readable())
{
FD_SET (a->second, &rfdset);
}
for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
{
if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)))
- fdlist[result++] = a->second;
+ {
+ ev[result++] = ref[a->second];
+ }
}
}
+ /** An event handler may remove its own descriptor from the list, therefore it is not
+ * safe to directly iterate over the list and dispatch events there with STL iterators.
+ * Thats a shame because it makes this code slower and more resource intensive, but maybe
+ * the user should stop using select(), as select() smells anyway.
+ */
+ for (int i = 0; i < result; i++)
+ {
+ ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ev[i]->Readable() ? "read" : "write", ev[i]->GetFd());
+ ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+ }
+
return result;
}