diff options
author | youngman <yman.jung@samsung.com> | 2016-01-04 17:06:17 +0900 |
---|---|---|
committer | Youngjae Shin <yj99.shin@samsung.com> | 2016-01-04 17:46:10 +0900 |
commit | 3e8b7a46e9e36353b3b27f7c0d84374f3242aabb (patch) | |
tree | 15cf0c4745dcca6661886c689b23dca330c7effe | |
parent | c5a3b26728304ea3d4da605fee57e13664b43b68 (diff) | |
download | iotcon-3e8b7a46e9e36353b3b27f7c0d84374f3242aabb.tar.gz iotcon-3e8b7a46e9e36353b3b27f7c0d84374f3242aabb.tar.bz2 iotcon-3e8b7a46e9e36353b3b27f7c0d84374f3242aabb.zip |
Add handle debug messages
Change-Id: I1947a752b78d3aab19d8e229f5a8930cfa3785a9
Signed-off-by: youngman <yman.jung@samsung.com>
-rw-r--r-- | common/ic-log.h | 6 | ||||
-rw-r--r-- | daemon/icd-dbus.c | 34 |
2 files changed, 27 insertions, 13 deletions
diff --git a/common/ic-log.h b/common/ic-log.h index 48a4184..d076da1 100644 --- a/common/ic-log.h +++ b/common/ic-log.h @@ -76,6 +76,12 @@ #define SECURE_DBG(fmt, arg...) SECURE_SLOGD(fmt, ##arg) #define SECURE_ERR(fmt, arg...) SECURE_SLOGE(fmt, ##arg) +#if __WORDSIZE == 64 +#define DBG_HANDLE(handle) _DBG("handle : %lld", #handle) +#else +#define DBG_HANDLE(handle) _DBG("handle : %d", #handle) +#endif + #else /* IC_DEBUGGING */ #define FN_CALL diff --git a/daemon/icd-dbus.c b/daemon/icd-dbus.c index f66c4ce..c202839 100644 --- a/daemon/icd-dbus.c +++ b/daemon/icd-dbus.c @@ -92,8 +92,8 @@ int icd_dbus_client_list_get_resource_info(OCResourceHandle handle, rsrc_handle = cur_hd->data; if (rsrc_handle->handle == handle) { - DBG("signal_number(%llx) for resource handle(%lld) found", - rsrc_handle->signal_number, handle); + DBG_HANDLE(handle); + DBG("signal_number(%llx) found", rsrc_handle->signal_number); *signal_number = rsrc_handle->signal_number; *bus_name = ic_utils_strdup(client->bus_name); g_mutex_unlock(&icd_dbus_client_list_mutex); @@ -154,8 +154,8 @@ static void _icd_dbus_cleanup_resource_list(void *data) RET_IF(NULL == resource_handle); RET_IF(NULL == resource_handle->handle); - DBG("handle(%lld, %llx) deregistering", resource_handle->handle, - resource_handle->signal_number); + DBG("Deregistering resource handle"); + DBG_HANDLE(resource_handle->handle); ret = icd_ioty_unregister_resource(resource_handle->handle); if (IOTCON_ERROR_NONE != ret) @@ -173,7 +173,8 @@ static void _icd_dbus_cleanup_presence_list(void *data) RET_IF(NULL == presence_handle); RET_IF(NULL == presence_handle->handle); - DBG("handle(%lld) deregistering", presence_handle->handle); + DBG("Deregistering presence handle"); + DBG_HANDLE(presence_handle->handle); ret = icd_ioty_unsubscribe_presence(presence_handle->handle, presence_handle->host_address); @@ -189,7 +190,8 @@ static void _icd_dbus_cleanup_observe_list(OCDoHandle data) { int ret; - DBG("handle(%lld) deregistering", data); + DBG("Deregistering observe handle"); + DBG_HANDLE(data); ret = icd_ioty_observer_stop(data, NULL); if (IOTCON_ERROR_NONE != ret) @@ -354,7 +356,8 @@ static int _icd_dbus_resource_list_add(const gchar *bus_name, OCResourceHandle h return ret; } - DBG("resource handle(%lld) added in the client(%s)", handle, bus_name); + DBG("Resource handle added in the client(%s)", bus_name); + DBG_HANDLE(handle); client->resource_list = g_list_append(client->resource_list, resource_handle); @@ -384,7 +387,8 @@ static void _icd_dbus_resource_list_remove(const gchar *bus_name, OCResourceHand resource_handle = cur_hd->data; if (resource_handle->handle == handle) { - DBG("resource handle(%lld) removed from handle list", handle); + DBG("Resource handle is removed"); + DBG_HANDLE(handle); client->resource_list = g_list_delete_link(client->resource_list, cur_hd); free(resource_handle); g_mutex_unlock(&icd_dbus_client_list_mutex); @@ -424,7 +428,8 @@ static int _icd_dbus_presence_list_add(const gchar *bus_name, return ret; } - DBG("presence handle(%lld) added in the client(%s)", handle, bus_name); + DBG("Presence handle added in the client(%s)", bus_name); + DBG_HANDLE(handle); client->presence_list = g_list_append(client->presence_list, presence_handle); @@ -455,7 +460,8 @@ static void _icd_dbus_presence_list_remove(const gchar *bus_name, presence_handle = cur_hd->data; if (presence_handle->handle == handle) { - DBG("presence handle(%lld) removed from handle list", handle); + DBG("Presence handle is removed"); + DBG_HANDLE(handle); client->presence_list = g_list_delete_link(client->presence_list, cur_hd); free(presence_handle->host_address); free(presence_handle); @@ -484,7 +490,8 @@ static int _icd_dbus_observe_list_add(const gchar *bus_name, OCDoHandle handle) return ret; } - DBG("observe handle(%lld) added in the client(%s)", handle, bus_name); + DBG("Observe handle added in the client(%s)", bus_name); + DBG_HANDLE(handle); client->observe_list = g_list_append(client->observe_list, handle); @@ -515,7 +522,8 @@ static void _icd_dbus_observe_list_remove(const gchar *bus_name, observe_handle = cur_hd->data; if (observe_handle == handle) { - DBG("presence handle(%lld) removed from handle list", handle); + DBG("Observe handle is removed"); + DBG_HANDLE(handle); client->observe_list = g_list_delete_link(client->observe_list, cur_hd); g_mutex_unlock(&icd_dbus_client_list_mutex); return; @@ -560,7 +568,7 @@ static gboolean _dbus_handle_register_resource(icDbus *object, ret = icd_ioty_unregister_resource(handle); if (IOTCON_ERROR_NONE != ret) - ERR("icd_ioty_unregister_resource(%lld) Fail(%d)", handle, ret); + ERR("icd_ioty_unregister_resource() Fail(%d)", ret); handle = NULL; } |