Deleted Added
full compact
thr_setprio.c (162037) thr_setprio.c (162499)
1/*
2 * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * $FreeBSD: head/lib/libthr/thread/thr_setprio.c 162037 2006-09-05 14:39:06Z davidxu $
32 * $FreeBSD: head/lib/libthr/thread/thr_setprio.c 162499 2006-09-21 04:21:30Z davidxu $
33 */
34
35#include "namespace.h"
36#include <pthread.h>
37#include "un-namespace.h"
38
39#include "thr_private.h"
40

--- 9 unchanged lines hidden (view full) ---

50 param.sched_priority = prio;
51 if (pthread == curthread) {
52 THR_LOCK(curthread);
53 if (curthread->attr.sched_policy == SCHED_OTHER ||
54 curthread->attr.prio == prio) {
55 curthread->attr.prio = prio;
56 ret = 0;
57 } else {
33 */
34
35#include "namespace.h"
36#include <pthread.h>
37#include "un-namespace.h"
38
39#include "thr_private.h"
40

--- 9 unchanged lines hidden (view full) ---

50 param.sched_priority = prio;
51 if (pthread == curthread) {
52 THR_LOCK(curthread);
53 if (curthread->attr.sched_policy == SCHED_OTHER ||
54 curthread->attr.prio == prio) {
55 curthread->attr.prio = prio;
56 ret = 0;
57 } else {
58 ret = thr_setschedparam(curthread->tid,
59 &param, sizeof(struct sched_param));
58 ret = _thr_setscheduler(curthread->tid,
59 curthread->attr.sched_policy, &param);
60 if (ret == -1)
61 ret = errno;
62 else
63 curthread->attr.prio = prio;
64 }
65 THR_UNLOCK(curthread);
66 } else if ((ret = _thr_ref_add(curthread, pthread, /*include dead*/0))
67 == 0) {
68 THR_THREAD_LOCK(curthread, pthread);
69 if (pthread->attr.sched_policy == SCHED_OTHER ||
70 pthread->attr.prio == prio) {
71 pthread->attr.prio = prio;
72 ret = 0;
73 } else {
60 if (ret == -1)
61 ret = errno;
62 else
63 curthread->attr.prio = prio;
64 }
65 THR_UNLOCK(curthread);
66 } else if ((ret = _thr_ref_add(curthread, pthread, /*include dead*/0))
67 == 0) {
68 THR_THREAD_LOCK(curthread, pthread);
69 if (pthread->attr.sched_policy == SCHED_OTHER ||
70 pthread->attr.prio == prio) {
71 pthread->attr.prio = prio;
72 ret = 0;
73 } else {
74 ret = thr_setschedparam(pthread->tid, &param,
75 sizeof(struct sched_param));
74 ret = _thr_setscheduler(pthread->tid,
75 curthread->attr.sched_policy, &param);
76 if (ret == -1)
77 ret = errno;
78 else
79 pthread->attr.prio = prio;
80 }
81 THR_THREAD_UNLOCK(curthread, pthread);
82 _thr_ref_delete(curthread, pthread);
83 }
84 return (ret);
85}
76 if (ret == -1)
77 ret = errno;
78 else
79 pthread->attr.prio = prio;
80 }
81 THR_THREAD_UNLOCK(curthread, pthread);
82 _thr_ref_delete(curthread, pthread);
83 }
84 return (ret);
85}