mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: freq_ctr: Return the new value after an update

Browse Source 
This will ease threads support integration.
This commit is contained in:
Christopher Faulet 2017-09-01 12:18:36 +02:00 committed by Willy Tarreau
parent 63fe65277a
commit de2075fd21
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/proto/freq_ctr.h
View File

@ -45,14 +45,15 @@ static inline void rotate_freq_ctr(struct freq_ctr *ctr)
* rotated if the period is over. It is important that it correctly initializes
* a null area.
*/
static inline void update_freq_ctr(struct freq_ctr *ctr, unsigned int inc)
static inline unsigned int update_freq_ctr(struct freq_ctr *ctr, unsigned int inc)
{
if (likely(ctr->curr_sec == now.tv_sec)) {
ctr->curr_ctr += inc;
return;
return ctr->curr_ctr;
}
rotate_freq_ctr(ctr);
ctr->curr_ctr = inc;
return ctr->curr_ctr;
/* Note: later we may want to propagate the update to other counters */
}
@ -79,15 +80,16 @@ static inline void rotate_freq_ctr_period(struct freq_ctr_period *ctr,
* a null area. This one works on frequency counters which have a period
* different from one second.
*/
static inline void update_freq_ctr_period(struct freq_ctr_period *ctr,
unsigned int period, unsigned int inc)
static inline unsigned int update_freq_ctr_period(struct freq_ctr_period *ctr,
unsigned int period, unsigned int inc)
{
if (likely(now_ms - ctr->curr_tick < period)) {
ctr->curr_ctr += inc;
return;
return ctr->curr_ctr;
}
rotate_freq_ctr_period(ctr, period);
ctr->curr_ctr = inc;
return ctr->curr_ctr;
/* Note: later we may want to propagate the update to other counters */
}