summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2009-11-13 13:11:00 +0100
committerAustin Foxley <austinf@cetoncorp.com>2009-11-22 11:05:45 -0800
commitbb8a3f00cfa3913c7f360f2fc601b9315cb5474a (patch)
treefc499dffecb5b5e84ad1323aab9194fc795d0eda
parent675e3c0b3cf40a751c52fde3e7964e112d4dad70 (diff)
remove wait callbacks for non-cancelation funcs
No need to install a cancellation handler, these are no cancellation point. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
-rw-r--r--libpthread/nptl/pthread_getattr_np.c6
-rw-r--r--libpthread/nptl/pthread_getschedparam.c6
-rw-r--r--libpthread/nptl/pthread_setschedparam.c6
-rw-r--r--libpthread/nptl/pthread_setschedprio.c6
4 files changed, 0 insertions, 24 deletions
diff --git a/libpthread/nptl/pthread_getattr_np.c b/libpthread/nptl/pthread_getattr_np.c
index 969459fe8..8819731ab 100644
--- a/libpthread/nptl/pthread_getattr_np.c
+++ b/libpthread/nptl/pthread_getattr_np.c
@@ -39,10 +39,6 @@ pthread_getattr_np (thread_id, attr)
struct pthread_attr *iattr = (struct pthread_attr *) attr;
int ret = 0;
- /* We have to handle cancellation in the following code since we are
- locking another threads desriptor. */
- pthread_cleanup_push ((void (*) (void *)) lll_unlock_wake_cb, &thread->lock);
-
lll_lock (thread->lock);
/* The thread library is responsible for keeping the values in the
@@ -171,7 +167,5 @@ pthread_getattr_np (thread_id, attr)
lll_unlock (thread->lock);
- pthread_cleanup_pop (0);
-
return ret;
}
diff --git a/libpthread/nptl/pthread_getschedparam.c b/libpthread/nptl/pthread_getschedparam.c
index 64b15cde9..10ad27142 100644
--- a/libpthread/nptl/pthread_getschedparam.c
+++ b/libpthread/nptl/pthread_getschedparam.c
@@ -38,10 +38,6 @@ __pthread_getschedparam (threadid, policy, param)
int result = 0;
- /* We have to handle cancellation in the following code since we are
- locking another threads descriptor. */
- pthread_cleanup_push ((void (*) (void *)) lll_unlock_wake_cb, &pd->lock);
-
lll_lock (pd->lock);
/* The library is responsible for maintaining the values at all
@@ -74,8 +70,6 @@ __pthread_getschedparam (threadid, policy, param)
lll_unlock (pd->lock);
- pthread_cleanup_pop (0);
-
return result;
}
strong_alias (__pthread_getschedparam, pthread_getschedparam)
diff --git a/libpthread/nptl/pthread_setschedparam.c b/libpthread/nptl/pthread_setschedparam.c
index c72116bcb..71c2f9b77 100644
--- a/libpthread/nptl/pthread_setschedparam.c
+++ b/libpthread/nptl/pthread_setschedparam.c
@@ -39,10 +39,6 @@ __pthread_setschedparam (threadid, policy, param)
int result = 0;
- /* We have to handle cancellation in the following code since we are
- locking another threads desriptor. */
- pthread_cleanup_push ((void (*) (void *)) lll_unlock_wake_cb, &pd->lock);
-
lll_lock (pd->lock);
/* Try to set the scheduler information. */
@@ -60,8 +56,6 @@ __pthread_setschedparam (threadid, policy, param)
lll_unlock (pd->lock);
- pthread_cleanup_pop (0);
-
return result;
}
strong_alias (__pthread_setschedparam, pthread_setschedparam)
diff --git a/libpthread/nptl/pthread_setschedprio.c b/libpthread/nptl/pthread_setschedprio.c
index 063f5232f..e7ea4b76f 100644
--- a/libpthread/nptl/pthread_setschedprio.c
+++ b/libpthread/nptl/pthread_setschedprio.c
@@ -41,10 +41,6 @@ pthread_setschedprio (threadid, prio)
struct sched_param param;
param.sched_priority = prio;
- /* We have to handle cancellation in the following code since we are
- locking another threads desriptor. */
- pthread_cleanup_push ((void (*) (void *)) lll_unlock_wake_cb, &pd->lock);
-
lll_lock (pd->lock);
/* Try to set the scheduler information. */
@@ -60,7 +56,5 @@ pthread_setschedprio (threadid, prio)
lll_unlock (pd->lock);
- pthread_cleanup_pop (0);
-
return result;
}