From 4d78f90d7fa97f5c4981053bb8b412bbcd6b54fe Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Mon, 18 Jun 2018 12:12:45 +0900 Subject: Add debug messages for qlibhomescreen Add debug messages for qlibhomescreen. Change-Id: I3df80ebe8c38484587011725538bc926b98d0ca0 Signed-off-by: zheng_wenlong --- src/hmi-debug.h | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/qlibhomescreen.cpp | 9 ++++++- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 src/hmi-debug.h diff --git a/src/hmi-debug.h b/src/hmi-debug.h new file mode 100644 index 0000000..28705f5 --- /dev/null +++ b/src/hmi-debug.h @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __HMI_DEBUG_H__ +#define __HMI_DEBUG_H__ + +#include +#include +#include +#include +#include + +enum LOG_LEVEL{ + LOG_LEVEL_NONE = 0, + LOG_LEVEL_ERROR, + LOG_LEVEL_WARNING, + LOG_LEVEL_NOTICE, + LOG_LEVEL_INFO, + LOG_LEVEL_DEBUG, + LOG_LEVEL_MAX = LOG_LEVEL_DEBUG +}; + +#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) + +#define HMI_ERROR(prefix, args,...) _HMI_LOG(LOG_LEVEL_ERROR, __FILENAME__, __FUNCTION__, __LINE__, prefix, args, ##__VA_ARGS__) +#define HMI_WARNING(prefix, args,...) _HMI_LOG(LOG_LEVEL_WARNING, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__) +#define HMI_NOTICE(prefix, args,...) _HMI_LOG(LOG_LEVEL_NOTICE, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__) +#define HMI_INFO(prefix, args,...) _HMI_LOG(LOG_LEVEL_INFO, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__) +#define HMI_DEBUG(prefix, args,...) _HMI_LOG(LOG_LEVEL_DEBUG, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__) + +static char ERROR_FLAG[6][20] = {"NONE", "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG"}; + +static void _HMI_LOG(enum LOG_LEVEL level, const char* file, const char* func, const int line, const char* prefix, const char* log, ...) +{ + const int log_level = (getenv("USE_HMI_DEBUG") == NULL)?LOG_LEVEL_ERROR:atoi(getenv("USE_HMI_DEBUG")); + if(log_level < level) + { + return; + } + + char *message; + struct timespec tp; + unsigned int time; + + clock_gettime(CLOCK_REALTIME, &tp); + time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000); + + va_list args; + va_start(args, log); + if (log == NULL || vasprintf(&message, log, args) < 0) + message = NULL; + fprintf(stderr, "[%10.3f] [%s %s] [%s, %s(), Line:%d] >>> %s \n", time / 1000.0, prefix, ERROR_FLAG[level], file, func, line, message); + va_end(args); + free(message); +} + +#endif //__HMI_DEBUG_H__ diff --git a/src/qlibhomescreen.cpp b/src/qlibhomescreen.cpp index 248dd72..b2f6751 100644 --- a/src/qlibhomescreen.cpp +++ b/src/qlibhomescreen.cpp @@ -17,6 +17,7 @@ #include "qlibhomescreen.h" #include #include +#include "hmi-debug.h" using namespace std; #define _POPUPREPLY "on_screen_reply" @@ -44,7 +45,7 @@ QLibHomeScreen::QLibHomeScreen(QObject *parent) : QObject(parent), mp_hs(NULL) { - + HMI_DEBUG("qlibhomescreen", "called."); } /** @@ -59,6 +60,7 @@ QLibHomeScreen::QLibHomeScreen(QObject *parent) : */ QLibHomeScreen::~QLibHomeScreen() { + HMI_DEBUG("qlibhomescreen", "called."); if (mp_hs != NULL) { delete mp_hs; } @@ -79,6 +81,7 @@ QLibHomeScreen::~QLibHomeScreen() */ void QLibHomeScreen::init(int port, const QString &token) { + HMI_DEBUG("qlibhomescreen", "called."); string ctoken = token.toStdString(); mp_hs = new LibHomeScreen(); mp_hs->init(port, ctoken.c_str()); @@ -101,6 +104,7 @@ void QLibHomeScreen::init(int port, const QString &token) */ int QLibHomeScreen::onScreenMessage(const QString &message) { + HMI_DEBUG("qlibhomescreen", "called."); string str = message.toStdString(); return mp_hs->onScreenMessage(str.c_str()); } @@ -119,6 +123,7 @@ int QLibHomeScreen::onScreenMessage(const QString &message) */ int QLibHomeScreen::subscribe(const QString &evetName) { + HMI_DEBUG("qlibhomescreen", "called."); string str = evetName.toStdString(); return mp_hs->subscribe(str); } @@ -137,6 +142,7 @@ int QLibHomeScreen::subscribe(const QString &evetName) */ int QLibHomeScreen::unsubscribe(const QString &evetName) { + HMI_DEBUG("qlibhomescreen", "called."); string str = evetName.toStdString(); return mp_hs->unsubscribe(str); } @@ -154,6 +160,7 @@ int QLibHomeScreen::unsubscribe(const QString &evetName) */ void QLibHomeScreen::set_event_handler(enum QEventType et, handler_fun f) { + HMI_DEBUG("qlibhomescreen", "called."); LibHomeScreen::EventType hs_et = (LibHomeScreen::EventType)et; return this->mp_hs->set_event_handler(hs_et, std::move(f)); } -- cgit 1.2.3-korg