Skip to content

Commit 8f23250

Browse files
author
Nat!
committed
use new mulle-c11 MULLE_C_STATIC_ALWAYS_INLINE
1 parent 609163c commit 8f23250

File tree

5 files changed

+100
-91
lines changed

5 files changed

+100
-91
lines changed

‎cmake/share/CMakeTweaksC.cmake‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmake/share/Environment.cmake‎

Lines changed: 42 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/mulle-atomic-c11.h‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,23 @@ typedef _Atomic( mulle_functionpointer_t) mulle_atomic_functionpointer_t;
5555
# pragma mark function pointer set and get
5656

5757
// new
58-
MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
58+
MULLE_C_STATIC_ALWAYS_INLINE mulle_functionpointer_t
5959
_mulle_atomic_functionpointer_read_nonatomic( mulle_atomic_functionpointer_t *p)
6060
{
6161
return( *(mulle_functionpointer_t *) p);
6262
}
6363

6464

6565
// old
66-
MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
66+
MULLE_C_STATIC_ALWAYS_INLINE mulle_functionpointer_t
6767
_mulle_atomic_functionpointer_nonatomic_read( mulle_atomic_functionpointer_t *p)
6868
{
6969
return( *(mulle_functionpointer_t *) p);
7070
}
7171

7272

7373
// new
74-
MULLE_C_ALWAYS_INLINE static inline void
74+
MULLE_C_STATIC_ALWAYS_INLINE void
7575
_mulle_atomic_functionpointer_write_nonatomic( mulle_atomic_functionpointer_t *p,
7676
mulle_functionpointer_t value)
7777
{
@@ -80,15 +80,15 @@ MULLE_C_ALWAYS_INLINE static inline void
8080

8181

8282
// old
83-
MULLE_C_ALWAYS_INLINE static inline void
83+
MULLE_C_STATIC_ALWAYS_INLINE void
8484
_mulle_atomic_functionpointer_nonatomic_write( mulle_atomic_functionpointer_t *p,
8585
mulle_functionpointer_t value)
8686
{
8787
*(mulle_functionpointer_t *) p = value;
8888
}
8989

9090

91-
MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
91+
MULLE_C_STATIC_ALWAYS_INLINE mulle_functionpointer_t
9292
_mulle_atomic_functionpointer_read( mulle_atomic_functionpointer_t *address)
9393
{
9494
mulle_functionpointer_t result;
@@ -105,7 +105,7 @@ MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
105105
}
106106

107107

108-
MULLE_C_ALWAYS_INLINE static inline void
108+
MULLE_C_STATIC_ALWAYS_INLINE void
109109
_mulle_atomic_functionpointer_write( mulle_atomic_functionpointer_t *address,
110110
mulle_functionpointer_t value)
111111
{
@@ -116,7 +116,7 @@ MULLE_C_ALWAYS_INLINE static inline void
116116
# pragma mark -
117117
# pragma mark primitive code
118118

119-
MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
119+
MULLE_C_STATIC_ALWAYS_INLINE mulle_functionpointer_t
120120
__mulle_atomic_functionpointer_weakcas( mulle_atomic_functionpointer_t *address,
121121
mulle_functionpointer_t value,
122122
mulle_functionpointer_t expect)
@@ -155,7 +155,7 @@ MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
155155
}
156156

157157

158-
MULLE_C_ALWAYS_INLINE static inline int
158+
MULLE_C_STATIC_ALWAYS_INLINE int
159159
_mulle_atomic_functionpointer_weakcas( mulle_atomic_functionpointer_t *address,
160160
mulle_functionpointer_t value,
161161
mulle_functionpointer_t expect)
@@ -194,7 +194,7 @@ MULLE_C_ALWAYS_INLINE static inline int
194194
}
195195

196196

197-
MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
197+
MULLE_C_STATIC_ALWAYS_INLINE mulle_functionpointer_t
198198
__mulle_atomic_functionpointer_cas( mulle_atomic_functionpointer_t *address,
199199
mulle_functionpointer_t value,
200200
mulle_functionpointer_t expect)
@@ -230,7 +230,7 @@ MULLE_C_ALWAYS_INLINE static inline mulle_functionpointer_t
230230
}
231231

232232

233-
MULLE_C_ALWAYS_INLINE static inline int
233+
MULLE_C_STATIC_ALWAYS_INLINE int
234234
_mulle_atomic_functionpointer_cas( mulle_atomic_functionpointer_t *address,
235235
mulle_functionpointer_t value,
236236
mulle_functionpointer_t expect)
@@ -272,35 +272,35 @@ MULLE_C_ALWAYS_INLINE static inline int
272272
# pragma mark -
273273
# pragma mark pointer set and get
274274

275-
MULLE_C_ALWAYS_INLINE static inline void *
275+
MULLE_C_STATIC_ALWAYS_INLINE void *
276276
_mulle_atomic_pointer_nonatomic_read( mulle_atomic_pointer_t *p)
277277
{
278278
return( *(void **) p);
279279
}
280280

281-
MULLE_C_ALWAYS_INLINE static inline void *
281+
MULLE_C_STATIC_ALWAYS_INLINE void *
282282
_mulle_atomic_pointer_read_nonatomic( mulle_atomic_pointer_t *p)
283283
{
284284
return( *(void **) p);
285285
}
286286

287287

288288

289-
MULLE_C_ALWAYS_INLINE static inline void
289+
MULLE_C_STATIC_ALWAYS_INLINE void
290290
_mulle_atomic_pointer_write_nonatomic( mulle_atomic_pointer_t *p, void *value)
291291
{
292292
*(void **) p = value;
293293
}
294294

