-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 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/>.
*/
-/* $Core: libIRCDthreadengine */
-
-/********* DEFAULTS **********/
-/* $ExtraSources: socketengines/socketengine_pthread.cpp */
-/* $ExtraObjects: socketengine_pthread.o */
-
-/* $If: USE_WIN32 */
-/* $ExtraSources: socketengines/socketengine_win32.cpp */
-/* $ExtraObjects: socketengine_win32.o */
-/* $EndIf */
#include "inspircd.h"
#include "threadengines/threadengine_win32.h"
-#include <pthread.h>
-pthread_mutex_t MyMutex = PTHREAD_MUTEX_INITIALIZER;
-
-Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine()
{
}
-void Win32ThreadEngine::Create(Thread* thread_to_init)
+void ThreadEngine::Start(Thread* thread)
{
- pthread_attr_t attribs;
- pthread_attr_init(&attribs);
- pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_JOINABLE);
- pthread_t* MyPThread = new pthread_t;
+ ThreadData* data = new ThreadData;
+ thread->state = data;
+
+ DWORD ThreadId = 0;
+ data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId);
- if (pthread_create(MyPThread, &attribs, Win32ThreadEngine::Entry, (void*)this) != 0)
+ if (data->handle == NULL)
{
- delete MyPThread;
- throw CoreException("Unable to create new Win32ThreadEngine: " + std::string(strerror(errno)));
+ thread->state = NULL;
+ delete data;
+ std::string err = "Unable to create new thread: ";
+#ifdef _WIN32
+ CHAR errdetail[100];
+ FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errdetail, 100, 0);
+ SetLastError(ERROR_SUCCESS);
+ err += errdetail;
+#else
+ err += dlerror();
+#endif
+ throw CoreException(err);
}
+}
- pthread_attr_destroy(&attribs);
-
- NewThread = thread_to_init;
- NewThread->Creator = this;
- NewThread->Extend("pthread", MyPThread);
+ThreadEngine::~ThreadEngine()
+{
}
-Win32ThreadEngine::~Win32ThreadEngine()
+DWORD WINAPI ThreadEngine::Entry(void* parameter)
{
+ Thread* pt = static_cast<Thread*>(parameter);
+ pt->Run();
+ return 0;
}
-void Win32ThreadEngine::Run()
+void ThreadData::FreeThread(Thread* thread)
{
- NewThread->Run();
+ thread->SetExitFlag();
+ WaitForSingleObject(handle,INFINITE);
}
-bool Win32ThreadEngine::Mutex(bool enable)
+class ThreadSignalSocket : public BufferedSocket
{
- if (enable)
- pthread_mutex_lock(&MyMutex);
- else
- pthread_mutex_unlock(&MyMutex);
+ SocketThread* parent;
+ public:
+ ThreadSignalSocket(SocketThread* t, int newfd)
+ : BufferedSocket(newfd), parent(t)
+ {
+ }
+
+ void OnDataReady()
+ {
+ recvq.clear();
+ parent->OnNotify();
+ }
+
+ void OnError(BufferedSocketError)
+ {
+ ServerInstance->GlobalCulls.AddItem(this);
+ }
+};
- return false;
+SocketThread::SocketThread()
+{
+ 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 (!ServerInstance->BindSocket(listenFD, 0, "127.0.0.1", true))
+ throw CoreException("Could not create ITC pipe");
+ ServerInstance->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);
+ ServerInstance->SE->Blocking(listenFD);
+ int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+ if (nfd < 0)
+ throw CoreException("Could not create ITC pipe");
+ new ThreadSignalSocket(this, nfd);
+ closesocket(listenFD);
+
+ ServerInstance->SE->Blocking(connFD);
+ this->signal.connFD = connFD;
}
-void* Win32ThreadEngine::Entry(void* parameter)
+void SocketThread::NotifyParent()
{
- ThreadEngine * pt = (ThreadEngine*)parameter;
- pt->Run();
- return NULL;
+ char dummy = '*';
+ send(signal.connFD, &dummy, 1, 0);
}
-void Win32ThreadEngine::FreeThread(Thread* thread)
+SocketThread::~SocketThread()
{
- pthread_t* pthread = NULL;
- if (thread->GetExt("pthread", pthread))
+ if (signal.connFD >= 0)
{
- thread->SetExitFlag();
- int rc;
- void* status;
- rc = pthread_join(*pthread, &status);
- delete pthread;
+ shutdown(signal.connFD, 2);
+ closesocket(signal.connFD);
}
}
-
projects / user / henk / code / inspircd.git / blobdiff