Fix util function HMI_*

To reduce coding, change HMI_*

Change-Id: Ib28b6a3c2756253e665498e459f5e1e165095941
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

1 files changed, 65 insertions, 65 deletions

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 8f3236f..38541bd 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -71,7 +71,7 @@ result<json> file_to_json(char const *filename)
     std::ifstream i(filename);
     if (i.fail())
     {
-        HMI_DEBUG("wm", "Could not open config file, so use default layer information");
+        HMI_DEBUG("Could not open config file, so use default layer information");
         j = default_layers_json;
     }
     else
@@ -84,7 +84,7 @@ result<json> file_to_json(char const *filename)
 
 struct result<layer_map> load_layer_map(char const *filename)
 {
-    HMI_DEBUG("wm", "loading IDs from %s", filename);
+    HMI_DEBUG("loading IDs from %s", filename);
 
     auto j = file_to_json(filename);
     if (j.is_err())
@@ -98,7 +98,7 @@ struct result<layer_map> load_layer_map(char const *filename)
 
 static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata)
 {
-    HMI_NOTICE("wm", "Time out occurs because the client replys endDraw slow, so revert the request");
+    HMI_NOTICE("Time out occurs because the client replys endDraw slow, so revert the request");
     reinterpret_cast<wm::WindowManager *>(userdata)->timerHandler();
     return 0;
 }
@@ -130,7 +130,7 @@ WindowManager::WindowManager(wl::display *d)
     string lm_setting_path = path;
     if (!path)
     {
-        HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
+        HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
     }
     else
     {
@@ -148,13 +148,13 @@ WindowManager::WindowManager(wl::display *d)
             }
             else
             {
-                HMI_ERROR("wm", "%s", l.err().value());
+                HMI_ERROR("%s", l.err().value());
             }
         }
     }
     catch (std::exception &e)
     {
-        HMI_ERROR("wm", "Loading of configuration failed: %s", e.what());
+        HMI_ERROR("Loading of configuration failed: %s", e.what());
     } */
 }
 
@@ -167,7 +167,7 @@ int WindowManager::init()
 
     if (this->layers.mapping.empty())
     {
-        HMI_ERROR("wm", "No surface -> layer mapping loaded");
+        HMI_ERROR("No surface -> layer mapping loaded");
         return -1;
     }
 
@@ -257,7 +257,7 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
        */
         lid = this->layers.get_layer_id(string("fallback"));
         l_id = this->lm->getNewLayerID("fallback");
-        HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role);
+        HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
         if (!lid)
         {
             return Err<int>("Drawing name does not match any role, fallback is disabled");
@@ -278,7 +278,7 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
         //     this->layers.main_surface_name == drawing_name)
         // {
         //     this->layers.main_surface = id;
-        //     HMI_DEBUG("wm", "Set main_surface id to %u", id);
+        //     HMI_DEBUG("Set main_surface id to %u", id);
         // }
 
         // add client into the db
@@ -322,7 +322,7 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
        * register drawing_name as fallback and make it displayed.
        */
         lid = this->layers.get_layer_id(string("fallback"));
-        HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role);
+        HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
         if (!lid)
         {
             return "Drawing name does not match any role, fallback is disabled";
@@ -341,7 +341,7 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
     this->layers.add_surface(sid, *lid);
 
     // this surface is already created
-    HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
+    HMI_DEBUG("surface_id is %u, layer_id is %u", sid, *lid);
 
     this->controller->layers[*lid]->add_surface(sid);
     this->layout_commit();
@@ -382,10 +382,10 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
        * register drawing_name as fallback and make it displayed.
        */
         lid = this->layers.get_layer_id(string("fallback"));
-        HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role.c_str());
+        HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role.c_str());
         if (!lid)
         {
-            HMI_ERROR("wm", "Drawing name does not match any role, fallback is disabled");
+            HMI_ERROR("Drawing name does not match any role, fallback is disabled");
             return ret;
         }
     }
