-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
#include "threadengines/threadengine_pthread.h"
#include <pthread.h>
#ifdef HAS_EVENTFD
#include <sys/eventfd.h>
-class ThreadSignalSocket : public BufferedSocket
+class ThreadSignalSocket : public EventHandler
{
SocketThread* parent;
public:
- ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
+ ThreadSignalSocket(SocketThread* p, int newfd) : parent(p)
+ {
+ SetFd(newfd);
+ ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+ }
~ThreadSignalSocket()
{
+ ServerInstance->SE->DelFd(this);
+ ServerInstance->SE->Close(GetFd());
}
void Notify()
eventfd_write(fd, 1);
}
- void OnDataReady()
- {
- recvq.clear();
- parent->OnNotify();
- }
-
- void OnError(BufferedSocketError)
+ void HandleEvent(EventType et, int errornum)
{
- ServerInstance->GlobalCulls.AddItem(this);
+ if (et == EVENT_READ)
+ {
+ eventfd_t dummy;
+ eventfd_read(fd, &dummy);
+ parent->OnNotify();
+ }
+ else
+ {
+ ServerInstance->GlobalCulls.AddItem(this);
+ }
}
};
SocketThread::SocketThread()
{
- int fd = eventfd(0, O_NONBLOCK);
+ signal.sock = NULL;
+ int fd = eventfd(0, EFD_NONBLOCK);
if (fd < 0)
- throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+ throw CoreException("Could not create pipe " + std::string(strerror(errno)));
signal.sock = new ThreadSignalSocket(this, fd);
}
#else
-class ThreadSignalSocket : public BufferedSocket
+class ThreadSignalSocket : public EventHandler
{
SocketThread* parent;
int send_fd;
public:
ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
- BufferedSocket(recvfd), parent(p), send_fd(sendfd) {}
+ parent(p), send_fd(sendfd)
+ {
+ SetFd(recvfd);
+ ServerInstance->SE->NonBlocking(fd);
+ ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+ }
~ThreadSignalSocket()
{
close(send_fd);
+ ServerInstance->SE->DelFd(this);
+ ServerInstance->SE->Close(GetFd());
}
void Notify()
{
- char dummy = '*';
+ static const char dummy = '*';
write(send_fd, &dummy, 1);
}
- void OnDataReady()
+ void HandleEvent(EventType et, int errornum)
{
- recvq.clear();
- parent->OnNotify();
- }
-
- void OnError(BufferedSocketError)
- {
- ServerInstance->GlobalCulls.AddItem(this);
+ if (et == EVENT_READ)
+ {
+ char dummy[128];
+ read(fd, dummy, 128);
+ parent->OnNotify();
+ }
+ else
+ {
+ ServerInstance->GlobalCulls.AddItem(this);
+ }
}
};
SocketThread::SocketThread()
{
+ signal.sock = NULL;
int fds[2];
if (pipe(fds))
- throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+ throw CoreException("Could not create pipe " + std::string(strerror(errno)));
signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
}
#endif
SocketThread::~SocketThread()
{
+ if (signal.sock)
+ {
+ signal.sock->cull();
+ delete signal.sock;
+ }
}