diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:38:04 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:38:04 +0000 |
commit | 5be02c06ab32edcc8ab3ea6b8ff291ba946ed831 (patch) | |
tree | 86a488d381ff8443f6b9de6a23708edb042a75f2 /src | |
parent | 06076559b84c1053d82929c05620ab0bd60b9c5f (diff) | |
download | gnunet-5be02c06ab32edcc8ab3ea6b8ff291ba946ed831.tar.gz gnunet-5be02c06ab32edcc8ab3ea6b8ff291ba946ed831.zip |
Refactoring gnunet time
Diffstat (limited to 'src')
-rw-r--r-- | src/datacache/perf_datacache.c | 6 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_mysql.c | 8 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_postgres.c | 2 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_sqlite.c | 14 | ||||
-rw-r--r-- | src/datacache/test_datacache.c | 2 | ||||
-rw-r--r-- | src/datacache/test_datacache_quota.c | 4 |
6 files changed, 18 insertions, 18 deletions
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index 023199231..904238f85 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c | |||
@@ -84,7 +84,7 @@ run (void *cls, | |||
84 | } | 84 | } |
85 | exp = GNUNET_TIME_absolute_get (); | 85 | exp = GNUNET_TIME_absolute_get (); |
86 | start = exp; | 86 | start = exp; |
87 | exp.value += 5 * 60 * 1000; | 87 | exp.abs_value += 5 * 60 * 1000; |
88 | memset (&k, 0, sizeof (GNUNET_HashCode)); | 88 | memset (&k, 0, sizeof (GNUNET_HashCode)); |
89 | for (i = 0; i < ITERATIONS; i++) | 89 | for (i = 0; i < ITERATIONS; i++) |
90 | { | 90 | { |
@@ -102,7 +102,7 @@ run (void *cls, | |||
102 | fprintf (stderr, "\n"); | 102 | fprintf (stderr, "\n"); |
103 | fprintf (stdout, "Stored %u items in %llums\n", | 103 | fprintf (stdout, "Stored %u items in %llums\n", |
104 | ITERATIONS, | 104 | ITERATIONS, |
105 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).value); | 105 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value); |
106 | start = GNUNET_TIME_absolute_get (); | 106 | start = GNUNET_TIME_absolute_get (); |
107 | memset (&k, 0, sizeof (GNUNET_HashCode)); | 107 | memset (&k, 0, sizeof (GNUNET_HashCode)); |
108 | for (i = 0; i < ITERATIONS; i++) | 108 | for (i = 0; i < ITERATIONS; i++) |
@@ -117,7 +117,7 @@ run (void *cls, | |||
117 | fprintf (stderr, "\n"); | 117 | fprintf (stderr, "\n"); |
118 | fprintf (stdout, "Found %u/%u items in %llums (%u were deleted during storage processing)\n", | 118 | fprintf (stdout, "Found %u/%u items in %llums (%u were deleted during storage processing)\n", |
119 | found, ITERATIONS, | 119 | found, ITERATIONS, |
120 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).value, | 120 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value, |
121 | ITERATIONS - found); | 121 | ITERATIONS - found); |
122 | 122 | ||
123 | GNUNET_DATACACHE_destroy (h); | 123 | GNUNET_DATACACHE_destroy (h); |
diff --git a/src/datacache/plugin_datacache_mysql.c b/src/datacache/plugin_datacache_mysql.c index 8241fb5f8..7936e0a1b 100644 --- a/src/datacache/plugin_datacache_mysql.c +++ b/src/datacache/plugin_datacache_mysql.c | |||
@@ -750,8 +750,8 @@ mysql_plugin_put (void *cls, | |||
750 | k_length = sizeof (GNUNET_HashCode); | 750 | k_length = sizeof (GNUNET_HashCode); |
751 | v_length = size; | 751 | v_length = size; |
752 | v_type = type; | 752 | v_type = type; |
753 | v_now = (unsigned long long) now.value; | 753 | v_now = (unsigned long long) now.abs_value; |
754 | v_discard_time = (unsigned long long) discard_time.value; | 754 | v_discard_time = (unsigned long long) discard_time.abs_value; |
755 | if (GNUNET_OK == | 755 | if (GNUNET_OK == |
756 | prepared_statement_run (plugin, | 756 | prepared_statement_run (plugin, |
757 | plugin->update_value, | 757 | plugin->update_value, |
@@ -862,7 +862,7 @@ mysql_plugin_get (void *cls, | |||
862 | rbind[0].buffer = &total; | 862 | rbind[0].buffer = &total; |
863 | rbind[0].is_unsigned = GNUNET_YES; | 863 | rbind[0].is_unsigned = GNUNET_YES; |
864 | v_type = type; | 864 | v_type = type; |
865 | v_now = (unsigned long long) now.value; | 865 | v_now = (unsigned long long) now.abs_value; |
866 | if ((GNUNET_OK != | 866 | if ((GNUNET_OK != |
867 | (ret = prepared_statement_run_select (plugin, | 867 | (ret = prepared_statement_run_select (plugin, |
868 | plugin->count_value, | 868 | plugin->count_value, |
@@ -930,7 +930,7 @@ mysql_plugin_get (void *cls, | |||
930 | return GNUNET_SYSERR; | 930 | return GNUNET_SYSERR; |
931 | } | 931 | } |
932 | cnt++; | 932 | cnt++; |
933 | expire.value = v_expire; | 933 | expire.abs_value = v_expire; |
934 | if (GNUNET_OK != iter (iter_cls, | 934 | if (GNUNET_OK != iter (iter_cls, |
935 | expire, | 935 | expire, |
936 | key, | 936 | key, |
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index c9d6deaaa..ca794ddd4 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c | |||
@@ -422,7 +422,7 @@ postgres_plugin_get (void *cls, | |||
422 | } | 422 | } |
423 | for (i=0;i<cnt;i++) | 423 | for (i=0;i<cnt;i++) |
424 | { | 424 | { |
425 | expiration_time.value = GNUNET_ntohll (*(uint64_t *) PQgetvalue (res, i, 0)); | 425 | expiration_time.abs_value = GNUNET_ntohll (*(uint64_t *) PQgetvalue (res, i, 0)); |
426 | type = ntohl (*(uint32_t *) PQgetvalue (res, i, 1)); | 426 | type = ntohl (*(uint32_t *) PQgetvalue (res, i, 1)); |
427 | size = PQgetlength (res, i, 2); | 427 | size = PQgetlength (res, i, 2); |
428 | #if DEBUG_POSTGRES | 428 | #if DEBUG_POSTGRES |
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 5c304bd8a..95b65cb10 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c | |||
@@ -112,9 +112,9 @@ sqlite_plugin_put (void *cls, | |||
112 | "PUT", | 112 | "PUT", |
113 | (unsigned int) size, | 113 | (unsigned int) size, |
114 | GNUNET_h2s (key), | 114 | GNUNET_h2s (key), |
115 | (unsigned long long) GNUNET_TIME_absolute_get_remaining (discard_time).value); | 115 | (unsigned long long) GNUNET_TIME_absolute_get_remaining (discard_time).rel_value); |
116 | #endif | 116 | #endif |
117 | dval = (int64_t) discard_time.value; | 117 | dval = (int64_t) discard_time.abs_value; |
118 | if (dval < 0) | 118 | if (dval < 0) |
119 | dval = INT64_MAX; | 119 | dval = INT64_MAX; |
120 | if (sq_prepare (plugin->dbh, | 120 | if (sq_prepare (plugin->dbh, |
@@ -206,9 +206,9 @@ sqlite_plugin_get (void *cls, | |||
206 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), | 206 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), |
207 | SQLITE_TRANSIENT); | 207 | SQLITE_TRANSIENT); |
208 | sqlite3_bind_int (stmt, 2, type); | 208 | sqlite3_bind_int (stmt, 2, type); |
209 | ntime = (int64_t) now.value; | 209 | ntime = (int64_t) now.abs_value; |
210 | GNUNET_assert (ntime >= 0); | 210 | GNUNET_assert (ntime >= 0); |
211 | sqlite3_bind_int64 (stmt, 3, now.value); | 211 | sqlite3_bind_int64 (stmt, 3, now.abs_value); |
212 | if (SQLITE_ROW != sqlite3_step (stmt)) | 212 | if (SQLITE_ROW != sqlite3_step (stmt)) |
213 | { | 213 | { |
214 | LOG_SQLITE (plugin->dbh, | 214 | LOG_SQLITE (plugin->dbh, |
@@ -242,13 +242,13 @@ sqlite_plugin_get (void *cls, | |||
242 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), | 242 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), |
243 | SQLITE_TRANSIENT); | 243 | SQLITE_TRANSIENT); |
244 | sqlite3_bind_int (stmt, 2, type); | 244 | sqlite3_bind_int (stmt, 2, type); |
245 | sqlite3_bind_int64 (stmt, 3, now.value); | 245 | sqlite3_bind_int64 (stmt, 3, now.abs_value); |
246 | if (sqlite3_step (stmt) != SQLITE_ROW) | 246 | if (sqlite3_step (stmt) != SQLITE_ROW) |
247 | break; | 247 | break; |
248 | size = sqlite3_column_bytes (stmt, 0); | 248 | size = sqlite3_column_bytes (stmt, 0); |
249 | dat = sqlite3_column_blob (stmt, 0); | 249 | dat = sqlite3_column_blob (stmt, 0); |
250 | exp.value = sqlite3_column_int64 (stmt, 1); | 250 | exp.abs_value = sqlite3_column_int64 (stmt, 1); |
251 | ntime = (int64_t) exp.value; | 251 | ntime = (int64_t) exp.abs_value; |
252 | if (ntime == INT64_MAX) | 252 | if (ntime == INT64_MAX) |
253 | exp = GNUNET_TIME_UNIT_FOREVER_ABS; | 253 | exp = GNUNET_TIME_UNIT_FOREVER_ABS; |
254 | cnt++; | 254 | cnt++; |
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index da7894d6b..d0785173e 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c | |||
@@ -84,7 +84,7 @@ run (void *cls, | |||
84 | return; | 84 | return; |
85 | } | 85 | } |
86 | exp = GNUNET_TIME_absolute_get (); | 86 | exp = GNUNET_TIME_absolute_get (); |
87 | exp.value += 5 * 60 * 1000; | 87 | exp.abs_value += 5 * 60 * 1000; |
88 | memset (&k, 0, sizeof (GNUNET_HashCode)); | 88 | memset (&k, 0, sizeof (GNUNET_HashCode)); |
89 | for (i = 0; i < 100; i++) | 89 | for (i = 0; i < 100; i++) |
90 | { | 90 | { |
diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index ada5ae171..4674a7da9 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c | |||
@@ -70,7 +70,7 @@ run (void *cls, | |||
70 | return; | 70 | return; |
71 | } | 71 | } |
72 | exp = GNUNET_TIME_absolute_get (); | 72 | exp = GNUNET_TIME_absolute_get (); |
73 | exp.value += 20 * 60 * 1000; | 73 | exp.abs_value += 20 * 60 * 1000; |
74 | memset (buf, 1, sizeof (buf)); | 74 | memset (buf, 1, sizeof (buf)); |
75 | memset (&k, 0, sizeof (GNUNET_HashCode)); | 75 | memset (&k, 0, sizeof (GNUNET_HashCode)); |
76 | for (i = 0; i < 10; i++) | 76 | for (i = 0; i < 10; i++) |
@@ -79,7 +79,7 @@ run (void *cls, | |||
79 | GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n); | 79 | GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n); |
80 | for (j = i; j < sizeof (buf); j += 10) | 80 | for (j = i; j < sizeof (buf); j += 10) |
81 | { | 81 | { |
82 | exp.value++; | 82 | exp.abs_value++; |
83 | buf[j] = i; | 83 | buf[j] = i; |
84 | ASSERT (GNUNET_OK == | 84 | ASSERT (GNUNET_OK == |
85 | GNUNET_DATACACHE_put (h, | 85 | GNUNET_DATACACHE_put (h, |