* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* ---------------------------------------------------
*/
-/* $Core: libIRCDsocketengine */
+/* $Core */
/********* DEFAULTS **********/
+
/* $ExtraSources: socketengines/socketengine_select.cpp */
/* $ExtraObjects: socketengine_select.o */
+/* $If: USE_POLL */
+/* $ExtraSources: socketengines/socketengine_poll.cpp */
+/* $ExtraObjects: socketengine_poll.o */
+/* $EndIf */
+
/* $If: USE_KQUEUE */
/* $ExtraSources: socketengines/socketengine_kqueue.cpp */
/* $ExtraObjects: socketengine_kqueue.o */
#include "inspircd.h"
#include "socketengine.h"
-int EventHandler::GetFd()
+EventHandler::EventHandler()
{
- return this->fd;
+ fd = -1;
}
void EventHandler::SetFd(int FD)
this->fd = FD;
}
-bool EventHandler::Readable()
+SocketEngine::SocketEngine()
{
- return true;
+ TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
+ lastempty = ServerInstance->Time();
+ indata = outdata = 0;
}
-bool EventHandler::Writeable()
+SocketEngine::~SocketEngine()
{
- return false;
}
-void SocketEngine::WantWrite(EventHandler* eh)
+void SocketEngine::SetEventMask(EventHandler* eh, int mask)
{
+ eh->event_mask = mask;
}
-SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
+void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
{
- TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
- lastempty = time(NULL);
- indata = outdata = 0;
-}
+ int old_m = eh->event_mask;
+ int new_m = old_m;
-SocketEngine::~SocketEngine()
-{
+ // if we are changing read/write type, remove the previously set bit
+ if (change & FD_WANT_READ_MASK)
+ new_m &= ~FD_WANT_READ_MASK;
+ if (change & FD_WANT_WRITE_MASK)
+ new_m &= ~FD_WANT_WRITE_MASK;
+
+ // if adding a trial read/write, insert it into the set
+ if (change & FD_TRIAL_NOTE_MASK && !(old_m & FD_TRIAL_NOTE_MASK))
+ trials.insert(eh->GetFd());
+
+ new_m |= change;
+ if (new_m == old_m)
+ return;
+
+ eh->event_mask = new_m;
+ OnSetEvent(eh, old_m, new_m);
}
-bool SocketEngine::AddFd(EventHandler* eh)
+void SocketEngine::DispatchTrialWrites()
{
- return true;
+ std::vector<int> working_list;
+ working_list.reserve(trials.size());
+ working_list.assign(trials.begin(), trials.end());
+ trials.clear();
+ for(unsigned int i=0; i < working_list.size(); i++)
+ {
+ int fd = working_list[i];
+ EventHandler* eh = GetRef(fd);
+ if (!eh)
+ continue;
+ int mask = eh->event_mask;
+ eh->event_mask &= ~(FD_ADD_TRIAL_READ | FD_ADD_TRIAL_WRITE);
+ if ((mask & (FD_ADD_TRIAL_READ | FD_READ_WILL_BLOCK)) == FD_ADD_TRIAL_READ)
+ eh->HandleEvent(EVENT_READ, 0);
+ if ((mask & (FD_ADD_TRIAL_WRITE | FD_WRITE_WILL_BLOCK)) == FD_ADD_TRIAL_WRITE)
+ eh->HandleEvent(EVENT_WRITE, 0);
+ }
}
bool SocketEngine::HasFd(int fd)
{
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ if ((fd < 0) || (fd > GetMaxFds()))
return false;
return ref[fd];
}
EventHandler* SocketEngine::GetRef(int fd)
{
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ if ((fd < 0) || (fd > GetMaxFds()))
return 0;
return ref[fd];
}
-bool SocketEngine::DelFd(EventHandler* eh, bool force)
-{
- return true;
-}
-
-int SocketEngine::GetMaxFds()
-{
- return 0;
-}
-
-int SocketEngine::GetRemainingFds()
-{
- return 0;
-}
-
-int SocketEngine::DispatchEvents()
-{
- return 0;
-}
-
-std::string SocketEngine::GetName()
-{
- return "misconfigured";
-}
-
bool SocketEngine::BoundsCheckFd(EventHandler* eh)
-{
+{
if (!eh)
return false;
- if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS))
+ if ((eh->GetFd() < 0) || (eh->GetFd() > GetMaxFds()))
return false;
return true;
}
return ioctlsocket(fd, FIONBIO, &opt);
#else
int flags = fcntl(fd, F_GETFL, 0);
- return fcntl(fd, F_SETFL, flags ^ O_NONBLOCK);
+ return fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
#endif
}
int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen)
{
this->UpdateStats(len, 0);
- return recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
+ return recvfrom(fd->GetFd(), buf, len, flags, from, fromlen);
}
int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
{
this->UpdateStats(0, len);
- return send(fd->GetFd(), (const char*)buf, len, flags);
+ return send(fd->GetFd(), buf, len, flags);
}
int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
{
this->UpdateStats(len, 0);
- return recv(fd->GetFd(), (char*)buf, len, flags);
+ return recv(fd->GetFd(), buf, len, flags);
}
int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen)
{
this->UpdateStats(0, len);
- return sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
+ return sendto(fd->GetFd(), buf, len, flags, to, tolen);
}
int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
{
- if (lastempty + 1 > time(NULL))
+ if (lastempty != ServerInstance->Time())
{
- lastempty = time(NULL);
+ lastempty = ServerInstance->Time();
indata = outdata = 0;
}
indata += len_in;
projects / user / henk / code / inspircd.git / blobdiff