]> the.earth.li Git - onak.git/blobdiff - stats.c
Remove dead store in generic_fetch_key
[onak.git] / stats.c
diff --git a/stats.c b/stats.c
index 7f241ee1aad311548b6577567c6dbbbaee992dbc..91c916688f4473b88005147424238f2d78871b34 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -1,16 +1,26 @@
 /*
  * 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.
  *
- * $Id: stats.c,v 1.10 2003/06/04 20:57:13 noodles Exp $
+ * 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>
 
+#include "cleanup.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
@@ -26,7 +36,7 @@
  */
 void initcolour(bool parent)
 {
-       unsigned long loop;
+       unsigned int loop;
        struct ll *curkey;
 
        /*
@@ -55,28 +65,30 @@ 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;
        struct ll *sigs = NULL;
        struct ll *nextkeys = NULL;
        long curdegree = 0;
-       long count = 0;
+       unsigned long count = 0;
        
        curdegree = 1;
        keys = lladd(NULL, want);
        oldkeys = keys;
 
-       while (keys != NULL && have->colour == 0) {
-               sigs = cached_getkeysigs(((struct stats_key *)
+       while ((!cleanup()) && keys != NULL && have->colour == 0) {
+               sigs = dbctx->cached_getkeysigs(dbctx, ((struct stats_key *)
                                        keys->object)->keyid);
-               while (sigs != NULL && have->colour == 0) {
+               while ((!cleanup()) && sigs != NULL && have->colour == 0) {
                        /*
                         * Check if we've seen this key before and if not mark
                         * it and add its sigs to the list we want to look at.
                         */
                        if (!((struct stats_key *)sigs->object)->disabled &&
+                           !((struct stats_key *)sigs->object)->revoked &&
                            ((struct stats_key *)sigs->object)->colour == 0) {
                                count++;
                                ((struct stats_key *)sigs->object)->colour =
@@ -120,40 +132,37 @@ 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;
        int rec;
        int pathnum;
        char *uid;
 
-       fullhave = getfullkeyid(have);
-       fullwant = getfullkeyid(want);
-
        /*
         * Make sure the keys we have and want are in the cache.
         */
-       cached_getkeysigs(fullhave);
-       cached_getkeysigs(fullwant);
+       (void) dbctx->cached_getkeysigs(dbctx, have);
+       (void) dbctx->cached_getkeysigs(dbctx, want);
 
-       if ((keyinfoa = findinhash(fullhave)) == NULL) {
-               printf("Couldn't find key 0x%llX.\n", have);
+       if ((keyinfoa = findinhash(have)) == NULL) {
+               printf("Couldn't find key 0x%016" PRIX64 ".\n", have);
                return;
        }
-       if ((keyinfob = findinhash(fullwant)) == NULL) {
-               printf("Couldn't find key 0x%llX.\n", want);
+       if ((keyinfob = findinhash(want)) == NULL) {
+               printf("Couldn't find key 0x%016" PRIX64 ".\n", want);
                return;
        }
 
        pathnum = 0;
        
-       while (pathnum < count) {
+       while ((!cleanup()) && (pathnum < 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",
@@ -162,46 +171,57 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        hashelements(),
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {
-                       printf("Can't find a link from 0x%08llX to 0x%08llX"
-                               "%s\n",
+                       if (pathnum == 0) {
+                               printf("Can't find a link from 0x%016" PRIX64
+                               " to 0x%016" PRIX64 "%s\n",
                                have,
                                want,
                                html ? "<BR>" : "");
+                       } else {
+                               printf("Can't find any further paths%s\n",
+                                       html ? "<BR>" : "");
+                       }
+                       pathnum = count;
                } else {
-                       printf("%d steps from 0x%08llX to 0x%08llX%s\n",
-                               keyinfoa->colour, have & 0xFFFFFFFF,
-                               want & 0xFFFFFFFF,
+                       printf("%d steps from 0x%016" PRIX64 " to 0x%016"
+                               PRIX64 "%s\n",
+                               keyinfoa->colour, have,
+                               want,
                                html ? "<BR>" : "");
                        curkey = keyinfoa;
                        while (curkey != NULL && curkey->keyid != 0) {
-                               uid = keyid2uid(curkey->keyid);
+                               uid = dbctx->keyid2uid(dbctx,
+                                               curkey->keyid);
                                if (html && uid == NULL) {
                                        printf("<a href=\"lookup?op=get&search="
-                                               "0x%08llX\">0x%08llX</a> (["
+                                               "0x%016" PRIX64 "\">0x%016"
+                                               PRIX64 "</a> (["
                                                "User id not found])%s<BR>\n",
-                                               curkey->keyid & 0xFFFFFFFF,
-                                               curkey->keyid & 0xFFFFFFFF,
-                                               (curkey->keyid == fullwant) ?
+                                               curkey->keyid,
+                                               curkey->keyid,
+                                               (curkey->keyid == want) ?
                                                        "" : " signs");
                                } else if (html && uid != NULL) {
                                        printf("<a href=\"lookup?op=get&search="
-                                               "0x%08llX\">0x%08llX</a>"
+                                               "0x%016" PRIX64 "\">0x%016"
+                                               PRIX64 "</a>"
                                                " (<a href=\"lookup?op=vindex&"
-                                               "search=0x%08llX\">%s</a>)%s"
+                                               "search=0x%016" PRIX64
+                                               "\">%s</a>)%s"
                                                "<BR>\n",
-                                               curkey->keyid & 0xFFFFFFFF,
-                                               curkey->keyid & 0xFFFFFFFF,
-                                               curkey->keyid & 0xFFFFFFFF,
+                                               curkey->keyid,
+                                               curkey->keyid,
+                                               curkey->keyid,
                                                txt2html(uid),
-                                               (curkey->keyid == fullwant) ?
+                                               (curkey->keyid == want) ?
                                                "" : " signs");
                                } else {
-                                       printf("0x%08llX (%s)%s\n",
-                                               curkey->keyid & 0xFFFFFFFF,
+                                       printf("0x%016" PRIX64 " (%s)%s\n",
+                                               curkey->keyid,
                                                (uid == NULL) ?
                                                        "[User id not found]" :
                                                        uid,
-                                               (curkey->keyid == fullwant) ?
+                                               (curkey->keyid == want) ?
                                                "" : " signs");
                                }
                                if (uid != NULL) {
@@ -220,7 +240,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        }
                        curkey = keyinfoa;
                        while (curkey != NULL && curkey->keyid != 0) {
-                               printf("0x%08llX ", curkey->keyid & 0xFFFFFFFF);
+                               printf("0x%016" PRIX64 " ",
+                                               curkey->keyid);
                                curkey = findinhash(curkey->parent);
                        }
                        putchar('\n');
@@ -231,7 +252,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;
@@ -250,7 +271,7 @@ struct stats_key *furthestkey(struct stats_key *have)
        curll = lladd(NULL, have);
 
        while (curll != NULL) {
-               sigs = 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) {