diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-09-27 19:36:14 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-09-27 19:36:14 +0000 |
commit | 9cefd9c5522797b132749ca7d99a930007d28347 (patch) | |
tree | 63aa5de219bbd5f0d23f5f0affd418eee5bdd494 /src/datacache | |
parent | a6a4bf9797ecf078179a102f52d1e30a4987bf03 (diff) | |
download | gnunet-9cefd9c5522797b132749ca7d99a930007d28347.tar.gz gnunet-9cefd9c5522797b132749ca7d99a930007d28347.zip |
-converting more places to use STRINGS_relative_time_to_string
Diffstat (limited to 'src/datacache')
-rw-r--r-- | src/datacache/perf_datacache.c | 10 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_sqlite.c | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index fd3891116..10289ec68 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c | |||
@@ -88,9 +88,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
88 | k = n; | 88 | k = n; |
89 | } | 89 | } |
90 | FPRINTF (stderr, "%s", "\n"); | 90 | FPRINTF (stderr, "%s", "\n"); |
91 | FPRINTF (stdout, "Stored %u items in %llums\n", ITERATIONS, | 91 | FPRINTF (stdout, "Stored %u items in %s\n", ITERATIONS, |
92 | (unsigned long long) | 92 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES)); |
93 | GNUNET_TIME_absolute_get_duration (start).rel_value); | ||
94 | GNUNET_snprintf (gstr, sizeof (gstr), "DATACACHE-%s", plugin_name); | 93 | GNUNET_snprintf (gstr, sizeof (gstr), "DATACACHE-%s", plugin_name); |
95 | GAUGER (gstr, "Time to PUT item in datacache", | 94 | GAUGER (gstr, "Time to PUT item in datacache", |
96 | GNUNET_TIME_absolute_get_duration (start).rel_value / ITERATIONS, | 95 | GNUNET_TIME_absolute_get_duration (start).rel_value / ITERATIONS, |
@@ -107,10 +106,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
107 | } | 106 | } |
108 | FPRINTF (stderr, "%s", "\n"); | 107 | FPRINTF (stderr, "%s", "\n"); |
109 | FPRINTF (stdout, | 108 | FPRINTF (stdout, |
110 | "Found %u/%u items in %llums (%u were deleted during storage processing)\n", | 109 | "Found %u/%u items in %s (%u were deleted during storage processing)\n", |
111 | found, ITERATIONS, | 110 | found, ITERATIONS, |
112 | (unsigned long long) | 111 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES), |
113 | GNUNET_TIME_absolute_get_duration (start).rel_value, | ||
114 | ITERATIONS - found); | 112 | ITERATIONS - found); |
115 | if (found > 0) | 113 | if (found > 0) |
116 | GAUGER (gstr, "Time to GET item from datacache", | 114 | GAUGER (gstr, "Time to GET item from datacache", |
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 26792e1fb..b51423de2 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c | |||
@@ -107,10 +107,10 @@ sqlite_plugin_put (void *cls, const struct GNUNET_HashCode * key, size_t size, | |||
107 | int64_t dval; | 107 | int64_t dval; |
108 | 108 | ||
109 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 109 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
110 | "Processing `%s' of %u bytes with key `%4s' and expiration %llums\n", | 110 | "Processing `%s' of %u bytes with key `%4s' and expiration %s\n", |
111 | "PUT", (unsigned int) size, GNUNET_h2s (key), | 111 | "PUT", (unsigned int) size, GNUNET_h2s (key), |
112 | (unsigned long long) | 112 | (unsigned long long) |
113 | GNUNET_TIME_absolute_get_remaining (discard_time).rel_value); | 113 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (discard_time), GNUNET_YES)); |
114 | dval = (int64_t) discard_time.abs_value; | 114 | dval = (int64_t) discard_time.abs_value; |
115 | if (dval < 0) | 115 | if (dval < 0) |
116 | dval = INT64_MAX; | 116 | dval = INT64_MAX; |