Merge "[Non-ACR] improve SAM Score" into tizen

diff --git a/include/bm_server.h b/include/bm_server.h
index 76703da..6719efb 100644 (file)
--- a/include/bm_server.h
+++ b/include/bm_server.h
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+BatteryMonitor *batterymonitor_obj = NULL;
+
 gboolean bm_get_mah_usage_by_app_id_for_resource_id_custom_interval(BatteryMonitor *obj, GDBusMethodInvocation *invocation,
                                const gchar *app_id, gint resource_id, gint64 start_time, gint64 end_time, gint uid);
 

diff --git a/include/bm_server_db.h b/include/bm_server_db.h
index a7cedd2..9d09175 100644 (file)
--- a/include/bm_server_db.h
+++ b/include/bm_server_db.h
@@ -22,13 +22,14 @@
 #include <glib.h>
 #include <tzplatform_config.h>
 #include <db-util.h>
+#include <pthread.h>
+
 #include "bm_private.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 /* List of Resources
 BM_RESOURCE_ID_BLE ==> rId_ble,
 BM_RESOURCE_ID_WIFI,
@@ -214,6 +215,7 @@ int bm_server_delete_table_by_time_interval(void);
 int bm_server_appid_insert_to_db(const char* app_id);
 
 GSList* bm_server_query_appid_map(int *error_code);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/bm_plugin_manager.c b/src/bm_plugin_manager.c
index 59b8e55..e855ec5 100644 (file)
--- a/src/bm_plugin_manager.c
+++ b/src/bm_plugin_manager.c
@@ -18,11 +18,8 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "bm_plugin_interface.h"
 #include "bm_plugin_manager.h"
 
-bm_plugin_info_h *plugins[BATTERY_MONITOR_PLUGINS_MAX];
-
 extern const bm_callbacks_st *bm_receiver_callbacks[BATTERY_MONITOR_CALLBACKS_MAX];
 
 const bm_callbacks_st ble_cb;
@@ -34,6 +31,8 @@ const bm_callbacks_st device_network_cb;
 const bm_callbacks_st gps_cb;
 #endif
 
+static bm_plugin_info_h *plugins[BATTERY_MONITOR_PLUGINS_MAX];
+
 inline void bm_populate_callbacks(void)
 {
        bm_receiver_callbacks[BM_DATA_TYPE_BLE] = &ble_cb;

diff --git a/src/bm_server.c b/src/bm_server.c
index f147427..3d0f149 100644 (file)
--- a/src/bm_server.c
+++ b/src/bm_server.c
@@ -34,8 +34,6 @@
 static GMainLoop *mainloop = NULL;
 static guint owner_id = 0;
 
-BatteryMonitor *batterymonitor_obj = NULL;
-
 static void bm_signal_handler(int signo, siginfo_t *info, void *data)
 {
        ENTER;

diff --git a/src/bm_server_db.c b/src/bm_server_db.c
index 9ef3761..5b1686b 100644 (file)
--- a/src/bm_server_db.c
+++ b/src/bm_server_db.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <glib.h>
 #include <db-util.h>
-#include <pthread.h>
 #include <sqlite3.h>
 #include <time.h>
 #include <tzplatform_config.h>
@@ -39,7 +38,7 @@
 static sqlite3* g_hBatteryMonitorDB = NULL;
 static sqlite3* g_hBatteryMonitorDB2 = NULL;
 
-pthread_mutex_t battery_monitor_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t battery_monitor_mutex;
 
 static const char* bm_db_err_msg(sqlite3 *bm_db_handle)
 {
@@ -2543,6 +2542,9 @@ int initialize_database(void)
 
        int return_code = BATTERY_MONITOR_ERROR_NONE;
 
+       if (pthread_mutex_init(&battery_monitor_mutex, NULL))
+               _ERR("error initializing mutex");
+
        return_code = bm_db_open();
        if (return_code != BATTERY_MONITOR_ERROR_NONE) {
                _ERR("Battery Monitor DB Open Error");
@@ -2565,6 +2567,9 @@ int deinitialize_database(void)
                return -1;
        }
 
+       if (pthread_mutex_destroy(&battery_monitor_mutex))
+               _ERR("error destroying mutex");
+
        EXIT;
        return BATTERY_MONITOR_ERROR_NONE;
 }