Merge branch 'GerHobbelt:master' into master

Author: oktonion

ChangeLog.md

@@ -467,7 +467,7 @@ pre-merge-with-mingw-patches / Wed, 30 Mar 2016
   * [b9afb8d2] Move recently incorrectly placed comment. (`Ross Johnson`)
   * [9f8c38b1] Version 2.9.0 last changes. (`Ross Johnson`)
   * [7452bc46] callbacks defined as cdecl (`Ross Johnson`)
-  * [473862a0] Fix MSC_VER related to item 2 in BUGS (`rpj`)
+  * [473862a0] Fix _MSC_VER related to item 2 in BUGS (`rpj`)
   * [b83397a7] Remove compile warning; fix bug (`rpj`)
   * [07078828] *** empty log message *** (`rpj`)
   * [d0616e87] Reorganisation of #defines (`rpj`)

README.md

@@ -1,5 +1,5 @@
 
-# pthread-win32 for Windows
+# pthread-win32 for Windows (a.k.a. pthreads4W)
 
 Combined `pthread-win32` fork of RedFox20 + Oktonion + WinBuild
 

create.c

@@ -93,7 +93,7 @@ pthread_create (pthread_t * tid,
   pthread_t thread = { 0 };		// init to shut up MSVC2013: warning C4701 : potentially uninitialized local variable 'thread' used
   ptw32_thread_t * tp;
   ptw32_thread_t * sp;
-  register pthread_attr_t a;
+  pthread_attr_t a;
   HANDLE threadH = 0;
   int result = EAGAIN;
   int run = PTW32_TRUE;

docs/ChangeLog.md

@@ -2399,7 +2399,7 @@ General Note:
 2011-07-06  Ross Johnson <ross dot johnson at homemail dot com dot au>
 
 	* pthread_cond_wait.c (pragma inline_depth): this is almost redundant
-	now nevertheless fixed thei controlling MSC_VER from "< 800" to
+	now nevertheless fixed thei controlling _MSC_VER from "< 800" to
 	"< 1400" (i.e. any prior to VC++ 8.0).
 	* pthread_once.ci (pragma inline_depth): Likewise.
 	* pthread_rwlock_timedwrlock.ci (pragma inline_depth): Likewise.
@@ -5034,7 +5034,7 @@ General Note:
 2000-08-12  Ross Johnson  <rpj at special.ise.canberra.edu.au>
 
 	* pthread.h: Add compile-time message when using
-	MSC_VER compiler and C++ EH to warn application
+	_MSC_VER compiler and C++ EH to warn application
 	programmers to use __PtW32Catch instead of catch(...)
 	if they want cancellation and pthread_exit to work.
 

implement.h

@@ -251,7 +251,7 @@ struct ptw32_thread_t_
   int sched_priority;		/* As set, not as currently is */
   int cancelState;
   int cancelType;
-  int implicit:1;
+  unsigned int implicit:1;
   DWORD thread;			/* Windows thread ID */
 #if defined(HAVE_CPU_AFFINITY)
   size_t cpuset;		/* Thread CPU affinity set */
@@ -788,7 +788,11 @@ char *ptw32_strdup (const char *s);
 #endif
 void ptw32_throw (DWORD exception)
 #if defined(__cplusplus)
+#if __cplusplus <= 201402L
     throw(ptw32_exception_cancel,ptw32_exception_exit)
+#else
+	noexcept(false)
+#endif
 #endif
 ;
 

pthread.h

@@ -103,13 +103,13 @@
 #undef  PTW32_LEVEL_MAX
 #define PTW32_LEVEL_MAX  3
 
-#if _POSIX_C_SOURCE >= 200112L			/* POSIX.1-2001 and later */
+#if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 200112L        /* POSIX.1-2001 and later */
 # define PTW32_LEVEL  PTW32_LEVEL_MAX	/* include everything     */
 
 #elif defined INCLUDE_NP			/* earlier than POSIX.1-2001, but... */
 # define PTW32_LEVEL  2			/* include non-portable extensions   */
 
-#elif _POSIX_C_SOURCE >= 199309L		/* POSIX.1-1993           */
+#elif defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 199309L	     /* POSIX.1-1993           */
 # define PTW32_LEVEL  1 			/* include 1b, 1c, and 1d */
 
 #elif defined _POSIX_SOURCE			/* early POSIX     */
@@ -654,6 +654,8 @@ struct ptw32_cleanup_t
 
 #if defined(PTW32_CLEANUP_CXX)
 
+#if defined(__cplusplus)
+
         /*
          * C++ version of cancel cleanup.
          * - John E. Bossom.
@@ -728,6 +730,8 @@ struct ptw32_cleanup_t
             cleanup.execute( _execute ); \
         }
 
+#endif  // __cplusplus
+
 #else
 
 #error ERROR [__FILE__, line __LINE__]: Cleanup type undefined.

pthread_getspecific.c

@@ -78,9 +78,9 @@ pthread_getspecific (pthread_key_t key)
     }
   else
     {
-      int lasterror = GetLastError ();
+      DWORD lasterror = GetLastError ();
 #if defined(RETAIN_WSALASTERROR)
-      int lastWSAerror = WSAGetLastError ();
+      DWORD lastWSAerror = WSAGetLastError ();
 #endif
       ptr = TlsGetValue (key->key);
 

pthread_spin_destroy.c

@@ -48,7 +48,7 @@
 int
 pthread_spin_destroy (pthread_spinlock_t * lock)
 {
-  register pthread_spinlock_t s;
+  pthread_spinlock_t s;
   int result = 0;
 
   if (lock == NULL || *lock == NULL)

pthread_spin_lock.c

@@ -48,7 +48,7 @@
 int
 pthread_spin_lock (pthread_spinlock_t * lock)
 {
-  register pthread_spinlock_t s;
+  pthread_spinlock_t s;
 
   if (NULL == lock || NULL == *lock)
     {

pthread_spin_trylock.c

@@ -48,7 +48,7 @@
 int
 pthread_spin_trylock (pthread_spinlock_t * lock)
 {
-  register pthread_spinlock_t s;
+  pthread_spinlock_t s;
 
   if (NULL == lock || NULL == *lock)
     {

pthread_spin_unlock.c

@@ -48,7 +48,7 @@
 int
 pthread_spin_unlock (pthread_spinlock_t * lock)
 {
-  register pthread_spinlock_t s;
+  pthread_spinlock_t s;
 
   if (NULL == lock || NULL == *lock)
     {

ptw32_mutex_check_need_init.c

@@ -55,8 +55,8 @@ static pthread_mutexattr_t ptw32_errorcheck_mutexattr = &ptw32_errorcheck_mutexa
 INLINE int
 ptw32_mutex_check_need_init (pthread_mutex_t * mutex)
 {
-  register int result = 0;
-  register pthread_mutex_t mtx;
+  int result = 0;
+  pthread_mutex_t mtx;
   ptw32_mcs_local_node_t node;
 
   ptw32_mcs_lock_acquire(&ptw32_mutex_test_init_lock, &node);

sched.h

@@ -56,13 +56,13 @@
  */
 #if ! defined __MINGW32__ || ! defined __have_typedef_pid_t
 
-# if defined __MINGW64__
+# if defined __MINGW64__ || defined WIN64 || defined _WIN64
     typedef __int64 pid_t;
 # else
     typedef int pid_t;
 #endif
 
-#if __GNUC__ < 4
+#if ! defined __GNUC__ || __GNUC__ < 4
 /* GCC v4.0 and later, (as used by MinGW), allows us to repeat a
  * typedef, provided every duplicate is consistent; only set this
  * multiple definition guard when we cannot be certain that it is

sem_getvalue.c

@@ -87,7 +87,7 @@ sem_getvalue (sem_t * sem, int *sval)
   int result = 0;
 
   ptw32_mcs_local_node_t node;
-  register sem_t s = *sem;
+  sem_t s = *sem;
 
   ptw32_mcs_lock_acquire(&s->lock, &node);
   *sval = s->value;

tests/benchlib.c

@@ -109,6 +109,9 @@ old_mutex_init(old_mutex_t *mutex, const old_mutexattr_t *attr)
     {
         CRITICAL_SECTION cs;
 
+#if (_WIN32_WINNT >= 0x0400)
+		ptw32_try_enter_critical_section = &TryEnterCriticalSection;
+#else
         /*
          * Load KERNEL32 and try to get address of TryEnterCriticalSection
          */
@@ -121,6 +124,7 @@ old_mutex_init(old_mutex_t *mutex, const old_mutexattr_t *attr)
 #else
         GetProcAddress(ptw32_h_kernel32,
                        (LPCSTR) "TryEnterCriticalSection");
+#endif
 #endif
 
         if (ptw32_try_enter_critical_section != NULL)
@@ -140,11 +144,14 @@ old_mutex_init(old_mutex_t *mutex, const old_mutexattr_t *attr)
             DeleteCriticalSection(&cs);
           }
 
