Use CHECKPOINT and RageThreads.

stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp

@@ -116,28 +116,27 @@ InputHandler_DInput::InputHandler_DInput()
 			Devices[i].buffered? "buffered": "unbuffered" );
 	}
 
-	InputThreadPtr = NULL;
 	StartThread();
 }
 
 void InputHandler_DInput::StartThread()
 {
-	ASSERT( InputThreadPtr == NULL );
+	ASSERT( !InputThread.IsCreated() );
 	if( PREFSMAN->m_bThreadedInput )
-		InputThreadPtr = SDL_CreateThread(InputThread_Start, this);
-	else
-		InputThreadPtr = NULL;
+	{
+		InputThread.SetName( "DirectInput thread" );
+		InputThread.Create( InputThread_Start, this );
+	}
 }
 
 void InputHandler_DInput::ShutdownThread()
 {
-	if( InputThreadPtr == NULL )
+	if( !InputThread.IsCreated() )
 		return;
 
 	shutdown = true;
 	LOG->Trace("Shutting down DirectInput thread ...");
-	SDL_WaitThread(InputThreadPtr, NULL);
-	InputThreadPtr = NULL;
+	InputThread.Wait();
 	LOG->Trace("DirectInput thread shut down.");
 	shutdown = false;
 }
@@ -427,7 +426,7 @@ void InputHandler_DInput::Update(float fDeltaTime)
 	{
 		if( !Devices[i].buffered )
 			UpdatePolled( Devices[i], zero );
-		else if( InputThreadPtr == NULL )
+		else if( !InputThread.IsCreated() )
 		{
 			/* If we have an input thread, it'll handle buffered devices. */
 			UpdateBuffered( Devices[i], zero );
@@ -438,10 +437,8 @@ void InputHandler_DInput::Update(float fDeltaTime)
 }
 
 
-void InputHandler_DInput::InputThread()
+void InputHandler_DInput::InputThreadMain()
 {
-	InitThreadData("DirectInput thread");
-	VDCHECKPOINT;
 	if(!SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST))
 		LOG->Warn(werr_ssprintf(GetLastError(), "Failed to set DirectInput thread priority"));
 
@@ -467,7 +464,7 @@ void InputHandler_DInput::InputThread()
 
 	while(!shutdown)
 	{
-		VDCHECKPOINT;
+		CHECKPOINT;
 		if( BufferedDevices.size() )
 		{
 			/* Update buffered devices. */
@@ -487,14 +484,14 @@ void InputHandler_DInput::InputThread()
 					UpdateBuffered( *BufferedDevices[i], now );
 			}
 		}
-		VDCHECKPOINT;
+		CHECKPOINT;
 
 		/* If we have no buffered devices, we didn't delay at WaitForMultipleObjectsEx. */
 		if( BufferedDevices.size() == 0 )
 			SDL_Delay( 50 );
-		VDCHECKPOINT;
+		CHECKPOINT;
 	}
-	VDCHECKPOINT;
+	CHECKPOINT;
 
 	for( i = 0; i < Devices.size(); ++i )
 	{

stepmania/src/arch/InputHandler/InputHandler_DirectInput.h

@@ -2,20 +2,20 @@
 #define INPUTHANDLER_DIRECTINPUT_H
 
 #include "InputHandler.h"
-#include "SDL_Thread.h"
+#include "RageThreads.h"
 
 struct DIDevice;
 class InputHandler_DInput: public InputHandler
 {
-	SDL_Thread *InputThreadPtr;
+	RageThread InputThread;
 	bool shutdown;
 
 	void UpdatePolled(DIDevice &device, const RageTimer &tm);
 	void UpdateBuffered(DIDevice &device, const RageTimer &tm);
 	void PollAndAcquireDevices();
 
-	static int InputThread_Start( void *p ) { ((InputHandler_DInput *) p)->InputThread();  return 0; }
-	void InputThread();
+	static int InputThread_Start( void *p ) { ((InputHandler_DInput *) p)->InputThreadMain();  return 0; }
+	void InputThreadMain();
 
 	void StartThread();
 	void ShutdownThread();

stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp

@@ -26,18 +26,19 @@ InputHandler_Win32_Pump::InputHandler_Win32_Pump()
 
 	/* Don't start a thread if we have no pads. */
 	if( FoundOnePad && PREFSMAN->m_bThreadedInput )
-		InputThreadPtr = SDL_CreateThread(InputThread_Start, this);
-	else
-		InputThreadPtr = NULL;
+	{
+		InputThread.SetName("Pump thread");
+		InputThread.Create( InputThread_Start, this );
+	}
 }
 
 InputHandler_Win32_Pump::~InputHandler_Win32_Pump()
 {
-	if( InputThreadPtr )
+	if( InputThread.IsCreated() )
 	{
 		shutdown = true;
 		LOG->Trace("Shutting down Pump thread ...");
-		SDL_WaitThread(InputThreadPtr, NULL);
+		InputThread.Wait();
 		LOG->Trace("Pump thread shut down.");
 	}
 
@@ -59,7 +60,7 @@ void InputHandler_Win32_Pump::HandleInput( int devno, int event )
 		DeviceInput dev(id, butno);
 		
 		/* If we're in a thread, our timestamp is accurate. */
-		if( InputThreadPtr )
+		if( InputThread.IsCreated() )
 			dev.ts.Touch();
 
 		ButtonPressed(dev, !(event & bits[butno]));
@@ -80,15 +81,12 @@ void InputHandler_Win32_Pump::GetDevicesAndDescriptions(vector<InputDevice>& vDe
 
 int InputHandler_Win32_Pump::InputThread_Start( void *p )
 {
-	((InputHandler_Win32_Pump *) p)->InputThread();
+	((InputHandler_Win32_Pump *) p)->InputThreadMain();
 	return 0;
 }
 
-void InputHandler_Win32_Pump::InputThread()
+void InputHandler_Win32_Pump::InputThreadMain()
 {
-	InitThreadData("Pump thread");
-	VDCHECKPOINT;
-
 	vector<WindowsFileIO *> sources;
 	int i;
 	for(i = 0; i < NUM_PUMPS; ++i)
@@ -99,23 +97,23 @@ void InputHandler_Win32_Pump::InputThread()
 
 	while(!shutdown)
 	{
-		VDCHECKPOINT;
+		CHECKPOINT;
 		int actual = 0, val = 0;
 		int ret = WindowsFileIO::read_several(sources, &val, actual, 0.100f);
 
-		VDCHECKPOINT;
+		CHECKPOINT;
 		if(ret <= 0) 
 			continue; /* no event */
 
 		HandleInput( actual, val );
 		InputHandler::UpdateTimer();
 	}
-	VDCHECKPOINT;
+	CHECKPOINT;
 }
 
 void InputHandler_Win32_Pump::Update(float fDeltaTime)
 {
-	if( InputThreadPtr == NULL )
+	if( !InputThread.IsCreated() )
 	{
 		for(int i = 0; i < NUM_PUMPS; ++i)
 		{

stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h

@@ -2,17 +2,17 @@
 #define INPUT_HANDLER_WIN32_PUMP_H 1
 
 #include "InputHandler.h"
-#include "SDL_Thread.h"
+#include "RageThreads.h"
 
 class USBDevice;
 class InputHandler_Win32_Pump: public InputHandler
 {
 	USBDevice *dev;
-	SDL_Thread *InputThreadPtr;
+	RageThread InputThread;
 	bool shutdown;
 
 	static int InputThread_Start( void *p );
-	void InputThread();
+	void InputThreadMain();
 	void HandleInput( int devno, int event );