wip: queue dynamic resizing

Author: tricktux

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

@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "utils/queue.h"
 #include "means-to-an-end/asset-prices.h"
 #include "means-to-an-end/client-session.h"
 
@@ -17,9 +18,12 @@ void clients_session_init(struct clients_session **pca, int client_id)
   *pca = malloc(sizeof(struct clients_session));
   assert(*pca != NULL);
 
-  asset_prices_init(&(*pca)->asset, 64);
+  asset_prices_init(&(*pca)->asset, 16);
   assert((*pca)->asset != NULL);
 
+  queue_init(&((*pca)->recv_qu), 512);
+  assert((*pca)->recv_qu != NULL);
+
   (*pca)->next = NULL;
   (*pca)->prev = NULL;
   (*pca)->client_id = client_id;

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

@@ -8,6 +8,7 @@ extern "C" {
 struct clients_session {
   int client_id;   // Client's file descriptor
   struct asset_prices *asset;
+  struct queue *recv_qu;
   struct clients_session *next;
   struct clients_session *prev;
 };

source/utils/queue.c

@@ -13,6 +13,38 @@
 #include "utils/queue.h"
 #include "log/log.h"
 
+void queue_init_data(struct queue* qu, size_t capacity)
+{
+  assert(qu != NULL);
+  assert(capacity > 0);
+  assert(capacity > qu->capacity);
+
+  char *new_data = NULL;
+  new_data = realloc(qu->data, capacity);
+  assert(new_data != NULL);
+
+  qu->data = new_data;
+  qu->capacity = capacity;
+  qu->free_capacity = capacity - qu->size;
+}
+
+void queue_expand_capacity(struct queue* qu, size_t size)
+{
+  assert(qu != NULL);
+  if (size ==0)
+    return;
+
+  if (qu->size + size < qu->free_capacity)
+    return;
+
+  size_t new_cap = qu->capacity * 2, new_free_cap = new_cap - qu->size;
+  while (qu->size + size >= new_free_cap) {
+    new_cap *= 2;
+    new_free_cap = new_cap - qu->size;
+  }
+  queue_init_data(qu, new_cap);
+}
+
 /**
  * @brief Initializes a queue with the specified capacity.
  *
@@ -35,12 +67,11 @@ void queue_init(struct queue** qu, size_t capacity)
   *qu = malloc(sizeof(struct queue));
   assert(qu != NULL);
 
-  (*qu)->data = malloc(capacity);
-  assert((*qu)->data != NULL);
-
-  (*qu)->capacity = capacity;
-  (*qu)->free_capacity = capacity;
+  (*qu)->capacity = 0;
   (*qu)->size = 0;
+  (*qu)->data = NULL;
+  queue_init_data(*qu, capacity);
+
   (*qu)->head = (*qu)->data;
 }
 
@@ -81,13 +112,13 @@ void queue_push(struct queue* qu, char* data, size_t size)
   assert(data != NULL);
 
   if (size == 0) {
-    log_warn("queue_push: size is zero... noop");
+    log_trace("queue_push: size is zero... noop");
     return;
   }
 
-  if (qu->size + size >= qu->capacity) {
-    log_error("queue_push: pushing over queue capacity... noop");
-    return;
+  if (qu->size + size >= qu->free_capacity) {
+    queue_expand_capacity(qu, size);
+    log_info("queue_push: expanding current capacity to %d\n", qu->capacity);
   }
 
   memcpy(qu->head, data, size);
@@ -115,9 +146,9 @@ void queue_push_ex(struct queue* qu, size_t size)
     return;
   }
 
-  if (qu->size + size >= qu->capacity) {
-    log_error("queue_push: pushing over queue capacity... noop");
-    return;
+  if (qu->size + size >= qu->free_capacity) {
+    queue_expand_capacity(qu, size);
+    log_info("queue_push: expanding current capacity to %d\n", qu->capacity);
   }
 
   qu->head += size;

test/means-to-an-end/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 add_executable(messages-prices-test 
     "${CMAKE_SOURCE_DIR}/source/log/log.c"
+    "${CMAKE_SOURCE_DIR}/source/utils/queue.c"
     "${CMAKE_SOURCE_DIR}/source/means-to-an-end/asset-prices.c"
     "${CMAKE_SOURCE_DIR}/source/means-to-an-end/client-session.c"
     messages-prices-test.cpp

test/queue/queue-test.cpp

@@ -89,8 +89,8 @@ TEST_CASE("Queue Edge Cases")
     queue_push(qu, const_cast<char*>("world"), 5);
 
     // As it should over push the capacity, size should remain the same.
-    REQUIRE(qu->size == 4);
-    REQUIRE(qu->free_capacity == 1);
+    REQUIRE(qu->size == 9);
+    REQUIRE(qu->capacity == 20);
   }
 
   SECTION("Pop Empty Queue")