+#if (_WIN32_WINNT >= 0x0400)
+#else
         if (ptw32_try_enter_critical_section == NULL)
           {
             (void) FreeLibrary(ptw32_h_kernel32);
             ptw32_h_kernel32 = 0;
           }
+#endif
 
       if (old_mutex_use == OLD_WIN32CS)
 	{

tests/context2.c

@@ -100,7 +100,9 @@ static void * func(void * arg)
 {
   washere = 1;
 
-  return (void *) tree(64);
+  void *rv = (void *) tree(64);
+  fprintf(stderr, "func: done\n");
+  return rv;
 }
 
 static void
@@ -110,6 +112,7 @@ anotherEnding ()
    * Switched context
    */
   washere++;
+  fprintf(stderr, "another ending!\n");
   pthread_exit(0);
 }
 
@@ -144,6 +147,8 @@ test_context2(void)
        */
       CONTEXT context;
 
+	  fprintf(stderr, "wait: done\n");
+
       context.ContextFlags = CONTEXT_CONTROL;
 
       GetThreadContext(hThread, &context);
@@ -160,6 +165,7 @@ test_context2(void)
   Sleep(1000);
 
   assert(washere == 2);
+  fprintf(stderr, "assertion check: done\n");
 
   return 0;
 }

tests/create3.c

