lib: resource-monitor: Replace with TIZNE_ERROR_* defintion to handle error

Replace with TIZNE_ERROR_* defintion to handle error as following:

 0       : TIZEN_ERROR_NONE (success)
 -EINVAL : TIZEN_ERROR_INVALID_PARAMETER
 -EIO    : TIZEN_ERROR_NO_DATA
 -ENOMEM : TIZEN_ERROR_OUT_OF_MEMORY

Change-Id: I1d14719c21c3a4f6f2224c9f76e00ff762b8c889
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/lib/resource-monitor/resource-monitor.c b/lib/resource-monitor/resource-monitor.c
index 938c9dc..8fa81e9 100644 (file)
--- a/lib/resource-monitor/resource-monitor.c
+++ b/lib/resource-monitor/resource-monitor.c
@@ -34,6 +34,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <tizen.h>
+
 #include "resource-monitor.h"
 
 #define REQUEST_SERVER_IP "127.0.0.1"
@@ -120,7 +122,7 @@ static inline int handle_request(struct request_data *data)
        int ret;
 
        if (!data)
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
 
        /* Make buffer with struct request_data according to request */
        switch (data->request) {
@@ -165,7 +167,7 @@ static inline int handle_request(struct request_data *data)
        default:
                _E("[libpass] Unknown request type, client(%d) | request(%d)",
                                        data->client_id, data->request);
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
        }
 
        /* Send request to resource-moniotor */
@@ -174,7 +176,7 @@ static inline int handle_request(struct request_data *data)
                                        data->client_id, request_name[data->request],
                                        data->resource_id, data->resource_type,
                                        data->ctrl_id, data->ctrl_value);
-               return -EIO;
+               return TIZEN_ERROR_NO_DATA;
        }
 
        /* Receive response from resource-moniotor */
@@ -184,7 +186,7 @@ static inline int handle_request(struct request_data *data)
                                        data->client_id, request_name[data->request],
                                        data->resource_id, data->resource_type,
                                        data->ctrl_id, data->ctrl_value);
-               return -EIO;
+               return TIZEN_ERROR_NO_DATA;
        }
        buffer[buffer_len] = '\0';
 
@@ -195,37 +197,37 @@ static inline int handle_request(struct request_data *data)
        case REQUEST_GET_RESOURCE_COUNT:
                if (sscanf(buffer, "%d$%d$%d", &response_req,
                                        &data->value_int32, &response_ret) < 3)
-                       ret = EINVAL;
+                       ret = TIZEN_ERROR_INVALID_PARAMETER;
                break;
        case REQUEST_GET_VALUE_UINT:
                if (sscanf(buffer, "%d$%u$%d", &response_req,
                                        &data->value_uint32, &response_ret) < 3)
-                       ret = -EINVAL;
+                       ret = TIZEN_ERROR_INVALID_PARAMETER;
                break;
        case REQUEST_GET_VALUE_INT64:
                if (sscanf(buffer, "%d$%"PRId64"$%d", &response_req,
                                        &data->value_int64, &response_ret) < 3)
-                       return -EINVAL;
+                       return TIZEN_ERROR_INVALID_PARAMETER;
                break;
        case REQUEST_GET_VALUE_UINT64:
                if (sscanf(buffer, "%d$%"PRIu64"$%d", &response_req,
                                        &data->value_uint64, &response_ret) < 3)
-                       ret = -EINVAL;
+                       ret = TIZEN_ERROR_INVALID_PARAMETER;
                break;
        case REQUEST_GET_VALUE_DOUBLE:
                if (sscanf(buffer, "%d$%lf$%d", &response_req,
                                        &data->value_double, &response_ret) < 3)
-                       ret = -EINVAL;
+                       ret = TIZEN_ERROR_INVALID_PARAMETER;
                break;
        case REQUEST_GET_VALUE_STRING:
                if (sscanf(buffer, "%d$%[^$]$%d", &response_req,
                                        data->value_string, &response_ret) < 3)
-                       ret = -EINVAL;
+                       ret = TIZEN_ERROR_INVALID_PARAMETER;
                break;
        case REQUEST_GET_RESOURCE_TS:
                if (sscanf(buffer, "%d$%"PRId64"$%"PRId64"$%d", &response_req,
                                        &data->ts_start, &data->ts_end, &response_ret) < 4)
-                       ret =-EINVAL;
+                       ret =TIZEN_ERROR_INVALID_PARAMETER;
                break;
        case REQUEST_UPDATE_RESOURCE_ALL:
        case REQUEST_UPDATE_RESOURCE:
@@ -237,14 +239,14 @@ static inline int handle_request(struct request_data *data)
        case REQUEST_UNSET_RESOURCE_ATTR:
        case REQUEST_IS_RESOURCE_ATTR_SET:
                if (sscanf(buffer, "%d$%d", &response_req, &response_ret) < 2)
