Revert "resource-manager: introduce sync getter"

Since non-sync getter for monitoring is moved into monitor_ops, sync
suffix for normal getter/setter is no more needed. Thus, this reverts
commit ad9493c0b5ae ("resource-manager: introduce sync getter").

Change-Id: I667899fc5254fa3777ffa5d784f062a3fa9e28c5
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>

diff --git a/src/resource-manager/resource-manager.c b/src/resource-manager/resource-manager.c
index c7da76d..d6f768f 100644 (file)
--- a/src/resource-manager/resource-manager.c
+++ b/src/resource-manager/resource-manager.c
@@ -828,143 +828,47 @@ syscommon_resman_get_resource_attr_int(int resource_id, u_int64_t attr_id, int32
 }
 
 int
-syscommon_resman_get_resource_attr_int_sync(int resource_id, u_int64_t attr_id, int32_t *data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_int(resource_id, attr_id, data);
-}
-
-int
 syscommon_resman_get_resource_attr_int64(int resource_id, u_int64_t attr_id, int64_t *data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_INT64, data);
 }
 
 int
-syscommon_resman_get_resource_attr_int64_sync(int resource_id, u_int64_t attr_id, int64_t *data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_int64(resource_id, attr_id, data);
-}
-
-int
 syscommon_resman_get_resource_attr_uint(int resource_id, u_int64_t attr_id, u_int32_t *data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_UINT, data);
 }
 
 int
-syscommon_resman_get_resource_attr_uint_sync(int resource_id, u_int64_t attr_id, u_int32_t *data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_uint(resource_id, attr_id, data);
-}
-
-int
 syscommon_resman_get_resource_attr_uint64(int resource_id, u_int64_t attr_id, u_int64_t *data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_UINT64, data);
 }
 
 int
-syscommon_resman_get_resource_attr_uint64_sync(int resource_id, u_int64_t attr_id, u_int64_t *data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_uint64(resource_id, attr_id, data);
-}
-
-int
 syscommon_resman_get_resource_attr_double(int resource_id, u_int64_t attr_id, double *data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, data);
 }
 
 int
-syscommon_resman_get_resource_attr_double_sync(int resource_id, u_int64_t attr_id, double *data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_double(resource_id, attr_id, data);
-}
-
-int
 syscommon_resman_get_resource_attr_string(int resource_id, u_int64_t attr_id, char *data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_STRING, data);
 }
 
 int
-syscommon_resman_get_resource_attr_string_sync(int resource_id, u_int64_t attr_id, char *data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_string(resource_id, attr_id, data);
-}
-
-int
 syscommon_resman_get_resource_attr_array(int resource_id, u_int64_t attr_id, struct syscommon_resman_array_value **data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, data);
 }
 
 int
-syscommon_resman_get_resource_attr_array_sync(int resource_id, u_int64_t attr_id, struct syscommon_resman_array_value **data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_array(resource_id, attr_id, data);
-}
-
-int
 syscommon_resman_get_resource_attr_ptr(int resource_id, u_int64_t attr_id, void **data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_PTR, data);
 }
 
-int
-syscommon_resman_get_resource_attr_ptr_sync(int resource_id, u_int64_t attr_id, void **data)
-{
-       int ret;
-
-       ret = update_resource_attr(find_resource(resource_id), attr_id);
-       if (ret != 0)
-               return ret;
-
-       return syscommon_resman_get_resource_attr_ptr(resource_id, attr_id, data);
-}
-
 static inline bool
 is_resource_attr_visible(struct syscommon_resman_resource *resource,
                         const struct syscommon_resman_resource_attribute *attr)

diff --git a/src/resource-manager/resource-manager.h b/src/resource-manager/resource-manager.h
index 0f2ea53..4902c70 100644 (file)
--- a/src/resource-manager/resource-manager.h
+++ b/src/resource-manager/resource-manager.h
@@ -158,21 +158,13 @@ int syscommon_resman_get_resource_attr_json(int resource_id, u_int64_t attr_id,
 int syscommon_resman_get_resource_list_json(char **json_string);
 
 int syscommon_resman_get_resource_attr_int(int resource_id, u_int64_t attr_id, int32_t *data);
-int syscommon_resman_get_resource_attr_int_sync(int resource_id, u_int64_t attr_id, int32_t *data);
 int syscommon_resman_get_resource_attr_int64(int resource_id, u_int64_t attr_id, int64_t *data);
-int syscommon_resman_get_resource_attr_int64_sync(int resource_id, u_int64_t attr_id, int64_t *data);
 int syscommon_resman_get_resource_attr_uint(int resource_id, u_int64_t attr_id, u_int32_t *data);
-int syscommon_resman_get_resource_attr_uint_sync(int resource_id, u_int64_t attr_id, u_int32_t *data);
 int syscommon_resman_get_resource_attr_uint64(int resource_id, u_int64_t attr_id, u_int64_t *data);
-int syscommon_resman_get_resource_attr_uint64_sync(int resource_id, u_int64_t attr_id, u_int64_t *data);
 int syscommon_resman_get_resource_attr_double(int resource_id, u_int64_t attr_id, double *data);
-int syscommon_resman_get_resource_attr_double_sync(int resource_id, u_int64_t attr_id, double *data);
 int syscommon_resman_get_resource_attr_string(int resource_id, u_int64_t attr_id, char *data);
-int syscommon_resman_get_resource_attr_string_sync(int resource_id, u_int64_t attr_id, char *data);
 int syscommon_resman_get_resource_attr_array(int resource_id, u_int64_t attr_id, struct syscommon_resman_array_value **data);
-int syscommon_resman_get_resource_attr_array_sync(int resource_id, u_int64_t attr_id, struct syscommon_resman_array_value **data);
 int syscommon_resman_get_resource_attr_ptr(int resource_id, u_int64_t attr_id, void **data);
-int syscommon_resman_get_resource_attr_ptr_sync(int resource_id, u_int64_t attr_id, void **data);
 
 int syscommon_resman_set_resource_attr_interest(int resource_id, u_int64_t interest_mask);
 int syscommon_resman_unset_resource_attr_interest(int resource_id, u_int64_t interest_mask);