Code Review
/
apps
/
agl-service-homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add debug message macros controlled by environment variable
[apps/agl-service-homescreen.git]
/
src
/
homescreen.c
diff --git
a/src/homescreen.c
b/src/homescreen.c
index
98631c8
..
7f5f067
100644
(file)
--- a/
src/homescreen.c
+++ b/
src/homescreen.c
@@
-27,6
+27,7
@@
#include <glib.h>
#include <pthread.h>
#include "hs-helper.h"
#include <glib.h>
#include <pthread.h>
#include "hs-helper.h"
+#include "hmi-debug.h"
#define COMMAND_EVENT_NUM 3
#define EVENT_SUBSCRIBE_ERROR_CODE 100
#define COMMAND_EVENT_NUM 3
#define EVENT_SUBSCRIBE_ERROR_CODE 100
@@
-56,7
+57,7
@@
static void pingSample(struct afb_req request)
{
static int pingcount = 0;
afb_req_success_f(request, json_object_new_int(pingcount), "Ping count = %d", pingcount);
{
static int pingcount = 0;
afb_req_success_f(request, json_object_new_int(pingcount), "Ping count = %d", pingcount);
-
AFB_NOTICE(
"Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
+
HMI_NOTICE("homescreen-service",
"Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
pingcount++;
}
pingcount++;
}
@@
-74,13
+75,13
@@
static void pingSample(struct afb_req request)
*/
static void tap_shortcut (struct afb_req request)
{
*/
static void tap_shortcut (struct afb_req request)
{
-
AFB_NOTICE("%s is called.", __FUNCTION__
);
+
HMI_NOTICE("homescreen-service","called."
);
int ret = 0;
const char* value = afb_req_value(request, _application_name);
if (value) {
int ret = 0;
const char* value = afb_req_value(request, _application_name);
if (value) {
-
AFB_NOTICE(
"request params = %s.", value);
+
HMI_NOTICE("homescreen-service",
"request params = %s.", value);
struct json_object* push_obj = json_object_new_object();
hs_add_object_to_json_object_str( push_obj, 2,
struct json_object* push_obj = json_object_new_object();
hs_add_object_to_json_object_str( push_obj, 2,
@@
-111,13
+112,13
@@
static void tap_shortcut (struct afb_req request)
*/
static void on_screen_message (struct afb_req request)
{
*/
static void on_screen_message (struct afb_req request)
{
-
AFB_NOTICE("%s is called.", __FUNCTION__
);
+
HMI_NOTICE("homescreen-service","called."
);
int ret = 0;
const char* value = afb_req_value(request, _display_message);
if (value) {
int ret = 0;
const char* value = afb_req_value(request, _display_message);
if (value) {
-
AFB_NOTICE(
"request params = %s.", value);
+
HMI_NOTICE("homescreen-service",
"request params = %s.", value);
struct json_object* push_obj = json_object_new_object();
hs_add_object_to_json_object_str( push_obj, 2,
struct json_object* push_obj = json_object_new_object();
hs_add_object_to_json_object_str( push_obj, 2,
@@
-150,13
+151,13
@@
static void on_screen_message (struct afb_req request)
static void subscribe(struct afb_req request)
{
const char *value = afb_req_value(request, "event");
static void subscribe(struct afb_req request)
{
const char *value = afb_req_value(request, "event");
-
AFB_NOTICE(
"value is %s", value);
+
HMI_NOTICE("homescreen-service",
"value is %s", value);
int ret = 0;
if(value) {
int index = hs_search_event_name_index(value);
if(index < 0)
{
int ret = 0;
if(value) {
int index = hs_search_event_name_index(value);
if(index < 0)
{
-
AFB_NOTICE(
"dedicated event doesn't exist");
+
HMI_NOTICE("homescreen-service",
"dedicated event doesn't exist");
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
else
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
else
@@
-165,7
+166,7
@@
static void subscribe(struct afb_req request)
}
}
else{
}
}
else{
-
AFB_NOTICE(
"Please input event name");
+
HMI_NOTICE("homescreen-service",
"Please input event name");
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
/*create response json object*/
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
/*create response json object*/
@@
-190,13
+191,13
@@
static void subscribe(struct afb_req request)
static void unsubscribe(struct afb_req request)
{
const char *value = afb_req_value(request, "event");
static void unsubscribe(struct afb_req request)
{
const char *value = afb_req_value(request, "event");
-
AFB_NOTICE(
"value is %s", value);
+
HMI_NOTICE("homescreen-service",
"value is %s", value);
int ret = 0;
if(value) {
int index = hs_search_event_name_index(value);
if(index < 0)
{
int ret = 0;
if(value) {
int index = hs_search_event_name_index(value);
if(index < 0)
{
-
AFB_NOTICE(
"dedicated event doesn't exist");
+
HMI_NOTICE("homescreen-service",
"dedicated event doesn't exist");
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
else
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
else
@@
-205,7
+206,7
@@
static void unsubscribe(struct afb_req request)
}
}
else{
}
}
else{
-
AFB_NOTICE(
"Please input event name");
+
HMI_NOTICE("homescreen-service",
"Please input event name");
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
/*create response json object*/
ret = EVENT_SUBSCRIBE_ERROR_CODE;
}
/*create response json object*/
@@
-230,13
+231,13
@@
static const struct afb_verb_v2 verbs[]= {
static int preinit()
{
static int preinit()
{
-
AFB_NOTICE(
"binding preinit (was register)");
+
HMI_NOTICE("homescreen-service",
"binding preinit (was register)");
return 0;
}
static int init()
{
return 0;
}
static int init()
{
-
AFB_NOTICE(
"binding init");
+
HMI_NOTICE("homescreen-service",
"binding init");
ev_tap_shortcut = afb_daemon_make_event(evlist[0]);
ev_on_screen_message = afb_daemon_make_event(evlist[1]);
ev_tap_shortcut = afb_daemon_make_event(evlist[0]);
ev_on_screen_message = afb_daemon_make_event(evlist[1]);
@@
-256,7
+257,7
@@
static int init()
static void onevent(const char *event, struct json_object *object)
{
static void onevent(const char *event, struct json_object *object)
{
-
AFB_NOTICE(
"on_event %s", event);
+
HMI_NOTICE("homescreen-service",
"on_event %s", event);
}
const struct afb_binding_v2 afbBindingV2 = {
}
const struct afb_binding_v2 afbBindingV2 = {