[newlib-cygwin/cygwin-3_5-branch] Cygwin: Change pthread_sigqueue() to accept thread id

Corinna Vinschen corinna@sourceware.org
Tue Nov 12 12:10:22 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b9060e06a6e4f52ad3c27488b32f7a825114e6b4

commit b9060e06a6e4f52ad3c27488b32f7a825114e6b4
Author:     Mark Geisert <mark@maxrnd.com>
AuthorDate: Mon Nov 11 22:38:29 2024 -0800
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Tue Nov 12 13:09:19 2024 +0100

    Cygwin: Change pthread_sigqueue() to accept thread id
    
    Change the first parameter of pthread_sigqueue() to be a thread id rather
    than a thread pointer. The change is to match the Linux implementation of
    this function.
    
    The user-visible function prototype is changed in include/pthread.h.
    The pthread_sigqueue() function is modified to work with a passed-in thread
    id rather than an indirect thread pointer as before.  (It used to be
    "pthread_t *thread", i.e., class pthread **.)  The release note for Cygwin
    3.5.5 is updated.
    
    Reported-by: Christian Franke <Christian.Franke@t-online.de>
    Addresses: https://cygwin.com/pipermail/cygwin/2024-September/256439.html
    Signed-off-by: Mark Geisert <mark@maxrnd.com>
    Fixes: 50350cafb375 ("* cygwin.din (pthread_sigqueue): Export.")
    (cherry picked from commit 1e8c92e21d386d2e4a29fa92e8258979ff19ae6b)

Diff:
---
 winsup/cygwin/include/pthread.h | 2 +-
 winsup/cygwin/release/3.5.5     | 3 +++
 winsup/cygwin/thread.cc         | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/winsup/cygwin/include/pthread.h b/winsup/cygwin/include/pthread.h
index cf2fcb04b3e2..8e296303d7b3 100644
--- a/winsup/cygwin/include/pthread.h
+++ b/winsup/cygwin/include/pthread.h
@@ -247,7 +247,7 @@ int pthread_getattr_np (pthread_t, pthread_attr_t *);
 int pthread_getname_np (pthread_t, char *, size_t) __attribute__((__nonnull__(2)));
 int pthread_setaffinity_np (pthread_t, size_t, const cpu_set_t *);
 int pthread_setname_np (pthread_t, const char *) __attribute__((__nonnull__(2)));
-int pthread_sigqueue (pthread_t *, int, const union sigval);
+int pthread_sigqueue (pthread_t, int, const union sigval);
 int pthread_timedjoin_np (pthread_t, void **, const struct timespec *);
 int pthread_tryjoin_np (pthread_t, void **);
 #endif
diff --git a/winsup/cygwin/release/3.5.5 b/winsup/cygwin/release/3.5.5
index 9cc51dc2e690..2ca4572db7ed 100644
--- a/winsup/cygwin/release/3.5.5
+++ b/winsup/cygwin/release/3.5.5
@@ -30,3 +30,6 @@ Fixes:
 
 - Fix a problem that signal handler destroys the FPU context.
   Addresses: https://cygwin.com/pipermail/cygwin/2024-October/256503.html
+
+- Fix type of pthread_sigqueue() first parameter to match Linux.
+  Addresses: https://cygwin.com/pipermail/cygwin/2024-September/256439.html
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 0c6f5703221b..9ee96504b82e 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -3301,13 +3301,13 @@ pthread_sigmask (int operation, const sigset_t *set, sigset_t *old_set)
 }
 
 int
-pthread_sigqueue (pthread_t *thread, int sig, const union sigval value)
+pthread_sigqueue (pthread_t thread, int sig, const union sigval value)
 {
   siginfo_t si = {0};
 
-  if (!pthread::is_good_object (thread))
+  if (!pthread::is_good_object (&thread))
     return EINVAL;
-  if (!(*thread)->valid)
+  if (!thread->valid)
     return ESRCH;
 
   si.si_signo = sig;
@@ -3315,7 +3315,7 @@ pthread_sigqueue (pthread_t *thread, int sig, const union sigval value)
   si.si_value = value;
   si.si_pid = myself->pid;
   si.si_uid = myself->uid;
-  return (int) sig_send (NULL, si, (*thread)->cygtls);
+  return (int) sig_send (NULL, si, thread->cygtls);
 }
 
 /* Cancelability */


More information about the Cygwin-cvs mailing list