From: Sung-hun Kim Date: Tue, 27 Sep 2022 08:54:52 +0000 (+0900) Subject: resource-monitor: Assign enum values copied from libpass header file X-Git-Tag: accepted/tizen/unified/20220928.144417^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_7.0_hotfix;p=platform%2Fcore%2Fapi%2Fresource-monitor.git resource-monitor: Assign enum values copied from libpass header file In order to hide pass/resource-monitor.h from public API, values defined in pass/resource-monitor.h are copied into the capi header file and '#include ' statement is moved to the .c file from the .h file. And replace from tab to space for function description. Change-Id: Ife7566e8d8c25418d5109c53a689065853d0d80c Signed-off-by: Sung-hun Kim Signed-off-by: Chanwoo Choi --- diff --git a/include/resource-monitor.h b/include/resource-monitor.h index fa160b9..c861192 100644 --- a/include/resource-monitor.h +++ b/include/resource-monitor.h @@ -20,7 +20,6 @@ #include #include -#include #ifdef __cplusplus extern "C" { @@ -55,15 +54,15 @@ typedef enum { * @since_tizen 7.0 */ typedef enum { - RESOURCE_MONITOR_TYPE_UNKNOWN = RESOURCE_TYPE_UNKNOWN, /**< Unknown Resource Type */ - RESOURCE_MONITOR_TYPE_CPU = RESOURCE_TYPE_CPU, /**< CPU Resource Type */ - RESOURCE_MONITOR_TYPE_BUS = RESOURCE_TYPE_BUS, /**< BUS Resource Type */ - RESOURCE_MONITOR_TYPE_GPU = RESOURCE_TYPE_GPU, /**< GPU Resource Type */ - RESOURCE_MONITOR_TYPE_MEMORY = RESOURCE_TYPE_MEMORY, /**< Memory Resource Type */ - RESOURCE_MONITOR_TYPE_BATTERY = RESOURCE_TYPE_BATTERY, /**< Battery Resource Type */ - RESOURCE_MONITOR_TYPE_DISPLAY = RESOURCE_TYPE_DISPLAY, /**< Display Resource Type */ - RESOURCE_MONITOR_TYPE_SYSTEM = RESOURCE_TYPE_SYSTEM, /**< System Resource Type */ - RESOURCE_MONITOR_TYPE_DISK = RESOURCE_TYPE_DISK, /**< Disk Resource Type */ + RESOURCE_MONITOR_TYPE_UNKNOWN = 0, /**< Unknown Resource Type */ + RESOURCE_MONITOR_TYPE_CPU = 1, /**< CPU Resource Type */ + RESOURCE_MONITOR_TYPE_BUS = 2, /**< BUS Resource Type */ + RESOURCE_MONITOR_TYPE_GPU = 3, /**< GPU Resource Type */ + RESOURCE_MONITOR_TYPE_MEMORY = 4, /**< Memory Resource Type */ + RESOURCE_MONITOR_TYPE_BATTERY = 5, /**< Battery Resource Type */ + RESOURCE_MONITOR_TYPE_DISPLAY = 7, /**< Display Resource Type */ + RESOURCE_MONITOR_TYPE_SYSTEM = 8, /**< System Resource Type */ + RESOURCE_MONITOR_TYPE_DISK = 10, /**< Disk Resource Type */ } resource_monitor_type_e; /** @@ -72,72 +71,72 @@ typedef enum { */ typedef enum { /* CPU Resource Attribute ID */ - RESOURCE_MONITOR_CPU_ATTR_CUR_FREQ = CPU_ATTR_CUR_FREQ, /**< Current CPU frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_CPU_ATTR_MIN_FREQ = CPU_ATTR_MIN_FREQ, /**< Current CPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_CPU_ATTR_MAX_FREQ = CPU_ATTR_MAX_FREQ, /**< Current CPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_CPU_ATTR_AVAILABLE_MIN_FREQ = CPU_ATTR_AVAILABLE_MIN_FREQ, /**< Available CPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_CPU_ATTR_AVAILABLE_MAX_FREQ = CPU_ATTR_AVAILABLE_MAX_FREQ, /**< Available CPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_CPU_ATTR_CUR_GOVERNOR = CPU_ATTR_CUR_GOVERNOR, /**< Current CPU frequency governor name (data type: DATA_TYPE_STRING) */ - RESOURCE_MONITOR_CPU_ATTR_NAME = CPU_ATTR_NAME, /**< CPU cluster name (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_CPU_ATTR_CUR_FREQ = (1ULL << 0), /**< Current CPU frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_CPU_ATTR_MIN_FREQ = (1ULL << 1), /**< Current CPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_CPU_ATTR_MAX_FREQ = (1ULL << 2), /**< Current CPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_CPU_ATTR_AVAILABLE_MIN_FREQ = (1ULL << 3), /**< Available CPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_CPU_ATTR_AVAILABLE_MAX_FREQ = (1ULL << 4), /**< Available CPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_CPU_ATTR_CUR_GOVERNOR = (1ULL << 5), /**< Current CPU frequency governor name (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_CPU_ATTR_NAME = (1ULL << 6), /**< CPU cluster name (data type: DATA_TYPE_STRING) */ /* Bus Resource Attribute ID */ - RESOURCE_MONITOR_BUS_ATTR_CUR_FREQ = BUS_ATTR_CUR_FREQ, /**< Current bus frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_BUS_ATTR_MIN_FREQ = BUS_ATTR_MIN_FREQ, /**< Current bus minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_BUS_ATTR_MAX_FREQ = BUS_ATTR_MAX_FREQ, /**< Current bus maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_BUS_ATTR_AVAILABLE_MIN_FREQ = BUS_ATTR_AVAILABLE_MIN_FREQ, /**< Available bus minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_BUS_ATTR_AVAILABLE_MAX_FREQ = BUS_ATTR_AVAILABLE_MAX_FREQ, /**< Available bus maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_BUS_ATTR_CUR_GOVERNOR = BUS_ATTR_CUR_GOVERNOR, /**< Current bus frequency governor name (data type: DATA_TYPE_STRING) */ - RESOURCE_MONITOR_BUS_ATTR_NAME = BUS_ATTR_NAME, /**< Bus device name (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_BUS_ATTR_CUR_FREQ = (1ULL << 0), /**< Current bus frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_BUS_ATTR_MIN_FREQ = (1ULL << 1), /**< Current bus minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_BUS_ATTR_MAX_FREQ = (1ULL << 2), /**< Current bus maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_BUS_ATTR_AVAILABLE_MIN_FREQ = (1ULL << 3), /**< Available bus minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_BUS_ATTR_AVAILABLE_MAX_FREQ = (1ULL << 4), /**< Available bus maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_BUS_ATTR_CUR_GOVERNOR = (1ULL << 5), /**< Current bus frequency governor name (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_BUS_ATTR_NAME = (1ULL << 6), /**< Bus device name (data type: DATA_TYPE_STRING) */ /* GPU Resource Attribute ID */ - RESOURCE_MONITOR_GPU_ATTR_CUR_FREQ = GPU_ATTR_CUR_FREQ, /**< Current GPU frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_GPU_ATTR_MIN_FREQ = GPU_ATTR_MIN_FREQ, /**< Current GPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_GPU_ATTR_MAX_FREQ = GPU_ATTR_MAX_FREQ, /**< Current GPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_GPU_ATTR_AVAILABLE_MIN_FREQ = GPU_ATTR_AVAILABLE_MIN_FREQ, /**< Available GPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_GPU_ATTR_AVAILABLE_MAX_FREQ = GPU_ATTR_AVAILABLE_MAX_FREQ, /**< Available GPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ - RESOURCE_MONITOR_GPU_ATTR_CUR_GOVERNOR = GPU_ATTR_CUR_GOVERNOR, /**< Current GPU frequency governor name (data type: DATA_TYPE_STRING) */ - RESOURCE_MONITOR_GPU_ATTR_NAME = GPU_ATTR_NAME, /**< GPU device name (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_GPU_ATTR_CUR_FREQ = (1ULL << 0), /**< Current GPU frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_GPU_ATTR_MIN_FREQ = (1ULL << 1), /**< Current GPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_GPU_ATTR_MAX_FREQ = (1ULL << 2), /**< Current GPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_GPU_ATTR_AVAILABLE_MIN_FREQ = (1ULL << 3), /**< Available GPU minimum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_GPU_ATTR_AVAILABLE_MAX_FREQ = (1ULL << 4), /**< Available GPU maximum frequency (data type: DATA_TYPE_INT, unit: kHz) */ + RESOURCE_MONITOR_GPU_ATTR_CUR_GOVERNOR = (1ULL << 5), /**< Current GPU frequency governor name (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_GPU_ATTR_NAME = (1ULL << 6), /**< GPU device name (data type: DATA_TYPE_STRING) */ /* Memory Resource Attribute ID */ - RESOURCE_MONITOR_MEMORY_ATTR_TOTAL = MEMORY_ATTR_TOTAL, /**< Memory total size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_AVAILABLE = MEMORY_ATTR_AVAILABLE, /**< Memory available size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_FREE = MEMORY_ATTR_FREE, /**< Memory free size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_BUFFER = MEMORY_ATTR_BUFFER, /**< Memory buffer size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_CACHED = MEMORY_ATTR_CACHED, /**< Memory cached size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_CMA_TOTAL = MEMORY_ATTR_CMA_TOTAL, /**< CMA memory total size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_CMA_FREE = MEMORY_ATTR_CMA_FREE, /**< CMA memory free size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_SWAP_TOTAL = MEMORY_ATTR_SWAP_TOTAL, /**< Swap memory total size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_MEMORY_ATTR_SWAP_FREE = MEMORY_ATTR_SWAP_FREE, /**< Swap memory free size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_TOTAL = (1ULL << 0), /**< Memory total size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_AVAILABLE = (1ULL << 1), /**< Memory available size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_FREE = (1ULL << 2), /**< Memory free size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_BUFFER = (1ULL << 3), /**< Memory buffer size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_CACHED = (1ULL << 4), /**< Memory cached size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_CMA_TOTAL = (1ULL << 5), /**< CMA memory total size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_CMA_FREE = (1ULL << 6), /**< CMA memory free size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_SWAP_TOTAL = (1ULL << 7), /**< Swap memory total size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_MEMORY_ATTR_SWAP_FREE = (1ULL << 8), /**< Swap memory free size (data type: DATA_TYPE_UINT64, unit: kB) */ /* Battery Resource Attribute ID */ - RESOURCE_MONITOR_BATTERY_ATTR_CAPACITY = BATTERY_ATTR_CAPACITY, /**< Battery capacity (data type: DATA_TYPE_INT, unit: %) */ - RESOURCE_MONITOR_BATTERY_ATTR_STATUS = BATTERY_ATTR_STATUS, /**< Battery status (data type: DATA_TYPE_STRING) */ - RESOURCE_MONITOR_BATTERY_ATTR_TEMPERATURE = BATTERY_ATTR_TEMPERATURE, /**< Battery temperature (data type: DATA_TYPE_INT) */ - RESOURCE_MONITOR_BATTERY_ATTR_VOLTAGE_NOW = BATTERY_ATTR_VOLTAGE_NOW, /**< Battery voltage value (data type: DATA_TYPE_INT, unit: uV) */ - RESOURCE_MONITOR_BATTERY_ATTR_CURRENT_NOW = BATTERY_ATTR_CURRENT_NOW, /**< Battery current value (data type: DATA_TYPE_INT, unit: uA) */ - RESOURCE_MONITOR_BATTERY_ATTR_PRESENT = BATTERY_ATTR_PRESENT, /**< Battery connected status (data type: DATA_TYPE_INT) */ - RESOURCE_MONITOR_BATTERY_ATTR_ONLINE = BATTERY_ATTR_ONLINE, /**< Battery Charger connector status (data type: DATA_TYPE_INT) */ + RESOURCE_MONITOR_BATTERY_ATTR_CAPACITY = (1ULL << 0), /**< Battery capacity (data type: DATA_TYPE_INT, unit: %) */ + RESOURCE_MONITOR_BATTERY_ATTR_STATUS = (1ULL << 1), /**< Battery status (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_BATTERY_ATTR_TEMPERATURE = (1ULL << 2), /**< Battery temperature (data type: DATA_TYPE_INT) */ + RESOURCE_MONITOR_BATTERY_ATTR_VOLTAGE_NOW = (1ULL << 3), /**< Battery voltage value (data type: DATA_TYPE_INT, unit: uV) */ + RESOURCE_MONITOR_BATTERY_ATTR_CURRENT_NOW = (1ULL << 4), /**< Battery current value (data type: DATA_TYPE_INT, unit: uA) */ + RESOURCE_MONITOR_BATTERY_ATTR_PRESENT = (1ULL << 5), /**< Battery connected status (data type: DATA_TYPE_INT) */ + RESOURCE_MONITOR_BATTERY_ATTR_ONLINE = (1ULL << 6), /**< Battery Charger connector status (data type: DATA_TYPE_INT) */ /* Display Resource Attribute ID */ - RESOURCE_MONITOR_DISPLAY_ATTR_FPS = DISPLAY_ATTR_FPS, /**< Display device name (data type: DATA_TYPE_DOUBLE) */ - RESOURCE_MONITOR_DISPLAY_ATTR_NAME = DISPLAY_ATTR_NAME, /**< Frame per second (data type: DATA_TYPE_STRING, unit: fps) */ + RESOURCE_MONITOR_DISPLAY_ATTR_FPS = (1ULL << 0), /**< Frame per second (data type: DATA_TYPE_DOUBLE) */ + RESOURCE_MONITOR_DISPLAY_ATTR_NAME = (1ULL << 1), /**< Display device name (data type: DATA_TYPE_STRING, unit: fps) */ /* System Resource Attribute ID */ - RESOURCE_MONITOR_SYSTEM_ATTR_CPU_UTIL = SYSTEM_ATTR_CPU_UTIL, /**< CPU average utilization (data type: DATA_TYPE_DOUBLE, unit: %) */ - RESOURCE_MONITOR_SYSTEM_ATTR_CPU_USER_UTIL = SYSTEM_ATTR_CPU_USER_UTIL, /**< CPU average utilization on user (data type: DATA_TYPE_DOUBLE, unit: %) */ - RESOURCE_MONITOR_SYSTEM_ATTR_CPU_SYS_UTIL = SYSTEM_ATTR_CPU_SYS_UTIL, /**< CPU average utilization on system (data type: DATA_TYPE_DOUBLE, unit: %) */ - RESOURCE_MONITOR_SYSTEM_ATTR_PER_CPU_UTIL = SYSTEM_ATTR_PER_CPU_UTIL, /**< Per-CPU utilization (data type: DATA_TYPE_ARRAY_DOUBLE, unit: %) */ - RESOURCE_MONITOR_SYSTEM_ATTR_PER_CPU_USER_UTIL = SYSTEM_ATTR_PER_CPU_USER_UTIL, /**< Per-CPU utilization on user (data type: DATA_TYPE_ARRAY_DOUBLE, unit: %) */ - RESOURCE_MONITOR_SYSTEM_ATTR_PER_CPU_SYS_UTIL = SYSTEM_ATTR_PER_CPU_SYS_UTIL, /**< Per-CPU utilization on system (data type: DATA_TYPE_ARRAY_DOUBLE, unit: %) */ - RESOURCE_MONITOR_SYSTEM_ATTR_POSSIBLE_CPU = SYSTEM_ATTR_POSSIBLE_CPU, /**< Number of possible CPU (data type: DATA_TYPE_INT, unit: ea) */ - RESOURCE_MONITOR_SYSTEM_ATTR_ONLINE_CPU = SYSTEM_ATTR_ONLINE_CPU, /**< Number of online CPU (data type: DATA_TYPE_INT, unit: ea) */ + RESOURCE_MONITOR_SYSTEM_ATTR_CPU_UTIL = (1ULL << 0), /**< CPU average utilization (data type: DATA_TYPE_DOUBLE, unit: %) */ + RESOURCE_MONITOR_SYSTEM_ATTR_CPU_USER_UTIL = (1ULL << 1), /**< CPU average utilization on user (data type: DATA_TYPE_DOUBLE, unit: %) */ + RESOURCE_MONITOR_SYSTEM_ATTR_CPU_SYS_UTIL = (1ULL << 2), /**< CPU average utilization on system (data type: DATA_TYPE_DOUBLE, unit: %) */ + RESOURCE_MONITOR_SYSTEM_ATTR_PER_CPU_UTIL = (1ULL << 3), /**< Per-CPU utilization (data type: DATA_TYPE_ARRAY_DOUBLE, unit: %) */ + RESOURCE_MONITOR_SYSTEM_ATTR_PER_CPU_USER_UTIL = (1ULL << 4), /**< Per-CPU utilization on user (data type: DATA_TYPE_ARRAY_DOUBLE, unit: %) */ + RESOURCE_MONITOR_SYSTEM_ATTR_PER_CPU_SYS_UTIL = (1ULL << 5), /**< Per-CPU utilization on system (data type: DATA_TYPE_ARRAY_DOUBLE, unit: %) */ + RESOURCE_MONITOR_SYSTEM_ATTR_POSSIBLE_CPU = (1ULL << 6), /**< Number of possible CPU (data type: DATA_TYPE_INT, unit: ea) */ + RESOURCE_MONITOR_SYSTEM_ATTR_ONLINE_CPU = (1ULL << 7), /**< Number of online CPU (data type: DATA_TYPE_INT, unit: ea) */ /* Disk Resource Attribute ID */ - RESOURCE_MONITOR_DISK_ATTR_NAME = DISK_ATTR_NAME, /**< Disk device name (data type: DATA_TYPE_STRING) */ - RESOURCE_MONITOR_DISK_ATTR_READ_PER_SEC = DISK_ATTR_READ_PER_SEC, /**< Disk read per second (data type: DATA_TYPE_DOUBLE, unit: kB/s) */ - RESOURCE_MONITOR_DISK_ATTR_WRITE_PER_SEC = DISK_ATTR_WRITE_PER_SEC, /**< Disk write per second (data type: DATA_TYPE_DOUBLE, unit: kB/s) */ - RESOURCE_MONITOR_DISK_ATTR_READ_TOTAL = DISK_ATTR_READ_TOTAL, /**< Disk read total size (data type: DATA_TYPE_UINT64, unit: kB) */ - RESOURCE_MONITOR_DISK_ATTR_WRITE_TOTAL = DISK_ATTR_WRITE_TOTAL, /**< Disk write total size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_DISK_ATTR_NAME = (1ULL << 0), /**< Disk device name (data type: DATA_TYPE_STRING) */ + RESOURCE_MONITOR_DISK_ATTR_READ_PER_SEC = (1ULL << 1), /**< Disk read per second (data type: DATA_TYPE_DOUBLE, unit: kB/s) */ + RESOURCE_MONITOR_DISK_ATTR_WRITE_PER_SEC = (1ULL << 2), /**< Disk write per second (data type: DATA_TYPE_DOUBLE, unit: kB/s) */ + RESOURCE_MONITOR_DISK_ATTR_READ_TOTAL = (1ULL << 3), /**< Disk read total size (data type: DATA_TYPE_UINT64, unit: kB) */ + RESOURCE_MONITOR_DISK_ATTR_WRITE_TOTAL = (1ULL << 4), /**< Disk write total size (data type: DATA_TYPE_UINT64, unit: kB) */ } resource_monitor_attr_id_e; /** @@ -146,19 +145,19 @@ typedef enum { */ typedef enum { /* CPU Resource Control ID */ - RESOURCE_MONITOR_CPU_CTRL_CLUSTER_ID = CPU_CTRL_CLUSTER_ID, /**< CPU cluster resource control ID */ + RESOURCE_MONITOR_CPU_CTRL_CLUSTER_ID = (1ULL << 0), /**< CPU cluster resource control ID */ /* Bus Resource Control ID */ - RESOURCE_MONITOR_BUS_CTRL_DEVICE_ID = BUS_CTRL_DEVICE_ID, /**< Bus device resource control ID */ + RESOURCE_MONITOR_BUS_CTRL_DEVICE_ID = (1ULL << 0), /**< Bus device resource control ID */ /* GPU Resource Control ID */ - RESOURCE_MONITOR_GPU_CTRL_DEVICE_ID = GPU_CTRL_DEVICE_ID, /**< GPU device resource control ID */ + RESOURCE_MONITOR_GPU_CTRL_DEVICE_ID = (1ULL << 0), /**< GPU device resource control ID */ /* Display Resource Control ID */ - RESOURCE_MONITOR_DISPLAY_CTRL_DEVICE_ID = DISPLAY_CTRL_DEVICE_ID, /**< Display device resource control ID */ + RESOURCE_MONITOR_DISPLAY_CTRL_DEVICE_ID = (1ULL << 0), /**< Display device resource control ID */ /* Disk Resource Control ID */ - RESOURCE_MONITOR_DISK_CTRL_DEVICE_ID = DISK_CTRL_DEVICE_ID, /**< Disk device resource control ID */ + RESOURCE_MONITOR_DISK_CTRL_DEVICE_ID = (1ULL << 0), /**< Disk device resource control ID */ } resource_monitor_ctrl_id_e; /** @@ -236,7 +235,7 @@ int resource_monitor_exit(int monitor_id); * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE Unavailable Resource Type + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE Unavailable Resource Type * @see resource_monitor_init() */ int resource_monitor_get_resource_count(int monitor_id, resource_monitor_type_e resource_type, int *resource_count); @@ -255,7 +254,7 @@ int resource_monitor_get_resource_count(int monitor_id, resource_monitor_type_e * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE Unavailable Resource Type + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE Unavailable Resource Type * @see resource_monitor_init() * @see resource_monitor_delete_resource() */ @@ -313,7 +312,7 @@ int resource_monitor_set_resource_ctrl(int monitor_id, int resource_id, resource * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_unset_resource_attr() @@ -334,7 +333,7 @@ int resource_monitor_set_resource_attr(int monitor_id, int resource_id, resource * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -416,7 +415,7 @@ int resource_monitor_update_resource(int monitor_id, int resource_id); * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -441,7 +440,7 @@ int resource_monitor_get_value_int(int monitor_id, int resource_id, resource_mon * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -466,7 +465,7 @@ int resource_monitor_get_value_int64(int monitor_id, int resource_id, resource_m * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -491,7 +490,7 @@ int resource_monitor_get_value_uint32(int monitor_id, int resource_id, resource_ * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -516,7 +515,7 @@ int resource_monitor_get_value_uint64(int monitor_id, int resource_id, resource_ * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -542,7 +541,7 @@ int resource_monitor_get_value_double(int monitor_id, int resource_id, resource_ * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -569,7 +568,7 @@ int resource_monitor_get_value_string(int monitor_id, int resource_id, resource_ * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -596,7 +595,7 @@ int resource_monitor_get_array_int(int monitor_id, int resource_id, resource_mon * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -623,7 +622,7 @@ int resource_monitor_get_array_int64(int monitor_id, int resource_id, resource_m * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -650,7 +649,7 @@ int resource_monitor_get_array_uint32(int monitor_id, int resource_id, resource_ * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -677,7 +676,7 @@ int resource_monitor_get_array_uint64(int monitor_id, int resource_id, resource_ * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -704,7 +703,7 @@ int resource_monitor_get_array_double(int monitor_id, int resource_id, resource_ * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute + * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Unavailable Attribute * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() diff --git a/src/resource-monitor.c b/src/resource-monitor.c index 6d92e93..06b6fd6 100644 --- a/src/resource-monitor.c +++ b/src/resource-monitor.c @@ -17,6 +17,8 @@ #include #include "resource-monitor.h" +#include + #ifdef LOG_TAG #undef LOG_TAG #endif