Browse Source

Merge branch 'master' of bitbucket.org:ckolivas/ckpool

master
Con Kolivas 10 years ago
parent
commit
a02cfb068e
  1. 16
      src/ckdb.c
  2. 2
      src/ckdb.h

16
src/ckdb.c

@ -1117,6 +1117,8 @@ static void alloc_storage()
static void dealloc_storage() static void dealloc_storage()
{ {
LOGWARNING("%s() logqueue ...", __func__);
FREE_LISTS(logqueue); FREE_LISTS(logqueue);
FREE_TREE(marks); FREE_TREE(marks);
@ -1128,6 +1130,8 @@ static void dealloc_storage()
FREE_STORE_DATA(workmarkers); FREE_STORE_DATA(workmarkers);
FREE_LIST_DATA(workmarkers); FREE_LIST_DATA(workmarkers);
LOGWARNING("%s() markersummary ...", __func__);
FREE_TREE(markersummary_userid); FREE_TREE(markersummary_userid);
FREE_TREE(markersummary); FREE_TREE(markersummary);
FREE_STORE_DATA(markersummary); FREE_STORE_DATA(markersummary);
@ -1135,6 +1139,8 @@ static void dealloc_storage()
FREE_ALL(workerstatus); FREE_ALL(workerstatus);
LOGWARNING("%s() userstats ...", __func__);
FREE_TREE(userstats_workerstatus); FREE_TREE(userstats_workerstatus);
FREE_TREE(userstats_statsdate); FREE_TREE(userstats_statsdate);
if (userstats_summ) if (userstats_summ)
@ -1142,11 +1148,15 @@ static void dealloc_storage()
FREE_STORE(userstats_eos); FREE_STORE(userstats_eos);
FREE_ALL(userstats); FREE_ALL(userstats);
LOGWARNING("%s() poolstats ...", __func__);
FREE_ALL(poolstats); FREE_ALL(poolstats);
FREE_ALL(auths); FREE_ALL(auths);
FREE_ALL(miningpayouts); FREE_ALL(miningpayouts);
FREE_ALL(blocks); FREE_ALL(blocks);
LOGWARNING("%s() sharesummary ...", __func__);
FREE_TREE(sharesummary_workinfoid); FREE_TREE(sharesummary_workinfoid);
FREE_TREE(sharesummary); FREE_TREE(sharesummary);
FREE_STORE_DATA(sharesummary); FREE_STORE_DATA(sharesummary);
@ -1155,6 +1165,8 @@ static void dealloc_storage()
FREE_ALL(shareerrors); FREE_ALL(shareerrors);
FREE_ALL(shares); FREE_ALL(shares);
LOGWARNING("%s() workinfo ...", __func__);
FREE_TREE(workinfo_height); FREE_TREE(workinfo_height);
FREE_TREE(workinfo); FREE_TREE(workinfo);
FREE_STORE_DATA(workinfo); FREE_STORE_DATA(workinfo);
@ -1174,9 +1186,13 @@ static void dealloc_storage()
FREE_TREE(userid); FREE_TREE(userid);
FREE_ALL(users); FREE_ALL(users);
LOGWARNING("%s() transfer/heartbeatqueue/workqueue ...", __func__);
FREE_LIST(transfer); FREE_LIST(transfer);
FREE_LISTS(heartbeatqueue); FREE_LISTS(heartbeatqueue);
FREE_LISTS(workqueue); FREE_LISTS(workqueue);
LOGWARNING("%s() finished", __func__);
} }
static bool setup_data() static bool setup_data()

2
src/ckdb.h

@ -52,7 +52,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "0.9.6" #define DB_VERSION "0.9.6"
#define CKDB_VERSION DB_VERSION"-0.832" #define CKDB_VERSION DB_VERSION"-0.833"
#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