[Feature][T8TSK-81]Merge MR3.0 New changes to commit ID:2b1db87cbf754219ab0e1cb48c663067ed55b7b3;GSW commit ID:4b1cf725e8037c2d878c85388384a0f5c8129274
Change-Id: Icbf9845e92b3564ad7f1d127c13c896b93a42c5b
diff --git a/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp b/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp
index 4b6f020..8d012da 100755
--- a/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp
+++ b/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp
@@ -24,7 +24,7 @@
#define LYNQ_REQUEST_PARAM_BUF 8192
#define LYNQ_REC_BUF 8192
-#define USER_LOG_TAG "LYNQ_NETWORK"
+#define USER_LOG_TAG "LYNQ_SMS"
typedef struct{
int uToken;
@@ -319,7 +319,7 @@
char urc_data[LYNQ_REC_BUF];
int res = 0;
lynq_head_t* phead;
-
+ int level,index,size;
LYINFLOG("urc recv thread is running");
while(module_urc_status)
{
@@ -330,7 +330,7 @@
LYERRLOG("thread_urc_recv step2 fail: res is %d",res);
continue;
}
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
phead=(lynq_head_t*) urc_data;
if(is_support_urc(phead->urcid)==false)
{
@@ -342,8 +342,8 @@
LYERRLOG("new parcel failure!!!");
continue;
}
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
- int level,index,size;
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+
if(urc_data_is_in_shm_data(phead->resp_type,level,index,size))
{
LYINFLOG("__FUNCTION__ %s __LINE__ %d,use share memory\n", __FUNCTION__, __LINE__);
@@ -367,14 +367,14 @@
s_recv_urc_parcel_list.push_back(urc_p);
BLOCK_WAKEUP_PROCESS_URC_MSG();
BLOCK_PROCESS_URC_MSG_UNLOCK();
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
}
else
{
delete urc_p;
urc_p = NULL;
}
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
}
LYINFLOG("urc recv thread ended");
return NULL;
@@ -397,9 +397,9 @@
BLOCK_PROCESS_URC_MSG_LOCK();
while(s_recv_urc_parcel_list.empty())
{
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
BLOCK_WAIT_PROCESS_URC_MSG();
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
}
iter=s_recv_urc_parcel_list.begin();
urc_p=(*iter);
@@ -408,11 +408,11 @@
urc_p->setDataPosition(0);
if(urc_p->dataAvail()>0)
{
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
pthread_mutex_lock(&s_urc_mutex);
urc_msg_process(urc_p);
pthread_mutex_unlock(&s_urc_mutex);
- LYINFLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
+ LYDBGLOG("__FUNCTION__ %s __LINE__ %d\n", __FUNCTION__, __LINE__);
}
delete urc_p;
urc_p = NULL;
diff --git a/src/lynq/lib/liblynq-sms/lynq_sms.cpp b/src/lynq/lib/liblynq-sms/lynq_sms.cpp
index 46f2119..ddf12b9 100755
--- a/src/lynq/lib/liblynq-sms/lynq_sms.cpp
+++ b/src/lynq/lib/liblynq-sms/lynq_sms.cpp
@@ -87,7 +87,7 @@
}
g_module_init_flag = MODULE_SWITCHING;
- LYLOGSET(LOG_DEBUG);
+ LYLOGSET(LOG_INFO);
LYLOGEINIT(USER_LOG_TAG);
g_module_Global_uToken = uToken;