Merge pull request #35 from SidoShiro/allocation-table-size

Allocation table size, good

Author: Nalydy

include/leader.h

@@ -31,4 +31,6 @@ void leader_loop(struct node *n, unsigned short terminal_id, unsigned short nb_n
 
 struct allocation *give_for_v_address(struct leader_resources *l_r, size_t v_address, size_t *part);
 
+size_t size_of_allocation(struct allocation *a);
+
 #endif /* !DISTRIBUTEDMALLOC_LEADER_H */

src/network/leader.c

@@ -81,6 +81,7 @@ int free_memory(size_t address, struct leader_resources *l_r) {
         for (size_t j = 0; j < reg->allocs[i]->number_parts; j++) {
             if (reg->allocs[i]->parts[j]->virtual_address <= address
                 && reg->allocs[i]->parts[j]->virtual_address + reg->allocs[i]->parts[j]->size > address) {
+                l_r->availaible_memory += size_of_allocation(reg->allocs[i]);
                 // Set all block of this alloc as free
                 for (j = 0; j < reg->allocs[i]->number_parts; j++) {
                     reg->allocs[i]->parts[j]->free = 0;
@@ -153,14 +154,19 @@ size_t alloc_memory(size_t size, struct leader_resources *l_r) {
     a->parts = NULL;
     a->v_address_start = SIZE_MAX;
     ssize_t m_size = size;
+    size_t m_t_size = 0;
     for (size_t i = 0; i < blks->nb_blocks; i++) {
         struct block *b = blks->blks[i];
         while (b && b->id != l_r->id && m_size > 0) {
             if (b->free == 0) {
                 b->free = 1;
-                m_size -= b->size;
-                if (m_size < 0) {
-                    b = split_block_u(b, -1 * m_size);
+                if ((ssize_t) b->size >= m_size) {
+                    m_t_size = m_size;
+                    m_size = 0;
+                    b = split_block_u(b, m_t_size);
+                } else {
+                    m_t_size = m_size - b->size;
+                    m_size -= b->size;
                 }
                 if (a->v_address_start == SIZE_MAX)
                     a->v_address_start = b->virtual_address;

src/utils/utils.c

@@ -30,12 +30,9 @@ void print_allocations_table(struct leader_resources *l_r) {
     size_t size = 0;
     size_t total_size = 0;
     for (size_t i = 0; i < a_r->count_alloc; i++) {
-        size = 0;
         if (a_r->allocs[i]) {
-            for (size_t j = 0; j < a_r->allocs[i]->number_parts; j++) {
-                size += a_r->allocs[i]->parts[j]->size;
-                total_size += a_r->allocs[i]->parts[j]->size;
-            }
+            size = size_of_allocation(a_r->allocs[i]);
+            total_size += size;
             printf("%4zu : %9zu : %5zu : %8zu : ", i, a_r->allocs[i]->v_address_start, a_r->allocs[i]->number_parts,
                    size);
             for (size_t j = 0; j < a_r->allocs[i]->number_parts; j++) {