WinCE fixes

Author: rpj

create.c

@@ -146,7 +146,9 @@ pthread_create (pthread_t * tid,
 #if defined(HAVE_SIGSET_T)
   tp->sigmask = sp->sigmask;
 #endif
+#if ! defined(WINCE)
   tp->cpuset = sp->cpuset;
+#endif
 
   if (a != NULL)
     {
@@ -224,8 +226,12 @@ pthread_create (pthread_t * tid,
           (void) ptw32_setthreadpriority (thread, SCHED_OTHER, priority);
         }
 
+#if ! defined(WINCE)
+
       SetThreadAffinityMask(tp->threadH, tp->cpuset);
 
+#endif
+
       if (run)
         {
           ResumeThread (threadH);
@@ -272,7 +278,12 @@ pthread_create (pthread_t * tid,
             (void) ptw32_setthreadpriority (thread, SCHED_OTHER, priority);
           }
 
+#if ! defined(WINCE)
+
         SetThreadAffinityMask(tp->threadH, tp->cpuset);
+
+#endif
+
       }
 
     ptw32_mcs_lock_release (&stateLock);

implement.h

@@ -59,8 +59,9 @@ typedef VOID (APIENTRY *PAPCFUNC)(DWORD dwParam);
  * Designed to allow error values to be set and retrieved in builds where
  * MSCRT libraries are statically linked to DLLs.
  */
-#if ( defined(PTW32_CONFIG_MINGW) && __MSVCRT_VERSION__ >= 0x0800 ) || \
-    ( defined(_MSC_VER) && _MSC_VER >= 1400 )  /* MSVC8+ */
+#if ! defined(WINCE) && \
+    (( defined(PTW32_CONFIG_MINGW) && __MSVCRT_VERSION__ >= 0x0800 ) || \
+    ( defined(_MSC_VER) && _MSC_VER >= 1400 ))  /* MSVC8+ */
 #  if defined(PTW32_CONFIG_MINGW)
 __attribute__((unused))
 #  endif
@@ -224,7 +225,9 @@ struct ptw32_thread_t_
   int cancelType;
   int implicit:1;
   DWORD thread;			/* Windows thread ID */
+#if ! defined(WINCE)
   size_t cpuset;		/* Thread CPU affinity set */
+#endif
 #if defined(_UWIN)
   DWORD dummy[5];
 #endif

need_errno.h

@@ -24,7 +24,7 @@
 #error ERROR: Only Win32 targets supported!
 #endif
 
-#include <winsock.h>
+//#include <winsock.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -114,18 +114,22 @@ _CRTIMP extern int errno;
 #define ERANGE          34
 #define EDEADLK         36
 
-/* defined differently in winsock.h on WinCE */
-#if !defined(ENAMETOOLONG)
-#define ENAMETOOLONG    38
-#endif
+/* defined differently in winsock.h on WinCE
+ * We don't use this value.
+ */
+//#if !defined(ENAMETOOLONG)
+//#define ENAMETOOLONG    38
+//#endif
 
 #define ENOLCK          39
 #define ENOSYS          40
 
-/* defined differently in winsock.h on WinCE */
-#if !defined(ENOTEMPTY)
-#define ENOTEMPTY       41
-#endif
+/* defined differently in winsock.h on WinCE
+ * We don't use this value.
+ */
+//#if !defined(ENOTEMPTY)
+//#define ENOTEMPTY       41
+//#endif
 
 #define EILSEQ          42
 
@@ -134,7 +138,7 @@ _CRTIMP extern int errno;
 #define ENOTRECOVERABLE	44
 
 /*
- * Support EDEADLOCK for compatibiity with older MS-C versions.
+ * Support EDEADLOCK for compatibility with older MS-C versions.
  */
 #define EDEADLOCK       EDEADLK
 

pthread_self.c

@@ -123,34 +123,40 @@ pthread_self (void)
     		  fail = PTW32_TRUE;
     	    }
 #endif
-    	  /*
-    	   * Get this threads CPU affinity by temporarily setting the threads
-    	   * affinity to that of the process to get the old thread affinity,
-    	   * then reset to the old affinity.
-    	   */
+
     	  if (!fail)
     	    {
-    		  if (GetProcessAffinityMask(GetCurrentProcess(), &vProcessMask, &vSystemMask))
-    		    {
-    			  vThreadMask = SetThreadAffinityMask(sp->threadH, vProcessMask);
-    			  if (vThreadMask)
-    			    {
-    				  if (SetThreadAffinityMask(sp->threadH, vThreadMask))
-    				    {
-    					  sp->cpuset = (size_t) vThreadMask;
-    				    }
-    				  else fail = PTW32_TRUE;
-    			    }
-    			  else fail = PTW32_TRUE;
-    		    }
-    		  else fail = PTW32_TRUE;
 
-    		  /*
-    		   * No need to explicitly serialise access to sched_priority
-    		   * because the new handle is not yet public.
-    		   */
-    		  sp->sched_priority = GetThreadPriority (sp->threadH);
-    		  pthread_setspecific (ptw32_selfThreadKey, (void *) sp);
+#if ! defined(WINCE)
+
+    	      /*
+    	       * Get this threads CPU affinity by temporarily setting the threads
+    	       * affinity to that of the process to get the old thread affinity,
+    	       * then reset to the old affinity.
+    	       */
+    	      if (GetProcessAffinityMask(GetCurrentProcess(), &vProcessMask, &vSystemMask))
+    	        {
+    	          vThreadMask = SetThreadAffinityMask(sp->threadH, vProcessMask);
+    	          if (vThreadMask)
+    	            {
+    	              if (SetThreadAffinityMask(sp->threadH, vThreadMask))
+    	                {
+    	                  sp->cpuset = (size_t) vThreadMask;
+    	                }
+    	              else fail = PTW32_TRUE;
+    	            }
+    	          else fail = PTW32_TRUE;
+    	        }
+    	      else fail = PTW32_TRUE;
+
+#endif
+
+    	      /*
+    	       * No need to explicitly serialise access to sched_priority
+    	       * because the new handle is not yet public.
+    	       */
+    	      sp->sched_priority = GetThreadPriority (sp->threadH);
+    	      pthread_setspecific (ptw32_selfThreadKey, (void *) sp);
     	    }
         }
 

