Syncing with Git head at http://sourceforge.net/p/pthreads4w/code

Author: rpj

ANNOUNCE

@@ -267,14 +267,21 @@ The following functions are implemented:
                               for thread validity checking)
 
       ---------------------------
-      Non-portable routines (see the README.NONPORTABLE file for usage)
+      Non-portable routines
       ---------------------------
+      (See the README.NONPORTABLE file or HTML manual pages for usage.)
+      pthread_attr_getname_np
+      pthread_attr_setname_np
+      pthread_getname_np
+      pthread_setname_np
       pthread_timedjoin_np
       pthread_tryjoin_np
       pthread_getw32threadhandle_np
       pthread_timechange_handler_np
       pthread_delay_np
       pthread_getunique_np
+      pthread_attr_getaffinity_np
+      pthread_attr_setaffinity_np
       pthread_getaffinity_np
       pthread_setaffinity_np
       pthread_mutexattr_getkind_np

ChangeLog

@@ -1,3 +1,34 @@
+2013-06-19  Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+	* pthread_attr_init.c: Initialise thread name element.
+	* create.c: Initialise thread name from attributes.
+
+2013-06-13  Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+	* pthread_setname_np.c: Initial version.
+	* pthread_getname_np.c: Initial version.
+	* pthread_attr_setname_np.c: Initial version.
+	* pthread_attr_getname_np.c: Initial version.
+	* pthread.h: Add new prototypes.
+	* implement.h (pthread_attr_t_): Add "thrname" element.
+	* (ptw32_thread_t): Add "name" element.
+
+2013-06-06  Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+	* pthread.h (_POSIX_THREAD_ATTR_STACKADDR): Now set to -1. The API
+	prototypes are defined but return ENOSYS; previously the addr value was
+	stored in the attribute struct and retreivable but unused.
+	* pthread_attr_setstackaddr.c: Should return ENOSYS rather than silently
+	ignore the setting.
+	* pthread_attr_getstackaddr.c: Likewise.
+	* pthread_attr_getaffinity_np.c: Initial version.
+	* pthread_attr_setaffinity_np.c: Initial version.
+
+2013-05-01  Andrew Chernow <achernow at gmail dot com>
+
+	* dll.c: Add invocation of thread detach logic for static linked
+	applications for MSVC8.0 or later builds.
+
 2012-12-19  Jason Baker <jason underscore baker at symantec dot com>
 
 	* pthread_win32_attach_detach_np.c (pthread_win32_process_attach_np):

GNUmakefile

@@ -140,7 +140,7 @@ GCE_CFLAGS	= $(PTW32_FLAGS) -mthreads
 
 ## Mingw
 #MAKE		?= make
-CFLAGS	= $(OPT) $(XOPT) $(ARCH) -I. -DHAVE_CONFIG_H -Wall
+CFLAGS	= $(OPT) $(XOPT) $(ARCH) -I. -DHAVE_CONFIG_H -DMINGW_HAS_SECURE_API -Wall
 
 OBJEXT = o
 RESEXT = o
@@ -172,6 +172,8 @@ PTHREAD_DEF	= pthread.def
 
 help:
 	@ echo "Run one of the following command lines:"
+	@ echo "$(MAKE) clean all                      (build targets GC, GCE, GC-static, GCE-static)"
+	@ echo "$(MAKE) clean all-tests                (build and test all non-debug targets below)"
 	@ echo "$(MAKE) clean GC                       (to build the GNU C dll with C cleanup code)"
 	@ echo "$(MAKE) clean GC-debug                 (to build the GNU C debug dll with C cleanup code)"
 	@ echo "$(MAKE) clean GCE                      (to build the GNU C dll with C++ exception handling)"

Makefile

@@ -88,12 +88,12 @@ all:
 TEST_ENV = CFLAGS="$(CFLAGS) /DNO_ERROR_DIALOGS"
 
 all-tests:
