resource-manager: Rename existing ops to monitor_ops

Change-Id: I2d5e1228052a24c52831a1ac64b6e8c9a6394617
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 d6f768f..9be7c13 100644 (file)
--- a/src/resource-manager/resource-manager.c
+++ b/src/resource-manager/resource-manager.c
@@ -303,7 +303,7 @@ syscommon_resman_get_resource_control_name(int resource_id, u_int64_t ctrl_id)
 }
 
 static int
-update_resource_attr(struct syscommon_resman_resource *resource,
+monitor_update_resource_attr(struct syscommon_resman_resource *resource,
                     u_int64_t attr_id)
 {
        int attr_index = RESOURCE_ATTR_INDEX(attr_id);
@@ -316,12 +316,12 @@ update_resource_attr(struct syscommon_resman_resource *resource,
 
        attr = &resource->attrs[attr_index];
 
-       if (!attr->ops.get)
+       if (!attr->monitor_ops.get)
                return -EINVAL;
 
        attr_value = &resource->attrs_value[attr_index];
 
-       ret = attr->ops.get(resource->id, attr, attr_value->data);
+       ret = attr->monitor_ops.get(resource->id, attr, attr_value->data);
        if (ret < 0)
                return ret;
 
@@ -329,7 +329,7 @@ update_resource_attr(struct syscommon_resman_resource *resource,
 }
 
 int
-syscommon_resman_update_resource_attrs(int resource_id)
+syscommon_resman_monitor_update_resource_attrs(int resource_id)
 {
        int i, ret;
        struct syscommon_resman_resource *resource = find_resource(resource_id);
@@ -346,7 +346,7 @@ syscommon_resman_update_resource_attrs(int resource_id)
        for (i = 0; i < resource->num_attrs; i++) {
                if (!(resource->attrs[i].id & resource->attr_interest))
                        continue;
-               update_resource_attr(resource, resource->attrs[i].id);
+               monitor_update_resource_attr(resource, resource->attrs[i].id);
        }
 
        return 0;
@@ -391,7 +391,7 @@ syscommon_resman_get_resource_attr_value(int resource_id, u_int64_t attr_id)
        return get_resource_attr_value(resource, attr_id);
 }
 
-static int is_resource_attr_supported(struct syscommon_resman_resource *resource, u_int64_t attr_id, bool *supported)
+static int monitor_is_resource_attr_supported(struct syscommon_resman_resource *resource, u_int64_t attr_id, bool *supported)
 {
        const struct syscommon_resman_resource_attribute *attr = NULL;
        int attr_index = RESOURCE_ATTR_INDEX(attr_id);
@@ -407,9 +407,9 @@ static int is_resource_attr_supported(struct syscommon_resman_resource *resource
 
        if (attr->id & resource->attr_supported) {
                is_supported = true;
-       } else if (attr->ops.is_supported) {
-               is_supported = attr->ops.is_supported(resource->id, attr);
-       } else if (attr->ops.get) {
+       } else if (attr->monitor_ops.is_supported) {
+               is_supported = attr->monitor_ops.is_supported(resource->id, attr);
+       } else if (attr->monitor_ops.get) {
                /*
                 * Optionally, if .is_supported ops is not implemented,
                 * use .get ops in order to check whether the resource attribute
@@ -417,7 +417,7 @@ static int is_resource_attr_supported(struct syscommon_resman_resource *resource
                 */
                char data[SYSCOMMON_RESMAN_BUFF_MAX] = {0, };
 
-               ret = attr->ops.get(resource->id, attr, (void *)data);
+               ret = attr->monitor_ops.get(resource->id, attr, (void *)data);
                is_supported = (ret < 0) ? false :  true;
        }
 
@@ -430,11 +430,11 @@ static int is_resource_attr_supported(struct syscommon_resman_resource *resource
 }
 
 int
-syscommon_resman_is_resource_attr_supported(int resource_id, u_int64_t attr_id, bool *supported)
+syscommon_resman_monitor_is_resource_attr_supported(int resource_id, u_int64_t attr_id, bool *supported)
 {
        struct syscommon_resman_resource *resource = find_resource(resource_id);
 
-       return is_resource_attr_supported(resource, attr_id, supported);
+       return monitor_is_resource_attr_supported(resource, attr_id, supported);
 }
 
 static bool
@@ -579,7 +579,7 @@ static void _put_resource_attr_json(json_object *jobj_attr)
 }
 
 int
-syscommon_resman_get_resource_attrs_json(int resource_id, char **json_string)
+syscommon_resman_monitor_get_resource_attrs_json(int resource_id, char **json_string)
 {
        json_object *jobj_root, *jobj_res_name, *jobj_res_type, *jobj_res_attrs, *jobj_attr;
        const struct syscommon_resman_resource_attribute *attr;
@@ -629,7 +629,7 @@ syscommon_resman_get_resource_attrs_json(int resource_id, char **json_string)
 }
 
 int
-syscommon_resman_get_resource_attr_json(int resource_id, u_int64_t attr_id, char **json_string)
+syscommon_resman_monitor_get_resource_attr_json(int resource_id, u_int64_t attr_id, char **json_string)
 {
        const struct syscommon_resman_resource_attribute *attr;
        const struct syscommon_resman_resource_attribute_value *attr_value;
@@ -822,49 +822,49 @@ get_resource_attr_value_data(int resource_id, u_int64_t attr_id, enum syscommon_
 }
 
 int
-syscommon_resman_get_resource_attr_int(int resource_id, u_int64_t attr_id, int32_t *data)
+syscommon_resman_monitor_get_resource_attr_int(int resource_id, u_int64_t attr_id, int32_t *data)
 {
        return get_resource_attr_value_data(resource_id, attr_id, SYSCOMMON_RESMAN_DATA_TYPE_INT, data);
 }
 
 int
-syscommon_resman_get_resource_attr_int64(int resource_id, u_int64_t attr_id, int64_t *data)
+syscommon_resman_monitor_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_uint(int resource_id, u_int64_t attr_id, u_int32_t *data)
+syscommon_resman_monitor_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_uint64(int resource_id, u_int64_t attr_id, u_int64_t *data)
+syscommon_resman_monitor_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_double(int resource_id, u_int64_t attr_id, double *data)
+syscommon_resman_monitor_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_string(int resource_id, u_int64_t attr_id, char *data)
+syscommon_resman_monitor_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_array(int resource_id, u_int64_t attr_id, struct syscommon_resman_array_value **data)
+syscommon_resman_monitor_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_ptr(int resource_id, u_int64_t attr_id, void **data)
+syscommon_resman_monitor_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);
 }
@@ -900,9 +900,9 @@ syscommon_resman_set_resource_attr_interest(int resource_id, u_int64_t interest_
                if (!(resource->attrs[i].id & interest_mask))
                        continue;
 
-               ret = is_resource_attr_supported(resource,
-                                                                 resource->attrs[i].id,
-                                                                 &supported);
+               ret = monitor_is_resource_attr_supported(resource,
+                                                        resource->attrs[i].id,
+                                                        &supported);
                if (ret < 0) {
                        goto err;
                } else if (!supported) {

diff --git a/src/resource-manager/resource-manager.h b/src/resource-manager/resource-manager.h
index 4902c70..c4d95f4 100644 (file)
--- a/src/resource-manager/resource-manager.h
+++ b/src/resource-manager/resource-manager.h
@@ -42,10 +42,7 @@ struct syscommon_resman_resource_attribute_value {
        void *data;
 };
 
-struct syscommon_resman_resource_attribute_ops {
-       int (*set)(int resource_id,
-                  const struct syscommon_resman_resource_attribute *attr,
-                  const void *data, int count);
+struct syscommon_resman_resource_attribute_monitor_ops {
        int (*get)(int resource_id,
                   const struct syscommon_resman_resource_attribute *attr,
                   void *data);
@@ -69,7 +66,7 @@ struct syscommon_resman_resource_attribute {
        const u_int64_t id;
        const int type;
        const u_int64_t flag;
-       const struct syscommon_resman_resource_attribute_ops ops;
+       const struct syscommon_resman_resource_attribute_monitor_ops monitor_ops;
        const struct syscommon_resman_resource_attribute_listener_ops listener_ops;
 };
 
@@ -139,12 +136,12 @@ int syscommon_resman_set_resource_control(int resource_id, u_int64_t ctrl_id, co
 const char *syscommon_resman_get_resource_control_name(int resource_id, u_int64_t ctrl_id);
 
 /* Handle resource attribute */
-int syscommon_resman_update_resource_attrs(int resource_id);
+int syscommon_resman_monitor_update_resource_attrs(int resource_id);
 const struct syscommon_resman_resource_attribute *
 syscommon_resman_get_resource_attr(int resource_id, u_int64_t attr_id);
 struct syscommon_resman_resource_attribute_value *
 syscommon_resman_get_resource_attr_value(int resource_id, u_int64_t attr_id);
-int syscommon_resman_is_resource_attr_supported(int resource_id, u_int64_t attr_id, bool *supported);
+int syscommon_resman_monitor_is_resource_attr_supported(int resource_id, u_int64_t attr_id, bool *supported);
 
 static inline bool
 syscommon_resman_resource_attr_supported_always(int resource_id,
@@ -153,18 +150,18 @@ syscommon_resman_resource_attr_supported_always(int resource_id,
        return true;
 }
 
-int syscommon_resman_get_resource_attrs_json(int resource_id, char **json_string);
-int syscommon_resman_get_resource_attr_json(int resource_id, u_int64_t attr_id, char **json_string);
+int syscommon_resman_monitor_get_resource_attrs_json(int resource_id, char **json_string);
+int syscommon_resman_monitor_get_resource_attr_json(int resource_id, u_int64_t attr_id, char **json_string);
 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_int64(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_uint64(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_string(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_ptr(int resource_id, u_int64_t attr_id, void **data);
+int syscommon_resman_monitor_get_resource_attr_int(int resource_id, u_int64_t attr_id, int32_t *data);
+int syscommon_resman_monitor_get_resource_attr_int64(int resource_id, u_int64_t attr_id, int64_t *data);
+int syscommon_resman_monitor_get_resource_attr_uint(int resource_id, u_int64_t attr_id, u_int32_t *data);
+int syscommon_resman_monitor_get_resource_attr_uint64(int resource_id, u_int64_t attr_id, u_int64_t *data);
+int syscommon_resman_monitor_get_resource_attr_double(int resource_id, u_int64_t attr_id, double *data);
+int syscommon_resman_monitor_get_resource_attr_string(int resource_id, u_int64_t attr_id, char *data);
+int syscommon_resman_monitor_get_resource_attr_array(int resource_id, u_int64_t attr_id, struct syscommon_resman_array_value **data);
+int syscommon_resman_monitor_get_resource_attr_ptr(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);