* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
#include <signal.h>
#include <fcntl.h>
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
+ThreadEngine::ThreadEngine()
{
}
sigaddset(&set, SIGPIPE);
pthread_sigmask(SIG_BLOCK, &set, NULL);
- Thread* pt = reinterpret_cast<Thread*>(parameter);
+ Thread* pt = static_cast<Thread*>(parameter);
pt->Run();
return parameter;
}
{
SocketThread* parent;
public:
- ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int newfd) :
- BufferedSocket(SI, newfd, const_cast<char*>("0.0.0.0")), parent(p) {}
+ ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
~ThreadSignalSocket()
{
eventfd_write(fd, 1);
}
- virtual bool OnDataReady()
+ void OnDataReady()
{
- eventfd_t data;
- if (eventfd_read(fd, &data))
- return false;
+ recvq.clear();
parent->OnNotify();
- return true;
+ }
+
+ void OnError(BufferedSocketError)
+ {
+ ServerInstance->GlobalCulls.AddItem(this);
}
};
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
{
int fd = eventfd(0, O_NONBLOCK);
if (fd < 0)
throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
- signal.sock = new ThreadSignalSocket(this, SI, fd);
+ signal.sock = new ThreadSignalSocket(this, fd);
}
#else
SocketThread* parent;
int send_fd;
public:
- ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int recvfd, int sendfd) :
- BufferedSocket(SI, recvfd, const_cast<char*>("0.0.0.0")), parent(p), send_fd(sendfd) {}
+ ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
+ BufferedSocket(recvfd), parent(p), send_fd(sendfd) {}
~ThreadSignalSocket()
{
write(send_fd, &dummy, 1);
}
- virtual bool OnDataReady()
+ void OnDataReady()
{
- char data;
- if (read(this->fd, &data, 1) <= 0)
- return false;
+ recvq.clear();
parent->OnNotify();
- return true;
+ }
+
+ void OnError(BufferedSocketError)
+ {
+ ServerInstance->GlobalCulls.AddItem(this);
}
};
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
{
int fds[2];
if (pipe(fds))
throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
- signal.sock = new ThreadSignalSocket(this, SI, fds[0], fds[1]);
+ signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
}
#endif