diff options
author | Dongwoo Lee <dwoo08.lee@samsung.com> | 2023-02-17 16:37:46 +0900 |
---|---|---|
committer | Dongwoo Lee <dwoo08.lee@samsung.com> | 2023-02-20 12:21:44 +0900 |
commit | b3390c627975fcd7101eef5820bb0aa60cca824c (patch) | |
tree | 5b5995c6d9ca7b6678fb9829913517c21e8a1bb2 /src | |
parent | e24170f23a1ae2758717e3d4d1b7e05ec76e40fa (diff) | |
download | pass-b3390c627975fcd7101eef5820bb0aa60cca824c.tar.gz pass-b3390c627975fcd7101eef5820bb0aa60cca824c.tar.bz2 pass-b3390c627975fcd7101eef5820bb0aa60cca824c.zip |
pass: monitor: Apply libsyscommon resource-monitor changesaccepted/tizen/unified/20230306.172219
Change-Id: I5da0095f9840d613f8962bcf3be824848c09e60f
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/monitor/monitor-thread.c | 2 | ||||
-rw-r--r-- | src/monitor/request-handler.c | 24 | ||||
-rw-r--r-- | src/resource/resource-battery.c | 70 | ||||
-rw-r--r-- | src/resource/resource-bus.c | 70 | ||||
-rw-r--r-- | src/resource/resource-cpu.c | 70 | ||||
-rw-r--r-- | src/resource/resource-disk.c | 50 | ||||
-rw-r--r-- | src/resource/resource-display.c | 20 | ||||
-rw-r--r-- | src/resource/resource-gpu.c | 70 | ||||
-rw-r--r-- | src/resource/resource-memory.c | 90 | ||||
-rw-r--r-- | src/resource/resource-network.c | 10 | ||||
-rw-r--r-- | src/resource/resource-process-group.c | 110 | ||||
-rw-r--r-- | src/resource/resource-process.c | 130 | ||||
-rw-r--r-- | src/resource/resource-system.c | 90 |
13 files changed, 403 insertions, 403 deletions
diff --git a/src/monitor/monitor-thread.c b/src/monitor/monitor-thread.c index 55b4bfe..5c2dc8e 100644 --- a/src/monitor/monitor-thread.c +++ b/src/monitor/monitor-thread.c @@ -40,7 +40,7 @@ new_command: return THREAD_RETURN_CONTINUE; } - syscommon_resman_update_resource_attrs(cmd->resource_id); + syscommon_resman_monitor_update_resource_attrs(cmd->resource_id); cmd->done = true; smp_wmb(); diff --git a/src/monitor/request-handler.c b/src/monitor/request-handler.c index e31b2c6..e069103 100644 --- a/src/monitor/request-handler.c +++ b/src/monitor/request-handler.c @@ -171,7 +171,7 @@ static int handle_request_update_resource(struct request_client *client, char *a } res_inst->ts_start = get_time_now(); - ret = syscommon_resman_update_resource_attrs(resource_id); + ret = syscommon_resman_monitor_update_resource_attrs(resource_id); res_inst->ts_end = get_time_now(); if (ret < 0) { res_inst->ts_start = res_inst->ts_end = 0; @@ -234,7 +234,7 @@ static void update_resource(gpointer key, gpointer value, gpointer user_data) struct resource_instance *res_inst = value; int ret; - ret = syscommon_resman_update_resource_attrs(res_inst->id); + ret = syscommon_resman_monitor_update_resource_attrs(res_inst->id); if (ret < 0) _E("failed to update resource attributes (name:%s,id:%d)\n", syscommon_resman_get_resource_name(res_inst->id), res_inst->id); @@ -354,7 +354,7 @@ static int handle_request_is_resource_attr_supported(struct request_client *clie return -EINVAL; } - return syscommon_resman_is_resource_attr_supported(resource_id, attr_id, supported); + return syscommon_resman_monitor_is_resource_attr_supported(resource_id, attr_id, supported); } static int handle_request_set_resource_ctrl(struct request_client *client, char *args) @@ -426,9 +426,9 @@ handle_request_get_json(struct request_client *client, char *args, skip_res: switch (request_type) { case REQUEST_GET_RESOURCE_JSON: - return syscommon_resman_get_resource_attrs_json(resource_id, json_string); + return syscommon_resman_monitor_get_resource_attrs_json(resource_id, json_string); case REQUEST_GET_VALUE_JSON: - return syscommon_resman_get_resource_attr_json(resource_id, attr_id, json_string); + return syscommon_resman_monitor_get_resource_attr_json(resource_id, attr_id, json_string); case REQUEST_GET_RESOURCE_LIST_JSON: return syscommon_resman_get_resource_list_json(json_string); default: @@ -456,7 +456,7 @@ static int handle_request_get_value_int(struct request_client *client, char *arg return -EINVAL; } - ret = syscommon_resman_get_resource_attr_int(resource_id, attr_id, value); + ret = syscommon_resman_monitor_get_resource_attr_int(resource_id, attr_id, value); if (ret < 0) { _E("failed to get int value, client(%d) | res:name(%s)id(%d) | attr:name(%s)id(%"PRId64")\n", client->socket_fd, @@ -488,7 +488,7 @@ static int handle_request_get_value_int64(struct request_client *client, char *a return -EINVAL; } - ret = syscommon_resman_get_resource_attr_int64(resource_id, attr_id, value); + ret = syscommon_resman_monitor_get_resource_attr_int64(resource_id, attr_id, value); if (ret < 0) { _E("failed to get int64 value, client(%d) | res:name(%s)id(%d) | attr:name(%s)id(%"PRId64")\n", client->socket_fd, @@ -521,7 +521,7 @@ handle_request_get_value_uint(struct request_client *client, char *args, u_int32 return -EINVAL; } - ret = syscommon_resman_get_resource_attr_uint(resource_id, attr_id, value); + ret = syscommon_resman_monitor_get_resource_attr_uint(resource_id, attr_id, value); if (ret < 0) { _E("failed to get uint value, client(%d) | res:name(%s)id(%d) | attr:name(%s)id(%"PRId64")\n", client->socket_fd, @@ -554,7 +554,7 @@ handle_request_get_value_uint64(struct request_client *client, char *args, u_int return -EINVAL; } - ret = syscommon_resman_get_resource_attr_uint64(resource_id, attr_id, value); + ret = syscommon_resman_monitor_get_resource_attr_uint64(resource_id, attr_id, value); if (ret < 0) { _E("failed to get uint64 value, client(%d) | res:name(%s)id(%d) | attr:name(%s)id(%"PRId64")\n", client->socket_fd, @@ -586,7 +586,7 @@ static int handle_request_get_value_double(struct request_client *client, char * return -EINVAL; } - ret = syscommon_resman_get_resource_attr_double(resource_id, attr_id, value); + ret = syscommon_resman_monitor_get_resource_attr_double(resource_id, attr_id, value); if (ret < 0) { _E("failed to get double value, client(%d) | res:name(%s)id(%d) | attr:name(%s)id(%"PRId64")\n", client->socket_fd, @@ -618,7 +618,7 @@ static int handle_request_get_value_string(struct request_client *client, char * return -EINVAL; } - ret = syscommon_resman_get_resource_attr_string(resource_id, attr_id, value); + ret = syscommon_resman_monitor_get_resource_attr_string(resource_id, attr_id, value); if (ret < 0) { _E("failed to get string value, client(%d) | res:name(%s)id(%d) | attr:name(%s)id(%"PRId64")\n", client->socket_fd, @@ -651,7 +651,7 @@ handle_request_get_value_array(struct request_client *client, char *args, struct return -EINVAL; } - ret = syscommon_resman_get_resource_attr_array(resource_id, attr_id, arr); + ret = syscommon_resman_monitor_get_resource_attr_array(resource_id, attr_id, arr); if (ret < 0) { _E("failed to get array value, client(%d) | (res:name(%s)id(%d) | attr:name(%s)id(%"PRId64")\n", client->socket_fd, diff --git a/src/resource/resource-battery.c b/src/resource/resource-battery.c index 92752dd..442ac52 100644 --- a/src/resource/resource-battery.c +++ b/src/resource/resource-battery.c @@ -91,59 +91,59 @@ static int battery_get_status(int resource_id, static const struct syscommon_resman_resource_attribute battery_attrs[] = { { - .name = "BATTERY_ATTR_CAPACITY", - .id = BATTERY_ATTR_CAPACITY, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BATTERY_ATTR_CAPACITY", + .id = BATTERY_ATTR_CAPACITY, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = battery_get_info, } }, { - .name = "BATTERY_ATTR_STATUS", - .id = BATTERY_ATTR_STATUS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BATTERY_ATTR_STATUS", + .id = BATTERY_ATTR_STATUS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = battery_get_status, } }, { - .name = "BATTERY_ATTR_TEMPERATURE", - .id = BATTERY_ATTR_TEMPERATURE, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BATTERY_ATTR_TEMPERATURE", + .id = BATTERY_ATTR_TEMPERATURE, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = battery_get_info, } }, { - .name = "BATTERY_ATTR_VOLTAGE_NOW", - .id = BATTERY_ATTR_VOLTAGE_NOW, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BATTERY_ATTR_VOLTAGE_NOW", + .id = BATTERY_ATTR_VOLTAGE_NOW, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = battery_get_info, } }, { - .name = "BATTERY_ATTR_CURRENT_NOW", - .id = BATTERY_ATTR_CURRENT_NOW, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BATTERY_ATTR_CURRENT_NOW", + .id = BATTERY_ATTR_CURRENT_NOW, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = battery_get_info, } }, { - .name = "BATTERY_ATTR_PRESENT", - .id = BATTERY_ATTR_PRESENT, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BATTERY_ATTR_PRESENT", + .id = BATTERY_ATTR_PRESENT, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = battery_get_info, } }, { - .name = "BATTERY_ATTR_ONLINE", - .id = BATTERY_ATTR_ONLINE, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BATTERY_ATTR_ONLINE", + .id = BATTERY_ATTR_ONLINE, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = battery_get_info, } }, diff --git a/src/resource/resource-bus.c b/src/resource/resource-bus.c index 8d3c63a..b38ffd7 100644 --- a/src/resource/resource-bus.c +++ b/src/resource/resource-bus.c @@ -130,59 +130,59 @@ static int bus_get_string_value(int resource_id, static const struct syscommon_resman_resource_attribute bus_attrs[] = { { - .name = "BUS_ATTR_CUR_FREQ", - .id = BUS_ATTR_CUR_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BUS_ATTR_CUR_FREQ", + .id = BUS_ATTR_CUR_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = bus_get_value_from_hal_power, }, }, { - .name = "BUS_ATTR_MIN_FREQ", - .id = BUS_ATTR_MIN_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BUS_ATTR_MIN_FREQ", + .id = BUS_ATTR_MIN_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = bus_get_value_from_hal_power, }, }, { - .name = "BUS_ATTR_MAX_FREQ", - .id = BUS_ATTR_MAX_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BUS_ATTR_MAX_FREQ", + .id = BUS_ATTR_MAX_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = bus_get_value_from_hal_power, } }, { - .name = "BUS_ATTR_AVAILABLE_MIN_FREQ", - .id = BUS_ATTR_AVAILABLE_MIN_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BUS_ATTR_AVAILABLE_MIN_FREQ", + .id = BUS_ATTR_AVAILABLE_MIN_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = bus_get_value_from_hal_power, } }, { - .name = "BUS_ATTR_AVAILABLE_MAX_FREQ", - .id = BUS_ATTR_AVAILABLE_MAX_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BUS_ATTR_AVAILABLE_MAX_FREQ", + .id = BUS_ATTR_AVAILABLE_MAX_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = bus_get_value_from_hal_power, } }, { - .name = "BUS_ATTR_CUR_GOVERNOR", - .id = BUS_ATTR_CUR_GOVERNOR, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BUS_ATTR_CUR_GOVERNOR", + .id = BUS_ATTR_CUR_GOVERNOR, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = bus_get_string_value, } }, { - .name = "BUS_ATTR_NAME", - .id = BUS_ATTR_NAME, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "BUS_ATTR_NAME", + .id = BUS_ATTR_NAME, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = bus_get_string_value, } }, diff --git a/src/resource/resource-cpu.c b/src/resource/resource-cpu.c index 1911f9b..40ea562 100644 --- a/src/resource/resource-cpu.c +++ b/src/resource/resource-cpu.c @@ -130,59 +130,59 @@ static int cpu_get_string_value(int resource_id, static const struct syscommon_resman_resource_attribute cpu_attrs[] = { { - .name = "CPU_ATTR_CUR_FREQ", - .id = CPU_ATTR_CUR_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "CPU_ATTR_CUR_FREQ", + .id = CPU_ATTR_CUR_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = cpu_get_value_from_hal_power, }, }, { - .name = "CPU_ATTR_MIN_FREQ", - .id = CPU_ATTR_MIN_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "CPU_ATTR_MIN_FREQ", + .id = CPU_ATTR_MIN_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = cpu_get_value_from_hal_power, }, }, { - .name = "CPU_ATTR_MAX_FREQ", - .id = CPU_ATTR_MAX_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "CPU_ATTR_MAX_FREQ", + .id = CPU_ATTR_MAX_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = cpu_get_value_from_hal_power, } }, { - .name = "CPU_ATTR_AVAILABLE_MIN_FREQ", - .id = CPU_ATTR_AVAILABLE_MIN_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "CPU_ATTR_AVAILABLE_MIN_FREQ", + .id = CPU_ATTR_AVAILABLE_MIN_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = cpu_get_value_from_hal_power, } }, { - .name = "CPU_ATTR_AVAILABLE_MAX_FREQ", - .id = CPU_ATTR_AVAILABLE_MAX_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "CPU_ATTR_AVAILABLE_MAX_FREQ", + .id = CPU_ATTR_AVAILABLE_MAX_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = cpu_get_value_from_hal_power, } }, { - .name = "CPU_ATTR_CUR_GOVERNOR", - .id = CPU_ATTR_CUR_GOVERNOR, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "CPU_ATTR_CUR_GOVERNOR", + .id = CPU_ATTR_CUR_GOVERNOR, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = cpu_get_string_value, } }, { - .name = "CPU_ATTR_NAME", - .id = CPU_ATTR_NAME, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "CPU_ATTR_NAME", + .id = CPU_ATTR_NAME, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = cpu_get_string_value, } }, diff --git a/src/resource/resource-disk.c b/src/resource/resource-disk.c index f9e7ed8..c775990 100644 --- a/src/resource/resource-disk.c +++ b/src/resource/resource-disk.c @@ -122,43 +122,43 @@ static int disk_get_value(int resource_id, static const struct syscommon_resman_resource_attribute disk_attrs[] = { { - .name = "DISK_ATTR_NAME", - .id = DISK_ATTR_NAME, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "DISK_ATTR_NAME", + .id = DISK_ATTR_NAME, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = disk_get_value, }, }, { - .name = "DISK_ATTR_READ_PER_SEC", - .id = DISK_ATTR_READ_PER_SEC, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "DISK_ATTR_READ_PER_SEC", + .id = DISK_ATTR_READ_PER_SEC, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = disk_get_value, }, }, { - .name = "DISK_ATTR_WRITE_PER_SEC", - .id = DISK_ATTR_WRITE_PER_SEC, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "DISK_ATTR_WRITE_PER_SEC", + .id = DISK_ATTR_WRITE_PER_SEC, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = disk_get_value, }, }, { - .name = "DISK_ATTR_READ_TOTAL", - .id = DISK_ATTR_READ_TOTAL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "DISK_ATTR_READ_TOTAL", + .id = DISK_ATTR_READ_TOTAL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = disk_get_value, }, }, { - .name = "DISK_ATTR_WRITE_TOTAL", - .id = DISK_ATTR_WRITE_TOTAL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "DISK_ATTR_WRITE_TOTAL", + .id = DISK_ATTR_WRITE_TOTAL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = disk_get_value, }, }, diff --git a/src/resource/resource-display.c b/src/resource/resource-display.c index de49778..d34f05d 100644 --- a/src/resource/resource-display.c +++ b/src/resource/resource-display.c @@ -185,19 +185,19 @@ static int display_get_name(int resource_id, static const struct syscommon_resman_resource_attribute display_attrs[] = { { - .name = "DISPLAY_ATTR_FPS", - .id = DISPLAY_ATTR_FPS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "DISPLAY_ATTR_FPS", + .id = DISPLAY_ATTR_FPS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = display_get_fps, }, }, { - .name = "DISPLAY_ATTR_NAME", - .id = DISPLAY_ATTR_NAME, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "DISPLAY_ATTR_NAME", + .id = DISPLAY_ATTR_NAME, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = display_get_name, }, }, diff --git a/src/resource/resource-gpu.c b/src/resource/resource-gpu.c index 1e3e51a..1b6e69e 100644 --- a/src/resource/resource-gpu.c +++ b/src/resource/resource-gpu.c @@ -131,59 +131,59 @@ static int gpu_get_string_value(int resource_id, static const struct syscommon_resman_resource_attribute gpu_attrs[] = { { - .name = "GPU_ATTR_CUR_FREQ", - .id = GPU_ATTR_CUR_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "GPU_ATTR_CUR_FREQ", + .id = GPU_ATTR_CUR_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = gpu_get_value_from_hal_power, }, }, { - .name = "GPU_ATTR_MIN_FREQ", - .id = GPU_ATTR_MIN_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "GPU_ATTR_MIN_FREQ", + .id = GPU_ATTR_MIN_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = gpu_get_value_from_hal_power, }, }, { - .name = "GPU_ATTR_MAX_FREQ", - .id = GPU_ATTR_MAX_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "GPU_ATTR_MAX_FREQ", + .id = GPU_ATTR_MAX_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = gpu_get_value_from_hal_power, } }, { - .name = "GPU_ATTR_AVAILABLE_MIN_FREQ", - .id = GPU_ATTR_AVAILABLE_MIN_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "GPU_ATTR_AVAILABLE_MIN_FREQ", + .id = GPU_ATTR_AVAILABLE_MIN_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = gpu_get_value_from_hal_power, } }, { - .name = "GPU_ATTR_AVAILABLE_MAX_FREQ", - .id = GPU_ATTR_AVAILABLE_MAX_FREQ, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "GPU_ATTR_AVAILABLE_MAX_FREQ", + .id = GPU_ATTR_AVAILABLE_MAX_FREQ, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = gpu_get_value_from_hal_power, } }, { - .name = "GPU_ATTR_CUR_GOVERNOR", - .id = GPU_ATTR_CUR_GOVERNOR, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "GPU_ATTR_CUR_GOVERNOR", + .id = GPU_ATTR_CUR_GOVERNOR, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = gpu_get_string_value, } }, { - .name = "GPU_ATTR_NAME", - .id = GPU_ATTR_NAME, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "GPU_ATTR_NAME", + .id = GPU_ATTR_NAME, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = gpu_get_string_value, } }, diff --git a/src/resource/resource-memory.c b/src/resource/resource-memory.c index bcec23b..0997e46 100644 --- a/src/resource/resource-memory.c +++ b/src/resource/resource-memory.c @@ -126,75 +126,75 @@ static int memory_get_memory_info(int resource_id, static const struct syscommon_resman_resource_attribute memory_attrs[] = { { - .name = "MEMORY_ATTR_TOTAL", - .id = MEMORY_ATTR_TOTAL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_TOTAL", + .id = MEMORY_ATTR_TOTAL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, }, }, { - .name = "MEMORY_ATTR_AVAILABLE", - .id = MEMORY_ATTR_AVAILABLE, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_AVAILABLE", + .id = MEMORY_ATTR_AVAILABLE, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, }, }, { - .name = "MEMORY_ATTR_FREE", - .id = MEMORY_ATTR_FREE, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_FREE", + .id = MEMORY_ATTR_FREE, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, } }, { - .name = "MEMORY_ATTR_BUFFER", - .id = MEMORY_ATTR_BUFFER, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_BUFFER", + .id = MEMORY_ATTR_BUFFER, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, } }, { - .name = "MEMORY_ATTR_CACHED", - .id = MEMORY_ATTR_CACHED, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_CACHED", + .id = MEMORY_ATTR_CACHED, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, } }, { - .name = "MEMORY_ATTR_CMA_TOTAL", - .id = MEMORY_ATTR_CMA_TOTAL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_CMA_TOTAL", + .id = MEMORY_ATTR_CMA_TOTAL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, } }, { - .name = "MEMORY_ATTR_CMA_FREE", - .id = MEMORY_ATTR_CMA_FREE, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_CMA_FREE", + .id = MEMORY_ATTR_CMA_FREE, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, } }, { - .name = "MEMORY_ATTR_SWAP_TOTAL", - .id = MEMORY_ATTR_SWAP_TOTAL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_SWAP_TOTAL", + .id = MEMORY_ATTR_SWAP_TOTAL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, } }, { - .name = "MEMORY_ATTR_SWAP_FREE", - .id = MEMORY_ATTR_SWAP_FREE, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "MEMORY_ATTR_SWAP_FREE", + .id = MEMORY_ATTR_SWAP_FREE, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = memory_get_memory_info, } }, diff --git a/src/resource/resource-network.c b/src/resource/resource-network.c index a467548..94c500e 100644 --- a/src/resource/resource-network.c +++ b/src/resource/resource-network.c @@ -68,11 +68,11 @@ static int network_get_name(int resource_id, static const struct syscommon_resman_resource_attribute network_attrs[] = { { - .name = "NETWORK_ATTR_NAME", - .id = NETWORK_ATTR_NAME, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "NETWORK_ATTR_NAME", + .id = NETWORK_ATTR_NAME, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = network_get_name, }, }, diff --git a/src/resource/resource-process-group.c b/src/resource/resource-process-group.c index 9ba0b06..7ad5cbd 100644 --- a/src/resource/resource-process-group.c +++ b/src/resource/resource-process-group.c @@ -256,101 +256,101 @@ static bool process_group_check_gpu_support(int resource_id, static const struct syscommon_resman_resource_attribute process_group_attrs[] = { { - .name = "PROCESS_GROUP_ATTR_PID_LIST", - .id = PROCESS_GROUP_ATTR_PID_LIST, - .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_PID_LIST", + .id = PROCESS_GROUP_ATTR_PID_LIST, + .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_pid_list, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_NAME_LIST", - .id = PROCESS_GROUP_ATTR_NAME_LIST, - .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_NAME_LIST", + .id = PROCESS_GROUP_ATTR_NAME_LIST, + .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_name_list, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_CPU_UTIL", - .id = PROCESS_GROUP_ATTR_CPU_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_CPU_UTIL", + .id = PROCESS_GROUP_ATTR_CPU_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_cpu_util, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_DISK_READ_PER_SEC", - .id = PROCESS_GROUP_ATTR_DISK_READ_PER_SEC, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_DISK_READ_PER_SEC", + .id = PROCESS_GROUP_ATTR_DISK_READ_PER_SEC, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_disk_attrs, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_DISK_WRITE_PER_SEC", - .id = PROCESS_GROUP_ATTR_DISK_WRITE_PER_SEC, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_DISK_WRITE_PER_SEC", + .id = PROCESS_GROUP_ATTR_DISK_WRITE_PER_SEC, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_disk_attrs, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_MEM_VIRT", - .id = PROCESS_GROUP_ATTR_MEM_VIRT, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_MEM_VIRT", + .id = PROCESS_GROUP_ATTR_MEM_VIRT, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_mem, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_MEM_RSS", - .id = PROCESS_GROUP_ATTR_MEM_RSS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_MEM_RSS", + .id = PROCESS_GROUP_ATTR_MEM_RSS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_mem, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_MEM_PSS", - .id = PROCESS_GROUP_ATTR_MEM_PSS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_MEM_PSS", + .id = PROCESS_GROUP_ATTR_MEM_PSS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_mem, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_MEM_SWAP", - .id = PROCESS_GROUP_ATTR_MEM_SWAP, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_MEM_SWAP", + .id = PROCESS_GROUP_ATTR_MEM_SWAP, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_mem, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_MEM_SWAP_PSS", - .id = PROCESS_GROUP_ATTR_MEM_SWAP_PSS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_MEM_SWAP_PSS", + .id = PROCESS_GROUP_ATTR_MEM_SWAP_PSS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_mem, .is_supported = process_group_check_taskstat_support, }, }, { - .name = "PROCESS_GROUP_ATTR_MEM_GPU", - .id = PROCESS_GROUP_ATTR_MEM_GPU, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_GROUP_ATTR_MEM_GPU", + .id = PROCESS_GROUP_ATTR_MEM_GPU, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_group_get_mem, .is_supported = process_group_check_gpu_support, }, diff --git a/src/resource/resource-process.c b/src/resource/resource-process.c index 511c5c3..4a4bdd5 100644 --- a/src/resource/resource-process.c +++ b/src/resource/resource-process.c @@ -265,119 +265,119 @@ static bool process_check_gpu_support(int resource_idource, static const struct syscommon_resman_resource_attribute process_attrs[] = { { - .name = "PROCESS_ATTR_CPU_UTIL", - .id = PROCESS_ATTR_CPU_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_CPU_UTIL", + .id = PROCESS_ATTR_CPU_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_cpu_util, .is_supported = process_check_taskstat_support, }, }, { - .name = "PROCESS_ATTR_MEM_VIRT", - .id = PROCESS_ATTR_MEM_VIRT, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_MEM_VIRT", + .id = PROCESS_ATTR_MEM_VIRT, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_mem_attrs, .is_supported = process_check_taskstat_support, }, }, { - .name = "PROCESS_ATTR_MEM_RSS", - .id = PROCESS_ATTR_MEM_RSS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_MEM_RSS", + .id = PROCESS_ATTR_MEM_RSS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_mem_attrs, .is_supported = process_check_taskstat_support, }, }, { - .name = "PROCESS_ATTR_MEM_RSS_PERCENT", - .id = PROCESS_ATTR_MEM_RSS_PERCENT, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_MEM_RSS_PERCENT", + .id = PROCESS_ATTR_MEM_RSS_PERCENT, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_mem_attrs, .is_supported = process_check_taskstat_support, }, }, { - .name = "PROCESS_ATTR_DISK_READ_PER_SEC", - .id = PROCESS_ATTR_DISK_READ_PER_SEC, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_DISK_READ_PER_SEC", + .id = PROCESS_ATTR_DISK_READ_PER_SEC, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_disk_attrs, .is_supported = process_check_taskstat_support, }, }, { - .name = "PROCESS_ATTR_DISK_WRITE_PER_SEC", - .id = PROCESS_ATTR_DISK_WRITE_PER_SEC, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_DISK_WRITE_PER_SEC", + .id = PROCESS_ATTR_DISK_WRITE_PER_SEC, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_disk_attrs, .is_supported = process_check_taskstat_support, }, }, { - .name = "PROCESS_ATTR_NAME", - .id = PROCESS_ATTR_NAME, - .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_NAME", + .id = PROCESS_ATTR_NAME, + .type = SYSCOMMON_RESMAN_DATA_TYPE_STRING, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_context_data, .is_supported = syscommon_resman_resource_attr_supported_always, }, }, { - .name = "PROCESS_ATTR_PGID", - .id = PROCESS_ATTR_PGID, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_PGID", + .id = PROCESS_ATTR_PGID, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_context_data, .is_supported = syscommon_resman_resource_attr_supported_always, }, }, { - .name = "PROCESS_ATTR_PPID", - .id = PROCESS_ATTR_PPID, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_PPID", + .id = PROCESS_ATTR_PPID, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_context_data, .is_supported = syscommon_resman_resource_attr_supported_always, }, }, { - .name = "PROCESS_ATTR_MEM_PSS", - .id = PROCESS_ATTR_MEM_PSS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_MEM_PSS", + .id = PROCESS_ATTR_MEM_PSS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_mem_attrs, .is_supported = syscommon_resman_resource_attr_supported_always, }, }, { - .name = "PROCESS_ATTR_MEM_SWAP", - .id = PROCESS_ATTR_MEM_SWAP, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_MEM_SWAP", + .id = PROCESS_ATTR_MEM_SWAP, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_mem_attrs, .is_supported = syscommon_resman_resource_attr_supported_always, }, }, { - .name = "PROCESS_ATTR_MEM_SWAP_PSS", - .id = PROCESS_ATTR_MEM_SWAP_PSS, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_MEM_SWAP_PSS", + .id = PROCESS_ATTR_MEM_SWAP_PSS, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_mem_attrs, .is_supported = syscommon_resman_resource_attr_supported_always, }, }, { - .name = "PROCESS_ATTR_MEM_GPU", - .id = PROCESS_ATTR_MEM_GPU, - .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, - .ops = { + .name = "PROCESS_ATTR_MEM_GPU", + .id = PROCESS_ATTR_MEM_GPU, + .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE, + .monitor_ops = { .get = process_get_mem_attrs, .is_supported = process_check_gpu_support, }, diff --git a/src/resource/resource-system.c b/src/resource/resource-system.c index dcef99a..24bdccf 100644 --- a/src/resource/resource-system.c +++ b/src/resource/resource-system.c @@ -393,75 +393,75 @@ static void system_exit_psi_listener(int resource_id, static const struct syscommon_resman_resource_attribute system_attrs[] = { { - .name = "SYSTEM_ATTR_CPU_UTIL", - .id = SYSTEM_ATTR_CPU_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_CPU_UTIL", + .id = SYSTEM_ATTR_CPU_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_avg_cpu_util, } }, { - .name = "SYSTEM_ATTR_CPU_USER_UTIL", - .id = SYSTEM_ATTR_CPU_USER_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_CPU_USER_UTIL", + .id = SYSTEM_ATTR_CPU_USER_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_avg_cpu_util, } }, { - .name = "SYSTEM_ATTR_CPU_SYS_UTIL", - .id = SYSTEM_ATTR_CPU_SYS_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_CPU_SYS_UTIL", + .id = SYSTEM_ATTR_CPU_SYS_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_avg_cpu_util, } }, { - .name = "SYSTEM_ATTR_PER_CPU_UTIL", - .id = SYSTEM_ATTR_PER_CPU_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_PER_CPU_UTIL", + .id = SYSTEM_ATTR_PER_CPU_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_per_cpu_util, } }, { - .name = "SYSTEM_ATTR_PER_CPU_USER_UTIL", - .id = SYSTEM_ATTR_PER_CPU_USER_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_PER_CPU_USER_UTIL", + .id = SYSTEM_ATTR_PER_CPU_USER_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_per_cpu_util, } }, { - .name = "SYSTEM_ATTR_PER_CPU_SYS_UTIL", - .id = SYSTEM_ATTR_PER_CPU_SYS_UTIL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_PER_CPU_SYS_UTIL", + .id = SYSTEM_ATTR_PER_CPU_SYS_UTIL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_ARRAY, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_per_cpu_util, } }, { - .name = "SYSTEM_ATTR_POSSIBLE_CPU", - .id = SYSTEM_ATTR_POSSIBLE_CPU, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_POSSIBLE_CPU", + .id = SYSTEM_ATTR_POSSIBLE_CPU, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_cpu_num, } }, { - .name = "SYSTEM_ATTR_ONLINE_CPU", - .id = SYSTEM_ATTR_ONLINE_CPU, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_ONLINE_CPU", + .id = SYSTEM_ATTR_ONLINE_CPU, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_cpu_num, } }, { - .name = "SYSTEM_ATTR_MEMORY_PRESSURE_LEVEL", - .id = SYSTEM_ATTR_MEMORY_PRESSURE_LEVEL, - .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, - .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, - .ops = { + .name = "SYSTEM_ATTR_MEMORY_PRESSURE_LEVEL", + .id = SYSTEM_ATTR_MEMORY_PRESSURE_LEVEL, + .type = SYSCOMMON_RESMAN_DATA_TYPE_INT, + .flag = SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC, + .monitor_ops = { .get = system_get_memory_pressure_level, .is_supported = system_memory_pressure_level_is_supported, }, |