change the location of mutex

Before calling global variable, it calls mutex lock first.
Some cases missed that, so it changed.
And, in that case, it doesn't have to check the variable value again. So, it removed that checking condition.

Change-Id: I6e585eaad94567ef629ff878d341cf1189d648ab

diff --git a/client/vc.c b/client/vc.c
index c514b817841e7843c856e6bf051ba602f5c40aee..39bd7aa78b5690b7cca3b29a1c5b7c05d69f7235 100644 (file)
--- a/client/vc.c
+++ b/client/vc.c
@@ -152,39 +152,39 @@ static void __check_privilege_deinitialize()
 
 static int __vc_check_privilege()
 {
-       if (true == g_privilege_allowed)
-               return VC_ERROR_NONE;
-
        pthread_mutex_lock(&g_cynara_mutex);
 
-       if (false == g_privilege_allowed) {
-               bool ret = true;
-               ret = __check_privilege_initialize();
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCC, "[ERROR] privilege initialize is failed");
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       if (true == g_privilege_allowed) {
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_NONE;
+       }
 
-               char uid[32];
-               snprintf(uid, 32, "%d", getuid());
-               ret = true;
-               ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
-                       __check_privilege_deinitialize();
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       bool ret = true;
+       ret = __check_privilege_initialize();
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCC, "[ERROR] privilege initialize is failed");
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
+       }
 
+       char uid[32];
+       snprintf(uid, 32, "%d", getuid());
+       ret = true;
+       ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
                __check_privilege_deinitialize();
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
        }
 
+       __check_privilege_deinitialize();
+
        g_privilege_allowed = true;
        pthread_mutex_unlock(&g_cynara_mutex);
        return VC_ERROR_NONE;
@@ -204,39 +204,39 @@ int __check_feature_privilege()
 
 int __vc_tts_check_privilege()
 {
-       if (true == g_vc_tts_privilege_allowed)
-               return VC_ERROR_NONE;
-
        pthread_mutex_lock(&g_cynara_mutex);
 
-       if (false == g_vc_tts_privilege_allowed) {
-               bool ret = true;
-               ret = __check_privilege_initialize();
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCC, "[ERROR] privilege initialize is failed");
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       if (true == g_vc_tts_privilege_allowed) {
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_NONE;
+       }
 
-               char uid[32];
-               snprintf(uid, 32, "%d", getuid());
-               ret = true;
-               ret = __check_privilege(uid, VC_TTS_PRIVILEGE);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Permission is denied(%s)(%s)", VC_TTS_PRIVILEGE, uid);
-                       __check_privilege_deinitialize();
-                       g_vc_tts_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       bool ret = true;
+       ret = __check_privilege_initialize();
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCC, "[ERROR] privilege initialize is failed");
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
+       }
 
+       char uid[32];
+       snprintf(uid, 32, "%d", getuid());
+       ret = true;
+       ret = __check_privilege(uid, VC_TTS_PRIVILEGE);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Permission is denied(%s)(%s)", VC_TTS_PRIVILEGE, uid);
                __check_privilege_deinitialize();
+               g_vc_tts_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
        }
 
+       __check_privilege_deinitialize();
+
        g_vc_tts_privilege_allowed = true;
        pthread_mutex_unlock(&g_cynara_mutex);
        return VC_ERROR_NONE;

diff --git a/client/vc_mgr.c b/client/vc_mgr.c
index 73d5c6b2a09fbd7d119f44c3c86c2a1fd58f54b7..c0e530562436484372a84b4ca57fd21a237b85d0 100644 (file)
--- a/client/vc_mgr.c
+++ b/client/vc_mgr.c
@@ -198,51 +198,51 @@ static void __check_privilege_deinitialize()
 
 static int __vc_mgr_check_privilege()
 {
-       if (true == g_privilege_allowed)
-               return VC_ERROR_NONE;
-
        pthread_mutex_lock(&g_cynara_mutex);
 
-       if (false == g_privilege_allowed) {
-               bool ret = true;
-               ret = __check_privilege_initialize();
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCM, "[ERROR] privilege initialize is failed");
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       if (true == g_privilege_allowed) {
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_NONE;
+       }
 
-               char uid[32];
-               snprintf(uid, 32, "%d", getuid());
-               ret = true;
-               ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
-                       __check_privilege_deinitialize();
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       bool ret = true;
+       ret = __check_privilege_initialize();
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCM, "[ERROR] privilege initialize is failed");
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
+       }
 
-               ret = __check_privilege(uid, VC_MGR_PRIVILEGE);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_MGR_PRIVILEGE, uid);
-                       __check_privilege_deinitialize();
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       char uid[32];
+       snprintf(uid, 32, "%d", getuid());
+       ret = true;
+       ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
+               __check_privilege_deinitialize();
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
+       }
 
+       ret = __check_privilege(uid, VC_MGR_PRIVILEGE);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_MGR_PRIVILEGE, uid);
                __check_privilege_deinitialize();
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
        }
 
+       __check_privilege_deinitialize();
+
        g_privilege_allowed = true;
        pthread_mutex_unlock(&g_cynara_mutex);
        return VC_ERROR_NONE;