-	$(MAKE) /E realclean VC-small-static$(XDBG)
-	cd tests && $(MAKE) /E clean VC-small-static$(XDBG) $(TEST_ENV) && $(MAKE) /E clean VCX-small-static$(XDBG) $(TEST_ENV)
-	$(MAKE) /E realclean VCE-small-static$(XDBG)
-	cd tests && $(MAKE) /E clean VCE-small-static$(XDBG) $(TEST_ENV)
-	$(MAKE) /E realclean VSE-small-static$(XDBG)
-	cd tests && $(MAKE) /E clean VSE-small-static$(XDBG) $(TEST_ENV)
+#	$(MAKE) /E realclean VC-small-static$(XDBG)
+#	cd tests && $(MAKE) /E clean VC-small-static$(XDBG) $(TEST_ENV) && $(MAKE) /E clean VCX-small-static$(XDBG) $(TEST_ENV)
+#	$(MAKE) /E realclean VCE-small-static$(XDBG)
+#	cd tests && $(MAKE) /E clean VCE-small-static$(XDBG) $(TEST_ENV)
+#	$(MAKE) /E realclean VSE-small-static$(XDBG)
+#	cd tests && $(MAKE) /E clean VSE-small-static$(XDBG) $(TEST_ENV)
 	$(MAKE) /E realclean VC$(XDBG)
 	cd tests && $(MAKE) /E clean VC$(XDBG) $(TEST_ENV) && $(MAKE) /E clean VCX$(XDBG) $(TEST_ENV)
 	$(MAKE) /E realclean VCE$(XDBG)

NEWS

@@ -21,7 +21,8 @@ we are successfully passing the full test suite with all build
 configurations. If you see failures then please consider how your
 toolchains might be contributing to the failure. See the README file
 for more detailed descriptions of the toolchains and test systems that
-we have used to get the tests to pass successfully.
+we have used to get the tests to pass successfully. We recommend
+MinGW64 over MinGW32 for both 64 and 32 bit builds.
 
 New Features
 ------------
@@ -32,11 +33,28 @@ pthread_tryjoin_np()
 sched_getaffinity()
 sched_setaffinity()
 pthread_getaffinity_np()
-pthread_getaffinity_np()
+pthread_setaffinity_np()
+pthread_attr_getaffinity_np()
+pthread_attr_setaffinity_np()
  - added for compatibility with Linux and other libgcc-based systems.
    The macros to manipulate cpu_set_t objects (the cpu affinity mask
    vector) are also defined: CPU_ZERO, CPU_CLR, CPU_SET, CPU_EQUAL,
    CPU_AND, CPU_OR, CPU_XOR, CPU_COUNT, CPU_ISSET.
+pthread_getname_np()
+pthread_setname_np()
+pthread_attr_getname_np()
+pthread_attr_setname_np()
+ - added for compatibility with other POSIX implementations. Because
+   some implementations use different *_setname_np() prototypes
+   you can define one of the following macros when building the library:
+     PTW32_COMPATIBILITY_BSD (compatibility with NetBSD, FreeBSD)
+     PTW32_COMPATIBILITY_TRU64
+   If not defined then compatibility is with Linux and other equivalents.
+   We don't impose a strict limit on the length of the thread name for the
+   default compatibility case. Unlike Linux, no default thread name is set.
+   For MSVC builds, the thread name if set is made available for use by the
+   MSVS debugger, i.e. it should be displayed within the debugger to
+   identify the thread in place of/as well as a threadID.
 
 Builds:
 New makefile targets have been added and existing targets modified or
@@ -47,6 +65,12 @@ The makefiles now know how to build both 32 and 64 bit versions if
 the toolchain allows it (MinGW only). See the README file "Building
 with ..." sections for details.
 
+Static linking:
+The autostatic functionality has been extended so that builds using
+MSVC8 and later no longer require apps to call
+pthread_win32_thread_detach_np(). That is, all of the DllMain
+functionality is not automatic for static linking for these builds.   
+
 Bug Fixes
 ---------
 Small object file static linking now works. The autostatic.c code is
