Skip to content

C
ccan
Commit 4bde5a87 authored by Rusty Russell's avatar Rusty Russell
Browse files
Options

tdb2: add --summary and logging to tools/speed. 

This helps us see where the problems are.
parent 5f388eef
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 4 deletions
ccan/tdb2/tools/speed.c
View file @ 4bde5a87
...@@ -94,15 +94,21 @@ static void dump_and_clear_stats(struct tdb_attribute_stats *stats) ...@@ -94,15 +94,21 @@ static void dump_and_clear_stats(struct tdb_attribute_stats *stats)
memset(&stats->allocs, 0, (char *)(stats+1) - (char *)&stats->allocs); memset(&stats->allocs, 0, (char *)(stats+1) - (char *)&stats->allocs);
} }
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
void *private, const char *message)
{
fputs(message, stderr);
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
unsigned int i, j, num = 1000, stage = 0, stopat = -1; unsigned int i, j, num = 1000, stage = 0, stopat = -1;
int flags = TDB_DEFAULT; int flags = TDB_DEFAULT;
bool transaction = false; bool transaction = false, summary = false;
TDB_DATA key, data; TDB_DATA key, data;
struct tdb_context *tdb; struct tdb_context *tdb;
struct timeval start, stop; struct timeval start, stop;
union tdb_attribute seed, stats; union tdb_attribute seed, stats, log;
enum TDB_ERROR ecode; enum TDB_ERROR ecode;
/* Try to keep benchmarks even. */ /* Try to keep benchmarks even. */
...@@ -110,6 +116,10 @@ int main(int argc, char *argv[]) ...@@ -110,6 +116,10 @@ int main(int argc, char *argv[])
seed.base.next = NULL; seed.base.next = NULL;
seed.seed.seed = 0; seed.seed.seed = 0;
log.base.attr = TDB_ATTRIBUTE_LOG;
log.base.next = &seed;
log.log.log_fn = tdb_log;
memset(&stats, 0, sizeof(stats)); memset(&stats, 0, sizeof(stats));
stats.base.attr = TDB_ATTRIBUTE_STATS; stats.base.attr = TDB_ATTRIBUTE_STATS;
stats.base.next = NULL; stats.base.next = NULL;
...@@ -130,6 +140,11 @@ int main(int argc, char *argv[]) ...@@ -130,6 +140,11 @@ int main(int argc, char *argv[])
argc--; argc--;
argv++; argv++;
} }
if (argv[1] && strcmp(argv[1], "--summary") == 0) {
summary = true;
argc--;
argv++;
}
if (argv[1] && strcmp(argv[1], "--stats") == 0) { if (argv[1] && strcmp(argv[1], "--stats") == 0) {
seed.base.next = &stats; seed.base.next = &stats;
argc--; argc--;
...@@ -137,7 +152,7 @@ int main(int argc, char *argv[]) ...@@ -137,7 +152,7 @@ int main(int argc, char *argv[])
} }
tdb = tdb_open("/tmp/speed.tdb", flags, O_RDWR|O_CREAT|O_TRUNC, tdb = tdb_open("/tmp/speed.tdb", flags, O_RDWR|O_CREAT|O_TRUNC,
0600, &seed); 0600, &log);
if (!tdb) if (!tdb)
err(1, "Opening /tmp/speed.tdb"); err(1, "Opening /tmp/speed.tdb");
...@@ -173,6 +188,12 @@ int main(int argc, char *argv[]) ...@@ -173,6 +188,12 @@ int main(int argc, char *argv[])
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (seed.base.next) if (seed.base.next)
dump_and_clear_stats(&stats.stats); dump_and_clear_stats(&stats.stats);
if (++stage == stopat) if (++stage == stopat)
...@@ -197,6 +218,12 @@ int main(int argc, char *argv[]) ...@@ -197,6 +218,12 @@ int main(int argc, char *argv[])
errx(1, "committing transaction: %s", tdb_errorstr(ecode)); errx(1, "committing transaction: %s", tdb_errorstr(ecode));
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (seed.base.next) if (seed.base.next)
dump_and_clear_stats(&stats.stats); dump_and_clear_stats(&stats.stats);
if (++stage == stopat) if (++stage == stopat)
...@@ -220,6 +247,12 @@ int main(int argc, char *argv[]) ...@@ -220,6 +247,12 @@ int main(int argc, char *argv[])
errx(1, "committing transaction: %s", tdb_errorstr(ecode)); errx(1, "committing transaction: %s", tdb_errorstr(ecode));
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (seed.base.next) if (seed.base.next)
dump_and_clear_stats(&stats.stats); dump_and_clear_stats(&stats.stats);
if (++stage == stopat) if (++stage == stopat)
...@@ -241,6 +274,12 @@ int main(int argc, char *argv[]) ...@@ -241,6 +274,12 @@ int main(int argc, char *argv[])
errx(1, "committing transaction: %s", tdb_errorstr(ecode)); errx(1, "committing transaction: %s", tdb_errorstr(ecode));
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (seed.base.next) if (seed.base.next)
dump_and_clear_stats(&stats.stats); dump_and_clear_stats(&stats.stats);
if (++stage == stopat) if (++stage == stopat)
...@@ -263,6 +302,12 @@ int main(int argc, char *argv[]) ...@@ -263,6 +302,12 @@ int main(int argc, char *argv[])
errx(1, "committing transaction: %s", tdb_errorstr(ecode)); errx(1, "committing transaction: %s", tdb_errorstr(ecode));
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (seed.base.next) if (seed.base.next)
dump_and_clear_stats(&stats.stats); dump_and_clear_stats(&stats.stats);
if (++stage == stopat) if (++stage == stopat)
...@@ -285,6 +330,12 @@ int main(int argc, char *argv[]) ...@@ -285,6 +330,12 @@ int main(int argc, char *argv[])
errx(1, "committing transaction: %s", tdb_errorstr(ecode)); errx(1, "committing transaction: %s", tdb_errorstr(ecode));
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (seed.base.next) if (seed.base.next)
dump_and_clear_stats(&stats.stats); dump_and_clear_stats(&stats.stats);
if (++stage == stopat) if (++stage == stopat)
...@@ -292,7 +343,6 @@ int main(int argc, char *argv[]) ...@@ -292,7 +343,6 @@ int main(int argc, char *argv[])
if (transaction && (ecode = tdb_transaction_start(tdb))) if (transaction && (ecode = tdb_transaction_start(tdb)))
errx(1, "starting transaction: %s", tdb_errorstr(ecode)); errx(1, "starting transaction: %s", tdb_errorstr(ecode));
/* Append 1000 records. */ /* Append 1000 records. */
printf("Appending %u records: ", num); fflush(stdout); printf("Appending %u records: ", num); fflush(stdout);
gettimeofday(&start, NULL); gettimeofday(&start, NULL);
...@@ -305,6 +355,12 @@ int main(int argc, char *argv[]) ...@@ -305,6 +355,12 @@ int main(int argc, char *argv[])
errx(1, "committing transaction: %s", tdb_errorstr(ecode)); errx(1, "committing transaction: %s", tdb_errorstr(ecode));
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (++stage == stopat) if (++stage == stopat)
exit(0); exit(0);
...@@ -330,6 +386,12 @@ int main(int argc, char *argv[]) ...@@ -330,6 +386,12 @@ int main(int argc, char *argv[])
printf(" %zu ns (%zu bytes)\n", printf(" %zu ns (%zu bytes)\n",
normalize(&start, &stop, num), file_size()); normalize(&start, &stop, num), file_size());
if (summary) {
char *sumstr = NULL;
tdb_summary(tdb, TDB_SUMMARY_HISTOGRAMS, &sumstr);
printf("%s\n", sumstr);
free(sumstr);
}
if (seed.base.next) if (seed.base.next)
dump_and_clear_stats(&stats.stats); dump_and_clear_stats(&stats.stats);
if (++stage == stopat) if (++stage == stopat)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7