Modify tfeature init sequence

[platform/core/telephony/tel-plugin-database.git] / src / database_main.c

diff --git a/src/database_main.c b/src/database_main.c
index a96c5ae..98dcde7 100644 (file)
--- a/src/database_main.c
+++ b/src/database_main.c
@@ -25,9 +25,11 @@
 #include <strings.h>
 
 #include <glib.h>
-#include <db-util.h>
+#include <sqlite3.h>
+#include <unistd.h>
 
 #include <tcore.h>
+#include <server.h>
 #include <plugin.h>
 #include <storage.h>
 
@@ -35,33 +37,11 @@
 #define PLUGIN_VERSION 1
 #endif
 
-static void *create_handle(Storage *strg, const char *path)
-{
-       int rv = 0;
-       sqlite3 *handle = NULL;
-
-       rv = db_util_open(path, &handle, 0);
-       if (rv != SQLITE_OK) {
-               err("fail to connect database err(%d)", rv);
-               return NULL;
-       }
+#define BUSY_WAITING_USEC 50000 /* 0.05 sec */
+#define BUSY_WAITING_MAX 20 /* wait for max 1 sec */
 
-       dbg("connected to %s", path);
-       return handle;
-}
 
-static gboolean remove_handle(Storage *strg, void *handle)
-{
-       if (!handle)
-               return FALSE;
-
-       db_util_close(handle);
-
-       dbg("disconnected from database");
-       return TRUE;
-}
-
-static gboolean update_query_database(Storage *strg, void *handle, const char *query, GHashTable *in_param)
+static gboolean __update_query_database(Storage *strg, void *handle, const char *query, GHashTable *in_param)
 {
        int rv = 0;
        sqlite3_stmt *stmt = NULL;
@@ -117,6 +97,72 @@ static gboolean update_query_database(Storage *strg, void *handle, const char *q
        return TRUE;
 }
 
+static int _busy_handler(void *pData, int count)
+{
+        if (count < BUSY_WAITING_MAX) {
+               usleep(BUSY_WAITING_USEC);
+               return 1;
+       }
+
+       dbg("Busy Handler will be returned SQLITE_BUSY error\n");
+       return 0;
+}
+
+static void *create_handle(Storage *strg, const char *path)
+{
+       int rv = 0;
+       sqlite3 *handle = NULL;
+
+       if (path == NULL) {
+               err("Invalid input param error");
+               return NULL;
+       }
+
+       rv = sqlite3_open(path, &handle);
+       if (rv != SQLITE_OK) {
+               err("fail to connect database err(%d), errmsg(%s)", rv, sqlite3_errmsg(handle));
+               return NULL;
+       }
+
+       rv = sqlite3_busy_handler(handle, _busy_handler, NULL);
+       if (rv != SQLITE_OK) {
+               err("fail to register busy handler err(%d), errmsg(%s)", rv, sqlite3_errmsg(handle));
+               return NULL;
+       }
+
+       dbg("connected to %s", path);
+       return handle;
+}
+
+static gboolean remove_handle(Storage *strg, void *handle)
+{
+       int rv = 0;
+
+       if (!handle)
+               return FALSE;
+
+       rv = sqlite3_close(handle);
+       if (rv != SQLITE_OK) {
+               err("fail to close database err(%d)", rv);
+               handle = NULL;
+               return FALSE;
+       }
+
+       dbg("disconnected from database");
+       return TRUE;
+}
+
+static gboolean update_query_database(Storage *strg, void *handle, const char *query, GHashTable *in_param)
+{
+       gboolean ret = TRUE;
+
+       dbg("update query");
+
+       ret = __update_query_database(strg, handle, query, in_param);
+
+       return ret;
+}
+
 static gboolean _read_query_database_internal(Storage *strg, void *handle, const char *query, GHashTable *in_param,
                gpointer out_param, int out_param_cnt, gboolean in_order)
 {
@@ -285,57 +331,13 @@ static gboolean insert_query_database(Storage *strg, void *handle, const char *q
 
 static gboolean remove_query_database(Storage *strg, void *handle, const char *query, GHashTable *in_param)
 {
-       int rv = 0;
-       sqlite3_stmt *stmt = NULL;
-       char szQuery[1000+1];   /* +1 is for NULL Termination Character '\0' */
+       gboolean ret = TRUE;
 
-       GHashTableIter iter;
-       gpointer key, value;
        dbg("remove query");
 
-       memset(szQuery, '\0', 1001);
-       strncpy(szQuery, query, 1000);
+       ret = __update_query_database(strg, handle, query, in_param);
 
-       rv = sqlite3_prepare_v2(handle, szQuery, strlen(szQuery), &stmt, NULL);
-       if (rv != SQLITE_OK) {
-               err("fail to connect to table (%d)", rv);
-               return FALSE;
-       }
-
-       if (in_param) {
-               g_hash_table_iter_init(&iter, in_param);
-               while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
-                       dbg("key(%s), value(%s)", (const char *)key, (const char *)value);
-
-                       if (!value || g_strcmp0((const char *)value, "") == 0) {
-                               dbg("bind null");
-                               rv = sqlite3_bind_null(stmt, atoi((const char *)key));
-                       } else {
-                               dbg("bind value");
-                               rv = sqlite3_bind_text(stmt, atoi((const char *)key), (const char *)value, strlen((const char *)value),
-                                               SQLITE_STATIC);
-                       }
-
-                       if (rv != SQLITE_OK) {
-                               dbg("fail to bind data (%d)", rv);
-                               break;
-                       }
-               }
-       }
-
-       if (rv != SQLITE_OK) {
-               sqlite3_finalize(stmt);
-               return FALSE;
-       }
-
-       rv = sqlite3_step(stmt);
-       dbg("remove query executed (%d)", rv);
-       sqlite3_finalize(stmt);
-
-       if (rv != SQLITE_DONE)
-               return FALSE;
-
-       return TRUE;
+       return ret;
 }
 
 static struct storage_operations ops = {
@@ -367,8 +369,20 @@ static gboolean on_init(TcorePlugin *p)
 
 static void on_unload(TcorePlugin *p)
 {
+       Storage *strg;
+
+       if (!p)
+               return;
+
        dbg("i'm unload!");
+
+       strg = tcore_server_find_storage(tcore_plugin_ref_server(p), "database");
+       if (!strg)
+               return;
+
+       tcore_storage_free(strg);
        return;
+
 }
 
 EXPORT_API struct tcore_plugin_define_desc plugin_define_desc = {