#include "cacommonutil.h"
#include "camanagerleutil.h"
#include "uarraylist.h"
-#include "camutex.h"
+#include "octhread.h"
#include "camanagerdevice.h"
#include "oic_malloc.h"
#define TAG "OIC_CA_MANAGER_DEVICE"
static u_arraylist_t *g_deviceACDataList = NULL;
-static ca_mutex g_deviceACDataListMutex = NULL;
+static oc_mutex g_deviceACDataListMutex = NULL;
static bool g_isBTRecovery = false;
jstring CAManagerGetLEAddressFromACData(JNIEnv *env, size_t idx)
{
OIC_LOG(DEBUG, TAG, "CAManagerCreateACDataList");
- ca_mutex_lock(g_deviceACDataListMutex);
+ oc_mutex_lock(g_deviceACDataListMutex);
if (NULL == g_deviceACDataList)
{
OIC_LOG(DEBUG, TAG, "Create AC Data list");
g_deviceACDataList = u_arraylist_create();
}
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
}
void CAManagerDestroyACDataList()
{
if (NULL == g_deviceACDataListMutex)
{
- g_deviceACDataListMutex = ca_mutex_new();
+ g_deviceACDataListMutex = oc_mutex_new();
if (NULL == g_deviceACDataListMutex)
{
- OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
{
if (g_deviceACDataListMutex)
{
- ca_mutex_free(g_deviceACDataListMutex);
+ oc_mutex_free(g_deviceACDataListMutex);
g_deviceACDataListMutex = NULL;
}
}
static CAManagerACData_t *CAManagerCreateACData(jstring jaddress)
{
- OIC_LOG(DEBUG, TAG, "IN - CAManagerCreateACData");
VERIFY_NON_NULL_RET(jaddress, TAG, "jaddress", NULL);
// create AC data
data->address = jaddress;
data->isAutoConnecting = false;
-
- OIC_LOG(DEBUG, TAG, "OUT - CAManagerCreateACData");
return data;
}
VERIFY_NON_NULL_RET(env, TAG, "env", NULL);
VERIFY_NON_NULL_RET(jaddress, TAG, "jaddress", false);
- ca_mutex_lock(g_deviceACDataListMutex);
+ oc_mutex_lock(g_deviceACDataListMutex);
const char* address = (*env)->GetStringUTFChars(env, jaddress, NULL);
if (!address)
{
OIC_LOG(ERROR, TAG, "address is null");
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}
{
OIC_LOG(ERROR, TAG, "curData is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}
{
OIC_LOG(ERROR, TAG, "address is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}
{
(*env)->ReleaseStringUTFChars(env, curData->address, setAddress);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return true;
}
(*env)->ReleaseStringUTFChars(env, curData->address, setAddress);
OIC_LOG_V(DEBUG, TAG, "[%s] doesn't exist in list", address);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}
void CAManagerAddACData(JNIEnv *env, jstring jaddress)
{
- OIC_LOG(DEBUG, TAG, "IN - CAManagerAddACData");
-
VERIFY_NON_NULL_VOID(env, TAG, "env");
VERIFY_NON_NULL_VOID(jaddress, TAG, "jaddress");
CAManagerACData_t *data = CAManagerCreateACData(gaddress);
- ca_mutex_lock(g_deviceACDataListMutex);
+ oc_mutex_lock(g_deviceACDataListMutex);
u_arraylist_add(g_deviceACDataList, data);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
}
else
{
OIC_LOG(DEBUG, TAG, "the address is already in ACData list");
}
-
- OIC_LOG(DEBUG, TAG, "OUT - CAManagerAddACData");
}
CAResult_t CAManagerRemoveACData(JNIEnv *env, jstring jaddress)
VERIFY_NON_NULL(env, TAG, "env");
VERIFY_NON_NULL(jaddress, TAG, "jaddress");
- ca_mutex_lock(g_deviceACDataListMutex);
+ oc_mutex_lock(g_deviceACDataListMutex);
const char* address = (*env)->GetStringUTFChars(env, jaddress, NULL);
if (!address)
{
OIC_LOG(ERROR, TAG, "address is null");
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
{
OIC_LOG(ERROR, TAG, "curData is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
{
OIC_LOG(ERROR, TAG, "address is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
OIC_LOG(ERROR, TAG, "removal has failed.");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
(*env)->ReleaseStringUTFChars(env, curData->address, setAddress);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
OICFree(curData);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
OIC_LOG(DEBUG, TAG, "remove done");
return CA_STATUS_OK;
}
OIC_LOG_V(DEBUG, TAG, "[%s] doesn't exist in list", address);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_OK;
}
OIC_LOG(DEBUG, TAG, "IN - CAManagerRemoveAllACData");
VERIFY_NON_NULL(env, TAG, "env");
- ca_mutex_lock(g_deviceACDataListMutex);
+ oc_mutex_lock(g_deviceACDataListMutex);
size_t length = u_arraylist_length(g_deviceACDataList);
for (size_t idx = 0; idx < length; idx++)
if (!curData)
{
OIC_LOG(ERROR, TAG, "curData is null");
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
if (NULL == u_arraylist_remove(g_deviceACDataList, idx))
{
OIC_LOG(ERROR, TAG, "removal has failed.");
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
OICFree(curData);
}
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
OIC_LOG(DEBUG, TAG, "OUT - CAManagerRemoveAllACData");
return CA_STATUS_OK;
}
VERIFY_NON_NULL(env, TAG, "env");
VERIFY_NON_NULL(jaddress, TAG, "jaddress");
- ca_mutex_lock(g_deviceACDataListMutex);
+ oc_mutex_lock(g_deviceACDataListMutex);
const char* address = (*env)->GetStringUTFChars(env, jaddress, NULL);
if (!address)
{
OIC_LOG(ERROR, TAG, "address is null");
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
{
OIC_LOG(ERROR, TAG, "curData is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
{
OIC_LOG(ERROR, TAG, "setAddress is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
*flag = curData->isAutoConnecting;
(*env)->ReleaseStringUTFChars(env, curData->address, setAddress);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_OK;
}
(*env)->ReleaseStringUTFChars(env, curData->address, setAddress);
OIC_LOG_V(DEBUG, TAG, "[%s] doesn't exist in list", address);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return CA_STATUS_FAILED;
}
VERIFY_NON_NULL_RET(env, TAG, "env", false);
VERIFY_NON_NULL_RET(jaddress, TAG, "jaddress", false);
- ca_mutex_lock(g_deviceACDataListMutex);
+ oc_mutex_lock(g_deviceACDataListMutex);
const char* address = (*env)->GetStringUTFChars(env, jaddress, NULL);
if (!address)
{
OIC_LOG(ERROR, TAG, "address is null");
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}
{
OIC_LOG(ERROR, TAG, "curData is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}
{
OIC_LOG(ERROR, TAG, "address is null");
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}
curData->isAutoConnecting = flag;
(*env)->ReleaseStringUTFChars(env, curData->address, setAddress);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return true;
}
(*env)->ReleaseStringUTFChars(env, curData->address, setAddress);
OIC_LOG_V(DEBUG, TAG, "[%s] doesn't exist in list", address);
(*env)->ReleaseStringUTFChars(env, jaddress, address);
- ca_mutex_unlock(g_deviceACDataListMutex);
+ oc_mutex_unlock(g_deviceACDataListMutex);
return false;
}