summaryrefslogtreecommitdiff
path: root/src/thread
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-05-23 14:13:54 -0400
committerRich Felker <dalias@aerifal.cx>2012-05-23 14:13:54 -0400
commitcfd892fde9454e014d9b291a56ce5740d8bc4a78 (patch)
tree25549d8ed33ff5205961084435b51849cc15f9e6 /src/thread
parent25d575edc494e5a519468889e62beea4dde186ea (diff)
downloadmusl-cfd892fde9454e014d9b291a56ce5740d8bc4a78.tar.gz
musl-cfd892fde9454e014d9b291a56ce5740d8bc4a78.tar.bz2
musl-cfd892fde9454e014d9b291a56ce5740d8bc4a78.tar.xz
musl-cfd892fde9454e014d9b291a56ce5740d8bc4a78.zip
simplify cancellation push/pop slightly
no need to pass unnecessary extra arguments on to the core code in pthread_create.c. this just wastes cycles and code bloat.
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/cancellation.c17
-rw-r--r--src/thread/pthread_create.c4
2 files changed, 9 insertions, 12 deletions
diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index ab7eebcc..9b21764b 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,23 +1,20 @@
#include "pthread_impl.h"
-void __do_cleanup_push();
-void __do_cleanup_pop();
+static void dummy(struct __ptcb *cb)
+{
+}
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);
void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
{
cb->__f = f;
cb->__x = x;
- __do_cleanup_push(cb, f, x);
+ __do_cleanup_push(cb);
}
void _pthread_cleanup_pop(struct __ptcb *cb, int run)
{
- __do_cleanup_pop(cb, run);
+ __do_cleanup_pop(cb);
if (run) cb->__f(cb->__x);
}
-
-static void dummy()
-{
-}
-weak_alias(dummy, __do_cleanup_push);
-weak_alias(dummy, __do_cleanup_pop);
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 917be54f..ecf93a46 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -43,14 +43,14 @@ void pthread_exit(void *result)
__syscall(SYS_exit, 0);
}
-void __do_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
+void __do_cleanup_push(struct __ptcb *cb)
{
struct pthread *self = pthread_self();
cb->__next = self->cancelbuf;
self->cancelbuf = cb;
}
-void __do_cleanup_pop(struct __ptcb *cb, int run)
+void __do_cleanup_pop(struct __ptcb *cb)
{
__pthread_self()->cancelbuf = cb->__next;
}