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

CLEANUP: peers: Indentation fixes.

Browse Source 
May be backported as far as 1.5.
This commit is contained in:
Frdric Lcaille 2019-01-22 10:31:39 +01:00 committed by Willy Tarreau
parent ce02557aad
commit a8725ec372
1 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/peers.c
View File

@ -233,12 +233,12 @@ uint64_t intdecode(char **str, char *end)
shift += 7; shift += 7;
} while (*(msg++) >= 128); } while (*(msg++) >= 128);
} }
*str = (char *)msg; *str = (char *)msg;
return i; return i;
fail: fail:
*str = NULL; *str = NULL;
return 0; return 0;
} }
/* Set the stick-table UPDATE message type byte at <msg_type> address, /* Set the stick-table UPDATE message type byte at <msg_type> address,
@ -259,7 +259,6 @@ static inline void peer_set_update_msg_type(char *msg_type, int use_identifier,
else else
*msg_type = PEER_MSG_STKT_INCUPDATE; *msg_type = PEER_MSG_STKT_INCUPDATE;
} }
} }
/* /*
* This prepare the data update message on the stick session <ts>, <st> is the considered * This prepare the data update message on the stick session <ts>, <st> is the considered
@ -771,22 +770,22 @@ static void peer_io_handler(struct appctx *appctx)
curpeer->flags &= PEER_LEARN_RESET; curpeer->flags &= PEER_LEARN_RESET;
/* if current peer is local */ /* if current peer is local */
if (curpeer->local) { if (curpeer->local) {
/* if current host need resyncfrom local and no process assined */ /* if current host need resyncfrom local and no process assined */
if ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FROMLOCAL && if ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FROMLOCAL &&
!(curpeers->flags & PEERS_F_RESYNC_ASSIGN)) { !(curpeers->flags & PEERS_F_RESYNC_ASSIGN)) {
/* assign local peer for a lesson, consider lesson already requested */ /* assign local peer for a lesson, consider lesson already requested */
curpeer->flags |= PEER_F_LEARN_ASSIGN; curpeer->flags |= PEER_F_LEARN_ASSIGN;
curpeers->flags |= (PEERS_F_RESYNC_ASSIGN|PEERS_F_RESYNC_PROCESS); curpeers->flags |= (PEERS_F_RESYNC_ASSIGN|PEERS_F_RESYNC_PROCESS);
} }
} }
else if ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FROMREMOTE && else if ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FROMREMOTE &&
!(curpeers->flags & PEERS_F_RESYNC_ASSIGN)) { !(curpeers->flags & PEERS_F_RESYNC_ASSIGN)) {
/* assign peer for a lesson */ /* assign peer for a lesson */
curpeer->flags |= PEER_F_LEARN_ASSIGN; curpeer->flags |= PEER_F_LEARN_ASSIGN;
curpeers->flags |= PEERS_F_RESYNC_ASSIGN; curpeers->flags |= PEERS_F_RESYNC_ASSIGN;
} }
/* switch to waiting message state */ /* switch to waiting message state */
@ -870,25 +869,25 @@ static void peer_io_handler(struct appctx *appctx)
} }
/* Init confirm counter */ /* Init confirm counter */
curpeer->confirm = 0; curpeer->confirm = 0;
/* reset teaching and learning flags to 0 */ /* reset teaching and learning flags to 0 */
curpeer->flags &= PEER_TEACH_RESET; curpeer->flags &= PEER_TEACH_RESET;
curpeer->flags &= PEER_LEARN_RESET; curpeer->flags &= PEER_LEARN_RESET;
/* If current peer is local */ /* If current peer is local */
if (curpeer->local) { if (curpeer->local) {
/* flag to start to teach lesson */ /* flag to start to teach lesson */
curpeer->flags |= PEER_F_TEACH_PROCESS; curpeer->flags |= PEER_F_TEACH_PROCESS;
} }
else if ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FROMREMOTE && else if ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FROMREMOTE &&
!(curpeers->flags & PEERS_F_RESYNC_ASSIGN)) { !(curpeers->flags & PEERS_F_RESYNC_ASSIGN)) {
/* If peer is remote and resync from remote is needed, /* If peer is remote and resync from remote is needed,
and no peer currently assigned */ and no peer currently assigned */
/* assign peer for a lesson */ /* assign peer for a lesson */
curpeer->flags |= PEER_F_LEARN_ASSIGN; curpeer->flags |= PEER_F_LEARN_ASSIGN;
curpeers->flags |= PEERS_F_RESYNC_ASSIGN; curpeers->flags |= PEERS_F_RESYNC_ASSIGN;
} }
@ -1008,11 +1007,8 @@ static void peer_io_handler(struct appctx *appctx)
/* flag to start to teach lesson */ /* flag to start to teach lesson */
curpeer->flags |= PEER_F_TEACH_PROCESS; curpeer->flags |= PEER_F_TEACH_PROCESS;
} }
else if (msg_head[1] == PEER_MSG_CTRL_RESYNCFINISHED) { else if (msg_head[1] == PEER_MSG_CTRL_RESYNCFINISHED) {
if (curpeer->flags & PEER_F_LEARN_ASSIGN) { if (curpeer->flags & PEER_F_LEARN_ASSIGN) {
curpeer->flags &= ~PEER_F_LEARN_ASSIGN; curpeer->flags &= ~PEER_F_LEARN_ASSIGN;
curpeers->flags &= ~(PEERS_F_RESYNC_ASSIGN|PEERS_F_RESYNC_PROCESS); curpeers->flags &= ~(PEERS_F_RESYNC_ASSIGN|PEERS_F_RESYNC_PROCESS);
@ -1021,7 +1017,6 @@ static void peer_io_handler(struct appctx *appctx)
curpeer->confirm++; curpeer->confirm++;
} }
else if (msg_head[1] == PEER_MSG_CTRL_RESYNCPARTIAL) { else if (msg_head[1] == PEER_MSG_CTRL_RESYNCPARTIAL) {
if (curpeer->flags & PEER_F_LEARN_ASSIGN) { if (curpeer->flags & PEER_F_LEARN_ASSIGN) {
curpeer->flags &= ~PEER_F_LEARN_ASSIGN; curpeer->flags &= ~PEER_F_LEARN_ASSIGN;
curpeers->flags &= ~(PEERS_F_RESYNC_ASSIGN|PEERS_F_RESYNC_PROCESS); curpeers->flags &= ~(PEERS_F_RESYNC_ASSIGN|PEERS_F_RESYNC_PROCESS);
@ -1408,29 +1403,28 @@ static void peer_io_handler(struct appctx *appctx)
/* Need to request a resync */ /* Need to request a resync */
if ((curpeer->flags & PEER_F_LEARN_ASSIGN) && if ((curpeer->flags & PEER_F_LEARN_ASSIGN) &&
(curpeers->flags & PEERS_F_RESYNC_ASSIGN) && (curpeers->flags & PEERS_F_RESYNC_ASSIGN) &&
!(curpeers->flags & PEERS_F_RESYNC_PROCESS)) { !(curpeers->flags & PEERS_F_RESYNC_PROCESS)) {
unsigned char msg[2]; unsigned char msg[2];
/* Current peer was elected to request a resync */ /* Current peer was elected to request a resync */
msg[0] = PEER_MSG_CLASS_CONTROL; msg[0] = PEER_MSG_CLASS_CONTROL;
msg[1] = PEER_MSG_CTRL_RESYNCREQ; msg[1] = PEER_MSG_CTRL_RESYNCREQ;
/* message to buffer */ /* message to buffer */
repl = ci_putblk(si_ic(si), (char *)msg, sizeof(msg)); repl = ci_putblk(si_ic(si), (char *)msg, sizeof(msg));
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
goto full; goto full;
appctx->st0 = PEER_SESS_ST_END; appctx->st0 = PEER_SESS_ST_END;
goto switchstate; goto switchstate;
} }
curpeers->flags |= PEERS_F_RESYNC_PROCESS; curpeers->flags |= PEERS_F_RESYNC_PROCESS;
} }
/* Nothing to read, now we start to write */ /* Nothing to read, now we start to write */
if (curpeer->tables) { if (curpeer->tables) {
struct shared_table *st; struct shared_table *st;
struct shared_table *last_local_table; struct shared_table *last_local_table;
@ -1776,7 +1770,7 @@ static void peer_io_handler(struct appctx *appctx)
if ((curpeer->flags & PEER_F_TEACH_PROCESS) && !(curpeer->flags & PEER_F_TEACH_FINISHED)) { if ((curpeer->flags & PEER_F_TEACH_PROCESS) && !(curpeer->flags & PEER_F_TEACH_FINISHED)) {
unsigned char msg[2]; unsigned char msg[2];
/* Current peer was elected to request a resync */ /* Current peer was elected to request a resync */
msg[0] = PEER_MSG_CLASS_CONTROL; msg[0] = PEER_MSG_CLASS_CONTROL;
msg[1] = ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FINISHED) ? PEER_MSG_CTRL_RESYNCFINISHED : PEER_MSG_CTRL_RESYNCPARTIAL; msg[1] = ((curpeers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FINISHED) ? PEER_MSG_CTRL_RESYNCFINISHED : PEER_MSG_CTRL_RESYNCPARTIAL;
/* process final lesson message */ /* process final lesson message */