Small fixes for windows #558
Conversation
|
@nightrune you've broken the Linux build, can you fix that so we can merge. May be time for another ifdef... |
| @@ -46,7 +46,7 @@ bool SetSchedParam(pthread_t thread, int policy, | |||
| int r = pthread_setschedparam(thread, policy, ¶m); | |||
| if (r != 0) { | |||
| OLA_FATAL << "Unable to set thread scheduling parameters for thread " | |||
| << thread << ": " << strerror(r); | |||
| << thread.x << ": " << strerror(r); | |||
There was a problem hiding this comment.
On Linux it appears to be ( http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/libpthread-ddefs.html ):
typedef unsigned long int pthread_t;
So we'll need another ifdef.
There was a problem hiding this comment.
Actually, looking at this, on Windows don't you want .p instead, based on the comment? http://pimprenelle.lps.ens.fr/xvindoc/pthread_8h_source.html#l00566
There was a problem hiding this comment.
What we want is something like
inline std::ostream& operator<< (std::ostream &out, pthread_t thread) {
#ifdef _WIN32
return out << thread.x
#else
return out << thread
}
in the Thread.h file .
| * @return stream | ||
| */ | ||
| inline std::ostream& operator<<(std::ostream &out, pthread_t thread) { | ||
| #ifdef WIN32 |
|
I think this should be in https://github.com/OpenLightingProject/ola/milestones/0.9.4 so the Windows build doesn't ship in a more broken state, it's functionality should only get better going forwards. |
|
As an alternative out there thought, what if we created a wrapper class around pthread, which could then implement a to string function? |
| @@ -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.."; | |||
Windows now builds after nomis52's changes.