Workaround emscripten bug in returning int64_t

Emscripten can't return a 64-bit integer from dynamically loaded code.

7 files changed, 38 insertions, 24 deletions

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 6c493768d..37df441c4 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -1241,7 +1241,7 @@ disk_utilization_change_cb (void *cls,
                 _("Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"),
                 (long long) payload,
                 (long long) -delta);
-    payload = plugin->api->estimate_size (plugin->api->cls);
+    plugin->api->estimate_size (plugin->api->cls, &payload);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _("New payload: %lld\n"),
                 (long long) payload);
@@ -1404,7 +1404,7 @@ process_stat_done (void *cls, int success)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Failed to obtain value from statistics service, recomputing it\n");
-    payload = plugin->api->estimate_size (plugin->api->cls);
+    plugin->api->estimate_size (plugin->api->cls, &payload);
   }
   if (GNUNET_YES == refresh_bf)
   {
diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c
index 8f7f3d1de..09b3fd416 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -184,12 +184,13 @@ struct Plugin
  * @param cls our "struct Plugin*"
  * @return number of bytes used on disk
  */
-static unsigned long long
-heap_plugin_estimate_size (void *cls)
+static void
+heap_plugin_estimate_size (void *cls, unsigned long long *estimate)
 {
   struct Plugin *plugin = cls;
 
-  return plugin->size;
+  if (NULL != estimate)
+    *estimate = plugin->size;
 }
 
 
diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index fab10b206..3a234e365 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -246,22 +246,25 @@ do_delete_entry (struct Plugin *plugin, unsigned long long uid)
  * @param cls our "struct Plugin *"
  * @return number of bytes used on disk
  */
-static unsigned long long
-mysql_plugin_estimate_size (void *cls)
+static void
+mysql_plugin_estimate_size (void *cls, unsigned long long *estimate)
 {
   struct Plugin *plugin = cls;
   MYSQL_BIND cbind[1];
   long long total;
 
+  if (NULL == estimate)
+    return;
   memset (cbind, 0, sizeof (cbind));
   total = 0;
   cbind[0].buffer_type = MYSQL_TYPE_LONGLONG;
   cbind[0].buffer = &total;
   cbind[0].is_unsigned = GNUNET_NO;
-  if (GNUNET_OK !=
+  if (GNUNET_OK ==
       GNUNET_MYSQL_statement_run_prepared_select (plugin->mc, plugin->get_size, 1, cbind, NULL, NULL, -1))
-    return 0;
-  return total;
+    *estimate = total;
+  else
+    *estimate = 0;
 }
 
 
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index e9495d35e..e7f7a7dd5 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -228,13 +228,15 @@ init_connection (struct Plugin *plugin)
  * @param cls our `struct Plugin *`
  * @return number of bytes used on disk
  */
-static unsigned long long
-postgres_plugin_estimate_size (void *cls)
+static void
+postgres_plugin_estimate_size (void *cls, unsigned long long *estimate)
 {
   struct Plugin *plugin = cls;
   unsigned long long total;
   PGresult *ret;
 
+  if (NULL == estimate)
+    return;
   ret =
       PQexecParams (plugin->dbh,
                     "SELECT SUM(LENGTH(value))+256*COUNT(*) FROM gn090", 0,
@@ -242,23 +244,26 @@ postgres_plugin_estimate_size (void *cls)
   if (GNUNET_OK !=
       GNUNET_POSTGRES_check_result (plugin->dbh, ret, PGRES_TUPLES_OK, "PQexecParams", "get_size"))
   {
-    return 0;
+    *estimate = 0;
+    return;
   }
   if ((PQntuples (ret) != 1) || (PQnfields (ret) != 1) )
   {
     GNUNET_break (0);
     PQclear (ret);
-    return 0;
+    *estimate = 0;
+    return;
   }
   if (PQgetlength (ret, 0, 0) != sizeof (unsigned long long))
   {
     GNUNET_break (0 == PQgetlength (ret, 0, 0));
     PQclear (ret);
-    return 0;
+    *estimate = 0;
+    return;
   }
   total = GNUNET_ntohll (*(const unsigned long long *) PQgetvalue (ret, 0, 0));
   PQclear (ret);
-  return total;
+  *estimate = total;
 }
 
 
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index ae57c6aa0..b962d22d7 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -1135,8 +1135,8 @@ sqlite_plugin_drop (void *cls)
  * @param cls the `struct Plugin`
  * @return the size of the database on disk (estimate)
  */
-static unsigned long long
-sqlite_plugin_estimate_size (void *cls)
+static void
+sqlite_plugin_estimate_size (void *cls, unsigned long long *estimate)
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt;
@@ -1147,12 +1147,15 @@ sqlite_plugin_estimate_size (void *cls)
   char *e;
 #endif
 
+  if (NULL == estimate)
+    return;
   if (SQLITE_VERSION_NUMBER < 3006000)
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "datastore-sqlite",
                      _
                      ("sqlite version to old to determine size, assuming zero\n"));
-    return 0;
+    *estimate = 0;
+    return;
   }
   CHECK (SQLITE_OK == sqlite3_exec (plugin->dbh, "VACUUM", NULL, NULL, ENULL));
   CHECK (SQLITE_OK ==
@@ -1172,7 +1175,7 @@ sqlite_plugin_estimate_size (void *cls)
               _
               ("Using sqlite page utilization to estimate payload (%llu pages of size %llu bytes)\n"),
               (unsigned long long) pages, (unsigned long long) page_size);
-  return pages * page_size;
+  *estimate = pages * page_size;
 }
 
 
diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c
index 5e577b1bc..cf4b2ec99 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -47,11 +47,13 @@ struct Plugin
  * @param cls our "struct Plugin*"
  * @return number of bytes used on disk
  */
-static unsigned long long
-template_plugin_estimate_size (void *cls)
+static void
+template_plugin_estimate_size (void *cls, unsigned long long *estimate)
 {
+  if (NULL == estimate)
+    return;
   GNUNET_break (0);
-  return 0;
+  *estimate = 0;
 }
 
 
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index 4eefcaefa..bf3deb2f4 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -241,7 +241,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     for (j = 0; j < PUT_10; j++)
     {
       put_value (crc->api, j, crc->i);
-      cs = crc->api->estimate_size (crc->api->cls);
+      crc->api->estimate_size (crc->api->cls, &cs);
       GNUNET_assert (os <= cs);
       os = cs;
     }