monitor: rename the member of request_client

Previously, client->id is used as a socket descriptor.
It can be a confused situation for future readers. So,
rename it to client->socket_fd to reveal the intention
of the member variable.

Change-Id: I3512da878b412f3b8aa5821c70de254bf5cd64bb
Signed-off-by: Sung-hun Kim <sfoon.kim@samsung.com>

diff --git a/include/util/request-handler.h b/include/util/request-handler.h
index d7eadc86b883afaf21d8781d05ef81fc2c12aeb0..c03adef992567c952d0569fa569ab1986769c7a5 100644 (file)
--- a/include/util/request-handler.h
+++ b/include/util/request-handler.h
@@ -26,7 +26,7 @@
 extern const char *request_type_str[];
 
 struct request_client {
-       int id;
+       int socket_fd;
        int nr_resources;
        struct thread *worker;
        GHashTable *resource_table;

diff --git a/src/monitor/request-handler.c b/src/monitor/request-handler.c
index ac0cffd48b7db694b217b00c4b931912a9ab1db7..3e54ac941e63ab0519b0ebd032232f1db7192978 100644 (file)
--- a/src/monitor/request-handler.c
+++ b/src/monitor/request-handler.c
@@ -256,7 +256,7 @@ static void handle_request(struct request_client *client, char *buffer)
        }
        sprintf(response, "%d", ret);
 
-       if (send(client->id, _response, strlen(_response), 0) < 0)
+       if (send(client->socket_fd, _response, strlen(_response), 0) < 0)
                _E("Failed to send respones, error: %s", strerror(errno));
 }
 
@@ -297,14 +297,14 @@ static int request_handler_func(void *data, void **result)
        struct request_client *client = (struct request_client *)data;
        int len;
 
-       _D("Start worker thread for client-%d", client->id);
+       _D("Start worker thread for client-%d", client->socket_fd);
 
        while (1) {
-               len = recv(client->id, buffer, REQUEST_BUFFER_MAX, 0);
+               len = recv(client->socket_fd, buffer, REQUEST_BUFFER_MAX, 0);
                if (len == 0) {
-                       _D("Client-%d is disconnected", client->id);
+                       _D("Client-%d is disconnected", client->socket_fd);
                        finalize_request_client(client);
-                       close(client->id);
+                       close(client->socket_fd);
                        destroy_request_client(client);
                        return THREAD_RETURN_DONE;
                }
@@ -326,7 +326,7 @@ int create_request_client(int socket_fd)
                return -ENOMEM;
        }
 
-       client->id = socket_fd;
+       client->socket_fd = socket_fd;
        client->resource_table = g_hash_table_new(g_int_hash, g_int_equal);
 
        create_daemon_thread(&client->worker, request_handler_func, client);