Skip to content

Commit c26b55a

Browse files
tony2001tony2001
committed
CS and folding ++
1 parent f9e784a commit c26b55a

File tree

4 files changed

+46
-25
lines changed

4 files changed

+46
-25
lines changed

‎sapi/fpm/fpm/fpm_arrays.h

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ struct fpm_array_s {
1515
size_t allocated;
1616
};
1717

18-
static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned int sz, unsigned int initial_num)
18+
static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned int sz, unsigned int initial_num) /* {{{ */
1919
{
2020
void *allocated = 0;
2121

@@ -43,22 +43,25 @@ static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned
4343

4444
return a;
4545
}
46+
/* }}} */
4647

47-
static inline void *fpm_array_item(struct fpm_array_s *a, unsigned int n)
48+
static inline void *fpm_array_item(struct fpm_array_s *a, unsigned int n) /* {{{ */
4849
{
4950
char *ret;
5051

5152
ret = (char *) a->data + a->sz * n;
5253

5354
return ret;
5455
}
56+
/* }}} */
5557

56-
static inline void *fpm_array_item_last(struct fpm_array_s *a)
58+
static inline void *fpm_array_item_last(struct fpm_array_s *a) /* {{{ */
5759
{
5860
return fpm_array_item(a, a->used - 1);
5961
}
62+
/* }}} */
6063

61-
static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n)
64+
static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n) /* {{{ */
6265
{
6366
int ret = -1;
6467

@@ -75,8 +78,9 @@ static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n)
7578

7679
return ret;
7780
}
81+
/* }}} */
7882

79-
static inline void *fpm_array_push(struct fpm_array_s *a)
83+
static inline void *fpm_array_push(struct fpm_array_s *a) /* {{{ */
8084
{
8185
void *ret;
8286

@@ -98,13 +102,15 @@ static inline void *fpm_array_push(struct fpm_array_s *a)
98102

99103
return ret;
100104
}
105+
/* }}} */
101106

102-
static inline void fpm_array_free(struct fpm_array_s *a)
107+
static inline void fpm_array_free(struct fpm_array_s *a) /* {{{ */
103108
{
104109
free(a->data);
105110
a->data = 0;
106111
a->sz = 0;
107112
a->used = a->allocated = 0;
108113
}
114+
/* }}} */
109115

110116
#endif

‎sapi/fpm/fpm/fpm_atomic.h

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ typedef uint32_t atomic_uint_t;
1919
typedef volatile atomic_uint_t atomic_t;
2020

2121

22-
static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
22+
static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add) /* {{{ */
2323
{
2424
__asm__ volatile ( "lock;" "xaddl %0, %1;" :
2525
"+r" (add) : "m" (*value) : "memory");
2626

2727
return add;
2828
}
29+
/* }}} */
2930

30-
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
31+
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
3132
{
3233
unsigned char res;
3334

@@ -36,22 +37,24 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, at
3637

3738
return res;
3839
}
40+
/* }}} */
3941

4042
#elif ( __amd64__ || __amd64 || __x86_64__ )
4143

4244
typedef int64_t atomic_int_t;
4345
typedef uint64_t atomic_uint_t;
4446
typedef volatile atomic_uint_t atomic_t;
4547

46-
static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
48+
static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add) /* {{{ */
4749
{
4850
__asm__ volatile ( "lock;" "xaddq %0, %1;" :
4951
"+r" (add) : "m" (*value) : "memory");
5052

5153
return add;
5254
}
55+
/* }}} */
5356

54-
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
57+
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
5558
{
5659
unsigned char res;
5760

@@ -60,6 +63,7 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, at
6063

6164
return res;
6265
}
66+
/* }}} */
6367

6468
#if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
6569

@@ -83,32 +87,36 @@ typedef uint32_t atomic_uint_t;
8387
typedef uint64_t atomic_uint_t;
8488
typedef volatile atomic_uint_t atomic_t;
8589

