From 360bac9dbc3987ad0ae1b7c457c9f9717a07f7da Mon Sep 17 00:00:00 2001 From: YoungHun Kim Date: Mon, 17 Dec 2018 16:08:12 +0900 Subject: [PATCH] Fix the dlog's invalid format Change-Id: I72e0bf3f2641c41d7b8cfa8b887aaddccd4e5e1f --- packaging/mm-resource-manager.spec | 2 +- src/daemon/mm_resource_manager_daemon_dbus.c | 4 ++-- src/daemon/mm_resource_manager_daemon_priv.c | 21 +++++++++++---------- src/lib/mm_resource_manager_priv.c | 26 +++++++++++++------------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/packaging/mm-resource-manager.spec b/packaging/mm-resource-manager.spec index 5c792ac..a62b870 100644 --- a/packaging/mm-resource-manager.spec +++ b/packaging/mm-resource-manager.spec @@ -1,6 +1,6 @@ Name: mm-resource-manager Summary: A Multimedia Resource Manager API -Version: 0.2.11 +Version: 0.2.12 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/daemon/mm_resource_manager_daemon_dbus.c b/src/daemon/mm_resource_manager_daemon_dbus.c index 470b617..cd9ffb5 100755 --- a/src/daemon/mm_resource_manager_daemon_dbus.c +++ b/src/daemon/mm_resource_manager_daemon_dbus.c @@ -97,11 +97,11 @@ int _mmrm_dmn_dbus_commit(mm_resource_manager_id id, GVariantIter *release, mm_resource_manager_dmn_res_request_s *release_requests = NULL, *acquire_requests = NULL; - MM_RM_DEBUG("Commit release request of %u items", + MM_RM_DEBUG("Commit release request of %"G_GSIZE_FORMAT" items", g_variant_iter_n_children(release)); __gv2c_array(release, &release_requests); - MM_RM_DEBUG("Commit acquire request of %u items", + MM_RM_DEBUG("Commit acquire request of %"G_GSIZE_FORMAT" items", g_variant_iter_n_children(acquire)); __gv2c_array(acquire, &acquire_requests); diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c index 567dbed..b09efff 100644 --- a/src/daemon/mm_resource_manager_daemon_priv.c +++ b/src/daemon/mm_resource_manager_daemon_priv.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "daemon/mm_resource_manager_daemon_priv.h" #include "daemon/mm_resource_manager_daemon_conf.h" @@ -185,7 +186,7 @@ mm_resource_manager_error_e _mmrm_dmn_destroy(mm_resource_manager_id id) MM_RM_RETVM_IF(i_man == MM_RESOURCE_MANGER_NOT_FOUND, MM_RESOURCE_MANAGER_ERROR_INVALID_PARAMETER, - "Resource manager #%llx doesn't exist", _mm_rm_hash64(id)); + "Resource manager #%"PRIu64" doesn't exist", _mm_rm_hash64(id)); __release_all_resources((mm_resource_manager_dmn_s*)managers->pdata[i_man]); mm_resource_manager_backend_commit_all(); @@ -206,7 +207,7 @@ mm_resource_manager_error_e _mmrm_dmn_commit(mm_resource_manager_id id, MM_RM_RETVM_IF(manager == NULL, MM_RESOURCE_MANAGER_ERROR_INVALID_PARAMETER, - "Resource manager #%llx doesn't exist", _mm_rm_hash64(id)); + "Resource manager #%"PRIu64" doesn't exist", _mm_rm_hash64(id)); MM_RM_RETVM_IF( (releases == NULL || releases[0].type == MM_RESOURCE_MANAGER_NO_RES) && (acquires == NULL || acquires[0].type == MM_RESOURCE_MANAGER_NO_RES), @@ -563,7 +564,7 @@ static GArray* __handle_acquire_requests(mm_resource_manager_dmn_p manager, i_man->resources[request->type]->parts = NULL; i_man->resources[request->type]->is_acquired = FALSE; - MM_RM_DEBUG("All parts of %s are released in RM #%llx", + MM_RM_DEBUG("All parts of %s are released in RM %"PRIu64, res_name, _mm_rm_hash64(i_man->id)); } else { __add_cb_request(cb_requests, i_man, request->type, @@ -573,7 +574,7 @@ static GArray* __handle_acquire_requests(mm_resource_manager_dmn_p manager, i_man->resources[request->type]->is_acquired = FALSE; - MM_RM_DEBUG("Full resource %s is released in RM #%llx", + MM_RM_DEBUG("Full resource %s is released in RM %"PRIu64, res_name, _mm_rm_hash64(i_man->id)); break; } @@ -607,7 +608,7 @@ static GArray* __handle_acquire_requests(mm_resource_manager_dmn_p manager, i_man->resources[request->type]->is_acquired = FALSE; is_released_fully = TRUE; - MM_RM_DEBUG("Full resource %s is released in RM #%llx", + MM_RM_DEBUG("Full resource %s is released in RM %"PRIu64, res_name, _mm_rm_hash64(i_man->id)); break; } @@ -638,7 +639,7 @@ static GArray* __handle_acquire_requests(mm_resource_manager_dmn_p manager, enough_volume = request->volume + acquired_volume <= conf->max_volume[request->type]; - MM_RM_DEBUG("%d units of %s are released in RM #%llx", + MM_RM_DEBUG("%d units of %s are released in RM %"PRIu64, g_array_index(parts, mm_resource_manager_res_volume, 0), res_name, _mm_rm_hash64(i_man->id)); @@ -650,7 +651,7 @@ static GArray* __handle_acquire_requests(mm_resource_manager_dmn_p manager, if (!parts->len) { MM_RM_DEBUG("Part array of %s is empty and will be " - "freed in RM #%llx", res_name, + "freed in RM %"PRIu64, res_name, _mm_rm_hash64(i_man->id)); g_array_free(parts, TRUE); i_man->resources[request->type]->parts = NULL; @@ -687,7 +688,7 @@ static void __handle_release_callbacks(GArray *requests) mm_resource_manager_dmn_release_cb_request_s, i); id = request->manager->id; MM_RM_HASH64(id); - MM_RM_DEBUG("Sending release callback to RM #%llx for %s of volume %d", + MM_RM_DEBUG("Sending release callback to RM #%"PRIu64" for %s of volume %d", id, _mm_resource_manager_get_res_str(request->type), request->volume); _mmrm_dmn_dbus_release_callback(id, request->type, request->volume); @@ -775,7 +776,7 @@ static gboolean __wait_for_release_cb_sync(mm_resource_manager_id id) if (read_size == sizeof(recv_id)) { ret = id == recv_id; if (ret == FALSE) - MM_RM_ERROR("Sync is received from wrong client #%llx", + MM_RM_ERROR("Sync is received from wrong client #%"PRIu64, recv_id); /* * Wait POLLHUP to avoid situation when client sent last sync @@ -788,7 +789,7 @@ static gboolean __wait_for_release_cb_sync(mm_resource_manager_id id) (sync.revents & (POLLHUP | POLLERR)) == 0) MM_RM_ERROR("The client didn't close the FIFO"); } else { - MM_RM_ERROR("Read is failed (revents=%hd,read_size=%d)", + MM_RM_ERROR("Read is failed (revents=%hd,read_size=%zd)", sync.revents, read_size); ret = FALSE; } diff --git a/src/lib/mm_resource_manager_priv.c b/src/lib/mm_resource_manager_priv.c index 1e8f00c..4996587 100644 --- a/src/lib/mm_resource_manager_priv.c +++ b/src/lib/mm_resource_manager_priv.c @@ -201,7 +201,7 @@ int _mm_resource_manager_create(mm_resource_manager_app_class_e app_class, g_mutex_lock(&handles_lock); g_ptr_array_add(handles, handle); - MM_RM_INFO("Resource manager #%llx is created", _mm_rm_hash64(handle->id)); + MM_RM_INFO("Resource manager #%"PRIu64" is created", _mm_rm_hash64(handle->id)); g_mutex_unlock(&handles_lock); return MM_RESOURCE_MANAGER_ERROR_NONE; @@ -234,7 +234,7 @@ int _mm_resource_manager_destroy(mm_resource_manager_h rm) free(handle); if (ret == MM_RESOURCE_MANAGER_ERROR_NONE) - MM_RM_INFO("Resource manager #%llx is destroyed", _mm_rm_hash64(id)); + MM_RM_INFO("Resource manager #%"PRIu64" is destroyed", _mm_rm_hash64(id)); return ret; } @@ -261,7 +261,7 @@ int _mm_resource_manager_mark_for_acquire( *resource_h = resource; MM_RM_INFO("Resource %p of type %d with volume %d is marked for acquire in " - "resource manager #%llx", *resource_h, type, volume, + "resource manager #%"PRIu64, *resource_h, type, volume, _mm_rm_hash64(handle->id)); g_mutex_unlock(&handle->resources_lock); @@ -326,7 +326,7 @@ int _mm_resource_manager_resize_marked(mm_resource_manager_h rm, break; } - MM_RM_INFO("Resource %p is resized for acquire in resource manager #%llx", + MM_RM_INFO("Resource %p is resized for acquire in resource manager #%"PRIu64, resource_h, _mm_rm_hash64(handle->id)); g_mutex_unlock(&handle->resources_lock); @@ -353,7 +353,7 @@ int _mm_resource_manager_mark_for_release(mm_resource_manager_h rm, __mark_resource_for_release(handle->resources, i, resource); - MM_RM_INFO("Resource %p is marked for release in resource manager #%llx", + MM_RM_INFO("Resource %p is marked for release in resource manager #%"PRIu64, resource_h, _mm_rm_hash64(handle->id)); g_mutex_unlock(&handle->resources_lock); @@ -377,7 +377,7 @@ int _mm_resource_manager_mark_all_for_release(mm_resource_manager_h rm) } } - MM_RM_INFO("All resources are marked for release in resource manager #%llx", + MM_RM_INFO("All resources are marked for release in resource manager #%"PRIu64, _mm_rm_hash64(handle->id)); g_mutex_unlock(&handle->resources_lock); @@ -407,7 +407,7 @@ int _mm_resource_manager_get_resource_info(mm_resource_manager_h rm, info->volume = resource->volume; info->is_acquire_failed = resource->is_acquire_failed; - MM_RM_INFO("Info structure of resource %p in resource manager #%llx is filled", + MM_RM_INFO("Info structure of resource %p in resource manager #%"PRIu64" is filled", resource_h, _mm_rm_hash64(handle->id)); g_mutex_unlock(&handle->resources_lock); @@ -426,7 +426,7 @@ int _mm_resource_manager_commit(mm_resource_manager_h rm) ret = __dbus_commit(handle); if (ret == MM_RESOURCE_MANAGER_ERROR_NONE) { - MM_RM_INFO("Changes in resource manager #%llx have been committed successfully", + MM_RM_INFO("Changes in resource manager #%"PRIu64" have been committed successfully", _mm_rm_hash64(handle->id)); } else { MM_RM_ERROR("Dbus commit request failed"); @@ -450,7 +450,7 @@ int _mm_resource_manager_set_status_cb(mm_resource_manager_h rm, handle->status_cb.user_data = user_data; g_mutex_unlock(&handle->resources_lock); - MM_RM_INFO("Status callback %p in resource manager #%llx is set", cb, + MM_RM_INFO("Status callback %p in resource manager #%"PRIu64" is set", cb, _mm_rm_hash64(handle->id)); return MM_RESOURCE_MANAGER_ERROR_NONE; @@ -497,7 +497,7 @@ void __mm_resource_manager_release_callback(mm_resource_manager_s *handle, gboolean release_all = FALSE; int j; - MM_RM_DEBUG("Release callback is emitted for %s of volume %d in RM #%llx", + MM_RM_DEBUG("Release callback is emitted for %s of volume %d in RM #%"PRIu64, _mm_resource_manager_get_res_str(type), volume, id); handle_id = handle->id; @@ -796,7 +796,7 @@ static int __dbus_create(mm_resource_manager_s *handle, &rm_error, NULL, &error); MM_RM_RET_IF_GERR(error, "DBus create msg cannot be sent"); - MM_RM_DEBUG("Create returned id - #%llx, error - %d", + MM_RM_DEBUG("Create returned id - #%"PRIu64", error - %d", _mm_rm_hash64(handle->id), rm_error); return rm_error; @@ -811,7 +811,7 @@ static int __dbus_destroy(mm_resource_manager_s *handle) NULL, &error); MM_RM_RET_IF_GERR(error, "DBus destroy msg cannot be sent"); - MM_RM_DEBUG("Destroy for id - #%llx returned error - %d", + MM_RM_DEBUG("Destroy for id - #%"PRIu64" returned error - %d", _mm_rm_hash64(handle->id), rm_error); return MM_RESOURCE_MANAGER_ERROR_NONE; @@ -879,7 +879,7 @@ static int __dbus_commit(mm_resource_manager_s *handle) if (error != NULL) MM_RM_RET_IF_GERR(error, "DBus commit msg cannot be sent"); - MM_RM_DEBUG("Commit for id - #%llx returned error - %d", + MM_RM_DEBUG("Commit for id - #%"PRIu64" returned error - %d", _mm_rm_hash64(handle->id), rm_error); if (rm_error == MM_RESOURCE_MANAGER_ERROR_NONE) { -- 2.7.4