0.3.4 release.

[onak.git] / maxpath.c

diff --git a/maxpath.c b/maxpath.c
index dfee16c4025cba994b0a19cc55d2f2a68cf28dd0..b9ba53a14b036b7b7a32cc0a3edc7b90e55c364c 100644 (file)
--- a/maxpath.c
+++ b/maxpath.c
@@ -14,6 +14,7 @@
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"

+#include "log.h"

 #include "onak-conf.h"
 #include "stats.h"
 
 #include "onak-conf.h"
 #include "stats.h"
 


@@ -30,7 +31,7 @@ void findmaxpath(unsigned long max)
         * My (noodles@earth.li, DSA) key is in the strongly connected set of
         * keys, so we use it as a suitable starting seed.
         */
         * My (noodles@earth.li, DSA) key is in the strongly connected set of
         * keys, so we use it as a suitable starting seed.
         */

-       cached_getkeysigs(0xF1BD4BE45B430367);
+       config.dbbackend->cached_getkeysigs(0xF1BD4BE45B430367);

 
        /*
         * Loop through the hash examining each key present and finding the
 
        /*
         * Loop through the hash examining each key present and finding the


@@ -41,7 +42,8 @@ void findmaxpath(unsigned long max)
        for (loop = 0; (loop < HASHSIZE) && (distance < max); loop++) {
                curkey = gethashtableentry(loop);
                while (curkey != NULL && distance < max) {
        for (loop = 0; (loop < HASHSIZE) && (distance < max); loop++) {
                curkey = gethashtableentry(loop);
                while (curkey != NULL && distance < max) {

-                       cached_getkeysigs(((struct stats_key *)
+                       config.dbbackend->cached_getkeysigs(
+                                       ((struct stats_key *)

                                        curkey->object)->keyid);
                        initcolour(false);
                        tmp = furthestkey((struct stats_key *)
                                        curkey->object)->keyid);
                        initcolour(false);
                        tmp = furthestkey((struct stats_key *)


@@ -70,13 +72,15 @@ void findmaxpath(unsigned long max)
 int main(int argc, char *argv[])
 {
        readconfig(NULL);
 int main(int argc, char *argv[])
 {
        readconfig(NULL);

-       initdb(true);
+       initlogthing("maxpath", config.logfile);
+       config.dbbackend->initdb(true);

        inithash();
        findmaxpath(30);
        printf("--------\n");
        findmaxpath(30);
        destroyhash();
        inithash();
        findmaxpath(30);
        printf("--------\n");
        findmaxpath(30);
        destroyhash();

-       cleanupdb();
+       config.dbbackend->cleanupdb();
+       cleanuplogthing();

        cleanupconfig();
        
        return EXIT_SUCCESS;
        cleanupconfig();
        
        return EXIT_SUCCESS;