diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-01-31 23:35:06 +0000 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-01-31 23:35:06 +0000 |
| commit | 6ad1c1c257c74c82179a0eb62277ceef1cc4e9e0 (patch) | |
| tree | 73a0657cad8a96c0d0611ec900b95adc4a264be0 /hardinfo2/benchmark.c | |
| parent | e9906f6d9335ae96cd6afac714646b97edc469a5 (diff) | |
Sync with internal subversion
Diffstat (limited to 'hardinfo2/benchmark.c')
| -rw-r--r-- | hardinfo2/benchmark.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/hardinfo2/benchmark.c b/hardinfo2/benchmark.c index e15c0dfe..f4cb904c 100644 --- a/hardinfo2/benchmark.c +++ b/hardinfo2/benchmark.c @@ -26,13 +26,15 @@ enum { BENCHMARK_FIB, BENCHMARK_MD5, BENCHMARK_SHA1, + BENCHMARK_BLOWFISH } Entries; static ModuleEntry hi_entries[] = { {"CPU ZLib", "compress.png"}, {"CPU Fibonacci", "module.png"}, {"CPU MD5", "module.png"}, - {"CPU SHA1", "module.png"} + {"CPU SHA1", "module.png"}, + {"CPU Blowfish", "blowfish.png"} }; static gchar * @@ -52,24 +54,24 @@ benchmark_include_results(gchar *results, const gchar *benchmark) g_free(value); } - results = g_strconcat(results, "[$ShellParam$]\n" - "Zebra=1\n", NULL); - g_strfreev(machines); g_key_file_free(conf); - return results; + return g_strconcat(results, "[$ShellParam$]\n" + "Zebra=1\n", NULL); } #include <arch/common/fib.h> #include <arch/common/zlib.h> #include <arch/common/md5.h> #include <arch/common/sha1.h> +#include <arch/common/blowfish.h> static gchar *bench_zlib = NULL, *bench_fib = NULL, *bench_md5 = NULL, - *bench_sha1 = NULL; + *bench_sha1 = NULL, + *bench_fish = NULL; gchar * hi_info(gint entry) @@ -82,6 +84,13 @@ hi_info(gint entry) bench_zlib = benchmark_zlib(); return g_strdup(bench_zlib); + case BENCHMARK_BLOWFISH: + if (bench_fish) + return g_strdup(bench_fish); + + bench_fish = benchmark_fish(); + return g_strdup(bench_fish); + case BENCHMARK_MD5: if (bench_md5) return g_strdup(bench_md5); @@ -116,6 +125,10 @@ hi_reload(gint entry) if (bench_zlib) g_free(bench_zlib); bench_zlib = benchmark_zlib(); break; + case BENCHMARK_BLOWFISH: + if (bench_fish) g_free(bench_fish); + bench_fish = benchmark_fish(); + break; case BENCHMARK_MD5: if (bench_md5) g_free(bench_md5); bench_md5 = benchmark_md5(); |