From: Dongwoo Lee Date: Thu, 15 Sep 2022 07:16:05 +0000 (+0900) Subject: resource-monitor: Fix to use proper error codes X-Git-Tag: accepted/tizen/unified/20220920.110713~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F281305%2F1;p=platform%2Fcore%2Fapi%2Fresource-monitor.git resource-monitor: Fix to use proper error codes Since TIZEN_ERROR_NOT_SUPPORTED error code can represents only the situation that the target does NOT SUPPORT such a features. So instead of it, the new local error codes is added as below: - RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE - RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE Change-Id: Ia8ba6042a1b251095b672f787f62528e76ba99f4 Signed-off-by: Dongwoo Lee --- diff --git a/include/resource-monitor.h b/include/resource-monitor.h index fdff048..fa160b9 100644 --- a/include/resource-monitor.h +++ b/include/resource-monitor.h @@ -42,11 +42,12 @@ extern "C" { */ typedef enum { RESOURCE_MONITOR_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ - RESOURCE_MONITOR_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not Supported */ RESOURCE_MONITOR_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission Denied */ RESOURCE_MONITOR_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid Parameter */ RESOURCE_MONITOR_ERROR_NO_DATA = TIZEN_ERROR_NO_DATA, /**< Empty Data */ RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of Memory */ + RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE = TIZEN_ERROR_RESOURCE_MONITOR | 0x01, /**< Unavailable Resource Type */ + RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE = TIZEN_ERROR_RESOURCE_MONITOR | 0x02, /**< Unavailable Attribute */ } resource_monitor_error_e; /** @@ -177,7 +178,6 @@ typedef enum { * @remarks The @c return value should be released using resource_monitor_exit(). * @return @c positive integer as resource monitor ID on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data * @retval #RESOURCE_MONITOR_ERROR_OUT_OF_MEMORY Out of Memory @@ -214,7 +214,6 @@ int resource_monitor_init(void); * @param[in] monitor_id ID of resource monitor which be returned by resource_monitor_init() * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data @@ -233,11 +232,11 @@ int resource_monitor_exit(int monitor_id); * @param[out] resource_count Resource count retrieved from resource monitor * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() */ int resource_monitor_get_resource_count(int monitor_id, resource_monitor_type_e resource_type, int *resource_count); @@ -252,11 +251,11 @@ int resource_monitor_get_resource_count(int monitor_id, resource_monitor_type_e * @param[in] resource_type Resource type * @return @c positive integer as resource ID on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_delete_resource() */ @@ -271,7 +270,6 @@ int resource_monitor_create_resource(int monitor_id, resource_monitor_type_e res * @param[in] resource_id Resource ID which be returned by resource_monitor_create_resource() * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data @@ -292,7 +290,6 @@ int resource_monitor_delete_resource(int monitor_id, int resource_id); * @param[in] value Value for resource control ID * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data @@ -312,11 +309,11 @@ int resource_monitor_set_resource_ctrl(int monitor_id, int resource_id, resource * @param[in] attr_mask Attribute mask including the various attributes * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_unset_resource_attr() @@ -333,11 +330,11 @@ int resource_monitor_set_resource_attr(int monitor_id, int resource_id, resource * @param[in] attr_mask Attribute mask including the various attributes * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -355,7 +352,6 @@ int resource_monitor_unset_resource_attr(int monitor_id, int resource_id, resour * @param[out] supported Resource attributes is either supported or not (@c true == supported, @c false = not supported) * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data @@ -374,7 +370,6 @@ int resource_monitor_is_resource_attr_supported(int monitor_id, int resource_id, * @param[in] monitor_id Resource monitor ID which be returned by resource_monitor_init() * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data @@ -395,7 +390,6 @@ int resource_monitor_update(int monitor_id); * @param[in] resource_id Resource ID which be returned by resource_monitor_create_resource() * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @retval #RESOURCE_MONITOR_ERROR_INVALID_PARAMETER Invalid Parameter * @retval #RESOURCE_MONITOR_ERROR_NO_DATA Empty Data @@ -418,11 +412,11 @@ int resource_monitor_update_resource(int monitor_id, int resource_id); * @param[out] value Value retrieved from resource attribute * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -443,11 +437,11 @@ int resource_monitor_get_value_int(int monitor_id, int resource_id, resource_mon * @param[out] value Value retrieved from resource attribute * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -468,11 +462,11 @@ int resource_monitor_get_value_int64(int monitor_id, int resource_id, resource_m * @param[out] value Value retrieved from resource attribute * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -493,11 +487,11 @@ int resource_monitor_get_value_uint32(int monitor_id, int resource_id, resource_ * @param[out] value Value retrieved from resource attribute * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -518,11 +512,11 @@ int resource_monitor_get_value_uint64(int monitor_id, int resource_id, resource_ * @param[out] value Value retrieved from resource attribute * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -544,11 +538,11 @@ int resource_monitor_get_value_double(int monitor_id, int resource_id, resource_ * @param[out] value Value retrieved from resource attribute * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -571,11 +565,11 @@ int resource_monitor_get_value_string(int monitor_id, int resource_id, resource_ * @param[out] length Length of array * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -598,11 +592,11 @@ int resource_monitor_get_array_int(int monitor_id, int resource_id, resource_mon * @param[out] length Length of array * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -625,11 +619,11 @@ int resource_monitor_get_array_int64(int monitor_id, int resource_id, resource_m * @param[out] length Length of array * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -652,11 +646,11 @@ int resource_monitor_get_array_uint32(int monitor_id, int resource_id, resource_ * @param[out] length Length of array * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -679,11 +673,11 @@ int resource_monitor_get_array_uint64(int monitor_id, int resource_id, resource_ * @param[out] length Length of array * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @see resource_monitor_init() * @see resource_monitor_create_resource() * @see resource_monitor_set_resource_attr() @@ -706,11 +700,11 @@ int resource_monitor_get_array_double(int monitor_id, int resource_id, resource_ * @param[out] length Length of array * @return @c 0 on success, otherwise a negative error value * @retval #RESOURCE_MONITOR_ERROR_NONE Successful - * @retval #RESOURCE_MONITOR_ERROR_NOT_SUPPORTED Not Supported * @retval #RESOURCE_MONITOR_ERROR_PERMISSION_DENIED Permission Denied * @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 * @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 d304ddd..02607f5 100644 --- a/src/resource-monitor.c +++ b/src/resource-monitor.c @@ -34,7 +34,12 @@ int resource_monitor_exit(int monitor_id) int resource_monitor_get_resource_count(int monitor_id, resource_monitor_type_e resource_type, int *resource_count) { - return pass_resource_monitor_get_resource_count(monitor_id, resource_type, resource_count); + int ret = pass_resource_monitor_get_resource_count(monitor_id, resource_type, resource_count); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE; + + return ret; } int resource_monitor_create_resource(int monitor_id, resource_monitor_type_e resource_type) @@ -42,8 +47,12 @@ int resource_monitor_create_resource(int monitor_id, resource_monitor_type_e res int ret; int resource_id = pass_resource_monitor_create_resource(monitor_id, resource_type); - if (resource_id < 0) - return resource_id; + if (resource_id < 0) { + if (resource_id == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_RESOURCE; + else + return resource_id; + } ret = pass_resource_monitor_set_resource_flag(monitor_id, resource_id, RESOURCE_FLAG_PUBLIC); if (ret < 0) @@ -63,12 +72,22 @@ int resource_monitor_set_resource_ctrl(int monitor_id, int resource_id, resource int resource_monitor_set_resource_attr(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_mask) { - return pass_resource_monitor_set_resource_attr(monitor_id, resource_id, (u_int64_t)attr_mask); + int ret = pass_resource_monitor_set_resource_attr(monitor_id, resource_id, (u_int64_t)attr_mask); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_unset_resource_attr(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_mask) { - return pass_resource_monitor_unset_resource_attr(monitor_id, resource_id, (u_int64_t)attr_mask); + int ret = pass_resource_monitor_unset_resource_attr(monitor_id, resource_id, (u_int64_t)attr_mask); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_is_resource_attr_supported(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, bool *supported) @@ -88,60 +107,120 @@ int resource_monitor_update_resource(int monitor_id, int resource_id) int resource_monitor_get_value_int(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, int32_t *value) { - return pass_resource_monitor_get_value_int(monitor_id, resource_id, (u_int64_t)attr_id, value); + int ret = pass_resource_monitor_get_value_int(monitor_id, resource_id, (u_int64_t)attr_id, value); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_value_int64(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, int64_t *value) { - return pass_resource_monitor_get_value_int64(monitor_id, resource_id, (u_int64_t)attr_id, value); + int ret = pass_resource_monitor_get_value_int64(monitor_id, resource_id, (u_int64_t)attr_id, value); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_value_uint32(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, u_int32_t *value) { - return pass_resource_monitor_get_value_uint(monitor_id, resource_id, (u_int64_t)attr_id, value); + int ret = pass_resource_monitor_get_value_uint(monitor_id, resource_id, (u_int64_t)attr_id, value); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_value_uint64(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, u_int64_t *value) { - return pass_resource_monitor_get_value_uint64(monitor_id, resource_id, (u_int64_t)attr_id, value); + int ret = pass_resource_monitor_get_value_uint64(monitor_id, resource_id, (u_int64_t)attr_id, value); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_value_double(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, double *value) { - return pass_resource_monitor_get_value_double(monitor_id, resource_id, (u_int64_t)attr_id, value); + int ret = pass_resource_monitor_get_value_double(monitor_id, resource_id, (u_int64_t)attr_id, value); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_value_string(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, char **value) { - return pass_resource_monitor_get_value_string(monitor_id, resource_id, (u_int64_t)attr_id, value); + int ret = pass_resource_monitor_get_value_string(monitor_id, resource_id, (u_int64_t)attr_id, value); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_array_int(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, int32_t **array, int *length) { - return pass_resource_monitor_get_array_int(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + int ret = pass_resource_monitor_get_array_int(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_array_int64(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, int64_t **array, int *length) { - return pass_resource_monitor_get_array_int64(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + int ret = pass_resource_monitor_get_array_int64(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_array_uint32(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, u_int32_t **array, int *length) { - return pass_resource_monitor_get_array_uint(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + int ret = pass_resource_monitor_get_array_uint(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_array_uint64(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, u_int64_t **array, int *length) { - return pass_resource_monitor_get_array_uint64(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + int ret = pass_resource_monitor_get_array_uint64(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_array_double(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, double **array, int *length) { - return pass_resource_monitor_get_array_double(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + int ret = pass_resource_monitor_get_array_double(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; } int resource_monitor_get_array_string(int monitor_id, int resource_id, resource_monitor_attr_id_e attr_id, char ***array, int *length) { - return pass_resource_monitor_get_array_string(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + int ret = pass_resource_monitor_get_array_string(monitor_id, resource_id, (u_int64_t)attr_id, array, length); + + if (ret == -ENOTSUP) + return RESOURCE_MONITOR_ERROR_NOT_SUPPORTED_ATTRIBUTE; + + return ret; }