Refactoring gnunet time

diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index 0231992314ff3598733ab5086ca681dbc1a64586..904238f851f868f576f1b261ac2a78aeb58571ef 100644 (file)
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -84,7 +84,7 @@ run (void *cls,
     }
   exp = GNUNET_TIME_absolute_get ();
   start = exp;
-  exp.value += 5 * 60 * 1000;
+  exp.abs_value += 5 * 60 * 1000;
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < ITERATIONS; i++)
     {
@@ -102,7 +102,7 @@ run (void *cls,
   fprintf (stderr, "\n");
   fprintf (stdout, "Stored %u items in %llums\n",
           ITERATIONS,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration(start).value);
+          (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value);
   start = GNUNET_TIME_absolute_get ();
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < ITERATIONS; i++)
@@ -117,7 +117,7 @@ run (void *cls,
   fprintf (stderr, "\n");
   fprintf (stdout, "Found %u/%u items in %llums (%u were deleted during storage processing)\n",
           found, ITERATIONS,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration(start).value,
+          (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value,
           ITERATIONS - found);
           
   GNUNET_DATACACHE_destroy (h);

diff --git a/src/datacache/plugin_datacache_mysql.c b/src/datacache/plugin_datacache_mysql.c
index 8241fb5f85af2d9ae1bccd02e0356c3b2bed71a9..7936e0a1b65fbca7db30411117f96bd169142ff0 100644 (file)
--- a/src/datacache/plugin_datacache_mysql.c
+++ b/src/datacache/plugin_datacache_mysql.c
@@ -750,8 +750,8 @@ mysql_plugin_put (void *cls,
   k_length = sizeof (GNUNET_HashCode);
   v_length = size;
   v_type = type;
-  v_now = (unsigned long long) now.value;
-  v_discard_time = (unsigned long long) discard_time.value;
+  v_now = (unsigned long long) now.abs_value;
+  v_discard_time = (unsigned long long) discard_time.abs_value;
   if (GNUNET_OK ==
       prepared_statement_run (plugin,
                              plugin->update_value,
@@ -862,7 +862,7 @@ mysql_plugin_get (void *cls,
   rbind[0].buffer = &total;
   rbind[0].is_unsigned = GNUNET_YES;
   v_type = type;
-  v_now = (unsigned long long) now.value;
+  v_now = (unsigned long long) now.abs_value;
   if ((GNUNET_OK !=
        (ret = prepared_statement_run_select (plugin,
                                             plugin->count_value,
@@ -930,7 +930,7 @@ mysql_plugin_get (void *cls,
           return GNUNET_SYSERR;
         }
       cnt++;
-      expire.value = v_expire;
+      expire.abs_value = v_expire;
       if (GNUNET_OK != iter (iter_cls, 
                             expire,
                             key, 

diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index c9d6deaaa565149fb0d530b352bbe5fd6aa0da33..ca794ddd4ea00f8369c62af5461b5fbc4a1b49e6 100644 (file)
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -422,7 +422,7 @@ postgres_plugin_get (void *cls,
     }
   for (i=0;i<cnt;i++)
     {
-      expiration_time.value = GNUNET_ntohll (*(uint64_t *) PQgetvalue (res, i, 0));
+      expiration_time.abs_value = GNUNET_ntohll (*(uint64_t *) PQgetvalue (res, i, 0));
       type = ntohl (*(uint32_t *) PQgetvalue (res, i, 1));
       size = PQgetlength (res, i, 2);
 #if DEBUG_POSTGRES

diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index 5c304bd8ade6ab0a634b6845a4a1f9799f1c9d06..95b65cb10ab5c89b4c5eb44b8c8e82297e2c613f 100644 (file)
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -112,9 +112,9 @@ sqlite_plugin_put (void *cls,
              "PUT",
              (unsigned int) size,
              GNUNET_h2s (key),
-             (unsigned long long) GNUNET_TIME_absolute_get_remaining (discard_time).value);
+             (unsigned long long) GNUNET_TIME_absolute_get_remaining (discard_time).rel_value);
 #endif
-  dval = (int64_t) discard_time.value;
+  dval = (int64_t) discard_time.abs_value;
   if (dval < 0)    
     dval = INT64_MAX;    
   if (sq_prepare (plugin->dbh,
@@ -206,9 +206,9 @@ sqlite_plugin_get (void *cls,
   sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode),
                      SQLITE_TRANSIENT);
   sqlite3_bind_int (stmt, 2, type);
-  ntime = (int64_t) now.value;
+  ntime = (int64_t) now.abs_value;
   GNUNET_assert (ntime >= 0);
-  sqlite3_bind_int64 (stmt, 3, now.value);
+  sqlite3_bind_int64 (stmt, 3, now.abs_value);
   if (SQLITE_ROW != sqlite3_step (stmt))
     {
       LOG_SQLITE (plugin->dbh,
@@ -242,13 +242,13 @@ sqlite_plugin_get (void *cls,
       sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode),
                          SQLITE_TRANSIENT);
       sqlite3_bind_int (stmt, 2, type);
-      sqlite3_bind_int64 (stmt, 3, now.value);
+      sqlite3_bind_int64 (stmt, 3, now.abs_value);
       if (sqlite3_step (stmt) != SQLITE_ROW)
         break;
       size = sqlite3_column_bytes (stmt, 0);
       dat = sqlite3_column_blob (stmt, 0);
-      exp.value = sqlite3_column_int64 (stmt, 1);
-      ntime = (int64_t) exp.value;
+      exp.abs_value = sqlite3_column_int64 (stmt, 1);
+      ntime = (int64_t) exp.abs_value;
       if (ntime == INT64_MAX)
        exp = GNUNET_TIME_UNIT_FOREVER_ABS;
       cnt++;

diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index da7894d6b601ac94216167dbc9d06e57854a7dd0..d0785173eff0968a29333142cacc3aa713de8d23 100644 (file)
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -84,7 +84,7 @@ run (void *cls,
       return;
     }
   exp = GNUNET_TIME_absolute_get ();
-  exp.value += 5 * 60 * 1000;
+  exp.abs_value += 5 * 60 * 1000;
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < 100; i++)
     {

diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index ada5ae1715c57e7176bfbe55c3802e70c76406af..4674a7da9a47719d8c221ccaf51523fe5ac682f2 100644 (file)
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -70,7 +70,7 @@ run (void *cls,
       return;
     }
   exp = GNUNET_TIME_absolute_get ();
-  exp.value += 20 * 60 * 1000;
+  exp.abs_value += 20 * 60 * 1000;
   memset (buf, 1, sizeof (buf));
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < 10; i++)
@@ -79,7 +79,7 @@ run (void *cls,
       GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
       for (j = i; j < sizeof (buf); j += 10)
         {
-         exp.value++;
+         exp.abs_value++;
           buf[j] = i;
           ASSERT (GNUNET_OK == 
                  GNUNET_DATACACHE_put (h,