resource-manager: Change type name of multiple data

SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64
 -> SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64

SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64
 -> SYSCOMMON_RESMAN_DATA_TYPE_3_UINT64

SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64_UINT64
 -> SYSCOMMON_RESMAN_DATA_TYPE_4_UINT64

Change-Id: I840db7996a3c7a0dba7afaa8465489a038edaeb0
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/include/libsyscommon/resource-type.h b/include/libsyscommon/resource-type.h
index b2f98bab9c11093ecc7b13ec198ec99bb70878f0..96cd412cb0c38c0273925ef3ffa9e303c73723ce 100644 (file)
--- a/include/libsyscommon/resource-type.h
+++ b/include/libsyscommon/resource-type.h
@@ -36,9 +36,9 @@ enum syscommon_resman_data_type {
        SYSCOMMON_RESMAN_DATA_TYPE_PTR,
        SYSCOMMON_RESMAN_DATA_TYPE_BOOLEAN,
 
-       SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64,
-       SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64,
-       SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64_UINT64,
+       SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64,
+       SYSCOMMON_RESMAN_DATA_TYPE_3_UINT64,
+       SYSCOMMON_RESMAN_DATA_TYPE_4_UINT64,
 
        SYSCOMMON_RESMAN_DATA_TYPE_UINT64_WITH_1_USER_DATA,
        SYSCOMMON_RESMAN_DATA_TYPE_UINT64_WITH_2_USER_DATA,

diff --git a/src/resource-manager/resource-manager.c b/src/resource-manager/resource-manager.c
index 3320ee9c143c28c630b9ad1b5c0dac9ce5b0bb48..8af6bf3adb3cd6b63560f697da6d0d537904b891 100644 (file)
--- a/src/resource-manager/resource-manager.c
+++ b/src/resource-manager/resource-manager.c
@@ -1648,7 +1648,7 @@ syscommon_resman_set_resource_attr_uint64_2(int resource_id, u_int64_t attr_id,
                return -EINVAL;
 
        return set_resource_attr_value_data_2_tuple(resource, attr_id,
-                                       SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64,
+                                       SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64,
                                        &data1, &data2, 1, 1);
 }
 
@@ -1662,7 +1662,7 @@ syscommon_resman_set_resource_attr_uint64_3(int resource_id, u_int64_t attr_id,
                return -EINVAL;
 
        return set_resource_attr_value_data_3_tuple(resource, attr_id,
-                                       SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64,
+                                       SYSCOMMON_RESMAN_DATA_TYPE_3_UINT64,
                                        &data1, &data2, &data3, 1, 1, 1);
 }
 
@@ -1676,7 +1676,7 @@ syscommon_resman_set_resource_attr_uint64_4(int resource_id, u_int64_t attr_id,
                return -EINVAL;
 
        return set_resource_attr_value_data_4_tuple(resource, attr_id,
-                                       SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64_UINT64,
+                                       SYSCOMMON_RESMAN_DATA_TYPE_4_UINT64,
                                        &data1, &data2, &data3, &data4, 1, 1, 1, 1);
 }
 
@@ -1767,9 +1767,9 @@ set_resource_attr_interest(struct syscommon_resman_resource *resource, u_int64_t
                        case SYSCOMMON_RESMAN_DATA_TYPE_ARRAY:
                                attr_value->data = calloc(1, sizeof(struct syscommon_resman_array_value));
                                break;
-                       case SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64:
-                       case SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64:
-                       case SYSCOMMON_RESMAN_DATA_TYPE_UINT64_UINT64_UINT64_UINT64:
+                       case SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64:
+                       case SYSCOMMON_RESMAN_DATA_TYPE_3_UINT64:
+                       case SYSCOMMON_RESMAN_DATA_TYPE_4_UINT64:
                                /**
                                 * FIXME: N-tuple data doesn't support the getter temporarily.
                                 * Don't store the passed data to attr_value.