Merge pull request #4685 from charsyam/refactoring/set_max_latency

Removing duplicated code to set max latency
This commit is contained in:
Salvatore Sanfilippo 2018-02-13 16:20:32 +01:00 committed by GitHub
commit 4f2d279dd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -109,19 +109,19 @@ void latencyAddSample(char *event, mstime_t latency) {
dictAdd(server.latency_events,zstrdup(event),ts); dictAdd(server.latency_events,zstrdup(event),ts);
} }
if (latency > ts->max) ts->max = latency;
/* If the previous sample is in the same second, we update our old sample /* If the previous sample is in the same second, we update our old sample
* if this latency is > of the old one, or just return. */ * if this latency is > of the old one, or just return. */
prev = (ts->idx + LATENCY_TS_LEN - 1) % LATENCY_TS_LEN; prev = (ts->idx + LATENCY_TS_LEN - 1) % LATENCY_TS_LEN;
if (ts->samples[prev].time == now) { if (ts->samples[prev].time == now) {
if (latency > ts->samples[prev].latency) if (latency > ts->samples[prev].latency)
ts->samples[prev].latency = latency; ts->samples[prev].latency = latency;
if (latency > ts->max) ts->max = latency;
return; return;
} }
ts->samples[ts->idx].time = time(NULL); ts->samples[ts->idx].time = time(NULL);
ts->samples[ts->idx].latency = latency; ts->samples[ts->idx].latency = latency;
if (latency > ts->max) ts->max = latency;
ts->idx++; ts->idx++;
if (ts->idx == LATENCY_TS_LEN) ts->idx = 0; if (ts->idx == LATENCY_TS_LEN) ts->idx = 0;