projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-remove async ecc key generation, not needed
[oweals/gnunet.git]
/
src
/
util
/
perf_crypto_hash.c
diff --git
a/src/util/perf_crypto_hash.c
b/src/util/perf_crypto_hash.c
index 746b33ecaa053bc36d3348ee30208717067a870a..930e99844ced9ff0f4433a65b41b0fbe90875c91 100644
(file)
--- a/
src/util/perf_crypto_hash.c
+++ b/
src/util/perf_crypto_hash.c
@@
-25,31
+25,23
@@
*/
#include "platform.h"
#include "gnunet_common.h"
*/
#include "platform.h"
#include "gnunet_common.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
#include <gauger.h>
#include <gauger.h>
+
static void
perfHash ()
{
static void
perfHash ()
{
- GNUNET_HashCode hc1;
- GNUNET_HashCode hc2;
- GNUNET_HashCode hc3;
- int i;
- char *buf;
+ struct GNUNET_HashCode hc;
+ unsigned int i;
+ char buf[64 * 1024];
- buf = GNUNET_malloc (1024 * 64);
- memset (buf, 1, 1024 * 64);
- GNUNET_CRYPTO_hash ("foo", 3, &hc1);
+ memset (buf, 1, sizeof (buf));
for (i = 0; i < 1024; i++)
for (i = 0; i < 1024; i++)
- {
- GNUNET_CRYPTO_hash (&hc1, sizeof (GNUNET_HashCode), &hc2);
- GNUNET_CRYPTO_hash (&hc2, sizeof (GNUNET_HashCode), &hc1);
- GNUNET_CRYPTO_hash (buf, 1024 * 64, &hc3);
- }
- GNUNET_free (buf);
+ GNUNET_CRYPTO_hash (buf, sizeof (buf), &hc);
}
}
+
int
main (int argc, char *argv[])
{
int
main (int argc, char *argv[])
{
@@
-57,14
+49,14
@@
main (int argc, char *argv[])
start = GNUNET_TIME_absolute_get ();
perfHash ();
start = GNUNET_TIME_absolute_get ();
perfHash ();
- printf ("Hash perf took %
llu m
s\n",
- (unsigned long long)
-
GNUNET_TIME_absolute_get_duration (start).rel_value
);
+ printf ("Hash perf took %s\n",
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start),
+
GNUNET_YES)
);
GAUGER ("UTIL", "Cryptographic hashing",
GAUGER ("UTIL", "Cryptographic hashing",
- 1024 * 64 * 1024 / (1 +
- GNUNET_TIME_absolute_get_duration
- (start).rel_value), "kb/s");
+
1024 * 64 * 1024 / (1 +
+
GNUNET_TIME_absolute_get_duration
+
(start).rel_value), "kb/s");
return 0;
}
return 0;
}
-/* end of
hashperf
.c */
+/* end of
perf_crypto_hash
.c */