added QuickThread::Sleep() and QuickThread::Yield()

added QuickThread::Myself() to get a QuickThread object that operates on the calling thread.

libusbemu has no platform-specific dependencies anymore: system-specific wrappers are provided through libusbemu_threads.h

Signed-off-by: Marcos Paulo Berteli Slomp <[email protected]>

Author: slomp

platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp

@@ -43,7 +43,6 @@
 #include "libusbemu_internal.h"
 #include <cassert>
 #include <algorithm>
-#include <windows.h>
 #include <conio.h>
 #include "freenect_internal.h"
 
@@ -52,6 +51,10 @@ using namespace libusbemu;
 int libusb_init(libusb_context** context)
 {
 	usb_init();
+  const usb_version* version = usb_get_version();
+  fprintf(stdout, "libusb-win32 version %d.%d.%d.%d (driver %d.%d.%d.%d)\n",
+    version->dll.major, version->dll.minor, version->dll.micro, version->dll.nano,
+    version->driver.major, version->driver.minor, version->driver.micro, version->driver.nano);
 	// there is no such a thing like 'context' in libusb-0.1...
 	// however, it is wise to emulate such context structure to localize and
   // keep track of any resource and/or internal data structures, as well as
@@ -382,11 +385,7 @@ int libusb_handle_events(libusb_context* ctx)
   // to alleviate sequence losses; however, even at such extreme conditions,
   // sequence losses still happen at frequent pace without ReapThreaded().
   if (ReapStrategy != ReapThreaded)
-  {
-    HANDLE hThread = GetCurrentThread();
-    SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL);
-    assert(THREAD_PRIORITY_TIME_CRITICAL == GetThreadPriority(hThread)); // paranoid...
-  }
+    QuickThread::Myself().RaisePriority();
 
   //HANDLE hMyself (GetCurrentThread());
   // ctx->mutex.Enter();
@@ -451,7 +450,7 @@ int ReapSequential(const libusb_device& dev)
 		if (NULL != wrapper)
 			ReapTransfer(wrapper, 100);
 	}
-  //Sleep(1);
+  //QuickThread::Yield();
 	return(0);
 }
 
@@ -560,7 +559,7 @@ int ReapThreaded(const libusb_device& dev)
       }
     }
   }
-  Sleep(1);
+  QuickThread::Yield();
 	return(0);
 }
 

platform/windows/libusb10emu/libusb-1.0/libusbemu_threads_win32.h

@@ -58,6 +58,11 @@ struct QuickThread
     }
   };
 
+  // allow the creation of pseudo-handles to the calling thread
+  // this constructor cannot and should never be called explicitly!
+  // use QuickThread::Myself() to spawn a pseudo-handle QuickThread
+  inline QuickThread() : hThread(GetCurrentThread()) {}
+
 public:
   template<typename F>
   inline QuickThread(F* proc, void* params) : hThread(NULL)
@@ -82,7 +87,14 @@ struct QuickThread
   inline ~QuickThread()
   {
     CloseHandle(hThread);
-    fprintf(stdout, "Thread resources released.\n");
+    // echo only if not a pseudo-handle...
+    if (hThread != GetCurrentThread())
+      fprintf(stdout, "Thread resources released.\n");
+  }
+
+  static inline QuickThread Myself()
+  {
+    return(QuickThread());
   }
 
   inline void Join()
@@ -98,12 +110,34 @@ struct QuickThread
   inline bool LowerPriority()
   {
     return(TRUE == SetThreadPriority(hThread, THREAD_PRIORITY_NORMAL));
-  };
+  }
 
   inline bool RaisePriority()
   {
     return(TRUE == SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL));
-  };
+  }
+
+  static inline void Sleep(int milliseconds)
+  {
+    ::Sleep(milliseconds);
+  }
+
+// Yield is already a Win32 macro (WinBase.h)...
+// http://winapi.freetechsecrets.com/win32/WIN32Yield.htm
+#ifdef Yield
+#undef Yield
+#endif
+// A pragma push/pop could be used instead, but it does not solve the issues
+// http://stackoverflow.com/questions/1793800/can-i-redefine-a-c-macro-for-a-few-includes-and-then-define-it-back
+//#pragma push_macro("Yield")
+//#undef Yield
+  static inline void Yield()
+  {
+    // Sleep(0) or Sleep(1) ?!
+    // http://stackoverflow.com/questions/1413630/switchtothread-thread-yield-vs-thread-sleep0-vs-thead-sleep1
+    ::Sleep(1);
+  }
+//#pragma pop_macro("Yield")
 };