From: Sunggoo Kim <sung.goo.kim@samsung.com>
Date: Tue, 28 Apr 2015 23:31:33 +0000 (+0900)
Subject: [PLM P150427-05738] Remove mutex for transaction
X-Git-Tag: accepted/tizen/mobile/20150724.090641~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42a903878cecd4fb70affa26919dd54b04d60b66;p=platform%2Fcore%2Fpim%2Fcontacts-service.git

[PLM P150427-05738] Remove mutex for transaction

Change-Id: I0cb29c48d71970f4a839a81af8957a12103ea20e
Signed-off-by: MyoungHoon Chae <mhoon.chae@samsung.com>
---

diff --git a/common/ctsvc_mutex.c b/common/ctsvc_mutex.c
index 5d68487..0a2ad72 100755
--- a/common/ctsvc_mutex.c
+++ b/common/ctsvc_mutex.c
@@ -37,7 +37,6 @@ static cts_mutex_fns __ctsvc_mutex_funtions =
 
 static pthread_mutex_t conn_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t sockfd_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t trans_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t ipc_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t ipc_pubsub_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t access_control_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -58,9 +57,6 @@ static inline pthread_mutex_t* __ctsvc_mutex_get_mutex(int type)
 	case CTS_MUTEX_SOCKET_FD:
 		ret_val = &sockfd_mutex;
 		break;
-	case CTS_MUTEX_TRANSACTION:
-		ret_val = &trans_mutex;
-		break;
 	case CTS_MUTEX_PIMS_IPC_CALL:
 		ret_val = &ipc_mutex;
 		break;
diff --git a/common/ctsvc_mutex.h b/common/ctsvc_mutex.h
index 98f8845..43bcb5c 100755
--- a/common/ctsvc_mutex.h
+++ b/common/ctsvc_mutex.h
@@ -25,7 +25,6 @@ enum {
 	CTS_MUTEX_CONNECTION,
 	CTS_MUTEX_UPDTATED_LIST_MEMPOOL,
 	CTS_MUTEX_SOCKET_FD,
-	CTS_MUTEX_TRANSACTION,
 	CTS_MUTEX_PIMS_IPC_CALL,
 	CTS_MUTEX_PIMS_IPC_PUBSUB,
 	CTS_MUTEX_ACCESS_CONTROL,
diff --git a/native/ctsvc_utils.c b/native/ctsvc_utils.c
index cfd27b0..3954c10 100644
--- a/native/ctsvc_utils.c
+++ b/native/ctsvc_utils.c
@@ -62,9 +62,6 @@ int ctsvc_begin_trans(void)
 {
 	int ret = -1, progress;
 
-#ifndef _CONTACTS_IPC_SERVER
-	ctsvc_mutex_lock(CTS_MUTEX_TRANSACTION);
-#endif
 	if (transaction_count <= 0) {
 		ret = ctsvc_query_exec("BEGIN IMMEDIATE TRANSACTION");
 		progress = 100000;
@@ -75,9 +72,6 @@ int ctsvc_begin_trans(void)
 		}
 		if(CONTACTS_ERROR_NONE != ret) {
 			CTS_ERR("ctsvc_query_exec() Failed(%d)", ret);
-#ifndef _CONTACTS_IPC_SERVER
-			ctsvc_mutex_unlock(CTS_MUTEX_TRANSACTION);
-#endif
 			return ret;
 		}
 
@@ -89,9 +83,6 @@ int ctsvc_begin_trans(void)
 	}
 	transaction_count++;
 	INFO("transaction_count : %d.", transaction_count);
-#ifndef _CONTACTS_IPC_SERVER
-	ctsvc_mutex_unlock(CTS_MUTEX_TRANSACTION);
-#endif
 	return CONTACTS_ERROR_NONE;
 }
 
@@ -100,18 +91,11 @@ int ctsvc_end_trans(bool is_success)
 	int ret = -1, progress;
 	char query[CTS_SQL_MIN_LEN] = {0};
 
-#ifndef _CONTACTS_IPC_SERVER
-	ctsvc_mutex_lock(CTS_MUTEX_TRANSACTION);
-#endif
-
 	transaction_count--;
 	INFO("%s, transaction_count : %d", is_success?"True": "False",  transaction_count);
 
 	if (0 != transaction_count) {
 		CTS_DBG("contact transaction_count : %d.", transaction_count);
-#ifndef _CONTACTS_IPC_SERVER
-		ctsvc_mutex_unlock(CTS_MUTEX_TRANSACTION);
-#endif
 		return CONTACTS_ERROR_NONE;
 	}
 
@@ -122,9 +106,6 @@ int ctsvc_end_trans(bool is_success)
 #endif
 		ret = ctsvc_query_exec("ROLLBACK TRANSACTION");
 
-#ifndef _CONTACTS_IPC_SERVER
-		ctsvc_mutex_unlock(CTS_MUTEX_TRANSACTION);
-#endif
 		return CONTACTS_ERROR_NONE;
 	}
 
@@ -155,9 +136,6 @@ int ctsvc_end_trans(bool is_success)
 #endif
 		tmp_ret = ctsvc_query_exec("ROLLBACK TRANSACTION");
 		WARN_IF(CONTACTS_ERROR_NONE != tmp_ret, "ctsvc_query_exec(ROLLBACK) Failed(%d)", tmp_ret);
-#ifndef _CONTACTS_IPC_SERVER
-		ctsvc_mutex_unlock(CTS_MUTEX_TRANSACTION);
-#endif
 		return ret;
 	}
 
@@ -166,10 +144,6 @@ int ctsvc_end_trans(bool is_success)
 	ctsvc_change_subject_publish_changed_info();
 #endif
 
-#ifndef _CONTACTS_IPC_SERVER
-	ctsvc_mutex_unlock(CTS_MUTEX_TRANSACTION);
-#endif
-
 	CTS_DBG("Transaction shut down! : (%d)\n", transaction_ver);
 
 	return CONTACTS_ERROR_NONE;