Merge 80df266 into 28bf5ab

OpenLightingProject · Dec 9, 2014 · 065434c · 065434c
2 parents 28bf5ab + 80df266
commit 065434c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/common/thread/ThreadTest.cpp b/common/thread/ThreadTest.cpp
@@ -25,7 +25,9 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <errno.h>
 #include <string.h>
+#ifndef _WIN32
 #include <sys/resource.h>
+#endif
 #include <algorithm>
 
 #include "ola/Logging.h"
@@ -136,7 +138,9 @@ void ThreadTest::testThread() {
 /*
  * Check that the scheduling options behave as expected.
  */
+
 void ThreadTest::testSchedulingOptions() {
+#ifndef _WIN32
 #if HAVE_DECL_RLIMIT_RTPRIO
   struct rlimit rlim;
   OLA_ASSERT_TRUE(ola::system::GetRLimit(RLIMIT_RTPRIO, &rlim));
@@ -213,8 +217,12 @@ void ThreadTest::testSchedulingOptions() {
     OLA_ASSERT_EQ(override_params.priority,
                   thread.GetSchedulingParams().priority);
   }
+#else
+  OLA_INFO << "Scheduling options are not supported on windows..";
+#endif  // #ifndef _WIN32
 }
 
+
 class MockConditionThread: public Thread {
  public:
     MockConditionThread(

diff --git a/common/thread/Utils.cpp b/common/thread/Utils.cpp
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <string>
 #include "ola/Logging.h"
+#include "ola/thread/Thread.h"
 
 namespace ola {
 namespace thread {
@@ -45,11 +46,16 @@ bool SetSchedParam(pthread_t thread, int policy,
                    const struct sched_param &param) {
   int r = pthread_setschedparam(thread, policy, &param);
   if (r != 0) {
-    OLA_FATAL << "Unable to set thread scheduling parameters for thread "
-              << thread << ": " << strerror(r);
+    OLA_FATAL << "Unable to set thread scheduling parameters for thread: "
+#ifdef _WIN32
+            << thread.x << ": " << strerror(r);
+#else
+            << thread << ": " << strerror(r);
+#endif
     return false;
   }
   return true;
 }
+
 }  // namespace thread
 }  // namespace ola