X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=stats.c;h=e8e3e2344af9ad71bc663940a1c6892c913dc066;hb=63024252ef5bc13b0b920112b91c1945e0cc6f13;hp=bcc4f9128d9a93825ae6e12e7c76378890e9dab2;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git
diff --git a/stats.c b/stats.c
index bcc4f91..e8e3e23 100644
--- a/stats.c
+++ b/stats.c
@@ -13,10 +13,10 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
+#include
#include
#include
@@ -25,7 +25,6 @@
#include "hash.h"
#include "keydb.h"
#include "ll.h"
-#include "onak-conf.h"
#include "stats.h"
/**
@@ -66,7 +65,8 @@ void initcolour(bool parent)
* key we have. It returns as soon as a path is found or when we run out
* of keys; whichever comes sooner.
*/
-unsigned long findpath(struct stats_key *have, struct stats_key *want)
+unsigned long findpath(struct onak_dbctx *dbctx,
+ struct stats_key *have, struct stats_key *want)
{
struct ll *keys = NULL;
struct ll *oldkeys = NULL;
@@ -80,7 +80,7 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
oldkeys = keys;
while ((!cleanup()) && keys != NULL && have->colour == 0) {
- sigs = config.dbbackend->cached_getkeysigs(((struct stats_key *)
+ sigs = dbctx->cached_getkeysigs(dbctx, ((struct stats_key *)
keys->object)->keyid);
while ((!cleanup()) && sigs != NULL && have->colour == 0) {
/*
@@ -132,7 +132,8 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
* key we have. It returns as soon as a path is found or when we run out
* of keys; whichever comes sooner.
*/
-void dofindpath(uint64_t have, uint64_t want, bool html, int count)
+void dofindpath(struct onak_dbctx *dbctx,
+ uint64_t have, uint64_t want, bool html, int count)
{
struct stats_key *keyinfoa, *keyinfob, *curkey;
uint64_t fullhave, fullwant;
@@ -140,14 +141,14 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
int pathnum;
char *uid;
- fullhave = config.dbbackend->getfullkeyid(have);
- fullwant = config.dbbackend->getfullkeyid(want);
+ fullhave = dbctx->getfullkeyid(dbctx, have);
+ fullwant = dbctx->getfullkeyid(dbctx, want);
/*
* Make sure the keys we have and want are in the cache.
*/
- (void) config.dbbackend->cached_getkeysigs(fullhave);
- (void) config.dbbackend->cached_getkeysigs(fullwant);
+ (void) dbctx->cached_getkeysigs(dbctx, fullhave);
+ (void) dbctx->cached_getkeysigs(dbctx, fullwant);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
printf("Couldn't find key 0x%016" PRIX64 ".\n", have);
@@ -165,7 +166,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
* Fill the tree info up.
*/
initcolour(true);
- rec = findpath(keyinfoa, keyinfob);
+ rec = findpath(dbctx, keyinfoa, keyinfob);
keyinfob->parent = 0;
printf("%s%d nodes examined. %ld elements in the hash%s\n",
@@ -193,7 +194,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
html ? "
" : "");
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
- uid = config.dbbackend->keyid2uid(
+ uid = dbctx->keyid2uid(dbctx,
curkey->keyid);
if (html && uid == NULL) {
printf("cached_getkeysigs(((struct stats_key *)
+ sigs = dbctx->cached_getkeysigs(dbctx, ((struct stats_key *)
curll->object)->keyid);
while (sigs != NULL) {
if (((struct stats_key *) sigs->object)->colour == 0) {