Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
34a79c35
Commit
34a79c35
authored
Aug 02, 2017
by
Salvatore Sanfilippo
Committed by
GitHub
Aug 02, 2017
Browse files
Merge pull request #3935 from itamarhaber/module-cmdstats
Changes command stats iteration to being dict-based
parents
bc64df9a
b8286d1f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
34a79c35
...
@@ -1987,15 +1987,18 @@ void populateCommandTable(void) {
...
@@ -1987,15 +1987,18 @@ void populateCommandTable(void) {
}
}
void resetCommandTableStats(void) {
void resetCommandTableStats(void) {
int
numcommands
=
sizeof
(
redisCommandTable
)
/
sizeof
(
struct
redisCommand
);
struct redisCommand *c;
int
j
;
dictEntry *de;
dictIterator *di;
for
(
j
=
0
;
j
<
numcommands
;
j
++
)
{
struct
redisCommand
*
c
=
redisCommandTable
+
j
;
di = dictGetSafeIterator(server.commands);
while((de = dictNext(di)) != NULL) {
c = (struct redisCommand *) dictGetVal(de);
c->microseconds = 0;
c->microseconds = 0;
c->calls = 0;
c->calls = 0;
}
}
dictReleaseIterator(di);
}
}
/* ========================== Redis OP Array API ============================ */
/* ========================== Redis OP Array API ============================ */
...
@@ -2794,7 +2797,7 @@ void bytesToHuman(char *s, unsigned long long n) {
...
@@ -2794,7 +2797,7 @@ void bytesToHuman(char *s, unsigned long long n) {
sds genRedisInfoString(char *section) {
sds genRedisInfoString(char *section) {
sds info = sdsempty();
sds info = sdsempty();
time_t uptime = server.unixtime-server.stat_starttime;
time_t uptime = server.unixtime-server.stat_starttime;
int
j
,
numcommands
;
int j;
struct rusage self_ru, c_ru;
struct rusage self_ru, c_ru;
unsigned long lol, bib;
unsigned long lol, bib;
int allsections = 0, defsections = 0;
int allsections = 0, defsections = 0;
...
@@ -3255,20 +3258,24 @@ sds genRedisInfoString(char *section) {
...
@@ -3255,20 +3258,24 @@ sds genRedisInfoString(char *section) {
(float)c_ru.ru_utime.tv_sec+(float)c_ru.ru_utime.tv_usec/1000000);
(float)c_ru.ru_utime.tv_sec+(float)c_ru.ru_utime.tv_usec/1000000);
}
}
/*
cmdtime
*/
/*
Command statistics
*/
if (allsections || !strcasecmp(section,"commandstats")) {
if (allsections || !strcasecmp(section,"commandstats")) {
if (sections++) info = sdscat(info,"\r\n");
if (sections++) info = sdscat(info,"\r\n");
info = sdscatprintf(info, "# Commandstats\r\n");
info = sdscatprintf(info, "# Commandstats\r\n");
numcommands
=
sizeof
(
redisCommandTable
)
/
sizeof
(
struct
redisCommand
);
for
(
j
=
0
;
j
<
numcommands
;
j
++
)
{
struct
redisCommand
*
c
=
redisCommandTable
+
j
;
struct redisCommand *c;
dictEntry *de;
dictIterator *di;
di = dictGetSafeIterator(server.commands);
while((de = dictNext(di)) != NULL) {
c = (struct redisCommand *) dictGetVal(de);
if (!c->calls) continue;
if (!c->calls) continue;
info = sdscatprintf(info,
info = sdscatprintf(info,
"cmdstat_%s:calls=%lld,usec=%lld,usec_per_call=%.2f\r\n",
"cmdstat_%s:calls=%lld,usec=%lld,usec_per_call=%.2f\r\n",
c->name, c->calls, c->microseconds,
c->name, c->calls, c->microseconds,
(c->calls == 0) ? 0 : ((float)c->microseconds/c->calls));
(c->calls == 0) ? 0 : ((float)c->microseconds/c->calls));
}
}
dictReleaseIterator(di);
}
}
/* Cluster */
/* Cluster */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment