From e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Tue, 7 Apr 2015 06:13:12 -0400
Subject: Clean up threading

  * Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
---
 src/jthread/win32/jthread.cpp | 146 ------------------------------------------
 1 file changed, 146 deletions(-)
 delete mode 100755 src/jthread/win32/jthread.cpp

(limited to 'src/jthread/win32/jthread.cpp')

diff --git a/src/jthread/win32/jthread.cpp b/src/jthread/win32/jthread.cpp
deleted file mode 100755
index b523d664c..000000000
--- a/src/jthread/win32/jthread.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-
-    This file is a part of the JThread package, which contains some object-
-    oriented thread wrappers for different thread implementations.
-
-    Copyright (c) 2000-2006  Jori Liesenborgs (jori.liesenborgs@gmail.com)
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include "jthread/jthread.h"
-#include <assert.h>
-#define UNUSED(expr) do { (void)(expr); } while (0)
-#ifndef _WIN32_WCE
-	#include <process.h>
-#endif // _WIN32_WCE
-
-JThread::JThread()
-{
-	retval = NULL;
-	requeststop = false;
-	running = false;
-}
-
-JThread::~JThread()
-{
-	Kill();
-}
-
-void JThread::Wait() {
-	if (running)
-	{
-		WaitForSingleObject(threadhandle, INFINITE);
-	}
-}
-
-int JThread::Start()
-{
-	if (running)
-	{
-		return ERR_JTHREAD_ALREADYRUNNING;
-	}
-	requeststop = false;
-
-	continuemutex.Lock();
-#ifndef _WIN32_WCE
-	threadhandle = (HANDLE)_beginthreadex(NULL,0,TheThread,this,0,&threadid);
-#else
-	threadhandle = CreateThread(NULL,0,TheThread,this,0,&threadid);
-#endif // _WIN32_WCE
-	if (threadhandle == NULL)
-	{
-		continuemutex.Unlock();
-		return ERR_JTHREAD_CANTSTARTTHREAD;
-	}
-
-	/* Wait until 'running' is set */
-	while (!running)
-	{
-		Sleep(1);
-	}
-
-	continuemutex.Unlock();
-
-	continuemutex2.Lock();
-	continuemutex2.Unlock();
-
-	return 0;
-}
-
-int JThread::Kill()
-{
-	if (!running)
-	{
-		return ERR_JTHREAD_NOTRUNNING;
-	}
-	TerminateThread(threadhandle,0);
-	CloseHandle(threadhandle);
-	running = false;
-	return 0;
-}
-
-void *JThread::GetReturnValue()
-{
-	void *val;
-
-	if (running) {
-		val = NULL;
-	} else {
-		val = retval;
-	}
-	return val;
-}
-
-bool JThread::IsSameThread()
-{
-	return GetCurrentThreadId() == threadid;
-}
-
-#ifndef _WIN32_WCE
-UINT __stdcall JThread::TheThread(void *param)
-#else
-DWORD WINAPI JThread::TheThread(void *param)
-#endif // _WIN32_WCE
-{
-	JThread *jthread;
-	void *ret;
-
-	jthread = (JThread *)param;
-
-	jthread->continuemutex2.Lock();
-	jthread->running = true;
-
-	jthread->continuemutex.Lock();
-	jthread->continuemutex.Unlock();
-
-	ret = jthread->Thread();
-
-	jthread->running = false;
-	jthread->retval = ret;
-	CloseHandle(jthread->threadhandle);
-	return 0;
-}
-
-void JThread::ThreadStarted()
-{
-	continuemutex2.Unlock();
-}
-
-- 
cgit v1.2.3