Browse Source

ckdb - remove summariser sleep delays during shutdown

master
kanoi 10 years ago
parent
commit
0e5a1a102e
  1. 32
      src/ckdb.c
  2. 2
      src/ckdb.h

32
src/ckdb.c

@ -1765,6 +1765,8 @@ static void summarise_userstats()
static void *summariser(__maybe_unused void *arg) static void *summariser(__maybe_unused void *arg)
{ {
int i;
pthread_detach(pthread_self()); pthread_detach(pthread_self());
rename_proc("db_summariser"); rename_proc("db_summariser");
@ -1773,19 +1775,35 @@ static void *summariser(__maybe_unused void *arg)
cksleep_ms(42); cksleep_ms(42);
while (!everyone_die) { while (!everyone_die) {
sleep(5); for (i = 0; i < 5; i++) {
if (!everyone_die) { if (!everyone_die)
sleep(1);
}
if (everyone_die)
break;
else {
if (startup_complete) if (startup_complete)
check_blocks(); check_blocks();
summarise_blocks(); if (!everyone_die)
summarise_blocks();
} }
sleep(4); for (i = 0; i < 4; i++) {
if (!everyone_die) if (!everyone_die)
sleep(1);
}
if (everyone_die)
break;
else
summarise_poolstats(); summarise_poolstats();
sleep(4); for (i = 0; i < 4; i++) {
if (!everyone_die) if (!everyone_die)
sleep(1);
}
if (everyone_die)
break;
else
summarise_userstats(); summarise_userstats();
} }

2
src/ckdb.h

@ -52,7 +52,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "0.9.2" #define DB_VERSION "0.9.2"
#define CKDB_VERSION DB_VERSION"-0.592" #define CKDB_VERSION DB_VERSION"-0.593"
#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__

Loading…
Cancel
Save