-                       ret = -EINVAL;
+                       ret = TIZEN_ERROR_INVALID_PARAMETER;
                break;
        default:
                _E("[libpass] Unknown request type, client(%d) | request(%35s) | res,id(%d)type(%d) | ctrl,id(%"PRId64")val(%d) ",
                                        data->client_id, request_name[data->request],
                                        data->resource_id, data->resource_type,
                                        data->ctrl_id, data->ctrl_value);
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
        }
 
        if (ret < 0) {
@@ -269,7 +271,7 @@ static inline int handle_request(struct request_data *data)
                                        data->client_id, request_name[data->request],
                                        data->resource_id, data->resource_type,
                                        data->ctrl_id, data->ctrl_value);
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
        }
 
        return response_ret;
@@ -280,12 +282,12 @@ int pass_resource_monitor_init(void)
 {
        struct pass_resource_monitor_client *client;
        struct sockaddr_in server_addr;
-       int ret = -EIO;
+       int ret = TIZEN_ERROR_NO_DATA;
 
        client = malloc(sizeof(struct pass_resource_monitor_client));
        if (!client) {
                _E("[libpass] failed to allocate memory");
-               return -ENOMEM;
+               return TIZEN_ERROR_OUT_OF_MEMORY;
        }
 
        /* open socket to server */
@@ -329,14 +331,14 @@ int pass_resource_monitor_exit(int id)
        client = find_client_by_id(id);
        if (!client) {
                _E("[libpass] cannot find client-%d", id);
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
        }
 
        close(client->id);
        remove_client_from_list(client);
        free(client);
 
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 EXPORT
@@ -354,7 +356,7 @@ int pass_resource_monitor_get_resource_count(int id, int resource_type, int *res
                return ret;
 
        *resource_count = request.value_int32;
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 EXPORT
@@ -483,7 +485,7 @@ static int pass_resource_monitor_get_json(int id, char *json_string, int request
 
        buffer = malloc(HUGE_BUFF_MAX + 1);
        if (!buffer)
-               return -ENOMEM;
+               return TIZEN_ERROR_OUT_OF_MEMORY;
 
        va_start(args, request_type);
        switch (request_type) {
@@ -504,14 +506,14 @@ static int pass_resource_monitor_get_json(int id, char *json_string, int request
        default:
                va_end(args);
                free(buffer);
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
        }
        va_end(args);
 
        if (send(id, buffer, buffer_len, 0) < 0) {
                _E("[libpass] error occurred while sending buffer");
                free(buffer);
-               return -EIO;
+               return TIZEN_ERROR_NO_DATA;
        }
 
        /* wait for response */
@@ -519,19 +521,19 @@ static int pass_resource_monitor_get_json(int id, char *json_string, int request
        if (buffer_len <= 0) {
                _E("[libpass] socket disconnected");
                free(buffer);
-               return -EIO;
+               return TIZEN_ERROR_NO_DATA;
        }
        buffer[buffer_len] = '\0';
 
        if (sscanf(buffer, "%d$%[^$]$%d", &response_req, json_string, &ret) < 3) {
                free(buffer);
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
        }
 
        if (response_req != request_type) {
                _E("[libpass] wrong response");
                free(buffer);
-               return -EINVAL;
+               return TIZEN_ERROR_INVALID_PARAMETER;
        }
 
        free(buffer);
@@ -573,7 +575,7 @@ int pass_resource_monitor_get_value_int(int id, int resource_id, u_int64_t attr_
                return ret;
 
        *value = request.value_int32;
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 EXPORT
@@ -592,7 +594,7 @@ int pass_resource_monitor_get_value_int64(int id, int resource_id, u_int64_t att
                return ret;
 
        *value = request.value_int64;
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 EXPORT
@@ -611,7 +613,7 @@ int pass_resource_monitor_get_value_uint(int id, int resource_id, u_int64_t attr
                return ret;
 
        *value = request.value_uint32;
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 EXPORT
@@ -630,7 +632,7 @@ int pass_resource_monitor_get_value_uint64(int id, int resource_id, u_int64_t at
                return ret;
 
        *value = request.value_uint64;
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 EXPORT
@@ -649,7 +651,7 @@ int pass_resource_monitor_get_value_double(int id, int resource_id, u_int64_t at
                return ret;
 
        *value = request.value_double;
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 EXPORT
@@ -668,7 +670,7 @@ int pass_resource_monitor_get_value_string(int id, int resource_id, u_int64_t at
                return ret;
 
        *value = g_strdup(request.value_string);
-       return 0;
+       return TIZEN_ERROR_NONE;
 }
 
 static int
@@ -682,19 +684,19 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
 
        buffer = malloc(HUGE_BUFF_MAX + 1);
        if (!buffer)
-               return -ENOMEM;
+               return TIZEN_ERROR_OUT_OF_MEMORY;
 
        array_str = malloc(HUGE_BUFF_MAX);
        if (!array_str) {
                free(buffer);
-               return -ENOMEM;
+               return TIZEN_ERROR_OUT_OF_MEMORY;
        }
 
        buffer_len = snprintf(buffer, HUGE_BUFF_MAX, "%d$%d$%"PRIu64,
                        REQUEST_GET_VALUE_ARRAY, res_id, attr_id);
        if (send(id, buffer, buffer_len, 0) < 0) {
                _E("[libpass] error occurred while sending buffer");
-               ret = -EIO;
+               ret = TIZEN_ERROR_NO_DATA;
                goto out_free;
        }
 
@@ -702,26 +704,26 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
        buffer_len = recv(id, buffer, HUGE_BUFF_MAX, 0);
        if (buffer_len <= 0) {
                _E("[libpass] socket disconnected");
-               ret = -EIO;
+               ret = TIZEN_ERROR_NO_DATA;
                goto out_free;
        }
        buffer[buffer_len] = '\0';
 
        if (sscanf(buffer, "%d$%d|%d|%[^$]$%d", &response_req,
                                &array_type, &array_len, array_str, &ret) < 5) {
-               ret = -EINVAL;
+               ret = TIZEN_ERROR_INVALID_PARAMETER;
                goto out_free;
        }
 
        if (response_req != REQUEST_GET_VALUE_ARRAY) {
                _E("[libpass] wrong response");
-               ret = -EINVAL;
+               ret = TIZEN_ERROR_INVALID_PARAMETER;
                goto out_free;
        }
 
        if (data_type != array_type) {
                _E("[libpass] wrong data type");
-               ret = -EINVAL;
+               ret = TIZEN_ERROR_INVALID_PARAMETER;
                goto out_free;
        }
 
@@ -731,7 +733,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                        int32_t *new_array = malloc(array_len * sizeof(int32_t));
 
                        if (!new_array) {
-                               ret = -ENOMEM;
+                               ret = TIZEN_ERROR_OUT_OF_MEMORY;
                                goto out_free;
                        }
 
@@ -747,7 +749,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                        int64_t *new_array = malloc(array_len * sizeof(int64_t));
 
                        if (!new_array) {
-                               ret = -ENOMEM;
+                               ret = TIZEN_ERROR_OUT_OF_MEMORY;
                                goto out_free;
                        }
 
@@ -763,7 +765,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                        u_int32_t *new_array = malloc(array_len * sizeof(u_int32_t));
 
                        if (!new_array) {
-                               ret = -ENOMEM;
+                               ret = TIZEN_ERROR_OUT_OF_MEMORY;
                                goto out_free;
                        }
 
@@ -779,7 +781,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                        u_int64_t *new_array = malloc(array_len * sizeof(u_int64_t));
 
                        if (!new_array) {
-                               ret = -ENOMEM;
+                               ret = TIZEN_ERROR_OUT_OF_MEMORY;
                                goto out_free;
                        }
 
@@ -795,7 +797,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                        double *new_array = malloc(array_len * sizeof(double));
 
                        if (!new_array) {
-                               ret = -ENOMEM;
+                               ret = TIZEN_ERROR_OUT_OF_MEMORY;
                                goto out_free;
                        }
 
@@ -811,7 +813,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                        char **new_array = calloc(array_len, sizeof(char *));
 
                        if (!new_array) {
-                               ret = -ENOMEM;
+                               ret = TIZEN_ERROR_OUT_OF_MEMORY;
                                goto out_free;
                        }
 
@@ -822,7 +824,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                                        for (int j = i - 1; j >= 0; j--)
                                                free(new_array[j]);
                                        free(new_array);
-                                       ret = -ENOMEM;
+                                       ret = TIZEN_ERROR_OUT_OF_MEMORY;
                                        goto out_free;
                                }
 
@@ -835,7 +837,7 @@ pass_resource_monitor_get_array(int id, int res_id, u_int64_t attr_id, int data_
                }
        default:
                _E("[libpass] not supported array data type");
-               ret = -EINVAL;
+               ret = TIZEN_ERROR_INVALID_PARAMETER;
        }
 
 out_free:
@@ -896,5 +898,5 @@ int pass_resource_monitor_get_resource_timestamp(int id, int res_id, int64_t *st
 
        *start = request.ts_start;
        *end = request.ts_end;
-       return 0;
+       return TIZEN_ERROR_NONE;
 }