X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futil.cpp;h=0591d554ec70ac928d3c028feee4972e3ed68fb2;hb=refs%2Fheads%2Fsandbox%2FKazumasaTanaka%2Fchange_screen_updated_test2;hp=672b0899e3ff8c98ae13e84aa253c37c4bf27782;hpb=8a791cb2ab7c159aac440cd97fbf2ae75d79b31f;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/util.cpp b/src/util.cpp
index 672b089..0591d55 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2018 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,36 +17,21 @@
 
 #include "util.hpp"
 
-#include <cerrno>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
+#include <time.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <fstream>
 
 #include <unistd.h>
 
-#ifdef SCOPE_TRACING
-thread_local int ScopeTrace::indent = 0;
-ScopeTrace::ScopeTrace(char const *func) : f(func)
-{
-    fprintf(stderr, "%lu %*s%s -->\n", pthread_self(), 2 * indent++, "", this->f);
-}
-ScopeTrace::~ScopeTrace() { fprintf(stderr, "%lu %*s%s <--\n", pthread_self(), 2 * --indent, "", this->f); }
-#endif
-
-unique_fd::~unique_fd()
-{
-    if (this->fd != -1)
-    {
-        close(this->fd);
-    }
-}
+static char ERROR_FLAG[6][20] = {"NONE", "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG"};
 
 void rectangle::fit(unsigned long to_width, unsigned long to_height)
 {
     // fit rect within (to_width x to_height)
 
-    if (to_width <= width()) {
+    if (to_width <= (unsigned long)width()) {
         // scale to fit with
         set_bottom(top() + (static_cast<long>(to_width) * height() / width()) - 1);
         set_right(left() + to_width - 1);
@@ -93,3 +79,117 @@ void rectangle::set_aspect(double ratio)
     }
 }
 
+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);
+}
+
+void _HMI_SEQ_LOG(enum LOG_LEVEL level, const char* file, const char* func, const int line, unsigned seq_num, 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] [wm %s] [%s, %s(), Line:%d] >>> req %d: %s \n", time / 1000.0, ERROR_FLAG[level], file, func, line, seq_num, message);
+    va_end(args);
+	free(message);
+}
+
+void _DUMP(enum LOG_LEVEL level, 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;
+    va_list args;
+    va_start(args, log);
+    if (log == NULL || vasprintf(&message, log, args) < 0)
+        message = NULL;
+    fprintf(stderr, "%s \n", message);
+    va_end(args);
+    free(message);
+}
+
+std::string get_file_path(const char *file_name, const char *root_path)
+{
+    char const *default_base_path = root_path;
+    std::string path("");
+
+    if(!file_name) {
+        return path;
+    }
+
+    if (!default_base_path) {
+        default_base_path = getenv("AFM_APP_INSTALL_DIR");
+        if (!default_base_path) {
+            HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
+        }
+    }
+    if (default_base_path) {
+        path = default_base_path;
+        path.append("/etc/");
+        path.append(file_name);
+    }
+
+    // Check for over-ride in /etc/xdg/windowmanager
+    std::string override_path("/etc/xdg/windowmanager/");
+    override_path.append(file_name);
+    std::ifstream i(override_path);
+    if (i.good()) {
+        path = override_path;
+    }
+    i.close();
+
+    HMI_INFO("Using %s", path.c_str());
+    return path;
+}
+
+void ChangeAreaReq::dump()
+{
+    DUMP("=== change request dump ===");
+    DUMP("request from : %s", this->appname.c_str());
+    DUMP("save : %s", this->save ? "true" : "false");
+    for(const auto& req : this->area_req)
+    {
+        DUMP("area change req : %s", req.first.c_str());
+        DUMP("  x:%d y:%d w:%d h:%d",req.second.x, req.second.y, req.second.w, req.second.h);
+    }
+    for(const auto& req : this->update_app2area)
+    {
+        DUMP("update change app : %s, area:%s", req.first.c_str(), req.second.c_str());
+    }
+    DUMP("======== dump end =========");
+}