Fix double pthread mutex unlock

[platform/core/uifw/tts.git] / client / tts_dbus.c

diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index 519a53e..71015b6 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -21,7 +21,7 @@
 #include "tts_dbus.h"
 #include "tts_defs.h"
 #include "tts_main.h"
-
+#include "tts_internal.h"
 
 #define HELLO_WAITING_TIME 500
 #define WAITING_TIME 5000
@@ -206,6 +206,8 @@ int tts_dbus_open_connection()
                return TTS_ERROR_OPERATION_FAILED;
        }
 
+       dbus_connection_set_exit_on_disconnect(g_conn_listener, false);
+
        char rule[128] = {0, };
        snprintf(rule, 128, "type='signal',interface='%s'", TTS_CLIENT_SERVICE_INTERFACE);
 
@@ -299,21 +301,27 @@ DBusMessage* __tts_dbus_make_message(int uid, const char* method)
 
        if (TTS_MODE_DEFAULT == client->mode) {
                msg = dbus_message_new_method_call(
-                       TTS_SERVER_SERVICE_NAME, 
-                       TTS_SERVER_SERVICE_OBJECT_PATH, 
-                       TTS_SERVER_SERVICE_INTERFACE, 
+                       TTS_SERVER_SERVICE_NAME,
+                       TTS_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_SERVER_SERVICE_INTERFACE,
                        method);
        } else if (TTS_MODE_NOTIFICATION == client->mode) {
                msg = dbus_message_new_method_call(
-                       TTS_NOTI_SERVER_SERVICE_NAME, 
-                       TTS_NOTI_SERVER_SERVICE_OBJECT_PATH, 
-                       TTS_NOTI_SERVER_SERVICE_INTERFACE, 
+                       TTS_NOTI_SERVER_SERVICE_NAME,
+                       TTS_NOTI_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_NOTI_SERVER_SERVICE_INTERFACE,
                        method);
        } else if (TTS_MODE_SCREEN_READER == client->mode) {
                msg = dbus_message_new_method_call(
-                       TTS_SR_SERVER_SERVICE_NAME, 
-                       TTS_SR_SERVER_SERVICE_OBJECT_PATH, 
-                       TTS_SR_SERVER_SERVICE_INTERFACE, 
+                       TTS_SR_SERVER_SERVICE_NAME,
+                       TTS_SR_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_SR_SERVER_SERVICE_INTERFACE,
+                       method);
+       } else if (TTS_MODE_INTERRUPT == client->mode) {
+               msg = dbus_message_new_method_call(
+                       TTS_INTERRUPT_SERVER_SERVICE_NAME,
+                       TTS_INTERRUPT_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_INTERRUPT_SERVER_SERVICE_INTERFACE,
                        method);
        } else {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input mode is not available");
@@ -347,7 +355,7 @@ int tts_dbus_request_hello(int uid)
        result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, HELLO_WAITING_TIME, &err);
        dbus_message_unref(msg);
        if (dbus_error_is_set(&err)) {
-//             SLOG(LOG_DEBUG, TAG_TTSC, "<<<< tts dbus log : %s", err);
+               SLOG(LOG_DEBUG, TAG_TTSC, "<<<< tts dbus log : %s", err);
                dbus_error_free(&err);
        }
 
@@ -418,20 +426,30 @@ int tts_dbus_request_initialize(int uid, bool* credential_needed)
                        /* add a rule for daemon error */
                        char rule_err[256] = {0, };
                        tts_client_s* client = tts_client_get_by_uid(uid);
-                       if (TTS_MODE_DEFAULT == client->mode) {
-                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SERVER_SERVICE_INTERFACE);
-                       } else if (TTS_MODE_NOTIFICATION == client->mode) {
-                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_NOTI_SERVER_SERVICE_INTERFACE);
-                       } else if (TTS_MODE_SCREEN_READER == client->mode) {
-                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SR_SERVER_SERVICE_INTERFACE);
+                       if (NULL == client) {
+                               SLOG(LOG_ERROR, TAG_TTSC, "Fail to get TTS client");
+                               return TTS_ERROR_OPERATION_FAILED;
                        }
-                       dbus_bus_add_match(g_conn_listener, rule_err, &err);
-                       dbus_connection_flush(g_conn_listener);
 
-                       if (dbus_error_is_set(&err)) {
-                               SLOG(LOG_ERROR, TAG_TTSC, "Match Error (%s)", err.message);
-                               dbus_error_free(&err);
-                               return TTS_ERROR_OPERATION_FAILED;
+                       if (TTS_ERROR_SERVICE_RESET != client->reason) {
+                               if (TTS_MODE_DEFAULT == client->mode) {
+                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SERVER_SERVICE_INTERFACE);
+                               } else if (TTS_MODE_NOTIFICATION == client->mode) {
+                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_NOTI_SERVER_SERVICE_INTERFACE);
+                               } else if (TTS_MODE_SCREEN_READER == client->mode) {
+                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SR_SERVER_SERVICE_INTERFACE);
+                               } else if (TTS_MODE_INTERRUPT == client->mode) {
+                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_INTERRUPT_SERVER_SERVICE_INTERFACE);
+                               }
+                               dbus_bus_add_match(g_conn_listener, rule_err, &err);
+                               dbus_connection_flush(g_conn_listener);
+
+                               if (dbus_error_is_set(&err)) {
+                                       SLOG(LOG_ERROR, TAG_TTSC, "Match Error (%s)", err.message);
+                                       dbus_error_free(&err);
+                                       return TTS_ERROR_OPERATION_FAILED;
+                               }
+                               client->reason = 0; // default value
                        }
                } else {
                        SLOG(LOG_ERROR, TAG_TTSC, "<<<< tts initialize : result = %d", result);
@@ -455,12 +473,19 @@ int tts_dbus_request_finalize(int uid)
        /* remove a rule for daemon error */
        char rule_err[256] = {0, };
        tts_client_s* client = tts_client_get_by_uid(uid);
+       if (NULL == client) {
+               SLOG(LOG_ERROR, TAG_TTSC, "Fail to get TTS client");
+               return TTS_ERROR_OPERATION_FAILED;
+       }
+
        if (TTS_MODE_DEFAULT == client->mode) {
                snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SERVER_SERVICE_INTERFACE);
        } else if (TTS_MODE_NOTIFICATION == client->mode) {
                snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_NOTI_SERVER_SERVICE_INTERFACE);
        } else if (TTS_MODE_SCREEN_READER == client->mode) {
                snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SR_SERVER_SERVICE_INTERFACE);
+       } else if (TTS_MODE_INTERRUPT == client->mode) {
+               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_INTERRUPT_SERVER_SERVICE_INTERFACE);
        }
        dbus_bus_remove_match(g_conn_listener, rule_err, &err);
        dbus_connection_flush(g_conn_listener);