@@ -85,6 +109,11 @@ pthread_win32_process_attach_np() fix potential failure/security around
 finding and loading of QUSEREX.DLL.
 - Jason Baker
 
+_POSIX_THREAD_ATTR_STACKADDR is now set equal to -1 in pthread.h. As a
+consequence pthread_attr_setstackaddr() now returns ENOSYS. Previously
+the value was stored and could be retrieved but was otherwise unused.
+pthread_attr_getstackaddr() returns ENOSYS correspondingly.
+- Ross Johnson
 
 RELEASE 2.9.1
 -------------

README.NONPORTABLE

@@ -110,6 +110,7 @@ pthread_mutexattr_getkind_np(pthread_mutexattr_t * attr, int *kind)
                 PTHREAD_MUTEX_ERRORCHECK
                 PTHREAD_MUTEX_RECURSIVE
 
+
 int
 pthread_delay_np (const struct timespec *interval)
 
@@ -138,14 +139,14 @@ pthread_delay_np (const struct timespec *interval)
         0          Successful completion. 
         [EINVAL]   The value specified by interval is invalid. 
 
+
 int
 pthread_timedjoin_np (pthread_t thread, void **value_ptr, const struct timespec *abstime)
 
 int
 pthread_tryjoin_np (pthread_t thread, void **value_ptr)
 
 		These function is added for compatibility with Linux.
-		
 
 
 int
@@ -156,6 +157,7 @@ pthread_num_processors_np (void)
         processors available to the process, which can be a lower number
         than the system's number, depending on the process's affinity mask.
 
+
 BOOL
 pthread_win32_process_attach_np (void);
 
@@ -185,6 +187,23 @@ pthread_win32_thread_detach_np (void);
 	pthread_win32_process_attach_np() which will return FALSE
 	if pthreads-win32 initialisation fails.
 
+
+int
+pthread_attr_getaffinity_np (pthread_attr_t * attr, size_t cpusetsize, cpu_set_t * cpuset);
+
+int
+pthread_attr_setaffinity_np (pthread_attr_t * attr, size_t cpusetsize, const cpu_set_t * cpuset);
+
+int
+pthread_getaffinity_np (pthread_t thread, size_t cpusetsize, cpu_set_t * cpuset);
+
+int
+pthread_setaffinity_np (pthread_t thread, size_t cpusetsize, const cpu_set_t * cpuset);
+
+	Manipulate the CPU affinity of threads. Compatibility with libgcc-based pthreads
+	implementations.
+
+
 int
 pthreadCancelableWait (HANDLE waitHandle);
 
@@ -354,7 +373,7 @@ rewritten.]
 
 Doesn't the compiler take care of padding?
 
-The C89 and later standards only effectively guarrantee element-by-element
+The C89 and later standards only effectively guarantee element-by-element
 equivalence following an assignment or pass by value of a struct or union,
 therefore undefined areas of any two otherwise equivalent pthread_t instances
 can still compare differently, e.g. attempting to compare two such pthread_t
@@ -574,7 +593,7 @@ bitclear((void*) &non-id, (void*) pthread_normalize(&id), sizeof(pthread_t));
 
 A pthread_t type change proposal to neutralise the effects of padding
 
-Even if pthread_nornalize() is available, padding is still a problem because
+Even if pthread_normalize() is available, padding is still a problem because
 the standard only garrantees element-by-element equivalence through
 copy operations (assignment and pass-by-value). So padding bit values can
 still change randomly after calls to pthread_normalize().

autostatic.c

@@ -39,6 +39,11 @@
 # include <config.h>
 #endif
 
+#if defined(PTW32_STATIC_LIB) && defined(_MSC_VER) && _MSC_VER >= 1400
+#  undef PTW32_STATIC_LIB
+#  define PTW32_STATIC_TLSLIB
+#endif
+
 #include "pthread.h"
 #include "implement.h"
 

common.mk

@@ -16,16 +16,20 @@ STATIC_OBJS	= \
 		errno.$(OBJEXT) \
 		global.$(OBJEXT) \
 		pthread_attr_destroy.$(OBJEXT) \