@@ -401,24 +401,24 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
         //wm_err = g_app_list.popFloatingSurface(id);
     }
     if(wm_err != WMError::SUCCESS){
-        HMI_ERROR("wm", "No floating surface for app: %s", id.c_str());
+        HMI_ERROR("No floating surface for app: %s", id.c_str());
         g_app_list.addFloatingClient(id, *lid, role);
-        HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str());
+        HMI_NOTICE("%s : Waiting for surface creation", id.c_str());
         return ret;
     }
 
     ret = true;
     if (g_app_list.contains(id))
     {
-        HMI_INFO("wm", "Add role: %s with surface: %d. Client %s has multi surfaces.",
+        HMI_INFO("Add role: %s with surface: %d. Client %s has multi surfaces.",
                  role.c_str(), surface, id.c_str());
         wm_err = g_app_list.appendRole(id, role, surface);
         if(wm_err != WMError::SUCCESS){
-            HMI_INFO("wm", errorDescription(wm_err));
+            HMI_INFO(errorDescription(wm_err));
         }
     }
     else{
-        HMI_INFO("wm", "Create new client: %s, surface: %d into layer: %d with role: %s",
+        HMI_INFO("Create new client: %s, surface: %d into layer: %d with role: %s",
                  id.c_str(), surface, *lid, role.c_str());
         g_app_list.addClient(id, *lid, surface, role);
     }
@@ -428,7 +428,7 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
     this->layers.add_surface(surface, *lid);
 
     // this surface is already created
-    HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface, *lid);
+    HMI_DEBUG("surface_id is %u, layer_id is %u", surface, *lid);
 
     const auto &o_layer = this->layers.get_layer(*lid);
     auto rect = o_layer.value().rect;
@@ -470,7 +470,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
     unsigned srfc = client->surfaceID(role);
     if(srfc == 0)
     {
-        HMI_ERROR("wm", "role sould be set with surface");
+        HMI_ERROR("role sould be set with surface");
         reply("role sould be set with surface");
         return;
     }
@@ -484,7 +484,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
 
     if(ret != WMError::SUCCESS)
     {
-        HMI_ERROR("wm", errorDescription(ret));
+        HMI_ERROR(errorDescription(ret));
         reply("Failed to set request");
         return;
     }
@@ -534,7 +534,7 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin
 
     if (ret != WMError::SUCCESS)
     {
-        HMI_ERROR("wm", errorDescription(ret));
+        HMI_ERROR(errorDescription(ret));
         reply("Failed to set request");
         return;
     }
@@ -574,7 +574,7 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
 
     if (!result)
     {
-        HMI_ERROR("wm", "%s is not in transition state", id.c_str());
+        HMI_ERROR("%s is not in transition state", id.c_str());
         return;
     }
 
@@ -628,7 +628,7 @@ result<json_object *> WindowManager::api_get_display_info()
 
 result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
 {
-    HMI_DEBUG("wm", "called");
+    HMI_DEBUG("called");
 
     // TODO: application requests by old role,
     //       so convert role old to new
@@ -667,7 +667,7 @@ void WindowManager::api_ping() { this->dispatch_pending_events(); }
 
 void WindowManager::send_event(char const *evname, char const *label)
 {
-    HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label);
+    HMI_DEBUG("%s: %s(%s)", __func__, evname, label);
 
     json_object *j = json_object_new_object();
     json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
@@ -675,14 +675,14 @@ void WindowManager::send_event(char const *evname, char const *label)
     int ret = afb_event_push(this->map_afb_event[evname], j);
     if (ret != 0)
     {
-        HMI_DEBUG("wm", "afb_event_push failed: %m");
+        HMI_DEBUG("afb_event_push failed: %m");
     }
 }
 
 void WindowManager::send_event(char const *evname, char const *label, char const *area,
                      int x, int y, int w, int h)
 {
-    HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d",
+    HMI_DEBUG("%s: %s(%s, %s) x:%d y:%d w:%d h:%d",
               __func__, evname, label, area, x, y, w, h);
 
     json_object *j_rect = json_object_new_object();
@@ -699,7 +699,7 @@ void WindowManager::send_event(char const *evname, char const *label, char const
     int ret = afb_event_push(this->map_afb_event[evname], j);
     if (ret != 0)
     {
-        HMI_DEBUG("wm", "afb_event_push failed: %m");
+        HMI_DEBUG("afb_event_push failed: %m");
     }
 }
 
@@ -713,12 +713,12 @@ void WindowManager::surface_created(uint32_t surface_id)
     auto layer_id = this->layers.get_layer_id(surface_id);
     if (!layer_id)
     {
-        HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!",
+        HMI_DEBUG("Newly created surfce %d is not associated with any layer!",
                   surface_id);
         return;
     }
 
-    HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id);
+    HMI_DEBUG("surface_id is %u, layer_id is %u", surface_id, *layer_id);
 
     this->controller->layers[*layer_id]->add_surface(surface_id);
     this->layout_commit();
@@ -726,7 +726,7 @@ void WindowManager::surface_created(uint32_t surface_id)
 
 void WindowManager::surface_removed(uint32_t surface_id)
 {
-    HMI_DEBUG("wm", "Delete surface_id %u", surface_id);
+    HMI_DEBUG("Delete surface_id %u", surface_id);
     this->id_alloc.remove_id(surface_id);
     this->layers.remove_surface(surface_id);
     g_app_list.removeSurface(surface_id);
@@ -734,7 +734,7 @@ void WindowManager::surface_removed(uint32_t surface_id)
 
 void WindowManager::surface_properties(unsigned surface_id, unsigned pid)
 {
-    HMI_DEBUG("wm", "get surface properties");
+    HMI_DEBUG("get surface properties");
 
     // search pid from surfaceID
     /*json_object *response;
@@ -744,12 +744,12 @@ void WindowManager::surface_properties(unsigned surface_id, unsigned pid)
     string appid = "";
     if(response == nullptr)
     {
-        HMI_ERROR("wm", "No runners");
+        HMI_ERROR("No runners");
     }
     else
     {
         // check appid then add it to the client
-        HMI_INFO("wm", "Runners:%s", json_object_get_string(response));
+        HMI_INFO("Runners:%s", json_object_get_string(response));
         int size = json_object_array_length(response);
         for(int i = 0; i < size; i++)
         {
@@ -773,7 +773,7 @@ void WindowManager::surface_properties(unsigned surface_id, unsigned pid)
 
 void WindowManager::removeClient(const string &appid)
 {
-    HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str());
+    HMI_DEBUG("Remove clinet %s from list", appid.c_str());
     g_app_list.removeClient(appid);
 }
 
@@ -910,13 +910,13 @@ int WindowManager::init_layers()
 {
     if (!this->controller)
     {
-        HMI_ERROR("wm", "ivi_controller global not available");
+        HMI_ERROR("ivi_controller global not available");
         return -1;
     }
 
     if (this->outputs.empty())
     {
-        HMI_ERROR("wm", "no output was set up!");
+        HMI_ERROR("no output was set up!");
         return -1;
     }
 
@@ -932,7 +932,7 @@ int WindowManager::init_layers()
                                         uint32_t(o->physical_height)};
 
 
-    HMI_DEBUG("wm", "SCALING: screen (%dx%d), physical (%dx%d)",
+    HMI_DEBUG("SCALING: screen (%dx%d), physical (%dx%d)",
               o->width, o->height, o->physical_width, o->physical_height);
 
     this->layers.loadAreaDb();
@@ -943,7 +943,7 @@ int WindowManager::init_layers()
     dp_bg.set_aspect(static_cast<double>(css_bg.w) / css_bg.h);
     dp_bg.fit(o->width, o->height);
     dp_bg.center(o->width, o->height);
-    HMI_DEBUG("wm", "SCALING: CSS BG(%dx%d) -> DDP %dx%d,(%dx%d)",
+    HMI_DEBUG("SCALING: CSS BG(%dx%d) -> DDP %dx%d,(%dx%d)",
               css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
 
     // Clear scene
@@ -959,7 +959,7 @@ int WindowManager::init_layers()
         auto &l = layers[i.second.layer_id];
         l->set_destination_rectangle(dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
         l->set_visibility(1);
-        HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"",
+        HMI_DEBUG("Setting up layer %s (%d) for surface role match \"%s\"",
                   i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
     }
 
@@ -978,7 +978,7 @@ void WindowManager::surface_set_layout(int surface_id, const string& area)
 {
     if (!this->controller->surface_exists(surface_id))
     {
-        HMI_ERROR("wm", "Surface %d does not exist", surface_id);
+        HMI_ERROR("Surface %d does not exist", surface_id);
         return;
     }
 
@@ -986,7 +986,7 @@ void WindowManager::surface_set_layout(int surface_id, const string& area)
 
     if (!o_layer_id)
     {
-        HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id);
+        HMI_ERROR("Surface %d is not associated with any layer!", surface_id);
         return;
     }
 
@@ -1003,7 +1003,7 @@ void WindowManager::surface_set_layout(int surface_id, const string& area)
     int w = rect.w;
     int h = rect.h;
 
-    HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
+    HMI_DEBUG("surface_set_layout for surface %u on layer %u", surface_id,
               layer_id);
 
     // set destination to the display rectangle
@@ -1015,7 +1015,7 @@ void WindowManager::surface_set_layout(int surface_id, const string& area)
     this->area_info[surface_id].w = w;
     this->area_info[surface_id].h = h;
 
-    HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }",
+    HMI_DEBUG("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
               surface_id, layer_id, x, y, w, h);
 }
 
@@ -1087,16 +1087,16 @@ void WindowManager::activate(int id)
                     this->surface_bg.erase(i);
 
                     // Remove from BG layer (999)
-                    HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id);
+                    HMI_DEBUG("Remove %s(%d) from BG layer", label, id);
                     this->controller->layers[999]->remove_surface(id);
 
                     // Add to FG layer (1001)
-                    HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id);
+                    HMI_DEBUG("Add %s(%d) to FG layer", label, id);
                     this->controller->layers[1001]->add_surface(id);
 
                     for (int j : this->surface_bg)
                     {
-                        HMI_DEBUG("wm", "Stored id:%d", j);
+                        HMI_DEBUG("Stored id:%d", j);
                     }
                     break;
                 }
@@ -1134,16 +1134,16 @@ void WindowManager::deactivate(int id)
             this->surface_bg.push_back(id);
 
             // Remove from FG layer (1001)
-            HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id);
+            HMI_DEBUG("Remove %s(%d) from FG layer", label, id);
             this->controller->layers[1001]->remove_surface(id);
 
             // Add to BG layer (999)
-            HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id);
+            HMI_DEBUG("Add %s(%d) to BG layer", label, id);
             this->controller->layers[999]->add_surface(id);
 
             for (int j : surface_bg)
             {
-                HMI_DEBUG("wm", "Stored id:%d", j);
+                HMI_DEBUG("Stored id:%d", j);
             }
         }
         else
@@ -1440,7 +1440,7 @@ void WindowManager::emitScreenUpdated(unsigned req_num)
         this->map_afb_event[kListEventName[Event_ScreenUpdated]], j);
     if (ret != 0)
     {
-        HMI_DEBUG("wm", "afb_event_push failed: %m");
+        HMI_DEBUG("afb_event_push failed: %m");
     }
 }
 
@@ -1448,7 +1448,7 @@ void WindowManager::setTimer()
 {
     struct timespec ts;
     if (clock_gettime(CLOCK_BOOTTIME, &ts) != 0) {
-        HMI_ERROR("wm", "Could't set time (clock_gettime() returns with error");
+        HMI_ERROR("Could't set time (clock_gettime() returns with error");
         return;
     }
 
@@ -1460,7 +1460,7 @@ void WindowManager::setTimer()
             CLOCK_BOOTTIME, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL, 1, processTimerHandler, this);
         if (ret < 0)
         {
-            HMI_ERROR("wm", "Could't set timer");
+            HMI_ERROR("Could't set timer");
         }
     }
     else
@@ -1523,7 +1523,7 @@ const char* WindowManager::convertRoleOldToNew(char const *old_role)
         new_role = old_role;
     }
 
-    HMI_DEBUG("wm", "old:%s -> new:%s", old_role, new_role);
+    HMI_DEBUG("old:%s -> new:%s", old_role, new_role);
 
     return new_role;
 }
@@ -1532,12 +1532,12 @@ int WindowManager::loadOldRoleDb()
 {
     // Get afm application installed dir
     char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
-    HMI_DEBUG("wm", "afm_app_install_dir:%s", afm_app_install_dir);
+    HMI_DEBUG("afm_app_install_dir:%s", afm_app_install_dir);
 
     string file_name;
     if (!afm_app_install_dir)
     {
-        HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
+        HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
     }
     else
     {
@@ -1549,22 +1549,22 @@ int WindowManager::loadOldRoleDb()
     int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
     if (0 > ret)
     {
-        HMI_ERROR("wm", "Could not open old_role.db, so use default old_role information");
+        HMI_ERROR("Could not open old_role.db, so use default old_role information");
         json_obj = json_tokener_parse(kDefaultOldRoleDb);
     }
-    HMI_DEBUG("wm", "json_obj dump:%s", json_object_get_string(json_obj));
+    HMI_DEBUG("json_obj dump:%s", json_object_get_string(json_obj));
 
     // Perse apps
     json_object* json_cfg;
     if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg))
     {
-        HMI_ERROR("wm", "Parse Error!!");
+        HMI_ERROR("Parse Error!!");
         return -1;
     }
 
     int len = json_object_array_length(json_cfg);
-    HMI_DEBUG("wm", "json_cfg len:%d", len);
-    HMI_DEBUG("wm", "json_cfg dump:%s", json_object_get_string(json_cfg));
+    HMI_DEBUG("json_cfg len:%d", len);
+    HMI_DEBUG("json_cfg dump:%s", json_object_get_string(json_cfg));
 
     for (int i=0; i<len; i++)
     {
@@ -1573,14 +1573,14 @@ int WindowManager::loadOldRoleDb()
         const char* old_role = jh::getStringFromJson(json_tmp, "name");
         if (nullptr == old_role)
         {
-            HMI_ERROR("wm", "Parse Error!!");
+            HMI_ERROR("Parse Error!!");
             return -1;
         }
 
         const char* new_role = jh::getStringFromJson(json_tmp, "new");
         if (nullptr == new_role)
         {
-            HMI_ERROR("wm", "Parse Error!!");
+            HMI_ERROR("Parse Error!!");
             return -1;
         }
 
@@ -1591,7 +1591,7 @@ int WindowManager::loadOldRoleDb()
     for(auto itr = this->roleold2new.begin();
       itr != this->roleold2new.end(); ++itr)
     {
-        HMI_DEBUG("wm", ">>> role old:%s new:%s",
+        HMI_DEBUG(">>> role old:%s new:%s",
                   itr->first.c_str(), itr->second.c_str());
     }
 
@@ -1621,7 +1621,7 @@ const char *WindowManager::check_surface_exist(const char *drawing_name)
         return "Surface is not on any layer!";
     }
 
-    HMI_DEBUG("wm", "surface %d is detected", *surface_id);
+    HMI_DEBUG("surface %d is detected", *surface_id);
     return nullptr;
 }