#include "inspircd.h"
#include "threadengines/threadengine_win32.h"
-Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine(InspIRCd* Instance)
{
}
-void Win32ThreadEngine::Create(Thread* thread)
+void ThreadEngine::Start(Thread* thread)
{
- Win32ThreadData* data = new Win32ThreadData;
+ ThreadData* data = new ThreadData;
thread->state = data;
DWORD ThreadId = 0;
- data->handle = CreateThread(NULL,0,Win32ThreadEngine::Entry,thread,0,&ThreadId);
+ data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId);
if (data->handle == NULL)
{
thread->state = NULL;
delete data;
- throw CoreException(std::string("Unable to create new Win32ThreadEngine: ") + dlerror());
+ throw CoreException(std::string("Unable to create new thread: ") + dlerror());
}
}
-Win32ThreadEngine::~Win32ThreadEngine()
+ThreadEngine::~ThreadEngine()
{
}
-DWORD WINAPI Win32ThreadEngine::Entry(void* parameter)
+DWORD WINAPI ThreadEngine::Entry(void* parameter)
{
- Thread* pt = reinterpret_cast<Thread*>(parameter);
+ Thread* pt = static_cast<Thread*>(parameter);
pt->Run();
return 0;
}
-void Win32ThreadData::FreeThread(Thread* thread)
+void ThreadData::FreeThread(Thread* thread)
{
thread->SetExitFlag();
WaitForSingleObject(handle,INFINITE);
}
-
-MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance)
+class ThreadSignalSocket : public BufferedSocket
{
-}
+ SocketThread* parent;
+ public:
+ ThreadSignalSocket(SocketThread* t, InspIRCd* SI, int newfd, const char* ip)
+ : BufferedSocket(SI, newfd, ip), parent(t)
+ {
+ }
+
+ virtual bool OnDataReady()
+ {
+ char data = 0;
+ if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
+ {
+ parent->OnNotify();
+ return true;
+ }
+ return false;
+ }
+};
-Mutex* MutexFactory::CreateMutex()
+class ThreadSignalListener : public ListenSocketBase
{
- return new Win32Mutex();
-}
+ SocketThread* parent;
+ sockaddr_in sock_us;
+ public:
+ ThreadSignalListener(SocketThread* t, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), parent(t)
+ {
+ socklen_t uslen = sizeof(sock_us);
+ if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
+ {
+ throw ModuleException("Could not getsockname() to find out port number for ITC port");
+ }
+ }
-Win32Mutex::Win32Mutex() : Mutex()
+ virtual void OnAcceptReady(int nfd)
+ {
+ new ThreadSignalSocket(parent, ServerInstance, nfd, "");
+ ServerInstance->SE->DelFd(this);
+ }
+/* Using getsockname and ntohs, we can determine which port number we were allocated */
+ int GetPort()
+ {
+ return ntohs(sock_us.sin_port);
+ }
+};
+
+SocketThread::SocketThread(InspIRCd* SI)
{
- InitializeCriticalSection(&wutex);
+ ThreadSignalListener* listener = new ThreadSignalListener(this, SI, 0, "127.0.0.1");
+ if (listener->GetFd() == -1)
+ throw CoreException("Could not create ITC pipe");
+ int connFD = socket(AF_INET, SOCK_STREAM, 0);
+ if (connFD == -1)
+ throw CoreException("Could not create ITC pipe");
+
+ struct sockaddr_in addr;
+ inet_aton("127.0.0.1", &addr.sin_addr);
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(listener->GetPort());
+
+ if (connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)) == -1)
+ {
+ SI->SE->DelFd(listener);
+ closesocket(connFD);
+ throw CoreException("Could not connet to ITC pipe");
+ }
+ this->signal.connFD = connFD;
}
-Win32Mutex::~Win32Mutex()
+void SocketThread::NotifyParent()
{
- DeleteCriticalSection(&wutex);
+ char dummy = '*';
+ send(signal.connFD, &dummy, 1, 0);
}
-void Win32Mutex::Enable(bool enable)
+SocketThread::~SocketThread()
{
- if (enable)
- EnterCriticalSection(&wutex);
- else
- LeaveCriticalSection(&wutex);
+ if (signal.connFD >= 0)
+ {
+ shutdown(signal.connFD, 2);
+ closesocket(signal.connFD);
+ }
}