* cygwin.din (pthread_attr_getstack): Export.
(pthread_attr_getstackaddr): Export. (pthread_getattr_np): Export. * ntdll.h (enum _THREAD_INFORMATION_CLASS): Add ThreadBasicInformation. (struct _THREAD_BASIC_INFORMATION): Define. (NtQueryInformationThread): Declare. * posix.sgml (std-susv4): Add pthread_attr_getstack. (std-gnu): Add pthread_getattr_np. (std-deprec): Add pthread_attr_getstackaddr. (std-notimpl): Remove pthread_attr_[gs]etstackaddr, as they were removed from SUSv4. * thread.cc (pthread_attr::pthread_attr): Initialize stackaddr. (pthread_attr_getstack): New function. (pthread_attr_getstackaddr): New function. (pthread_attr_setstacksize): Return EINVAL if passed size less than PTHREAD_STACK_MIN, as required by POSIX. (pthread_getattr_np): New function. * thread.h (class pthread_attr): Add stackaddr member. * include/pthread.h (pthread_attr_getstack): Declare. (pthread_attr_getstackaddr): Declare unconditionally. (pthread_attr_setstack): Declare inside false conditional for reference. (pthread_getattr_np): Declare. * include/cygwin/version.h (CYGWIN_VERSION_API_MINOR): Bump.
This commit is contained in:
@@ -1085,7 +1085,7 @@ pthread::resume ()
|
||||
|
||||
pthread_attr::pthread_attr ():verifyable_object (PTHREAD_ATTR_MAGIC),
|
||||
joinable (PTHREAD_CREATE_JOINABLE), contentionscope (PTHREAD_SCOPE_PROCESS),
|
||||
inheritsched (PTHREAD_INHERIT_SCHED), stacksize (0)
|
||||
inheritsched (PTHREAD_INHERIT_SCHED), stackaddr (NULL), stacksize (0)
|
||||
{
|
||||
schedparam.sched_priority = 0;
|
||||
}
|
||||
@@ -2237,11 +2237,35 @@ pthread_attr_setscope (pthread_attr_t *attr, int contentionscope)
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" int
|
||||
pthread_attr_getstack (const pthread_attr_t *attr, void **addr, size_t *size)
|
||||
{
|
||||
if (!pthread_attr::is_good_object (attr))
|
||||
return EINVAL;
|
||||
/* uses lowest address of stack on all platforms */
|
||||
*addr = (void *)((int)(*attr)->stackaddr - (*attr)->stacksize);
|
||||
*size = (*attr)->stacksize;
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" int
|
||||
pthread_attr_getstackaddr (const pthread_attr_t *attr, void **addr)
|
||||
{
|
||||
if (!pthread_attr::is_good_object (attr))
|
||||
return EINVAL;
|
||||
/* uses stack address, which is the higher address on platforms
|
||||
where the stack grows downwards, such as x86 */
|
||||
*addr = (*attr)->stackaddr;
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" int
|
||||
pthread_attr_setstacksize (pthread_attr_t *attr, size_t size)
|
||||
{
|
||||
if (!pthread_attr::is_good_object (attr))
|
||||
return EINVAL;
|
||||
if (size < PTHREAD_STACK_MIN)
|
||||
return EINVAL;
|
||||
(*attr)->stacksize = size;
|
||||
return 0;
|
||||
}
|
||||
@@ -2381,6 +2405,51 @@ pthread::resume (pthread_t *thread)
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" int
|
||||
pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
|
||||
{
|
||||
const size_t sizeof_tbi = sizeof (THREAD_BASIC_INFORMATION);
|
||||
PTHREAD_BASIC_INFORMATION tbi;
|
||||
NTSTATUS ret;
|
||||
|
||||
if (!pthread::is_good_object (&thread))
|
||||
return ESRCH;
|
||||
|
||||
/* attr may not be pre-initialized */
|
||||
if (!pthread_attr::is_good_object (attr))
|
||||
{
|
||||
int rv = pthread_attr_init (attr);
|
||||
if (rv != 0)
|
||||
return rv;
|
||||
}
|
||||
|
||||
(*attr)->joinable = thread->attr.joinable;
|
||||
(*attr)->contentionscope = thread->attr.contentionscope;
|
||||
(*attr)->inheritsched = thread->attr.inheritsched;
|
||||
(*attr)->schedparam = thread->attr.schedparam;
|
||||
|
||||
tbi = (PTHREAD_BASIC_INFORMATION) malloc (sizeof_tbi);
|
||||
ret = NtQueryInformationThread (thread->win32_obj_id, ThreadBasicInformation,
|
||||
tbi, sizeof_tbi, NULL);
|
||||
|
||||
if (NT_SUCCESS (ret))
|
||||
{
|
||||
PNT_TIB tib = tbi->TebBaseAddress;
|
||||
(*attr)->stackaddr = tib->StackBase;
|
||||
/* stack grows downwards on x86 systems */
|
||||
(*attr)->stacksize = (int)tib->StackBase - (int)tib->StackLimit;
|
||||
}
|
||||
else
|
||||
{
|
||||
debug_printf ("NtQueryInformationThread(ThreadBasicInformation), "
|
||||
"status %p", ret);
|
||||
(*attr)->stackaddr = thread->attr.stackaddr;
|
||||
(*attr)->stacksize = thread->attr.stacksize;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* provided for source level compatability.
|
||||
See http://www.opengroup.org/onlinepubs/007908799/xsh/pthread_getconcurrency.html
|
||||
*/
|
||||
|
Reference in New Issue
Block a user