86-
static inline int atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new)
90+
static inline int atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
8791
{
8892
__asm__ __volatile__("casx [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory");
8993

9094
return new;
9195
}
96+
/* }}} */
9297

93-
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
98+
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
9499
{
95100
return (atomic_cas_64(lock, old, set)==old);
96101
}
102+
/* }}} */
97103
#else
98104
typedef uint32_t atomic_uint_t;
99105
typedef volatile atomic_uint_t atomic_t;
100106

101-
static inline int atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new)
107+
static inline int atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
102108
{
103109
__asm__ __volatile__("cas [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory");
104110

105111
return new;
106112
}
113+
/* }}} */
107114

108-
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
115+
static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
109116
{
110117
return (atomic_cas_32(lock, old, set)==old);
111118
}
119+
/* }}} */
112120
#endif
113121

114122
#else
@@ -117,7 +125,7 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, at
117125

118126
#endif
119127

120-
static inline int fpm_spinlock(atomic_t *lock, int try_once)
128+
static inline int fpm_spinlock(atomic_t *lock, int try_once) /* {{{ */
121129
{
122130
if (try_once) {
123131
return atomic_cmp_set(lock, 0, 1) ? 0 : -1;
@@ -134,6 +142,7 @@ static inline int fpm_spinlock(atomic_t *lock, int try_once)
134142

135143
return 0;
136144
}
145+
/* }}} */
137146

138147
#endif
139148

‎sapi/fpm/fpm/fpm_sockets.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,22 @@ enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
1414
int fpm_sockets_init_main();
1515

1616

17-
static inline int fd_set_blocked(int fd, int blocked)
17+
static inline int fd_set_blocked(int fd, int blocked) /* {{{ */
1818
{
1919
int flags = fcntl(fd, F_GETFL);
2020

21-
if (flags < 0) return -1;
21+
if (flags < 0) {
22+
return -1;
23+
}
2224

23-
if (blocked)
25+
if (blocked) {
2426
flags &= ~O_NONBLOCK;
25-
else
27+
} else {
2628
flags |= O_NONBLOCK;
27-
29+
}
2830
return fcntl(fd, F_SETFL, flags);
2931
}
32+
/* }}} */
3033

3134
#define IPQUAD(sin_addr) \
3235
(unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[0], \

‎sapi/fpm/fpm/fpm_str.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
#ifndef FPM_STR_H
66
#define FPM_STR_H 1
77

8-
static inline char *cpystrn(char *dst, const char *src, size_t dst_size)
8+
static inline char *cpystrn(char *dst, const char *src, size_t dst_size) /* {{{ */
99
{
1010
char *d, *end;
1111

12-
if (!dst_size) return dst;
12+
if (!dst_size) {
13+
return dst;
14+
}
1315

1416
d = dst;
1517
end = dst + dst_size - 1;
@@ -24,8 +26,9 @@ static inline char *cpystrn(char *dst, const char *src, size_t dst_size)
2426

2527
return d;
2628
}
29+
/* }}} */
2730

28-
static inline char *str_purify_filename(char *dst, char *src, size_t size)
31+
static inline char *str_purify_filename(char *dst, char *src, size_t size) /* {{{ */
2932
{
3033
char *d, *end;
3134

@@ -35,8 +38,7 @@ static inline char *str_purify_filename(char *dst, char *src, size_t size)
3538
for (; d < end && *src; ++d, ++src) {
3639
if (* (unsigned char *) src < ' ' || * (unsigned char *) src > '\x7f') {
3740
*d = '.';
38-
}
39-
else {
41+
} else {
4042
*d = *src;
4143
}
4244
}
@@ -45,5 +47,6 @@ static inline char *str_purify_filename(char *dst, char *src, size_t size)
4547

4648
return d;
4749
}
50+
/* }}} */
4851

4952
#endif

0 commit comments

Comments
 (0)