@@ -88,10 +88,10 @@ static void * func(void * arg)
 
 #ifndef MONOLITHIC_PTHREAD_TESTS
 int
-main(int argc, char **argv)
+main(void)
 #else
 int
-test_create3(int argc, char **argv)
+test_create3(void)
 #endif
 {
   pthread_t t;

tests/test.h

@@ -162,7 +162,13 @@ static const char * error_string[] = {
           (fprintf(stderr, "Assertion failed: (%s), file %s, line %d\n", \
                    #e, __FILE__, (int) __LINE__), exit(1), 0))
 
+#if defined(PTW32_CLEANUP_CXX) && defined(__PTHREAD_JUMBO_BUILD__) && defined(MONOLITHIC_PTHREAD_TESTS)
+// fix/hack the error about duplicate definitions of the assertion code in (forced) C++ mode (for pthread-EH.cpp); this does NOT affect the other build modes; the default build mode remains as-is.
+extern int assertE;
+#else
 int assertE;
+#endif
+
 # define assert_e(e, o, r) \
    (((assertE = e) o (r)) ? ((ASSERT_TRACE) ? fprintf(stderr, \
                                     "Assertion succeeded: (%s), file %s, line %d\n", \

tests/tryentercs.c

@@ -80,6 +80,9 @@ test_tryentercs(void)
 
   printf("Last Error [main enter] %ld\n", (long) GetLastError());
 
+#if (_WIN32_WINNT >= 0x0400)
+  _try_enter_critical_section = &TryEnterCriticalSection;
+#else
   /*
    * Load KERNEL32 and try to get address of TryEnterCriticalSection
    */
@@ -88,6 +91,7 @@ test_tryentercs(void)
         (TryEnterCriticalSection_f *)
         GetProcAddress(_h_kernel32,
                          (LPCSTR) "TryEnterCriticalSection");
+#endif
 
   if (_try_enter_critical_section != NULL)
     {
@@ -108,7 +112,10 @@ test_tryentercs(void)
       DeleteCriticalSection(&cs);
     }
 
+#if (_WIN32_WINNT >= 0x0400)
+#else
   (void) FreeLibrary(_h_kernel32);
+#endif
 
   printf("This system %s TryEnterCriticalSection.\n",
          (_try_enter_critical_section == NULL) ? "DOES NOT SUPPORT" : "SUPPORTS");

tests/tryentercs2.c

@@ -80,6 +80,9 @@ test_tryentercs2(void)
 
   printf("Last Error [main enter] %ld\n", (long) GetLastError());
 
+#if (_WIN32_WINNT >= 0x0400)
+  _try_enter_critical_section = &TryEnterCriticalSection;
+#else
   /*
    * Load KERNEL32 and try to get address of TryEnterCriticalSection
    */
@@ -88,6 +91,7 @@ test_tryentercs2(void)
         (TryEnterCriticalSection_f *)
         GetProcAddress(_h_kernel32,
                          (LPCSTR) "TryEnterCriticalSection");
+#endif
 
   if (_try_enter_critical_section != NULL)
     {
@@ -121,7 +125,10 @@ test_tryentercs2(void)
       printf("Last Error [try enter] %ld\n", (long) GetLastError());
     }
 
+#if (_WIN32_WINNT >= 0x0400)
+#else
   (void) FreeLibrary(_h_kernel32);
+#endif
 
   printf("This system %s TryEnterCriticalSection.\n",
          (_try_enter_critical_section == NULL) ? "DOES NOT SUPPORT" : "SUPPORTS");

tests/wrapper4tests_1.c

@@ -11,6 +11,11 @@
 #include <windows.h>
 
 
+#if defined(BUILD_MONOLITHIC)
+#define main      pthw32_all_tests_main
+#endif
+
+
 #ifndef MONOLITHIC_PTHREAD_TESTS
 
 int main(int argc, char **argv)
@@ -20,6 +25,11 @@ int main(int argc, char **argv)
 
 #else
 
+// fix/hack the error about duplicate definitions of the assertion code in (forced) C++ mode (for pthread-EH.cpp); this does NOT affect the other build modes; the default build mode remains as-is.
+#if defined(PTW32_CLEANUP_CXX) && defined(__PTHREAD_JUMBO_BUILD__)
+int assertE;
+#endif
+
 int test_affinity1(void);
 int test_affinity2(void);
 int test_affinity3(void);
@@ -276,7 +286,6 @@ int main(int argc, char **argv)
 	TEST_WRAPPER(test_condvar7);
 	TEST_WRAPPER(test_condvar9);
 	TEST_WRAPPER(test_exception1);
-	TEST_WRAPPER(test_sequence1);
 
 	TEST_WRAPPER(test_affinity1);
 	TEST_WRAPPER(test_affinity2);
@@ -321,7 +330,7 @@ int main(int argc, char **argv)
 	TEST_WRAPPER(test_condvar8);
 //	TEST_WRAPPER(test_condvar9);
 	TEST_WRAPPER(test_context1);
-	TEST_WRAPPER(test_context2);
+//	TEST_WRAPPER(test_context2);	// fails in MSVC2022; probably stack corruption at process_exit() as this example hard-swaps PC (program counter) register while resuming...
 	TEST_WRAPPER(test_count1);
 	TEST_WRAPPER(test_create1);
 	TEST_WRAPPER(test_create2);
@@ -421,6 +430,7 @@ int main(int argc, char **argv)
 	TEST_WRAPPER(test_semaphore4t);
 	TEST_WRAPPER(test_semaphore5);
 //	TEST_WRAPPER(test_sequence1);
+//	TEST_WRAPPER(test_sequence2);
 	TEST_WRAPPER(test_sizes);
 	TEST_WRAPPER(test_spin1);
 	TEST_WRAPPER(test_spin2);