Print this page
remove support for non-ANSI compilation
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/head/synch.h
+++ new/usr/src/head/synch.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21
22 22 /*
23 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
23 24 * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
24 25 */
25 26
26 27 #ifndef _SYNCH_H
27 28 #define _SYNCH_H
28 29
29 30 /*
30 31 * synch.h:
31 32 * definitions needed to use the thread synchronization interface
32 33 */
33 34
34 35 #ifndef _ASM
35 36 #include <sys/machlock.h>
36 37 #include <sys/time_impl.h>
37 38 #include <sys/synch.h>
38 39 #endif /* _ASM */
39 40
40 41 #ifdef __cplusplus
41 42 extern "C" {
42 43 #endif
43 44
44 45 #ifndef _ASM
45 46
46 47 /*
47 48 * Semaphores
48 49 */
49 50 typedef struct _sema {
50 51 /* this structure must be the same as sem_t in <semaphore.h> */
51 52 uint32_t count; /* semaphore count */
52 53 uint16_t type;
53 54 uint16_t magic;
54 55 upad64_t pad1[3]; /* reserved for a mutex_t */
55 56 upad64_t pad2[2]; /* reserved for a cond_t */
56 57 } sema_t;
57 58
58 59 /*
59 60 * POSIX.1c Note:
60 61 * POSIX.1c requires that <pthread.h> define the structures pthread_mutex_t
61 62 * and pthread_cond_t. These structures are identical to mutex_t (lwp_mutex_t)
62 63 * and cond_t (lwp_cond_t) which are defined in <synch.h>. A nested included
63 64 * of <synch.h> (to allow a "#typedef mutex_t pthread_mutex_t") would pull in
64 65 * non-posix symbols/constants violating the namespace restrictions. Hence,
65 66 * pthread_mutex_t/pthread_cond_t have been redefined in <pthread.h> (actually
66 67 * in <sys/types.h>). Any modifications done to mutex_t/lwp_mutex_t or
67 68 * cond_t/lwp_cond_t should also be done to pthread_mutex_t/pthread_cond_t.
68 69 */
69 70 typedef lwp_mutex_t mutex_t;
70 71 typedef lwp_cond_t cond_t;
71 72
72 73 /*
73 74 * Readers/writer locks
74 75 *
75 76 * NOTE: The layout of this structure should be kept in sync with the layout
76 77 * of the correponding structure of pthread_rwlock_t in sys/types.h.
77 78 * Also, there is an identical structure for lwp_rwlock_t in <sys/synch.h>.
78 79 * Because we have to deal with C++, we cannot redefine this one as that one.
|
↓ open down ↓ |
46 lines elided |
↑ open up ↑ |
79 80 */
80 81 typedef struct _rwlock {
81 82 int32_t readers; /* rwstate word */
82 83 uint16_t type;
83 84 uint16_t magic;
84 85 mutex_t mutex; /* used with process-shared rwlocks */
85 86 cond_t readercv; /* used only to indicate ownership */
86 87 cond_t writercv; /* used only to indicate ownership */
87 88 } rwlock_t;
88 89
89 -#ifdef __STDC__
90 90 int _lwp_mutex_lock(lwp_mutex_t *);
91 91 int _lwp_mutex_unlock(lwp_mutex_t *);
92 92 int _lwp_mutex_trylock(lwp_mutex_t *);
93 93 int _lwp_cond_wait(lwp_cond_t *, lwp_mutex_t *);
94 94 int _lwp_cond_timedwait(lwp_cond_t *, lwp_mutex_t *, timespec_t *);
95 95 int _lwp_cond_reltimedwait(lwp_cond_t *, lwp_mutex_t *, timespec_t *);
96 96 int _lwp_cond_signal(lwp_cond_t *);
97 97 int _lwp_cond_broadcast(lwp_cond_t *);
98 98 int _lwp_sema_init(lwp_sema_t *, int);
99 99 int _lwp_sema_wait(lwp_sema_t *);
100 100 int _lwp_sema_trywait(lwp_sema_t *);
101 101 int _lwp_sema_post(lwp_sema_t *);
102 102 int cond_init(cond_t *, int, void *);
103 103 int cond_destroy(cond_t *);
104 104 int cond_wait(cond_t *, mutex_t *);
105 105 int cond_timedwait(cond_t *, mutex_t *, const timespec_t *);
106 106 int cond_reltimedwait(cond_t *, mutex_t *, const timespec_t *);
107 107 int cond_signal(cond_t *);
108 108 int cond_broadcast(cond_t *);
109 109 int mutex_init(mutex_t *, int, void *);
110 110 int mutex_destroy(mutex_t *);
111 111 int mutex_consistent(mutex_t *);
112 112 int mutex_lock(mutex_t *);
113 113 int mutex_trylock(mutex_t *);
114 114 int mutex_unlock(mutex_t *);
115 115 int rwlock_init(rwlock_t *, int, void *);
116 116 int rwlock_destroy(rwlock_t *);
117 117 int rw_rdlock(rwlock_t *);
118 118 int rw_wrlock(rwlock_t *);
119 119 int rw_unlock(rwlock_t *);
|
↓ open down ↓ |
20 lines elided |
↑ open up ↑ |
120 120 int rw_tryrdlock(rwlock_t *);
121 121 int rw_trywrlock(rwlock_t *);
122 122 int sema_init(sema_t *, unsigned int, int, void *);
123 123 int sema_destroy(sema_t *);
124 124 int sema_wait(sema_t *);
125 125 int sema_timedwait(sema_t *, const timespec_t *);
126 126 int sema_reltimedwait(sema_t *, const timespec_t *);
127 127 int sema_post(sema_t *);
128 128 int sema_trywait(sema_t *);
129 129
130 -#else /* __STDC__ */
131 -
132 -int _lwp_mutex_lock();
133 -int _lwp_mutex_unlock();
134 -int _lwp_mutex_trylock();
135 -int _lwp_cond_wait();
136 -int _lwp_cond_timedwait();
137 -int _lwp_cond_reltimedwait();
138 -int _lwp_cond_signal();
139 -int _lwp_cond_broadcast();
140 -int _lwp_sema_init();
141 -int _lwp_sema_wait();
142 -int _lwp_sema_trywait();
143 -int _lwp_sema_post();
144 -int cond_init();
145 -int cond_destroy();
146 -int cond_wait();
147 -int cond_timedwait();
148 -int cond_reltimedwait();
149 -int cond_signal();
150 -int cond_broadcast();
151 -int mutex_init();
152 -int mutex_destroy();
153 -int mutex_consistent();
154 -int mutex_lock();
155 -int mutex_trylock();
156 -int mutex_unlock();
157 -int rwlock_init();
158 -int rwlock_destroy();
159 -int rw_rdlock();
160 -int rw_wrlock();
161 -int rw_unlock();
162 -int rw_tryrdlock();
163 -int rw_trywrlock();
164 -int sema_init();
165 -int sema_destroy();
166 -int sema_wait();
167 -int sema_timedwait();
168 -int sema_reltimedwait();
169 -int sema_post();
170 -int sema_trywait();
171 -
172 -#endif /* __STDC__ */
173 -
174 130 #endif /* _ASM */
175 131
176 132 /* "Magic numbers" tagging synchronization object types */
177 133 #define MUTEX_MAGIC _MUTEX_MAGIC
178 134 #define SEMA_MAGIC _SEMA_MAGIC
179 135 #define COND_MAGIC _COND_MAGIC
180 136 #define RWL_MAGIC _RWL_MAGIC
181 137
182 138 /*
183 139 * POSIX.1c Note:
184 140 * DEFAULTMUTEX is defined same as PTHREAD_MUTEX_INITIALIZER in <pthread.h>.
185 141 * DEFAULTCV is defined same as PTHREAD_COND_INITIALIZER in <pthread.h>.
186 142 * DEFAULTRWLOCK is defined same as PTHREAD_RWLOCK_INITIALIZER in <pthread.h>.
187 143 * Any changes to these macros should be reflected in <pthread.h>
188 144 */
189 145 #define DEFAULTMUTEX \
190 146 {{0, 0, 0, {USYNC_THREAD}, MUTEX_MAGIC}, \
191 147 {{{0, 0, 0, 0, 0, 0, 0, 0}}}, 0}
192 148 #define SHAREDMUTEX \
193 149 {{0, 0, 0, {USYNC_PROCESS}, MUTEX_MAGIC}, \
194 150 {{{0, 0, 0, 0, 0, 0, 0, 0}}}, 0}
195 151 #define RECURSIVEMUTEX \
196 152 {{0, 0, 0, {USYNC_THREAD|LOCK_RECURSIVE}, MUTEX_MAGIC}, \
197 153 {{{0, 0, 0, 0, 0, 0, 0, 0}}}, 0}
198 154 #define ERRORCHECKMUTEX \
199 155 {{0, 0, 0, {USYNC_THREAD|LOCK_ERRORCHECK}, MUTEX_MAGIC}, \
200 156 {{{0, 0, 0, 0, 0, 0, 0, 0}}}, 0}
201 157 #define RECURSIVE_ERRORCHECKMUTEX \
202 158 {{0, 0, 0, {USYNC_THREAD|LOCK_RECURSIVE|LOCK_ERRORCHECK}, \
203 159 MUTEX_MAGIC}, {{{0, 0, 0, 0, 0, 0, 0, 0}}}, 0}
204 160 #define DEFAULTCV \
205 161 {{{0, 0, 0, 0}, USYNC_THREAD, COND_MAGIC}, 0}
206 162 #define SHAREDCV \
207 163 {{{0, 0, 0, 0}, USYNC_PROCESS, COND_MAGIC}, 0}
208 164 #define DEFAULTSEMA \
209 165 {0, USYNC_THREAD, SEMA_MAGIC, {0, 0, 0}, {0, 0}}
210 166 #define SHAREDSEMA \
211 167 {0, USYNC_PROCESS, SEMA_MAGIC, {0, 0, 0}, {0, 0}}
212 168 #define DEFAULTRWLOCK \
213 169 {0, USYNC_THREAD, RWL_MAGIC, DEFAULTMUTEX, DEFAULTCV, DEFAULTCV}
214 170 #define SHAREDRWLOCK \
215 171 {0, USYNC_PROCESS, RWL_MAGIC, SHAREDMUTEX, SHAREDCV, SHAREDCV}
216 172
217 173 /*
218 174 * Tests on lock states.
219 175 */
220 176 #define SEMA_HELD(x) _sema_held(x)
221 177 #define RW_READ_HELD(x) _rw_read_held(x)
222 178 #define RW_WRITE_HELD(x) _rw_write_held(x)
223 179 #define RW_LOCK_HELD(x) (RW_READ_HELD(x) || RW_WRITE_HELD(x))
224 180 #define MUTEX_HELD(x) _mutex_held(x)
225 181
226 182 /*
227 183 * The following definitions are for assertions which can be checked
228 184 * statically by tools like lock_lint. You can also define your own
229 185 * run-time test for each. If you don't, we define them to 1 so that
230 186 * such assertions simply pass.
|
↓ open down ↓ |
47 lines elided |
↑ open up ↑ |
231 187 */
232 188 #ifndef NO_LOCKS_HELD
233 189 #define NO_LOCKS_HELD 1
234 190 #endif
235 191 #ifndef NO_COMPETING_THREADS
236 192 #define NO_COMPETING_THREADS 1
237 193 #endif
238 194
239 195 #ifndef _ASM
240 196
241 -#ifdef __STDC__
242 -
243 197 /*
244 198 * The *_held() functions apply equally well to Solaris threads
245 199 * and to Posix threads synchronization objects, but the formal
246 200 * type declarations are different, so we just declare the argument
247 201 * to each *_held() function to be a void *, expecting that they will
248 202 * be called with the proper type of argument in each case.
249 203 */
250 204 int _sema_held(void *); /* sema_t or sem_t */
251 205 int _rw_read_held(void *); /* rwlock_t or pthread_rwlock_t */
252 206 int _rw_write_held(void *); /* rwlock_t or pthread_rwlock_t */
253 207 int _mutex_held(void *); /* mutex_t or pthread_mutex_t */
254 208
255 -#else /* __STDC__ */
256 -
257 -int _sema_held();
258 -int _rw_read_held();
259 -int _rw_write_held();
260 -int _mutex_held();
261 -
262 -#endif /* __STDC__ */
263 -
264 209 /* Pause API */
265 -#ifdef __STDC__
266 210 void smt_pause(void);
267 -#else /* __STDC__ */
268 -void smt_pause();
269 -#endif /* __STDC__ */
270 211
271 212 #endif /* _ASM */
272 213
273 214 #ifdef __cplusplus
274 215 }
275 216 #endif
276 217
277 218 #endif /* _SYNCH_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX