RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-01 02:52:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: lb/threads: Use the new _HA_ATOMIC_* macros.

Browse Source 
Use the new _HA_ATOMIC_* macros and add barriers where needed.
This commit is contained in:
Olivier Houchard 2019-03-08 18:52:46 +01:00 committed by Olivier Houchard
parent a798bf56e2
commit 36a8e6f970
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lb_fwrr.c
View File

@ -354,7 +354,7 @@ static void fwrr_queue_srv(struct server *s)
s->npos >= grp->curr_weight + grp->next_weight) {
/* put into next tree, and readjust npos in case we could
* finally take this back to current. */
HA_ATOMIC_SUB(&s->npos, grp->curr_weight);
_HA_ATOMIC_SUB(&s->npos, grp->curr_weight);
fwrr_queue_by_weight(grp->next, s);
}
else {
@ -392,7 +392,7 @@ static inline void fwrr_get_srv_next(struct server *s)
&s->proxy->lbprm.fwrr.bck :
&s->proxy->lbprm.fwrr.act;
HA_ATOMIC_ADD(&s->npos, grp->curr_weight);
_HA_ATOMIC_ADD(&s->npos, grp->curr_weight);
}
/* prepares a server when it was marked down.
@ -487,20 +487,20 @@ static inline void fwrr_update_position(struct fwrr_group *grp, struct server *s
/* first time ever for this server */
s->lpos = grp->curr_pos;
s->npos = grp->curr_pos + grp->next_weight / s->cur_eweight;
HA_ATOMIC_ADD(&s->rweight, (grp->next_weight % s->cur_eweight));
_HA_ATOMIC_ADD(&s->rweight, (grp->next_weight % s->cur_eweight));
if (s->rweight >= s->cur_eweight) {
HA_ATOMIC_SUB(&s->rweight, s->cur_eweight);
HA_ATOMIC_ADD(&s->npos, 1);
_HA_ATOMIC_SUB(&s->rweight, s->cur_eweight);
_HA_ATOMIC_ADD(&s->npos, 1);
}
} else {
s->lpos = s->npos;
HA_ATOMIC_ADD(&s->npos, (grp->next_weight / s->cur_eweight));
HA_ATOMIC_ADD(&s->rweight, (grp->next_weight % s->cur_eweight));
_HA_ATOMIC_ADD(&s->npos, (grp->next_weight / s->cur_eweight));
_HA_ATOMIC_ADD(&s->rweight, (grp->next_weight % s->cur_eweight));
if (s->rweight >= s->cur_eweight) {
HA_ATOMIC_SUB(&s->rweight, s->cur_eweight);
HA_ATOMIC_ADD(&s->npos, 1);
_HA_ATOMIC_SUB(&s->rweight, s->cur_eweight);
_HA_ATOMIC_ADD(&s->npos, 1);
}
}
}

4
src/lb_map.c
View File

@ -123,7 +123,7 @@ void recalc_server_map(struct proxy *px)
break;
}
HA_ATOMIC_ADD(&cur->wscore, cur->next_eweight);
_HA_ATOMIC_ADD(&cur->wscore, cur->next_eweight);
v = (cur->wscore + tot) / tot; /* result between 0 and 3 */
if (best == NULL || v > max) {
max = v;
@ -133,7 +133,7 @@ void recalc_server_map(struct proxy *px)
}
px->lbprm.map.srv[o] = best;
if (best)
HA_ATOMIC_SUB(&best->wscore, tot);
_HA_ATOMIC_SUB(&best->wscore, tot);
}
}