+		pthread_attr_getaffinity_np.$(OBJEXT) \
 		pthread_attr_getdetachstate.$(OBJEXT) \
 		pthread_attr_getinheritsched.$(OBJEXT) \
+		pthread_attr_getname_np.$(OBJEXT) \
 		pthread_attr_getschedparam.$(OBJEXT) \
 		pthread_attr_getschedpolicy.$(OBJEXT) \
 		pthread_attr_getscope.$(OBJEXT) \
 		pthread_attr_getstackaddr.$(OBJEXT) \
 		pthread_attr_getstacksize.$(OBJEXT) \
 		pthread_attr_init.$(OBJEXT) \
+		pthread_attr_setaffinity_np.$(OBJEXT) \
 		pthread_attr_setdetachstate.$(OBJEXT) \
 		pthread_attr_setinheritsched.$(OBJEXT) \
+		pthread_attr_setname_np.$(OBJEXT) \
 		pthread_attr_setschedparam.$(OBJEXT) \
 		pthread_attr_setschedpolicy.$(OBJEXT) \
 		pthread_attr_setscope.$(OBJEXT) \
@@ -52,6 +56,7 @@ STATIC_OBJS	= \
 		pthread_equal.$(OBJEXT) \
 		pthread_exit.$(OBJEXT) \
 		pthread_getconcurrency.$(OBJEXT) \
+		pthread_getname_np.$(OBJEXT) \
 		pthread_getschedparam.$(OBJEXT) \
 		pthread_getspecific.$(OBJEXT) \
 		pthread_getunique_np.$(OBJEXT) \
@@ -99,6 +104,7 @@ STATIC_OBJS	= \
 		pthread_setcancelstate.$(OBJEXT) \
 		pthread_setcanceltype.$(OBJEXT) \
 		pthread_setconcurrency.$(OBJEXT) \
+		pthread_setname_np.$(OBJEXT) \
 		pthread_setschedparam.$(OBJEXT) \
 		pthread_setspecific.$(OBJEXT) \
 		pthread_spin_destroy.$(OBJEXT) \
@@ -176,8 +182,12 @@ PTHREAD_SRCS	= \
 		ptw32_spinlock_check_need_init.c \
 		pthread_attr_init.c \
 		pthread_attr_destroy.c \
+		pthread_attr_getaffinity_np.c \
+		pthread_attr_setaffinity_np.c \
 		pthread_attr_getdetachstate.c \
 		pthread_attr_setdetachstate.c \
+		pthread_attr_getname_np.c \
+		pthread_attr_setname_np.c \
 		pthread_attr_getscope.c \
 		pthread_attr_setscope.c \
 		pthread_attr_getstackaddr.c \
@@ -260,6 +270,8 @@ PTHREAD_SRCS	= \
 		pthread_attr_getschedparam.c \
 		pthread_attr_setinheritsched.c \
 		pthread_attr_getinheritsched.c \
+		pthread_getname_np.c \
+		pthread_setname_np.c \
 		pthread_setschedparam.c \
 		pthread_getschedparam.c \
 		sched_get_priority_max.c \

create.c

@@ -152,9 +152,20 @@ pthread_create (pthread_t * tid,
 
   if (a != NULL)
     {
+      cpu_set_t none;
+      cpu_set_t attr_cpuset;
+      ((_sched_cpu_set_vector_*)&attr_cpuset)->_cpuset = a->cpuset;
+
       stackSize = (unsigned int)a->stacksize;
       tp->detachState = a->detachstate;
       priority = a->param.sched_priority;
+      CPU_ZERO(&none);
+      if (! CPU_EQUAL(&attr_cpuset, &none))
+        {
+          tp->cpuset = a->cpuset;
+        }
+      if (a->thrname != NULL)
+        tp->name = _strdup(a->thrname);
 
 #if (THREAD_PRIORITY_LOWEST > THREAD_PRIORITY_NORMAL)
       /* WinCE */