pthread_setaffinity.c

@@ -80,10 +80,17 @@ pthread_setaffinity_np (pthread_t thread, size_t cpusetsize,
       * 				ESRCH	Thread does not exist
       * 				EFAULT	pcuset is NULL
       * 				EAGAIN	The thread affinity could not be set
+      * 				ENOSYS  The platform does not support this function
       *
       * ------------------------------------------------------
       */
 {
+#if defined(WINCE)
+
+  return ENOSYS;
+
+#else
+
   int result = 0;
   ptw32_thread_t * tp;
   ptw32_mcs_local_node_t node;
@@ -146,6 +153,8 @@ pthread_setaffinity_np (pthread_t thread, size_t cpusetsize,
   ptw32_mcs_lock_release (&node);
 
   return result;
+
+#endif
 }
 
 int
@@ -177,10 +186,17 @@ pthread_getaffinity_np (pthread_t thread, size_t cpusetsize, cpu_set_t *cpuset)
       * 				0		Success
       * 				ESRCH	thread does not exist
       * 				EFAULT	cpuset is NULL
+      *                                 ENOSYS  The platform does not support this function
       *
       * ------------------------------------------------------
       */
 {
+#if defined(WINCE)
+
+  return ENOSYS;
+
+#else
+
   int result = 0;
   ptw32_thread_t * tp;
   ptw32_mcs_local_node_t node;
@@ -222,4 +238,6 @@ pthread_getaffinity_np (pthread_t thread, size_t cpusetsize, cpu_set_t *cpuset)
   ptw32_mcs_lock_release(&node);
 
   return result;
+
+#endif
 }

ptw32_new.c

@@ -84,7 +84,9 @@ ptw32_new (void)
   tp->threadLock = 0;
   tp->robustMxListLock = 0;
   tp->robustMxList = NULL;
+#if ! defined(WINCE)
   CPU_ZERO((cpu_set_t*)&tp->cpuset);
+#endif
   tp->cancelEvent = CreateEvent (0, (int) PTW32_TRUE,	/* manualReset  */
 				 (int) PTW32_FALSE,	/* setSignaled  */
 				 NULL);

tests/affinity3.c

@@ -56,6 +56,11 @@ main()
   CPU_ZERO(&switchmask);
   CPU_ZERO(&flipmask);
 
+  if (pthread_getaffinity_np(self, sizeof(cpu_set_t), &processCpus) == ENOSYS)
+    {
+      printf("pthread_get/set_affinity_np API not supported for this platform: skipping test.");
+      return 0;
+    }
   assert(pthread_getaffinity_np(self, sizeof(cpu_set_t), &processCpus) == 0);
   printf("This thread has a starting affinity with %d CPUs\n", CPU_COUNT(&processCpus));
   assert(!CPU_EQUAL(&mask, &processCpus));

tests/affinity4.c

@@ -49,6 +49,12 @@ main()
   cpu_set_t keepCpus;
   pthread_t self = pthread_self();
 
+  if (pthread_getaffinity_np(self, sizeof(cpu_set_t), &threadCpus) == ENOSYS)
+    {
+      printf("pthread_get/set_affinity_np API not supported for this platform: skipping test.");
+      return 0;
+    }
+
   CPU_ZERO(&keepCpus);
   for (cpu = 1; cpu < sizeof(cpu_set_t)*8; cpu += 2)
     {

tests/affinity5.c

@@ -79,6 +79,12 @@ main()
   cpu_set_t keepCpus;
   pthread_t self = pthread_self();
 
+  if (pthread_getaffinity_np(self, sizeof(cpu_set_t), &threadCpus) == ENOSYS)
+    {
+      printf("pthread_get/set_affinity_np API not supported for this platform: skipping test.");
+      return 0;
+    }
+
   CPU_ZERO(&keepCpus);
   for (cpu = 1; cpu < sizeof(cpu_set_t)*8; cpu += 2)
     {