Skip to content
Snippets Groups Projects
Commit 41fc91db authored by Dmitry E. Oboukhov's avatar Dmitry E. Oboukhov
Browse files

some fixes by review: code cleanup

parent 447f9012
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/stat.h
+ 3
− 4
View file @ 41fc91db
......@@ -37,10 +37,9 @@ int stat_register(const char **name, size_t count);
void stat_collect(int base, int name, i64 value);
void stat_print(struct tbuf *buf);
int stat_foreach(
int cb(const char *name, i64 value, int rps, void *udata),
void *data
);
typedef int (*stat_cb)(const char *name, i64 value, int rps, void *udata);
int stat_foreach(stat_cb cb, void *data);
#endif /* TARANTOOL_STAT_H_INCLUDED */
src/box_lua_stat.m
+ 7
− 10
View file @ 41fc91db
......@@ -38,7 +38,7 @@
static int
_one_stat_item(const char *name, i64 value, int rps, void *udata)
set_stat_item(const char *name, i64 value, int rps, void *udata)
{
struct lua_State *L = udata;
......@@ -59,13 +59,12 @@ _one_stat_item(const char *name, i64 value, int rps, void *udata)
}
struct _seek_udata { const char *key; struct lua_State *L; };
struct stat_udata { const char *key; struct lua_State *L; };
static int
_seek_stat_item(const char *name, i64 value, int rps, void *udata)
seek_stat_item(const char *name, i64 value, int rps, void *udata)
{
struct _seek_udata *sst = udata;
struct stat_udata *sst = udata;
if (strcmp(name, sst->key) != 0)
return 0;
......@@ -86,11 +85,11 @@ _seek_stat_item(const char *name, i64 value, int rps, void *udata)
static int
lbox_stat_index(struct lua_State *L)
{
struct _seek_udata sst;
struct stat_udata sst;
sst.key = lua_tolstring(L, -1, NULL);
sst.L = L;
return stat_foreach(_seek_stat_item, &sst);
return stat_foreach(seek_stat_item, &sst);
}
......@@ -98,9 +97,7 @@ static int
lbox_stat_full(struct lua_State *L)
{
lua_newtable(L);
stat_foreach(_one_stat_item, L);
stat_foreach(set_stat_item, L);
return 1;
}
......
src/stat.m
+ 25
− 32
View file @ 41fc91db
......@@ -80,39 +80,8 @@ stat_collect(int base, int name, i64 value)
stats[base + name].value[SECS] += value;
}
void
stat_print(struct tbuf *buf)
{
int max_len = 0;
tbuf_printf(buf, "statistics:" CRLF);
for (int i = 0; i <= stats_max; i++) {
if (stats[i].name == NULL)
continue;
max_len = MAX(max_len, strlen(stats[i].name));
}
for (int i = 0; i <= stats_max; i++) {
if (stats[i].name == NULL)
continue;
int diff = 0;
for (int j = 0; j < SECS; j++)
diff += stats[i].value[j];
diff /= SECS;
tbuf_printf(buf, " %s:%*s{ rps: %- 6i, total: %- 12" PRIi64 " }" CRLF,
stats[i].name, 1 + max_len - (int)strlen(stats[i].name), " ",
diff, stats[i].value[SECS]);
}
}
int
stat_foreach(
int cb(const char *name, i64 value, int rps, void *udata),
void *udata
)
stat_foreach(stat_cb cb, void *udata)
{
if (!cb)
return 0;
......@@ -134,6 +103,30 @@ stat_foreach(
}
static int
stat_print_item(const char *name, i64 value, int rps, void *udata)
{
struct tbuf *buf = udata;
int name_len = strlen(name);
tbuf_printf(buf,
" %s:%*s{ rps: %- 6i, total: %- 12" PRIi64 " }" CRLF,
name,
(int)(18 >= name_len ? 18 - name_len : 1),
" ",
rps,
value
);
return 0;
}
void
stat_print(struct tbuf *buf)
{
tbuf_printf(buf, "statistics:" CRLF);
stat_foreach(stat_print_item, buf);
}
void
stat_age(ev_timer *timer, int events __attribute__((unused)))
{
......
test/box/admin.result
+ 12
− 12
View file @ 41fc91db
show stat
---
statistics:
REPLACE: { rps: 0 , total: 0 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
REPLACE: { rps: 0 , total: 0 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
...
help
---
......@@ -78,12 +78,12 @@ configuration:
show stat
---
statistics:
REPLACE: { rps: 0 , total: 0 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
REPLACE: { rps: 0 , total: 0 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
...
insert into t0 values (1, 'tuple')
Insert OK, 1 row affected
......
test/box/lua.result
+ 6
− 6
View file @ 41fc91db
No preview for this file type
test/box/stat.result
+ 12
− 12
View file @ 41fc91db
......@@ -26,12 +26,12 @@ Insert OK, 1 row affected
show stat
---
statistics:
REPLACE: { rps: 2 , total: 10 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
REPLACE: { rps: 10 , total: 2 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
...
#
# restart server
......@@ -44,12 +44,12 @@ statistics:
show stat
---
statistics:
REPLACE: { rps: 0 , total: 0 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
REPLACE: { rps: 0 , total: 0 }
SELECT: { rps: 0 , total: 0 }
UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
...
delete from t0 where k0 = 0
Delete OK, 1 row affected
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment