markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ckdb - allow > 60s times in the cmd_shsta report

master
kanoi 9 years ago
parent
296e50f4bb
commit
f4ef396445
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/ckdb.h
  2. 12
      src/ckdb_cmd.c

2
src/ckdb.h
Unescape View File

@ -52,7 +52,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "1.0.5" #define DB_VERSION "1.0.5"
#define CKDB_VERSION DB_VERSION"-2.102" #define CKDB_VERSION DB_VERSION"-2.103"
#define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL " - from %s %s() line %d"
#define WHERE_FFL_HERE __FILE__, __func__, __LINE__ #define WHERE_FFL_HERE __FILE__, __func__, __LINE__

12
src/ckdb_cmd.c
Unescape View File

@ -6830,7 +6830,7 @@ static char *cmd_shsta(__maybe_unused PGconn *conn, char *cmd, char *id,
" recv t%fs/t%"PRIu64"/av%fs" " recv t%fs/t%"PRIu64"/av%fs"
" lckw t%fs/t%"PRIu64"/av%fs" " lckw t%fs/t%"PRIu64"/av%fs"
" lckb t%fs/t%"PRIu64"/av%fs", " lckb t%fs/t%"PRIu64"/av%fs",
us_tvdiff(now, &sock_stt)/1000000, tvdiff(now, &sock_stt),
sock_us/1000000, sock_acc, (sock_us/count1)/1000000, sock_us/1000000, sock_acc, (sock_us/count1)/1000000,
sock_recv_us/1000000, sock_recv, sock_recv_us/1000000, sock_recv,
(sock_recv_us/count2)/1000000, (sock_recv_us/count2)/1000000,
@ -6843,23 +6843,23 @@ static char *cmd_shsta(__maybe_unused PGconn *conn, char *cmd, char *id,
tot1 = 0; tot1 = 0;
else { else {
if (!break_reload_fin.tv_sec) if (!break_reload_fin.tv_sec)
tot1 = us_tvdiff(now, &break_reload_stt); tot1 = tvdiff(now, &break_reload_stt);
else else
tot1 = us_tvdiff(&break_reload_fin, &break_reload_stt); tot1 = tvdiff(&break_reload_fin, &break_reload_stt);
} }
if (!break_cmd_stt.tv_sec) if (!break_cmd_stt.tv_sec)
tot2 = 0; tot2 = 0;
else else
tot2 = us_tvdiff(now, &break_cmd_stt); tot2 = tvdiff(now, &break_cmd_stt);
count1 = break_reload_processed ? : 1; count1 = break_reload_processed ? : 1;
count2 = break_cmd_processed ? : 1; count2 = break_cmd_processed ? : 1;
LOGWARNING(" break reload: t%fs/t%"PRIu64"/av%fs " LOGWARNING(" break reload: t%fs/t%"PRIu64"/av%fs "
"%"PRIu64"s/%"PRIu64"w/%"PRIu64"t" "%"PRIu64"s/%"PRIu64"w/%"PRIu64"t"
" cmd: t%fs/t%"PRIu64"/av%fs " " cmd: t%fs/t%"PRIu64"/av%fs "
"%"PRIu64"s/%"PRIu64"w/%"PRIu64"t", "%"PRIu64"s/%"PRIu64"w/%"PRIu64"t",
tot1/1000000, break_reload_processed, (tot1/count1)/1000000, tot1, break_reload_processed, tot1/count1,
bq_reload_signals, bq_reload_wakes, bq_reload_timeouts, bq_reload_signals, bq_reload_wakes, bq_reload_timeouts,
tot2/1000000, break_cmd_processed, (tot2/count2)/1000000, tot2, break_cmd_processed, tot2/count2,
bq_cmd_signals, bq_cmd_wakes, bq_cmd_timeouts); bq_cmd_signals, bq_cmd_wakes, bq_cmd_timeouts);
LOGWARNING(" queue reload: %"PRIu64"s/%"PRIu64"w/%"PRIu64"t" LOGWARNING(" queue reload: %"PRIu64"s/%"PRIu64"w/%"PRIu64"t"

Write Preview
Loading…
Cancel
Save