mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: lists: Fix alignement of \ when relevant.

Browse Source 
Make sure all the \ are properly aligned in macroes, this contains no
functional change.
This commit is contained in:
Olivier Houchard 2019-10-11 16:57:43 +02:00 committed by Olivier Houchard
parent 74715da030
commit 804ef244c6
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
include/common/mini-clist.h
View File

@ -233,11 +233,11 @@ struct cond_wordlist {
while (1) { \ while (1) { \
struct mt_list *n; \ struct mt_list *n; \
struct mt_list *p; \ struct mt_list *p; \
n = _HA_ATOMIC_XCHG(&(lh)->next, MT_LIST_BUSY); \ n = _HA_ATOMIC_XCHG(&(lh)->next, MT_LIST_BUSY); \
if (n == MT_LIST_BUSY) \ if (n == MT_LIST_BUSY) \
continue; \ continue; \
p = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY); \ p = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY); \
if (p == MT_LIST_BUSY) { \ if (p == MT_LIST_BUSY) { \
(lh)->next = n; \ (lh)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
@ -268,17 +268,17 @@ struct cond_wordlist {
*/ */
#define MT_LIST_ADDQ(_lh, _el) \ #define MT_LIST_ADDQ(_lh, _el) \
({ \ ({ \
int _ret = 0; \ int _ret = 0; \
struct mt_list *lh = (_lh), *el = (_el); \ struct mt_list *lh = (_lh), *el = (_el); \
do { \ do { \
while (1) { \ while (1) { \
struct mt_list *n; \ struct mt_list *n; \
struct mt_list *p; \ struct mt_list *p; \
p = _HA_ATOMIC_XCHG(&(lh)->prev, MT_LIST_BUSY); \ p = _HA_ATOMIC_XCHG(&(lh)->prev, MT_LIST_BUSY); \
if (p == MT_LIST_BUSY) \ if (p == MT_LIST_BUSY) \
continue; \ continue; \
n = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY); \ n = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY); \
if (n == MT_LIST_BUSY) { \ if (n == MT_LIST_BUSY) { \
(lh)->prev = p; \ (lh)->prev = p; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
@ -355,18 +355,18 @@ struct cond_wordlist {
while (1) { \ while (1) { \
struct mt_list *n, *n2; \ struct mt_list *n, *n2; \
struct mt_list *p, *p2 = NULL; \ struct mt_list *p, *p2 = NULL; \
n = _HA_ATOMIC_XCHG(&(el)->next, MT_LIST_BUSY); \ n = _HA_ATOMIC_XCHG(&(el)->next, MT_LIST_BUSY); \
if (n == MT_LIST_BUSY) \ if (n == MT_LIST_BUSY) \
continue; \ continue; \
p = _HA_ATOMIC_XCHG(&(el)->prev, MT_LIST_BUSY); \ p = _HA_ATOMIC_XCHG(&(el)->prev, MT_LIST_BUSY); \
if (p == MT_LIST_BUSY) { \ if (p == MT_LIST_BUSY) { \
(el)->next = n; \ (el)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
} \ } \
if (p != (el)) { \ if (p != (el)) { \
p2 = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY);\ p2 = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY);\
if (p2 == MT_LIST_BUSY) { \ if (p2 == MT_LIST_BUSY) { \
(el)->prev = p; \ (el)->prev = p; \
(el)->next = n; \ (el)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
@ -375,7 +375,7 @@ struct cond_wordlist {
} \ } \
if (n != (el)) { \ if (n != (el)) { \
n2 = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY);\ n2 = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY);\
if (n2 == MT_LIST_BUSY) { \ if (n2 == MT_LIST_BUSY) { \
if (p2 != NULL) \ if (p2 != NULL) \
p->next = p2; \ p->next = p2; \
(el)->prev = p; \ (el)->prev = p; \
@ -407,8 +407,8 @@ struct cond_wordlist {
while (1) { \ while (1) { \
struct mt_list *n, *n2; \ struct mt_list *n, *n2; \
struct mt_list *p, *p2; \ struct mt_list *p, *p2; \
n = _HA_ATOMIC_XCHG(&(lh)->next, MT_LIST_BUSY); \ n = _HA_ATOMIC_XCHG(&(lh)->next, MT_LIST_BUSY); \
if (n == MT_LIST_BUSY) \ if (n == MT_LIST_BUSY) \
continue; \ continue; \
if (n == (lh)) { \ if (n == (lh)) { \
(lh)->next = lh; \ (lh)->next = lh; \
@ -416,22 +416,22 @@ struct cond_wordlist {
_ret = NULL; \ _ret = NULL; \
break; \ break; \
} \ } \
p = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY); \ p = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY); \
if (p == MT_LIST_BUSY) { \ if (p == MT_LIST_BUSY) { \
(lh)->next = n; \ (lh)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
} \ } \
n2 = _HA_ATOMIC_XCHG(&n->next, MT_LIST_BUSY); \ n2 = _HA_ATOMIC_XCHG(&n->next, MT_LIST_BUSY); \
if (n2 == MT_LIST_BUSY) { \ if (n2 == MT_LIST_BUSY) { \
n->prev = p; \ n->prev = p; \
__ha_barrier_store(); \ __ha_barrier_store(); \
(lh)->next = n; \ (lh)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
} \ } \
p2 = _HA_ATOMIC_XCHG(&n2->prev, MT_LIST_BUSY); \ p2 = _HA_ATOMIC_XCHG(&n2->prev, MT_LIST_BUSY); \
if (p2 == MT_LIST_BUSY) { \ if (p2 == MT_LIST_BUSY) { \
n->next = n2; \ n->next = n2; \
n->prev = p; \ n->prev = p; \
__ha_barrier_store(); \ __ha_barrier_store(); \
@ -498,18 +498,18 @@ struct cond_wordlist {
while (1) { \ while (1) { \
struct mt_list *n, *n2; \ struct mt_list *n, *n2; \
struct mt_list *p, *p2 = NULL; \ struct mt_list *p, *p2 = NULL; \
n = _HA_ATOMIC_XCHG(&(el)->next, MT_LIST_BUSY); \ n = _HA_ATOMIC_XCHG(&(el)->next, MT_LIST_BUSY); \
if (n == MT_LIST_BUSY) \ if (n == MT_LIST_BUSY) \
continue; \ continue; \
p = _HA_ATOMIC_XCHG(&(el)->prev, MT_LIST_BUSY); \ p = _HA_ATOMIC_XCHG(&(el)->prev, MT_LIST_BUSY); \
if (p == MT_LIST_BUSY) { \ if (p == MT_LIST_BUSY) { \
(el)->next = n; \ (el)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
} \ } \
if (p != (el)) { \ if (p != (el)) { \
p2 = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY);\ p2 = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY);\
if (p2 == MT_LIST_BUSY) { \ if (p2 == MT_LIST_BUSY) { \
(el)->prev = p; \ (el)->prev = p; \
(el)->next = n; \ (el)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
@ -518,7 +518,7 @@ struct cond_wordlist {
} \ } \
if (n != (el)) { \ if (n != (el)) { \
n2 = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY);\ n2 = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY);\
if (n2 == MT_LIST_BUSY) { \ if (n2 == MT_LIST_BUSY) { \
if (p2 != NULL) \ if (p2 != NULL) \
p->next = p2; \ p->next = p2; \
(el)->prev = p; \ (el)->prev = p; \
@ -572,12 +572,12 @@ struct cond_wordlist {
struct mt_list *n = NULL; \ struct mt_list *n = NULL; \
while (1) { \ while (1) { \
struct mt_list *n2; \ struct mt_list *n2; \
n = _HA_ATOMIC_XCHG(&((el)->next), MT_LIST_BUSY); \ n = _HA_ATOMIC_XCHG(&((el)->next), MT_LIST_BUSY); \
if (n == MT_LIST_BUSY) \ if (n == MT_LIST_BUSY) \
continue; \ continue; \
if (n != (el)) { \ if (n != (el)) { \
n2 = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY);\ n2 = _HA_ATOMIC_XCHG(&n->prev, MT_LIST_BUSY);\
if (n2 == MT_LIST_BUSY) { \ if (n2 == MT_LIST_BUSY) { \
(el)->next = n; \ (el)->next = n; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
@ -593,12 +593,12 @@ struct cond_wordlist {
struct mt_list *p = NULL; \ struct mt_list *p = NULL; \
while (1) { \ while (1) { \
struct mt_list *p2; \ struct mt_list *p2; \
p = _HA_ATOMIC_XCHG(&((el)->prev), MT_LIST_BUSY); \ p = _HA_ATOMIC_XCHG(&((el)->prev), MT_LIST_BUSY); \
if (p == MT_LIST_BUSY) \ if (p == MT_LIST_BUSY) \
continue; \ continue; \
if (p != (el)) { \ if (p != (el)) { \
p2 = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY);\ p2 = _HA_ATOMIC_XCHG(&p->next, MT_LIST_BUSY);\
if (p2 == MT_LIST_BUSY) { \ if (p2 == MT_LIST_BUSY) { \
(el)->prev = p; \ (el)->prev = p; \
__ha_barrier_store(); \ __ha_barrier_store(); \
continue; \ continue; \
@ -648,7 +648,7 @@ struct cond_wordlist {
} else \ } else \
_MT_LIST_RELINK_DELETED(tmpelt2); \ _MT_LIST_RELINK_DELETED(tmpelt2); \
(tmpelt) = MT_LIST_BUSY; \ (tmpelt) = MT_LIST_BUSY; \
})) \ })) \
for ((tmpelt) = (list_head), (tmpelt2).prev = NULL, (tmpelt2).next = _MT_LIST_LOCK_NEXT(tmpelt); ({ \ for ((tmpelt) = (list_head), (tmpelt2).prev = NULL, (tmpelt2).next = _MT_LIST_LOCK_NEXT(tmpelt); ({ \
(item) = MT_LIST_ELEM((tmpelt2.next), typeof(item), member); \ (item) = MT_LIST_ELEM((tmpelt2.next), typeof(item), member); \
if (&item->member != (list_head)) { \ if (&item->member != (list_head)) { \