Deleted Added
full compact
thr_umtx.h (212077) thr_umtx.h (216641)
1/*-
2 * Copyright (c) 2005 David Xu <davidxu@freebsd.org>
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2005 David Xu <davidxu@freebsd.org>
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/lib/libthr/thread/thr_umtx.h 212077 2010-09-01 03:11:21Z davidxu $
26 * $FreeBSD: head/lib/libthr/thread/thr_umtx.h 216641 2010-12-22 05:01:52Z davidxu $
27 */
28
29#ifndef _THR_FBSD_UMTX_H_
30#define _THR_FBSD_UMTX_H_
31
32#include <strings.h>
33#include <sys/umtx.h>
34
35#define DEFAULT_UMUTEX {0,0,{0,0},{0,0,0,0}}
36#define DEFAULT_URWLOCK {0,0,0,0,{0,0,0,0}}
37
38int __thr_umutex_lock(struct umutex *mtx, uint32_t id) __hidden;
27 */
28
29#ifndef _THR_FBSD_UMTX_H_
30#define _THR_FBSD_UMTX_H_
31
32#include <strings.h>
33#include <sys/umtx.h>
34
35#define DEFAULT_UMUTEX {0,0,{0,0},{0,0,0,0}}
36#define DEFAULT_URWLOCK {0,0,0,0,{0,0,0,0}}
37
38int __thr_umutex_lock(struct umutex *mtx, uint32_t id) __hidden;
39int __thr_umutex_lock_spin(struct umutex *mtx, uint32_t id) __hidden;
39int __thr_umutex_timedlock(struct umutex *mtx, uint32_t id,
40 const struct timespec *timeout) __hidden;
41int __thr_umutex_unlock(struct umutex *mtx, uint32_t id) __hidden;
42int __thr_umutex_trylock(struct umutex *mtx) __hidden;
43int __thr_umutex_set_ceiling(struct umutex *mtx, uint32_t ceiling,
44 uint32_t *oldceiling) __hidden;
45
46void _thr_umutex_init(struct umutex *mtx) __hidden;
47void _thr_urwlock_init(struct urwlock *rwl) __hidden;
48
49int _thr_umtx_wait(volatile long *mtx, long exp,
50 const struct timespec *timeout) __hidden;
51int _thr_umtx_wait_uint(volatile u_int *mtx, u_int exp,
52 const struct timespec *timeout, int shared) __hidden;
40int __thr_umutex_timedlock(struct umutex *mtx, uint32_t id,
41 const struct timespec *timeout) __hidden;
42int __thr_umutex_unlock(struct umutex *mtx, uint32_t id) __hidden;
43int __thr_umutex_trylock(struct umutex *mtx) __hidden;
44int __thr_umutex_set_ceiling(struct umutex *mtx, uint32_t ceiling,
45 uint32_t *oldceiling) __hidden;
46
47void _thr_umutex_init(struct umutex *mtx) __hidden;
48void _thr_urwlock_init(struct urwlock *rwl) __hidden;
49
50int _thr_umtx_wait(volatile long *mtx, long exp,
51 const struct timespec *timeout) __hidden;
52int _thr_umtx_wait_uint(volatile u_int *mtx, u_int exp,
53 const struct timespec *timeout, int shared) __hidden;
54int _thr_umtx_timedwait_uint(volatile u_int *mtx, u_int exp, int clockid,
55 const struct timespec *timeout, int shared) __hidden;
53int _thr_umtx_wake(volatile void *mtx, int count, int shared) __hidden;
54int _thr_ucond_wait(struct ucond *cv, struct umutex *m,
55 const struct timespec *timeout, int check_unpaking) __hidden;
56void _thr_ucond_init(struct ucond *cv) __hidden;
57int _thr_ucond_signal(struct ucond *cv) __hidden;
58int _thr_ucond_broadcast(struct ucond *cv) __hidden;
59
60int __thr_rwlock_rdlock(struct urwlock *rwlock, int flags, struct timespec *tsp) __hidden;

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

92_thr_umutex_lock(struct umutex *mtx, uint32_t id)
93{
94 if (_thr_umutex_trylock2(mtx, id) == 0)
95 return (0);
96 return (__thr_umutex_lock(mtx, id));
97}
98
99static inline int
56int _thr_umtx_wake(volatile void *mtx, int count, int shared) __hidden;
57int _thr_ucond_wait(struct ucond *cv, struct umutex *m,
58 const struct timespec *timeout, int check_unpaking) __hidden;
59void _thr_ucond_init(struct ucond *cv) __hidden;
60int _thr_ucond_signal(struct ucond *cv) __hidden;
61int _thr_ucond_broadcast(struct ucond *cv) __hidden;
62
63int __thr_rwlock_rdlock(struct urwlock *rwlock, int flags, struct timespec *tsp) __hidden;

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

95_thr_umutex_lock(struct umutex *mtx, uint32_t id)
96{
97 if (_thr_umutex_trylock2(mtx, id) == 0)
98 return (0);
99 return (__thr_umutex_lock(mtx, id));
100}
101
102static inline int
103_thr_umutex_lock_spin(struct umutex *mtx, uint32_t id)
104{
105 if (_thr_umutex_trylock2(mtx, id) == 0)
106 return (0);
107 return (__thr_umutex_lock_spin(mtx, id));
108}
109
110static inline int
100_thr_umutex_timedlock(struct umutex *mtx, uint32_t id,
101 const struct timespec *timeout)
102{
103 if (_thr_umutex_trylock2(mtx, id) == 0)
104 return (0);
105 return (__thr_umutex_timedlock(mtx, id, timeout));
106}
107

--- 89 unchanged lines hidden ---
111_thr_umutex_timedlock(struct umutex *mtx, uint32_t id,
112 const struct timespec *timeout)
113{
114 if (_thr_umutex_trylock2(mtx, id) == 0)
115 return (0);
116 return (__thr_umutex_timedlock(mtx, id, timeout));
117}
118

--- 89 unchanged lines hidden ---