[Feature][T108] [task-view-1792] modify LOG
Only Configure: No
Affected branch: GSW_V1453
Affected module: log
Self-test: yes
Doc Update: no
Change-Id: Iee673a64346d0fad2450fec1092f61bae981e7dc
diff --git a/mbtk/libgsw_lib/gsw_at_interface.c b/mbtk/libgsw_lib/gsw_at_interface.c
index 6620d25..c17bbea 100755
--- a/mbtk/libgsw_lib/gsw_at_interface.c
+++ b/mbtk/libgsw_lib/gsw_at_interface.c
@@ -15,94 +15,7 @@
#include <stdbool.h>
#include "gsw_at_interface.h"
#include "gsw_hal_errcode.h"
-
-#ifndef LOG_ERR_LEVEL
-#define LOG_ERR_LEVEL 3 /* error conditions */
-#endif
-#ifndef LOG_WARN_LEVEL
-#define LOG_WARN_LEVEL 4 /* warning conditions */
-#endif
-#ifndef LOG_INFO_LEVEL
-#define LOG_INFO_LEVEL 6 /* informational */
-#endif
-#ifndef LOG_DEBUG_LEVEL
-#define LOG_DEBUG_LEVEL 7 /* debug-level messages */
-#endif
-#ifndef LOG_VERBOSE_LEVEL
-#define LOG_VERBOSE_LEVEL 8
-#endif
-
-#define GSW_AT "[HAL][GSW_AT]"
-
-#define LOGV(fmt, args ...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_VERBOSE_LEVEL, "%s#%s: "GSW_AT"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGI(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_INFO_LEVEL, "%s#%s: "GSW_AT"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGD(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_DEBUG_LEVEL, "%s#%s: "GSW_AT"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGW(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_WARN_LEVEL, "%s#%s: "GSW_AT"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGE(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_ERR_LEVEL, "%s#%s: "GSW_AT"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
+#include "gsw_log_interface.h"
#define OUT_MAX_SIZE 1024
#define LINE __LINE__
@@ -111,15 +24,15 @@
#define SOCKET_ZERO 0
#define SOCKET_SUCC 1
#define SOCKET_FAIL -1
-
-typedef void (*mbtk_log)(int level, const char *format,...);
+#define GSW_AT "[HAL][GSW_AT]"
+//typedef void (*mbtk_log)(int level, const char *format,...);
typedef enum
{
A_SUCCESS = 0,
A_ERROR = -1
}LYNQ_AT_E;
-static mbtk_log fun_ptr_log = NULL;
+//static mbtk_log fun_ptr_log = NULL;
static void *dlHandle_at = NULL;
char *lynqLib_at = "/lib/libmbtk_lib.so";
char *output = NULL;
@@ -135,11 +48,11 @@
int socket_local_client (char* name) {
- LOGD("[%d][%s] enter",LINE,FUNC);
+ LOGD(GSW_AT,"[%d][%s] enter",LINE,FUNC);
sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sockfd < 0)
{
- LOGD("Can't open stream socket (%s)", name);
+ LOGD(GSW_AT,"Can't open stream socket (%s)", name);
return -1;
}
addr_server.sun_family = AF_UNIX;
@@ -148,32 +61,32 @@
if (connect(sockfd, (struct sockaddr *) &addr_server, sizeof(struct sockaddr_un)) < 0)
{
close(sockfd);
- LOGD("Can't connect to server side, path: %s, %s", name, strerror(errno));
+ LOGD(GSW_AT,"Can't connect to server side, path: %s, %s", name, strerror(errno));
return -1;
}
- LOGD("[%d][%s] connect %s success",LINE,FUNC,name);
+ LOGD(GSW_AT,"[%d][%s] connect %s success",LINE,FUNC,name);
return sockfd;
}
bool send_msg_to_service(int fd,char *msg,int size)
{
- LOGD("[%d][%s] enter",LINE,FUNC);
+ LOGD(GSW_AT,"[%d][%s] enter",LINE,FUNC);
if (fd < 0)
{
- LOGD("fd invalid when send to atci service. errno = %d", errno);
+ LOGD(GSW_AT,"fd invalid when send to atci service. errno = %d", errno);
return false;
}
if(NULL == msg)
{
- LOGD("atcmd is null.");
+ LOGD(GSW_AT,"atcmd is null.");
return false;
}
int sendLen = send(fd, msg, size, 0);
if (sendLen != size)
{
- LOGD("lose data when send to atci service. errno = %d", errno);
+ LOGD(GSW_AT,"lose data when send to atci service. errno = %d", errno);
return false;
}
- LOGD("client send to app demo: %s", msg);
+ LOGD(GSW_AT,"client send to app demo: %s", msg);
return true;
}
@@ -181,15 +94,15 @@
{
int ret = 0;
ret = recv(fd, buf, len, 0);
- LOGD("[%d][%s] recv after",LINE,FUNC);
+ LOGD(GSW_AT,"[%d][%s] recv after",LINE,FUNC);
if (ret < 0)
{
- LOGD("acti_cmd_recv client select error, ret=%d, error=%s(%d),fd=%d", ret,strerror(errno), errno, fd);
+ LOGD(GSW_AT,"acti_cmd_recv client select error, ret=%d, error=%s(%d),fd=%d", ret,strerror(errno), errno, fd);
return SOCKET_FAIL;
}
else if(ret == 0)
{
- LOGD("acti_cmd_recv client recv error, ret=%d, error=%s(%d),fd=%d", ret,strerror(errno), errno, fd);
+ LOGD(GSW_AT,"acti_cmd_recv client recv error, ret=%d, error=%s(%d),fd=%d", ret,strerror(errno), errno, fd);
return SOCKET_ZERO;
}
return SOCKET_SUCC;
@@ -202,14 +115,14 @@
*/
void *thread_recv(void *parm)
{
- LOGD("[%d][%s] enter",LINE,FUNC);
+ LOGD(GSW_AT,"[%d][%s] enter",LINE,FUNC);
char at_cmd[100] = {0};
int fd = -1;
int ret = 0;
fd = socket_local_client(AT_EXTERSION_SOCKET_NAME);
if(fd <= 0)
{
- LOGE("socket_local_client fail\n");
+ LOGE(GSW_AT,"socket_local_client fail\n");
connect_state = false;
pthread_mutex_unlock(&s_startupMutex);
return NULL;
@@ -217,7 +130,7 @@
int len_buf = strlen(buffer_at);
if(!send_msg_to_service(fd,buffer_at,len_buf))
{
- LOGE("send_msg_to_service fail\n");
+ LOGE(GSW_AT,"send_msg_to_service fail\n");
connect_state = false;
pthread_mutex_unlock(&s_startupMutex);
return NULL;
@@ -228,7 +141,7 @@
output = (char *)malloc(sizeof(char)*OUT_MAX_SIZE);
if(NULL == output)
{
- LOGE("thread_recv malloc fail\n");
+ LOGE(GSW_AT,"thread_recv malloc fail\n");
return NULL;
}
TryNewLink:
@@ -237,7 +150,7 @@
if (connect(fd, (struct sockaddr *) &addr_server, sizeof(struct sockaddr_un)) < 0)
{
close(fd);
- LOGE("Can't connect to server side, path: %s, errno:%d", AT_EXTERSION_SOCKET_NAME, errno);
+ LOGE(GSW_AT,"Can't connect to server side, path: %s, errno:%d", AT_EXTERSION_SOCKET_NAME, errno);
return NULL;
}
connect_state = true;
@@ -249,12 +162,12 @@
ret = atsvc_cmd_recv(fd, at_cmd,sizeof(at_cmd));
if (ret < 0)
{
- LOGE("[%d][%s]receive CMD error",LINE,FUNC);
+ LOGE(GSW_AT,"[%d][%s]receive CMD error",LINE,FUNC);
continue;
}
else if(ret == SOCKET_ZERO)
{
- LOGE("maybe client socket closed 1. retry new link!");
+ LOGE(GSW_AT,"maybe client socket closed 1. retry new link!");
connect_state = false;
goto TryNewLink;
}
@@ -266,10 +179,10 @@
}
//begin deal with callback
tmp(input, output, OUT_MAX_SIZE);
- LOGD("lynq_reg_third_at send output to service\n");
+ LOGD(GSW_AT,"lynq_reg_third_at send output to service\n");
if(!send_msg_to_service(fd,output, strlen(output)))
{
- LOGE("thread_recv send fail\n");
+ LOGE(GSW_AT,"thread_recv send fail\n");
continue;
}
}
@@ -289,14 +202,14 @@
*/
int lynq_connect_service_start(void)
{
- LOGD("[%d][%s] enter",LINE,FUNC);
+ LOGD(GSW_AT,"[%d][%s] enter",LINE,FUNC);
pthread_t lynq_at_tid;
int rt = pthread_create(&lynq_at_tid, NULL, thread_recv, NULL);
pthread_mutex_lock(&s_startupMutex);
- LOGD("[%d][%s] pthread mutex unlock",LINE,FUNC);
+ LOGD(GSW_AT,"[%d][%s] pthread mutex unlock",LINE,FUNC);
if((connect_state != true) && rt < 0)
{
- LOGE("connect fail,rt:%d,connect state:%d\n",rt,connect_state);
+ LOGE(GSW_AT,"connect fail,rt:%d,connect state:%d\n",rt,connect_state);
return -1;
}
return 0;
@@ -317,23 +230,23 @@
memcpy(buffer_at, atcmd, strlen(atcmd));
tmp = func;
- LOGD("lynq_reg_third_at start\n");
+ LOGD(GSW_AT,"lynq_reg_third_at start\n");
int ret = lynq_connect_service_start();
if(ret != 0)
{
- LOGE("lynq_connect_service_start start failed\n");
+ LOGE(GSW_AT,"lynq_connect_service_start start failed\n");
return GSW_HAL_NORMAL_FAIL;
}
- LOGD("lynq_connect_service_start success ret:%d\n",ret);
+ LOGD(GSW_AT,"lynq_connect_service_start success ret:%d\n",ret);
return GSW_HAL_SUCCESS;
}
int32_t gsw_sdk_at_init(void)
{
dlHandle_at = dlopen(lynqLib_at, RTLD_NOW);
- fun_ptr_log = (mbtk_log)dlsym(dlHandle_at, "mbtk_log");
- if(fun_ptr_log == NULL || dlHandle_at == NULL)
+ //fun_ptr_log = (mbtk_log)dlsym(dlHandle_at, "mbtk_log");
+ if(dlHandle_at == NULL)
{
return GSW_HAL_NORMAL_FAIL;
}
@@ -344,12 +257,12 @@
{
if (num != soc_max)
{
- LOGE("temperture if not support,num is %d\n",num);
+ LOGE(GSW_AT,"temperture if not support,num is %d\n",num);
return GSW_HAL_SUCCESS;
}
if (NULL == temp)
{
- LOGE("temperture is null\n");
+ LOGE(GSW_AT,"temperture is null\n");
return GSW_HAL_ARG_INVALID;
}
@@ -359,18 +272,18 @@
fp = fopen(cmd, "r");
if (fp == NULL)
{
- LOGE("Unable to open file");
+ LOGE(GSW_AT,"Unable to open file");
return GSW_HAL_NORMAL_FAIL;
}
if (fgets(buf, sizeof(buf), fp) == NULL)
{
- LOGE("fgets fail");
+ LOGE(GSW_AT,"fgets fail");
fclose(fp);
return GSW_HAL_NORMAL_FAIL;
}
if (strlen(buf) == 0)
{
- LOGE("read len == 0\n");
+ LOGE(GSW_AT,"read len == 0\n");
fclose(fp);
return GSW_HAL_NORMAL_FAIL;
}