refact: change name

- More fitting name

Author: tricktux

source/means-to-an-end/client-session.c

@@ -9,12 +9,12 @@
 #include "means-to-an-end/asset-prices.h"
 #include "means-to-an-end/client-session.h"
 
-void clients_asset_init(struct clients_asset **pca, int client_id)
+void clients_session_init(struct clients_session **pca, int client_id)
 {
   assert(*pca == NULL);
   assert(client_id > 0);
 
-  *pca = malloc(sizeof(struct clients_asset));
+  *pca = malloc(sizeof(struct clients_session));
   assert(*pca != NULL);
 
   asset_prices_init(&(*pca)->asset, 64);
@@ -25,10 +25,10 @@ void clients_asset_init(struct clients_asset **pca, int client_id)
   (*pca)->client_id = client_id;
 }
 
-void clients_asset_get_beg(struct clients_asset **pca) {
+void clients_session_get_beg(struct clients_session **pca) {
   // Ensure we start from the beginning of the list
-  struct clients_asset *prev = (*pca)->prev;
-  struct clients_asset *first = *pca;
+  struct clients_session *prev = (*pca)->prev;
+  struct clients_session *first = *pca;
   while (prev != NULL) {
     first = prev;
     prev = prev->prev;
@@ -37,15 +37,15 @@ void clients_asset_get_beg(struct clients_asset **pca) {
   *pca = first;
 }
 
-void clients_asset_free(struct clients_asset **pca)
+void clients_session_free(struct clients_session **pca)
 {
   assert(*pca != NULL);
   assert((*pca)->asset != NULL);
 
   // Adjust prev and next values now that middle is gone
-  struct clients_asset *prev = NULL;
-  struct clients_asset *next = NULL;
-  struct clients_asset *curr = *pca;
+  struct clients_session *prev = NULL;
+  struct clients_session *next = NULL;
+  struct clients_session *curr = *pca;
   prev = curr->prev;
   next = curr->next;
   if (prev != NULL)
@@ -71,15 +71,15 @@ void clients_asset_free(struct clients_asset **pca)
   *pca = NULL;
 }
 
-void clients_asset_free_all(struct clients_asset **pca)
+void clients_session_free_all(struct clients_session **pca)
 {
   assert(*pca != NULL);
   assert((*pca)->asset != NULL);
 
-  clients_asset_get_beg(pca);
+  clients_session_get_beg(pca);
 
-  struct clients_asset *next = NULL;
-  struct clients_asset *curr = *pca;
+  struct clients_session *next = NULL;
+  struct clients_session *curr = *pca;
   do {
     next = curr->next;
     asset_prices_free(&(curr->asset));
@@ -91,10 +91,10 @@ void clients_asset_free_all(struct clients_asset **pca)
   *pca = NULL;
 }
 
-void clients_asset_get_end(struct clients_asset **pca) {
+void clients_session_get_end(struct clients_session **pca) {
   // Ensure we are at the end of the list
-  struct clients_asset *next = (*pca)->next;
-  struct clients_asset *last = *pca;
+  struct clients_session *next = (*pca)->next;
+  struct clients_session *last = *pca;
   while (next != NULL) {
     last = next;
     next = next->next;
@@ -103,46 +103,46 @@ void clients_asset_get_end(struct clients_asset **pca) {
   *pca = last;
 }
 
-void clients_asset_add(struct clients_asset **pca, int id)
+void clients_session_add(struct clients_session **pca, int id)
 {
   assert(id > 0);
 
   if (*pca == NULL) {
-    clients_asset_init(pca, id);
+    clients_session_init(pca, id);
     return;
   }
 
-  clients_asset_get_end(pca);
+  clients_session_get_end(pca);
 
-  clients_asset_init(&((*pca)->next), id);
-  struct clients_asset *next = (*pca)->next;
+  clients_session_init(&((*pca)->next), id);
+  struct clients_session *next = (*pca)->next;
   next->prev = *pca;
 }
 
-bool clients_asset_remove(struct clients_asset **pca, int id)
+bool clients_session_remove(struct clients_session **pca, int id)
 {
   assert(*pca != NULL);
   assert(id > 0);
 
-  bool found = clients_asset_find(pca, id);
+  bool found = clients_session_find(pca, id);
   if (found) {
-    clients_asset_free(pca);
+    clients_session_free(pca);
     return true;
   }
 
   return false;
 }
 
-bool clients_asset_find(struct clients_asset **pca, int id)
+bool clients_session_find(struct clients_session **pca, int id)
 {
   if (*pca == NULL)
     return false;
   assert(id > 0);
 
-  clients_asset_get_beg(pca);
+  clients_session_get_beg(pca);
 
-  struct clients_asset *next = NULL;
-  struct clients_asset *curr = *pca;
+  struct clients_session *next = NULL;
+  struct clients_session *curr = *pca;
   do {
     if (curr->client_id == id) {
       *pca = curr;

source/means-to-an-end/client-session.h

@@ -5,21 +5,21 @@
 extern "C" {
 #endif
 
-struct clients_asset {
+struct clients_session {
   int client_id;   // Client's file descriptor
   struct asset_prices *asset;
-  struct client_asset *next;
-  struct client_asset *prev;
+  struct clients_session *next;
+  struct clients_session *prev;
 };
 
-void clients_asset_init(struct clients_asset **pca, int client_id);
-void clients_asset_free_all(struct clients_asset **pca);
-void clients_asset_add(struct clients_asset **pca, int id);
-bool clients_asset_remove(struct clients_asset **pca, int id);
-bool clients_asset_find(struct clients_asset **pca, int id);
-void clients_asset_get_end(struct clients_asset **pca);
-void clients_asset_get_beg(struct clients_asset **pca);
-void clients_asset_free(struct clients_asset **pca);
+void clients_session_init(struct clients_session **pca, int client_id);
+void clients_session_free_all(struct clients_session **pca);
+void clients_session_add(struct clients_session **pca, int id);
+bool clients_session_remove(struct clients_session **pca, int id);
+bool clients_session_find(struct clients_session **pca, int id);
+void clients_session_get_end(struct clients_session **pca);
+void clients_session_get_beg(struct clients_session **pca);
+void clients_session_free(struct clients_session **pca);
 
 #ifdef __cplusplus
 }

source/means-to-an-end/main.c

@@ -75,7 +75,7 @@ int main()
   int n, fd, res, size, sdsize, rs, result;
   struct epoll_ctl_info epci = {epollfd, 0, 0};
   struct queue *rcqu = NULL, *sdqu = NULL;
-  struct clients_asset *ca = NULL;
+  struct clients_session *ca = NULL;
   queue_init(&rcqu, QUEUE_CAPACITY);
   queue_init(&sdqu, QUEUE_CAPACITY);
 
@@ -96,7 +96,7 @@ int main()
       // Handle a new listen connection
       if (events[n].data.fd == listen_fd) {
         int new_fd = fd_accept_and_epoll_add(&epci);
-        clients_asset_add(&ca, new_fd);
+        clients_session_add(&ca, new_fd);
         continue;
       }
 
@@ -110,7 +110,7 @@ int main()
       // Handle error case while recv data
       if (res < -1) {
         log_error("main epoll loop: error while receiving data");
-        clients_asset_remove(&ca, fd);
+        clients_session_remove(&ca, fd);
         if (fd_poll_del_and_close(&epci) == -1) {
           perror("epoll_ctl: recv 0");
           exit(EXIT_FAILURE);
@@ -136,15 +136,15 @@ int main()
             fd,
             size);
 
-        client_found = clients_asset_find(&ca, fd);
+        client_found = clients_session_find(&ca, fd);
         assert(client_found);
         message_parse(ca->asset, sdqu, data, size);
         sdsize = queue_pop_no_copy(sdqu, &sddata);
         if (sdsize > 0) {
           rs = sendall(fd, sddata, &sdsize);
           if (rs != 0) {
             log_error("main epoll loop:: failed during sendall function");
-            clients_asset_remove(&ca, fd);
+            clients_session_remove(&ca, fd);
             if (fd_poll_del_and_close(&epci) == -1) {
               perror("epoll_ctl: recv 0");
               exit(EXIT_FAILURE);
@@ -160,7 +160,7 @@ int main()
 
       // Handle closing request received
       log_info("main epoll loop:: closing connection");
-      clients_asset_remove(&ca, fd);
+      clients_session_remove(&ca, fd);
       if (fd_poll_del_and_close(&epci) == -1) {
         perror("epoll_ctl: recv 0");
         exit(EXIT_FAILURE);

test/means-to-an-end/messages-prices-test.cpp

@@ -162,99 +162,99 @@ TEST_CASE("price query tests", "[prices]")
 
 
 // Helper function to create a list with multiple clients
-void create_test_list(struct clients_asset **pca, int num_clients) {
+void create_test_list(struct clients_session **pca, int num_clients) {
   for (int i = 1; i <= num_clients; ++i) {
-    clients_asset_add(pca, i);
+    clients_session_add(pca, i);
   }
 }
 
-TEST_CASE("clients_asset operations", "[clients_asset]") {
-  struct clients_asset *ca = nullptr;
+TEST_CASE("clients_session operations", "[clients_session]") {
+  struct clients_session *ca = nullptr;
 
   SECTION("Initialization and addition") {
     REQUIRE(ca == nullptr);
 
-    clients_asset_init(&ca, 1);
+    clients_session_init(&ca, 1);
     REQUIRE(ca != nullptr);
 
-    clients_asset_add(&ca, 2);
-    clients_asset_add(&ca, 3);
+    clients_session_add(&ca, 2);
+    clients_session_add(&ca, 3);
 
     // Check if we can find all added clients
-    REQUIRE(clients_asset_find(&ca, 1));
-    REQUIRE(clients_asset_find(&ca, 2));
-    REQUIRE(clients_asset_find(&ca, 3));
+    REQUIRE(clients_session_find(&ca, 1));
+    REQUIRE(clients_session_find(&ca, 2));
+    REQUIRE(clients_session_find(&ca, 3));
 
-    clients_asset_free_all(&ca);
+    clients_session_free_all(&ca);
   }
 
   SECTION("Finding clients") {
     create_test_list(&ca, 5);
 
-    REQUIRE(clients_asset_find(&ca, 1));
-    REQUIRE(clients_asset_find(&ca, 3));
-    REQUIRE(clients_asset_find(&ca, 5));
-    REQUIRE_FALSE(clients_asset_find(&ca, 6));
-    REQUIRE_FALSE(clients_asset_find(&ca, 88));
+    REQUIRE(clients_session_find(&ca, 1));
+    REQUIRE(clients_session_find(&ca, 3));
+    REQUIRE(clients_session_find(&ca, 5));
+    REQUIRE_FALSE(clients_session_find(&ca, 6));
+    REQUIRE_FALSE(clients_session_find(&ca, 88));
 
-    clients_asset_free_all(&ca);
+    clients_session_free_all(&ca);
   }
 
   SECTION("Removing clients") {
     create_test_list(&ca, 5);
 
-    REQUIRE(clients_asset_remove(&ca, 3));
-    REQUIRE_FALSE(clients_asset_find(&ca, 3));
+    REQUIRE(clients_session_remove(&ca, 3));
+    REQUIRE_FALSE(clients_session_find(&ca, 3));
 
-    REQUIRE(clients_asset_remove(&ca, 1));
-    REQUIRE_FALSE(clients_asset_find(&ca, 1));
+    REQUIRE(clients_session_remove(&ca, 1));
+    REQUIRE_FALSE(clients_session_find(&ca, 1));
 
-    REQUIRE(clients_asset_remove(&ca, 5));
-    REQUIRE_FALSE(clients_asset_find(&ca, 5));
+    REQUIRE(clients_session_remove(&ca, 5));
+    REQUIRE_FALSE(clients_session_find(&ca, 5));
 
-    REQUIRE_FALSE(clients_asset_remove(&ca, 6));
+    REQUIRE_FALSE(clients_session_remove(&ca, 6));
 
-    clients_asset_free_all(&ca);
+    clients_session_free_all(&ca);
   }
 
   SECTION("Get beginning and end") {
     create_test_list(&ca, 5);
 
-    clients_asset_get_end(&ca);
-    REQUIRE(clients_asset_find(&ca, 5));
+    clients_session_get_end(&ca);
+    REQUIRE(clients_session_find(&ca, 5));
 
-    clients_asset_get_beg(&ca);
-    REQUIRE(clients_asset_find(&ca, 1));
+    clients_session_get_beg(&ca);
+    REQUIRE(clients_session_find(&ca, 1));
 
-    clients_asset_free_all(&ca);
+    clients_session_free_all(&ca);
   }
 
   SECTION("Free individual client") {
     create_test_list(&ca, 3);
 
-    struct clients_asset *temp = ca;
-    clients_asset_find(&temp, 2);
-    clients_asset_free(&temp);
+    struct clients_session *temp = ca;
+    clients_session_find(&temp, 2);
+    clients_session_free(&temp);
 
-    REQUIRE_FALSE(clients_asset_find(&ca, 2));
-    REQUIRE(clients_asset_find(&ca, 1));
-    REQUIRE(clients_asset_find(&ca, 3));
+    REQUIRE_FALSE(clients_session_find(&ca, 2));
+    REQUIRE(clients_session_find(&ca, 1));
+    REQUIRE(clients_session_find(&ca, 3));
 
-    clients_asset_free_all(&ca);
+    clients_session_free_all(&ca);
   }
 
   SECTION("Free all clients") {
     create_test_list(&ca, 5);
 
-    clients_asset_free_all(&ca);
+    clients_session_free_all(&ca);
     REQUIRE(ca == nullptr);
 
     // Ensure we can create a new list after freeing all
     create_test_list(&ca, 3);
-    REQUIRE(clients_asset_find(&ca, 1));
-    REQUIRE(clients_asset_find(&ca, 2));
-    REQUIRE(clients_asset_find(&ca, 3));
+    REQUIRE(clients_session_find(&ca, 1));
+    REQUIRE(clients_session_find(&ca, 2));
+    REQUIRE(clients_session_find(&ca, 3));
 
-    clients_asset_free_all(&ca);
+    clients_session_free_all(&ca);
   }
 }