#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, int newfd)
+ : BufferedSocket(newfd), parent(t)
+ {
+ }
-Mutex* MutexFactory::CreateMutex()
-{
- return new Win32Mutex();
-}
+ void OnDataReady()
+ {
+ recvq.clear();
+ parent->OnNotify();
+ }
+};
-Win32Mutex::Win32Mutex() : Mutex()
+SocketThread::SocketThread(InspIRCd* SI)
{
- InitializeCriticalSection(&wutex);
+ int listenFD = socket(AF_INET, SOCK_STREAM, 0);
+ if (listenFD == -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");
+
+ if (!SI->BindSocket(listenFD, 0, "127.0.0.1", true))
+ throw CoreException("Could not create ITC pipe");
+ SI->SE->NonBlocking(connFD);
+
+ struct sockaddr_in addr;
+ socklen_t sz = sizeof(addr);
+ getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+ connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
+ int nfd = accept(listenFD);
+ if (nfd < 0)
+ throw CoreException("Could not create ITC pipe");
+ new ThreadSignalSocket(parent, nfd);
+ closesocket(listenFD);
+
+ SI->SE->Blocking(connFD);
+ 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);
+ }
}