diff options
| author | antirez <antirez@gmail.com> | 2014-07-01 16:09:02 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2014-07-09 19:04:02 +0200 |
| commit | e400ae60f5fb51ac2be4544f522d30298372d998 (patch) | |
| tree | 2fe7dac80614acbb861f50725aeff6d79c321f37 | |
| parent | a57eb3272d0fbc38f82f75b79cff616325532316 (diff) | |
| download | redis-e400ae60f5fb51ac2be4544f522d30298372d998.tar.gz | |
Latency monitor: command duration is in useconds. Convert.
| -rw-r--r-- | src/latency.h | 4 | ||||
| -rw-r--r-- | src/redis.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/latency.h b/src/latency.h index cba303912..b01c19214 100644 --- a/src/latency.h +++ b/src/latency.h @@ -36,7 +36,7 @@ void latencyAddSample(char *event, mstime_t latency); /* Add the sample only if the elapsed time is >= to the configured threshold. */ #define latencyAddSampleIfNeeded(event,var) \ if (server.latency_monitor_threshold && \ - var >= server.latency_monitor_threshold) \ - latencyAddSample(event,var); + (var) >= server.latency_monitor_threshold) \ + latencyAddSample((event),(var)); #endif /* __LATENCY_H */ diff --git a/src/redis.c b/src/redis.c index 159cb0b4b..b7f03c227 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1934,7 +1934,7 @@ void call(redisClient *c, int flags) { if (flags & REDIS_CALL_SLOWLOG && c->cmd->proc != execCommand) { char *latency_event = (c->cmd->flags & REDIS_CMD_FAST) ? "fast-command" : "command"; - latencyAddSampleIfNeeded(latency_event,duration); + latencyAddSampleIfNeeded(latency_event,duration/1000); slowlogPushEntryIfNeeded(c->argv,c->argc,duration); } if (flags & REDIS_CALL_STATS) { |