X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=stats.c;h=e8e3e2344af9ad71bc663940a1c6892c913dc066;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=88d7a050de183bc266367e1ed3fe3d3225845ba4;hpb=936be87217c58254edc92aa63178fa0461f67150;p=onak.git

diff --git a/stats.c b/stats.c
index 88d7a05..e8e3e23 100644
--- a/stats.c
+++ b/stats.c
@@ -1,11 +1,22 @@
 /*
  * stats.c - various routines to do stats on the key graph
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2004,2007-2009 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2000-2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -14,7 +25,6 @@
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"
-#include "onak-conf.h"
 #include "stats.h"
 
 /**
@@ -55,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;
@@ -69,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) {
 			/*
@@ -121,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;
@@ -129,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);
@@ -154,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",
@@ -182,7 +194,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 				html ? "<BR>" : "");
 			curkey = keyinfoa;
 			while (curkey != NULL && curkey->keyid != 0) {
-				uid = config.dbbackend->keyid2uid(
+				uid = dbctx->keyid2uid(dbctx,
 						curkey->keyid);
 				if (html && uid == NULL) {
 					printf("<a href=\"lookup?op=get&search="
@@ -244,7 +256,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 
 
 
-struct stats_key *furthestkey(struct stats_key *have)
+struct stats_key *furthestkey(struct onak_dbctx *dbctx, struct stats_key *have)
 {
 	unsigned long count = 0;
 	unsigned long curdegree = 0;
@@ -263,7 +275,7 @@ struct stats_key *furthestkey(struct stats_key *have)
 	curll = lladd(NULL, have);
 
 	while (curll != NULL) {
-		sigs = config.dbbackend->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) {