Bug 858680 - Part 3: Allow mozStorage to access the dbstats virtual t…

…able, r=asuth.
iaxat · Apr 30, 2015 · d99742b · d99742b
1 parent 5e7ae73
commit d99742b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/db/sqlite3/src/sqlite.def b/db/sqlite3/src/sqlite.def
@@ -51,6 +51,7 @@ EXPORTS
         sqlite3_create_function16
         sqlite3_create_module
         sqlite3_data_count
+        sqlite3_dbstat_register
         sqlite3_db_filename
         sqlite3_db_handle
         sqlite3_db_mutex

diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp
@@ -62,6 +62,10 @@ PRLogModuleInfo* gStorageLog = nullptr;
 #define CHECK_MAINTHREAD_ABUSE() do { /* Nothing */ } while(0)
 #endif
 
+extern "C" {
+int sqlite3_dbstat_register(sqlite3 *db);
+}
+
 namespace mozilla {
 namespace storage {
 
@@ -144,7 +148,14 @@ struct Module
 };
 
 Module gModules[] = {
-  { "filesystem", RegisterFileSystemModule }
+  { "filesystem", RegisterFileSystemModule },
+  { "dbstat",
+    [](sqlite3* aDatabase, const char* aName) -> int
+    {
+      MOZ_ASSERT(!strcmp(aName, "dbstat"));
+      return sqlite3_dbstat_register(aDatabase);
+    }
+  }
 };
 
 ////////////////////////////////////////////////////////////////////////////////