aboutsummaryrefslogtreecommitdiff
path: root/src/dht/test_dhtlog.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-08-10 15:23:21 +0000
committerNathan S. Evans <evans@in.tum.de>2010-08-10 15:23:21 +0000
commit0cd34604e5497edad8fa3a761ef626ad7168c90a (patch)
tree980215ff8a81f9b897e32c8ccad833652c3bf6d6 /src/dht/test_dhtlog.c
parentda1d8fd60b46ccdeb9c9e09b58e0a2bb89db3bfd (diff)
downloadgnunet-0cd34604e5497edad8fa3a761ef626ad7168c90a.tar.gz
gnunet-0cd34604e5497edad8fa3a761ef626ad7168c90a.zip
lots of little things, mainly report statistics at end of dht profiling testcase
Diffstat (limited to 'src/dht/test_dhtlog.c')
-rw-r--r--src/dht/test_dhtlog.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/dht/test_dhtlog.c b/src/dht/test_dhtlog.c
index 26332bf5b..467e3876e 100644
--- a/src/dht/test_dhtlog.c
+++ b/src/dht/test_dhtlog.c
@@ -69,20 +69,13 @@ test (struct GNUNET_DHTLOG_Handle * api)
69 5, 1, 12, 0, 0, 0, 69 5, 1, 12, 0, 0, 0,
70 "TEST INSERT TRIAL"); 70 "TEST INSERT TRIAL");
71 CHECK(ret); 71 CHECK(ret);
72
73 ret = api->insert_topology(500); 72 ret = api->insert_topology(500);
74
75 CHECK(ret); 73 CHECK(ret);
76
77 fprintf (stderr, "Trial uid is %llu\n", trialuid);
78
79 ret = api->insert_node (&nodeuid, &p1); 74 ret = api->insert_node (&nodeuid, &p1);
80 ret = api->insert_node (&nodeuid, &p2); 75 ret = api->insert_node (&nodeuid, &p2);
81 ret = api->insert_node (&nodeuid, &p3); 76 ret = api->insert_node (&nodeuid, &p3);
82 ret = api->insert_node (&nodeuid, &p4); 77 ret = api->insert_node (&nodeuid, &p4);
83
84 CHECK(ret); 78 CHECK(ret);
85
86 ret = api->insert_topology(0); 79 ret = api->insert_topology(0);
87 ret = api->insert_extended_topology(&p1, &p2); 80 ret = api->insert_extended_topology(&p1, &p2);
88 ret = api->insert_extended_topology(&p3, &p4); 81 ret = api->insert_extended_topology(&p3, &p4);
@@ -90,35 +83,26 @@ test (struct GNUNET_DHTLOG_Handle * api)
90 CHECK(ret); 83 CHECK(ret);
91 ret = api->insert_dhtkey (&dhtkeyuid, &k1); 84 ret = api->insert_dhtkey (&dhtkeyuid, &k1);
92 ret = api->insert_dhtkey (&dhtkeyuid, &k2); 85 ret = api->insert_dhtkey (&dhtkeyuid, &k2);
93
94 CHECK(ret); 86 CHECK(ret);
95
96 ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1); 87 ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1);
97
98 fprintf (stderr, "Sql uid for dht query is %llu\n", sqlqueryuid);
99
100 ret = 88 ret =
101 api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 1, DHTLOG_GET, &p1, &k2, 89 api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 1, DHTLOG_GET, &p1, &k2,
102 &p4, &p3); 90 &p4, &p3);
103 fprintf (stderr, "Sql uid for dht route is %llu\n", sqlrouteuid);
104 ret = 91 ret =
105 api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 0, DHTLOG_PUT, &p3, &k1, 92 api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 0, DHTLOG_PUT, &p3, &k1,
106 &p4, &p2); 93 &p4, &p2);
107 fprintf (stderr, "Sql uid for dht route is %llu\n", sqlrouteuid);
108 ret = 94 ret =
109 api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 1, DHTLOG_ROUTE, &p3, &k2, 95 api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 1, DHTLOG_ROUTE, &p3, &k2,
110 &p2, NULL); 96 &p2, NULL);
111 fprintf (stderr, "Sql uid for dht route is %llu\n", sqlrouteuid);
112 ret = 97 ret =
113 api->insert_route (&sqlrouteuid, sqlqueryuid, 4, 7, DHTLOG_ROUTE, &p3, &k2, 98 api->insert_route (&sqlrouteuid, sqlqueryuid, 4, 7, DHTLOG_ROUTE, &p3, &k2,
114 NULL, NULL); 99 NULL, NULL);
115 fprintf (stderr, "Sql uid for dht route is %llu, ret %d\n", sqlrouteuid, ret);
116 sleep (1); 100 sleep (1);
117 fprintf (stderr, "Updating trial %llu with endtime of now\n", trialuid); 101 ret = api->insert_stat(&p1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
102 ret = api->insert_stat(&p2, 12, 23, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27);
103 CHECK(ret);
118 ret = api->update_trial (trialuid, 0, 0, 0); 104 ret = api->update_trial (trialuid, 0, 0, 0);
119
120 CHECK(ret); 105 CHECK(ret);
121
122 return 0; 106 return 0;
123} 107}
124 108
@@ -143,7 +127,6 @@ run (void *cls,
143 ok = test(api); 127 ok = test(api);
144 128
145 GNUNET_DHTLOG_disconnect(api); 129 GNUNET_DHTLOG_disconnect(api);
146 GNUNET_free(api);
147} 130}
148 131
149 132