* [hurd,commited] htl: Add internal version of __pthread_mutex_timedlock
@ 2020-01-13 19:42 Samuel Thibault
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Thibault @ 2020-01-13 19:42 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault, commit-hurd
The C11 threads implementation will need it.
---
htl/Versions | 1 +
sysdeps/htl/pt-mutex-timedlock.c | 3 ++-
sysdeps/htl/pthreadP.h | 2 ++
sysdeps/mach/hurd/htl/pt-mutex-timedlock.c | 3 ++-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/htl/Versions b/htl/Versions
index 1c306acf5c..77f7335b9c 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -155,5 +155,6 @@ libpthread {
__pthread_setspecific;
__pthread_getattr_np;
__pthread_attr_getstack;
+ __pthread_mutex_timedlock;
}
}
diff --git a/sysdeps/htl/pt-mutex-timedlock.c b/sysdeps/htl/pt-mutex-timedlock.c
index d0ebb2975e..0e50f38ef2 100644
--- a/sysdeps/htl/pt-mutex-timedlock.c
+++ b/sysdeps/htl/pt-mutex-timedlock.c
@@ -189,8 +189,9 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
}
int
-pthread_mutex_timedlock (struct __pthread_mutex *mutex,
+__pthread_mutex_timedlock (struct __pthread_mutex *mutex,
const struct timespec *abstime)
{
return __pthread_mutex_timedlock_internal (mutex, abstime);
}
+strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock)
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index af0154538a..affe7cdf53 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -29,6 +29,8 @@ extern struct __pthread **__pthread_threads;
extern int _pthread_mutex_init (pthread_mutex_t *mutex, const pthread_mutexattr_t *attr);
extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
+extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,
+ const struct timespec *__abstime);
extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
extern int __pthread_cond_broadcast (pthread_cond_t *cond);
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
index 13136ddfe1..e83bc57875 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
@@ -24,7 +24,7 @@
#include <hurdlock.h>
int
-pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
+__pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
{
struct __pthread *self;
int ret, flags = mtxp->__flags & GSYNC_SHARED;
@@ -76,3 +76,4 @@ pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
return ret;
}
+strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock)
--
2.24.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [hurd,commited] htl: Add internal version of __pthread_mutex_timedlock
2020-01-14 18:52 [PATCH 00/10] Port C11 threads to GNU/Hurd Samuel Thibault
@ 2020-01-14 18:52 ` Samuel Thibault
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Thibault @ 2020-01-14 18:52 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault, commit-hurd
The C11 threads implementation will need it.
---
htl/Versions | 1 +
sysdeps/htl/pt-mutex-timedlock.c | 3 ++-
sysdeps/htl/pthreadP.h | 2 ++
sysdeps/mach/hurd/htl/pt-mutex-timedlock.c | 3 ++-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/htl/Versions b/htl/Versions
index 1c306acf5c..77f7335b9c 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -155,5 +155,6 @@ libpthread {
__pthread_setspecific;
__pthread_getattr_np;
__pthread_attr_getstack;
+ __pthread_mutex_timedlock;
}
}
diff --git a/sysdeps/htl/pt-mutex-timedlock.c b/sysdeps/htl/pt-mutex-timedlock.c
index d0ebb2975e..0e50f38ef2 100644
--- a/sysdeps/htl/pt-mutex-timedlock.c
+++ b/sysdeps/htl/pt-mutex-timedlock.c
@@ -189,8 +189,9 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
}
int
-pthread_mutex_timedlock (struct __pthread_mutex *mutex,
+__pthread_mutex_timedlock (struct __pthread_mutex *mutex,
const struct timespec *abstime)
{
return __pthread_mutex_timedlock_internal (mutex, abstime);
}
+strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock)
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index af0154538a..affe7cdf53 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -29,6 +29,8 @@ extern struct __pthread **__pthread_threads;
extern int _pthread_mutex_init (pthread_mutex_t *mutex, const pthread_mutexattr_t *attr);
extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
+extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,
+ const struct timespec *__abstime);
extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
extern int __pthread_cond_broadcast (pthread_cond_t *cond);
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
index 13136ddfe1..e83bc57875 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
@@ -24,7 +24,7 @@
#include <hurdlock.h>
int
-pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
+__pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
{
struct __pthread *self;
int ret, flags = mtxp->__flags & GSYNC_SHARED;
@@ -76,3 +76,4 @@ pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
return ret;
}
+strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock)
--
2.24.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-14 18:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-13 19:42 [hurd,commited] htl: Add internal version of __pthread_mutex_timedlock Samuel Thibault
-- strict thread matches above, loose matches on Subject: below --
2020-01-14 18:52 [PATCH 00/10] Port C11 threads to GNU/Hurd Samuel Thibault
2020-01-14 18:52 ` [hurd,commited] htl: Add internal version of __pthread_mutex_timedlock Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).