diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/hmi-debug.h | 72 | ||||
| -rw-r--r-- | include/libcloudproxy.h | 19 |
2 files changed, 45 insertions, 46 deletions
diff --git a/include/hmi-debug.h b/include/hmi-debug.h index c8e8638..674f5df 100644 --- a/include/hmi-debug.h +++ b/include/hmi-debug.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * Copyright (c) 2018 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. @@ -17,29 +17,21 @@ #ifndef __HMI_DEBUG_H__ #define __HMI_DEBUG_H__ -#ifdef __cplusplus -extern "C" { -#endif - #include <time.h> #include <stdio.h> #include <stdarg.h> #include <string.h> #include <stdlib.h> -#include <sys/types.h> // gettid() -#include <unistd.h> -#include <sys/syscall.h> - - 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 - }; +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__) @@ -49,34 +41,30 @@ extern "C" { #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 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, ...) +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) { - //SA: WARN: const int log_level = (getenv("USE_HMI_DEBUG") == NULL)?LOG_LEVEL_ERROR:atoi(getenv("USE_HMI_DEBUG")); - const int log_level = LOG_LEVEL_MAX; - if(log_level < level) - { - return; - } - - char *message; - struct timespec tp; - unsigned int time; + return; + } - clock_gettime(CLOCK_REALTIME, &tp); - time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000); + char *message; + struct timespec tp; + unsigned int time; - 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] [thread %llx]>>> %s \n", time / 1000.0, prefix, ERROR_FLAG[level], file, func, line, (unsigned long long)syscall(__NR_gettid), message); - va_end(args); - free(message); - } + clock_gettime(CLOCK_REALTIME, &tp); + time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000); -#ifdef __cplusplus + 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 + #endif //__HMI_DEBUG_H__ diff --git a/include/libcloudproxy.h b/include/libcloudproxy.h index b333a14..e2501b3 100644 --- a/include/libcloudproxy.h +++ b/include/libcloudproxy.h @@ -19,6 +19,7 @@ #include <vector> #include <map> #include <string> +#include <mutex> #include <functional> #include <json-c/json.h> #include <systemd/sd-event.h> @@ -29,6 +30,15 @@ extern "C" #include <afb/afb-ws-client.h> } + +struct CloudType +{ + static constexpr const char* Azure{"azure"}; + static constexpr const char* Aws {"aws"}; + + static bool isSupported(const char* type); +}; + class CloudProxyClient { public: @@ -41,7 +51,6 @@ public: Event_Max }; - CloudProxyClient(); ~CloudProxyClient(); @@ -50,7 +59,8 @@ public: int init(const int port, const std::string& token); - int sendMessage(const std::string& data); + // sendMessage call is synchronous (will wait a cloudproxy reply): + int sendMessage(const std::string& cloud_type, const std::string& data); void set_event_handler(enum EventType et, handler_func f); @@ -60,13 +70,14 @@ public: int unsubscribe(const std::string& event_name); private: - int call(const std::string& verb, struct json_object* arg); + int call_sync(const std::string& verb, struct json_object* arg); private: static const std::vector<std::string> m_api_list; static const std::vector<std::string> m_event_list; - std::map<EventType, handler_func> handlers; + std::mutex m_mutex; // used by call_sync only + std::map<EventType, handler_func> m_handlers; struct afb_wsj1_itf m_itf; struct afb_wsj1* m_websock{nullptr}; sd_event* m_loop{nullptr}; |