diff --git a/client/vc_mgr_data.cpp b/client/vc_mgr_data.cpp
index 27c96a277dfa2c2603f6e72d9ff9d773f098b6a8..cdcffdcf97107ae331e7b17e5f936eab19f8aeaa 100644 (file)
--- a/client/vc_mgr_data.cpp
+++ b/client/vc_mgr_data.cpp
@@ -96,10 +96,10 @@ int vc_mgr_data_get_feedback_data_size()
 
 int vc_mgr_data_clear_feedback_data(vc_feedback_data_s** data)
 {
-       SLOG(LOG_INFO, TAG_VCM, "[DATA] clear feedback data, empty(%d)", g_feedback_data.empty());
-
        pthread_mutex_lock(&g_feedback_data_mutex);
 
+       SLOG(LOG_INFO, TAG_VCM, "[DATA] clear feedback data, empty(%d)", g_feedback_data.empty());
+
        if (NULL != *data) {
                SLOG(LOG_INFO, TAG_VCM, "[DEBUG] pid(%d), utt_id(%d), data(%p) size(%d) rate(%d)", (*data)->pid, (*data)->utt_id, (*data)->data, (*data)->data_size, (*data)->rate);
 

diff --git a/common/vc_command.c b/common/vc_command.c
index edff3b4fac41eb3d8fa7a1e9178196aa29040038..2958d9d1504467bd89902d37bc06b92c13173d39 100644 (file)
--- a/common/vc_command.c
+++ b/common/vc_command.c
@@ -150,38 +150,38 @@ static void __check_privilege_deinitialize()
 
 static int __vc_cmd_check_privilege()
 {
-       if (true == g_privilege_allowed)
-               return VC_ERROR_NONE;
-
        pthread_mutex_lock(&g_cynara_mutex);
 
-       if (false == g_privilege_allowed) {
-               bool ret = true;
-               ret = __check_privilege_initialize();
-               if (false == ret) {
-                       SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] privilege initialize is failed");
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-               }
+       if (true == g_privilege_allowed) {
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_NONE;
+       }
 
-               char uid[32];
-               snprintf(uid, 32, "%d", getuid());
-               ret = true;
-               ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
-                       __check_privilege_deinitialize();
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VC_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       bool ret = true;
+       ret = __check_privilege_initialize();
+       if (false == ret) {
+               SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] privilege initialize is failed");
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+       }
 
+       char uid[32];
+       snprintf(uid, 32, "%d", getuid());
+       ret = true;
+       ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
                __check_privilege_deinitialize();
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
        }
 
+       __check_privilege_deinitialize();
+
        g_privilege_allowed = true;
        pthread_mutex_unlock(&g_cynara_mutex);
        return VC_ERROR_NONE;

diff --git a/server/vce.c b/server/vce.c
index 7daff10ba2337b4eff039ba7ef86e89541a5c7f8..d97cb8619a8a27b9d25f6e2bb7c2a86f533a4b38 100644 (file)
--- a/server/vce.c
+++ b/server/vce.c
@@ -113,60 +113,59 @@ static void __check_privilege_deinitialize()
 
 static int __vce_check_privilege()
 {
-       if (true == g_privilege_allowed)
-               return VC_ERROR_NONE;
-
        pthread_mutex_lock(&g_cynara_mutex);
 
-       if (false == g_privilege_allowed) {
-               bool ret = true;
-               ret = __check_privilege_initialize();
-               if (false == ret) {
-                       SLOG(LOG_ERROR, TAG_VCD, "[ERROR] privilege initialize is failed");
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VCE_ERROR_PERMISSION_DENIED;
-               }
-
-               char uid[32];
-               snprintf(uid, 32, "%d", getuid());
-               ret = true;
-               ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
-                       __check_privilege_deinitialize();
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VCE_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       if (true == g_privilege_allowed) {
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VC_ERROR_NONE;
+       }
 
-               ret = __check_privilege(uid, VC_PRIVILEGE_APPMGR_LAUNCH);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_APPMGR_LAUNCH, uid);
-                       __check_privilege_deinitialize();
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VCE_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       bool ret = true;
+       ret = __check_privilege_initialize();
+       if (false == ret) {
+               SLOG(LOG_ERROR, TAG_VCD, "[ERROR] privilege initialize is failed");
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VCE_ERROR_PERMISSION_DENIED;
+       }
 
-               ret = __check_privilege(uid, VC_PRIVILEGE_DATASHARING);
-               if (false == ret) {
-                       //LCOV_EXCL_START
-                       SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_DATASHARING, uid);
-                       __check_privilege_deinitialize();
-                       g_privilege_allowed = false;
-                       pthread_mutex_unlock(&g_cynara_mutex);
-                       return VCE_ERROR_PERMISSION_DENIED;
-                       //LCOV_EXCL_STOP
-               }
+       char uid[32];
+       snprintf(uid, 32, "%d", getuid());
+       ret = true;
+       ret = __check_privilege(uid, VC_PRIVILEGE_RECORDER);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_RECORDER, uid);
+               __check_privilege_deinitialize();
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VCE_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
+       }
 
+       ret = __check_privilege(uid, VC_PRIVILEGE_APPMGR_LAUNCH);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_APPMGR_LAUNCH, uid);
                __check_privilege_deinitialize();
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VCE_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
+       }
 
+       ret = __check_privilege(uid, VC_PRIVILEGE_DATASHARING);
+       if (false == ret) {
+               //LCOV_EXCL_START
+               SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE_DATASHARING, uid);
+               __check_privilege_deinitialize();
+               g_privilege_allowed = false;
+               pthread_mutex_unlock(&g_cynara_mutex);
+               return VCE_ERROR_PERMISSION_DENIED;
+               //LCOV_EXCL_STOP
        }
 
+       __check_privilege_deinitialize();
+
        g_privilege_allowed = true;
        pthread_mutex_unlock(&g_cynara_mutex);
        return VCE_ERROR_NONE;