about summary refs log tree commit diff
path: root/htl
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-09 22:23:52 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-10 01:03:50 +0000
commit59b7fe99f2593682ba779fe0faa8f1156d48d087 (patch)
tree6593a95d3d233a943b67a290cccf78fbbc793c0c /htl
parentf1cd3407e4c6767e0bbe2ca122b713c6581b8d67 (diff)
downloadglibc-59b7fe99f2593682ba779fe0faa8f1156d48d087.tar.gz
glibc-59b7fe99f2593682ba779fe0faa8f1156d48d087.tar.xz
glibc-59b7fe99f2593682ba779fe0faa8f1156d48d087.zip
htl: Add support for libc cancellation points
Diffstat (limited to 'htl')
-rw-r--r--htl/Makefile1
-rw-r--r--htl/Versions2
-rw-r--r--htl/cancellation.c45
-rw-r--r--htl/pt-testcancel.c3
4 files changed, 50 insertions, 1 deletions
diff --git a/htl/Makefile b/htl/Makefile
index b2dc797ee4..1b33748934 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -132,6 +132,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 									    \
 	shm-directory							    \
 									    \
+	cancellation							    \
 	cthreads-compat							    \
 	herrno								    \
 	$(SYSDEPS)
diff --git a/htl/Versions b/htl/Versions
index 4f5f727753..1ec6f363d5 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -168,6 +168,8 @@ libpthread {
     __pthread_mutex_init;
     __pthread_mutex_destroy;
     __pthread_mutex_timedlock;
+    __pthread_enable_asynccancel;
+    __pthread_disable_asynccancel;
 
     _pthread_mutex_lock; _pthread_mutex_trylock; _pthread_mutex_unlock;
     _pthread_rwlock_destroy; _pthread_rwlock_init;
diff --git a/htl/cancellation.c b/htl/cancellation.c
new file mode 100644
index 0000000000..598f911d91
--- /dev/null
+++ b/htl/cancellation.c
@@ -0,0 +1,45 @@
+/* Set the cancel type during blocking calls.
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library;  if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <pthread.h>
+#include <pthreadP.h>
+#include <pt-internal.h>
+
+int __pthread_enable_asynccancel (void)
+{
+  struct __pthread *p = _pthread_self ();
+  int oldtype;
+
+  __pthread_mutex_lock (&p->cancel_lock);
+  oldtype = p->cancel_type;
+  p->cancel_type = PTHREAD_CANCEL_ASYNCHRONOUS;
+  __pthread_mutex_unlock (&p->cancel_lock);
+
+  __pthread_testcancel ();
+
+  return oldtype;
+}
+
+void __pthread_disable_asynccancel (int oldtype)
+{
+  struct __pthread *p = _pthread_self ();
+
+  __pthread_mutex_lock (&p->cancel_lock);
+  p->cancel_type = oldtype;
+  __pthread_mutex_unlock (&p->cancel_lock);
+}
diff --git a/htl/pt-testcancel.c b/htl/pt-testcancel.c
index 1ec324b95f..37326280ee 100644
--- a/htl/pt-testcancel.c
+++ b/htl/pt-testcancel.c
@@ -22,7 +22,7 @@
 #include <pthreadP.h>
 
 void
-pthread_testcancel (void)
+__pthread_testcancel (void)
 {
   struct __pthread *p = _pthread_self ();
   int cancelled;
@@ -34,3 +34,4 @@ pthread_testcancel (void)
   if (cancelled)
     __pthread_exit (PTHREAD_CANCELED);
 }
+strong_alias (__pthread_testcancel, pthread_testcancel)