Merge pull request #31 from SidoShiro/dev

Dev

Author: SidoShiro

CMakeLists.txt

@@ -1,26 +1,29 @@
 cmake_minimum_required(VERSION 3.0)
 
 set(CMAKE_C_COMPILER "mpicc")
-set(CMAKE_C_FLAGS "-O3 -std=c11 -Werror -Wall -Wextra -pedantic")
+set(CMAKE_C_FLAGS "-O3 -std=c11 -Werror -Wall -Wextra -pedantic -fsanitize=address")
 
 project(DistributedMalloc)
 
 find_package(MPI REQUIRED)
 
 # Vars with files for compilation
-set(SRCS
-        src/utils/utils.c
-        src/cli/cli.c
-        src/network/message.c
-        src/network/block.c
-        src/network/node.c
-        src/utils/command_queue.c
-        src/graph/graph.c
-        src/graph/map.c
-        src/network/leader.c
-        src/network/leader_election.c
-        src/utils/debug.c
-        src/cli/user.c)
+set(SRCS 
+    src/utils/utils.c
+    src/cli/cli.c
+    src/network/message.c
+    src/network/block.c
+    src/network/node.c
+    src/utils/command_queue.c
+    src/graph/graph.c
+    src/graph/map.c
+    src/network/leader.c
+    src/network/leader_election.c
+    src/utils/debug.c
+    src/cli/user.c
+    src/network/communication.c
+    src/utils/queue.c)
+
 
 set(MAIN src/main/main.c)
 

README.md

@@ -49,11 +49,14 @@ default is 20.
 * **Message**
   * id_s (source)
   * id_t (target)
-  * id_o (final target for operation)
+  * id_o (final target for operation or additional information)
+  * need_callback (does this message require an ALIVE callback)
   * size
   * address
   * enum *Op*
     * OK
+    * MALLOC
+    * FREE
     * WRITE
     * READ
     * SNAP
@@ -62,6 +65,11 @@ default is 20.
     * (REVIVE)
     * (DIE)
     * (TEST)
+    * NONE
+    * DUMP
+    * LEADER_OK (leader election is over + a success)
+    * ALIVE (callback, proving its aliveness)
+    * LEADER_AGAIN (supposed leader is dead, need to retart the election)
 * **Block**
   * Linked list of:
     * address

include/block.h

@@ -52,8 +52,6 @@ add_block(struct block *blk, unsigned short id, size_t size, size_t node_address
 
 void merge_free_block(struct block_register *blks);
 
-struct block_register *init_nodes_same_size(unsigned short nb_nodes, size_t size);
-
 /**
  * Splited half 2 is free = 0
  * @param b

include/command_queue.h

@@ -45,6 +45,8 @@ struct data_size *generate_data_size(size_t size);
 
 struct data_id *generate_data_id(unsigned short id);
 
+struct data_address *generate_data_address(size_t address);
+
 struct data_write {
     size_t address;
     size_t size;

include/communication.h

@@ -0,0 +1,23 @@
+#ifndef DISTRIBUTEDMALLOC_COMMUNICATION_H
+#define DISTRIBUTEDMALLOC_COMMUNICATION_H
+
+#include "message.h"
+
+#include "queue.h"
+
+// Number of attempts failed before considering the node as dead.
+#define NB_ITER 60
+
+/*
+ * Send the given message 'm' to the destination node
+ * Return 1 if it's a success, 0 if the destination node didn't respond in time
+ */
+int send_safe_message(struct message *m_send, struct queue *queue);
+
+/*
+ * Receive a message sent with 'send_safe_message'
+ * then send a OP_OK to the source node
+ */
+struct message *receive_message(struct queue *message_queue);
+
+#endif /* !DISTRIBUTEDMALLOC_COMMUNICATION_H */

include/globals.h

@@ -1,7 +1,7 @@
 #ifndef DISTRIBUTEDMALLOC_GLOBALS_H
 #define DISTRIBUTEDMALLOC_GLOBALS_H
 
-#define DEF_NODE_SIZE 32
+#define DEF_NODE_SIZE 8
 #define DEF_NODE_USER 0
 #define DEF_NODE_LEADER 1
 

include/leader.h

@@ -13,6 +13,8 @@ struct leader_resources {
     struct allocation_register  *leader_reg;
     struct command_queue *leader_command_queue;
     unsigned short id;
+    size_t availaible_memory;
+    size_t max_memory;
 };
 
 struct address_search {
@@ -27,4 +29,6 @@ struct leader_resources *generate_leader_resources(size_t nb_nodes , size_t id);
 
 void leader_loop(struct node *n, unsigned short terminal_id, unsigned short nb_nodes);
 
+struct allocation *give_for_v_address(struct leader_resources *l_r, size_t v_address, size_t *part);
+
 #endif /* !DISTRIBUTEDMALLOC_LEADER_H */

include/message.h

@@ -16,13 +16,18 @@ enum operation {
     OP_KILL,
     OP_TEST,
     OP_NONE,
-    OP_DUMP
+    OP_DUMP,
+    OP_DUMP_ALL,
+    OP_LEADER_OK,
+    OP_ALIVE,
+    OP_LEADER_AGAIN
 };
 
 struct message {
     unsigned short id_s; // Source message id
     unsigned short id_t; // Target message id
     unsigned short id_o; // Node id for the operation
+    unsigned short need_callback; // 1 if the target node have to respond OP_ALIVE
     size_t address;
     size_t size;
     enum operation op;
@@ -35,4 +40,12 @@ struct message *generate_message(unsigned short id_s,
                                  size_t size,
                                  enum operation op);
 
+struct message *generate_message_a(unsigned short id_s,
+                                   unsigned short id_t,
+                                   unsigned short id_o,
+                                   size_t address,
+                                   size_t size,
+                                   enum operation op,
+                                   unsigned short need_callback);
+
 #endif /* !DISTRIBUTEDMALLOC_MESSAGE_H */

include/node.h

@@ -10,8 +10,11 @@ struct node {
     unsigned char isleader; // 1 = is Leader, 0 = no
     // map; // From .dot file
     size_t size;
+    char *memory;
 };
 
 struct node *generate_node(unsigned short id, size_t size);
 
+void node_cycle(struct node *n);
+
 #endif /* !DISTRIBUTEDMALLOC_NODE_H */

include/queue.h

@@ -0,0 +1,21 @@
+#ifndef DISTRIBUTEDMALLOC_QUEUE_H
+#define DISTRIBUTEDMALLOC_QUEUE_H
+
+struct queue {
+    struct queue_node *first;
+};
+
+struct queue_node {
+    void *data;
+    struct queue_node *next;
+};
+
+struct queue *queue_init();
+
+void queue_push_back(struct queue *q, void *data);
+
+void queue_free(struct queue *q);
+
+void *queue_pop(struct queue *q);
+
+#endif /* !DISTRIBUTEDMALLOC_QUEUE_H */