295295

296-
MULLE_C_ALWAYS_INLINE static inline void
296+
MULLE_C_STATIC_ALWAYS_INLINE void
297297
_mulle_atomic_pointer_nonatomic_write( mulle_atomic_pointer_t *p, void *value)
298298
{
299299
*(void **) p = value;
300300
}
301301

302302

303-
MULLE_C_ALWAYS_INLINE static inline void *
303+
MULLE_C_STATIC_ALWAYS_INLINE void *
304304
_mulle_atomic_pointer_read( mulle_atomic_pointer_t *address)
305305
{
306306
void *result;
@@ -318,7 +318,7 @@ MULLE_C_ALWAYS_INLINE static inline void *
318318
}
319319

320320

321-
MULLE_C_ALWAYS_INLINE static inline void
321+
MULLE_C_STATIC_ALWAYS_INLINE void
322322
_mulle_atomic_pointer_write( mulle_atomic_pointer_t *address, void *value)
323323
{
324324
atomic_store_explicit( address, value, memory_order_relaxed);
@@ -328,7 +328,7 @@ MULLE_C_ALWAYS_INLINE static inline void
328328
# pragma mark -
329329
# pragma mark primitive code
330330

331-
MULLE_C_ALWAYS_INLINE static inline void *
331+
MULLE_C_STATIC_ALWAYS_INLINE void *
332332
__mulle_atomic_pointer_cas_weak( mulle_atomic_pointer_t *address,
333333
void *value,
334334
void *expect)
@@ -365,7 +365,7 @@ MULLE_C_ALWAYS_INLINE static inline void *
365365
}
366366

367367

368-
MULLE_C_ALWAYS_INLINE static inline void *
368+
MULLE_C_STATIC_ALWAYS_INLINE void *
369369
__mulle_atomic_pointer_weakcas( mulle_atomic_pointer_t *address,
370370
void *value,
371371
void *expect)
@@ -374,7 +374,7 @@ MULLE_C_ALWAYS_INLINE static inline void *
374374
}
375375

376376

377-
MULLE_C_ALWAYS_INLINE static inline int
377+
MULLE_C_STATIC_ALWAYS_INLINE int
378378
_mulle_atomic_pointer_cas_weak( mulle_atomic_pointer_t *address,
379379
void *value,
380380
void *expect)
@@ -414,7 +414,7 @@ MULLE_C_ALWAYS_INLINE static inline int
414414
}
415415

416416

417-
MULLE_C_ALWAYS_INLINE static inline int
417+
MULLE_C_STATIC_ALWAYS_INLINE int
418418
_mulle_atomic_pointer_weakcas( mulle_atomic_pointer_t *address,
419419
void *value,
420420
void *expect)
@@ -425,7 +425,7 @@ MULLE_C_ALWAYS_INLINE static inline int
425425

426426

427427
// this returns actual
428-
MULLE_C_ALWAYS_INLINE static inline void *
428+
MULLE_C_STATIC_ALWAYS_INLINE void *
429429
__mulle_atomic_pointer_cas( mulle_atomic_pointer_t *address,
430430
void *value,
431431
void *expect)
@@ -463,7 +463,7 @@ MULLE_C_ALWAYS_INLINE static inline void *
463463

464464

465465
// this returns a flag if the operation was successful
466-
MULLE_C_ALWAYS_INLINE static inline int
466+
MULLE_C_STATIC_ALWAYS_INLINE int
467467
_mulle_atomic_pointer_cas( mulle_atomic_pointer_t *address,
468468
void *value,
469469
void *expect)
@@ -503,7 +503,7 @@ MULLE_C_ALWAYS_INLINE static inline int
503503
}
504504

505505

506-
MULLE_C_ALWAYS_INLINE static inline void *
506+
MULLE_C_STATIC_ALWAYS_INLINE void *
507507
_mulle_atomic_pointer_increment( mulle_atomic_pointer_t *address)
508508
{
509509
return( (void *) atomic_fetch_add_explicit( (atomic_intptr_t *) address,
@@ -512,7 +512,7 @@ MULLE_C_ALWAYS_INLINE static inline void *
512512
}
513513

514514

515-
MULLE_C_ALWAYS_INLINE static inline void *
515+
MULLE_C_STATIC_ALWAYS_INLINE void *
516516
_mulle_atomic_pointer_decrement( mulle_atomic_pointer_t *address)
517517
{
518518
return( (void *) atomic_fetch_add_explicit( (atomic_intptr_t *) address,
@@ -522,7 +522,7 @@ MULLE_C_ALWAYS_INLINE static inline void *
522522

523523

524524
// returns the result, not the previous value like increment/decrement
525-
MULLE_C_ALWAYS_INLINE static inline void *
525+
MULLE_C_STATIC_ALWAYS_INLINE void *
526526
_mulle_atomic_pointer_add( mulle_atomic_pointer_t *address, intptr_t diff)
527527
{
528528
return( (void *) ((intptr_t) atomic_fetch_add_explicit( (atomic_intptr_t *) address,
@@ -531,7 +531,7 @@ MULLE_C_ALWAYS_INLINE static inline void *
531531
}
532532

533533

534-
MULLE_C_ALWAYS_INLINE static inline void
534+
MULLE_C_STATIC_ALWAYS_INLINE void
535535
mulle_atomic_memory_barrier( void)
536536
{
537537
atomic_signal_fence( memory_order_seq_cst);

0 commit comments

Comments
 (0)