Merge pull request #19 from SidoShiro/dev

Dev

Author: SidoShiro

.gitignore

@@ -2,6 +2,7 @@
 *idea/*
 *cmake-build-debug/*
 *build/*
+*vscode/*
 
 # Prerequisites
 *.d

CMakeLists.txt

@@ -8,10 +8,29 @@ project(DistributedMalloc)
 find_package(MPI REQUIRED)
 
 # Vars with files for compilation
-set(SRCS src/main/main.c 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)
+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(MAIN src/main/main.c)
+
+set(TEST_MAIN test/main_test.c)
+
 
 include_directories("include/")
 include_directories(SYSTEM ${MPI_INCLUDE_PATH})
 
-add_executable(dmalloc ${SRCS} ${MPI_C_LIBRARIES})
+add_executable(dmalloc ${SRCS} ${MAIN} ${MPI_C_LIBRARIES})
 
+include_directories("include/")
+add_executable(test_dmalloc ${SRCS} ${TEST_MAIN} ${MPI_C_LIBRARIES})

README.md

@@ -22,6 +22,9 @@ make
 mpirun --hostfile hostfile dmalloc [DOTFILE]
 ```
 
+The *run.sh* script execute **mpirun** on build/dmalloc, takes 1 argument for number of nodes,
+default is 20.
+
 
 # Tooltips
 

include/block.h

@@ -1,24 +1,65 @@
 #ifndef DISTRIBUTEDMALLOC_BLOCK_H
 #define DISTRIBUTEDMALLOC_BLOCK_H
 
-#include "stdlib.h"
+#include <stdlib.h>
+#include <stdio.h>
 
+/**
+ * size of block
+ * address on id node
+ * address virtual (user view)
+ * next block
+ * free : 0 is free, 1 is allocated
+ */
 struct block {
     unsigned short id;
     size_t size;
-    size_t address;
+    size_t node_address;
+    size_t virtual_address;
     struct block *next;
+    char free;
 };
 
-struct blocks {
+struct block_register {
     size_t nb_blocks;
     struct block **blks;
 };
 
-struct blocks *generate_blocks(size_t nb_blks);
+struct allocation_register {
+    size_t size_alloc;
+    size_t count_alloc;
+    struct allocation **allocs;
+};
+
+struct allocation {
+    size_t number_parts;
+    size_t v_address_start;
+    struct block **parts;
+};
+
+struct allocation_register *generate_allocs(size_t size_alloc);
+
+void add_allocation(struct allocation_register *a_r, struct allocation *a);
+
+struct block_register *init_nodes_same_size(unsigned short nb_nodes, size_t size);
+
+struct block_register *generate_blocks(size_t nb_blks);
+
+struct block *generate_block(unsigned short id, size_t size, size_t node_address, size_t virtual_address, char free);
+
+void
+add_block(struct block *blk, unsigned short id, size_t size, size_t node_address, size_t virtual_address, char free);
+
+void merge_free_block(struct block_register *blks);
 
-struct block *generate_block(unsigned short id, size_t size, size_t address);
+struct block_register *init_nodes_same_size(unsigned short nb_nodes, size_t size);
 
-void add_block(struct block blk, unsigned short id, size_t size, size_t address);
+/**
+ * Splited half 2 is free = 0
+ * @param b
+ * @param size
+ * @return
+ */
+struct block *split_block_u(struct block *b, size_t size);
 
 #endif /* !DISTRIBUTEDMALLOC_BLOCK_H */

include/cli.h

@@ -7,8 +7,11 @@
 #include <stdlib.h>
 #include <err.h>
 
+#include "message.h"
 #include "utils.h"
 
 void start_cli();
 
+void send_command(enum operation op, void *data, unsigned short leader);
+
 #endif /* !DISTRIBUTEDMALLOC_CLI_H */

include/command_queue.h

@@ -3,25 +3,28 @@
 
 #include <stdlib.h>
 
-enum user_command {
-    MALLOC, // Data => Size
-    FREE, // Data => Address
-    WRITE, // Data => Address; Data size; Data
-    READ, // Data => Address; Data size
-    DUMP, // Data => Address
-    SNAP,
-    DNET,
-    KILL, // Data => id
-    REVIVE, // Data => id
-    NONE
-};
+#include "message.h"
+
+// OP_MALLOC, // Data => Size
+// OP_FREE, // Data => Address
+// OP_WRITE, // Data => Address; Data size; Data
+// OP_READ, // Data => Address; Data size
+// OP_DUMP, // Data => Address
+// OP_SNAP,
+// OP_DNET,
+// OP_KILL, // Data => id
+// OP_REVIVE, // Data => id
+// OP_NONE
 
 struct command_queue {
-    enum user_command command;
+    enum operation command;
     struct command_queue *next;
     void *data; // Contain the structure depending of the command
 };
 
+
+struct command_queue *generate_command_queue(enum operation op, void *data);
+
 // Delete first command queue, return head
 struct command_queue *pop_command(struct command_queue *head);
 
@@ -32,7 +35,15 @@ struct command_queue *push_command(struct command_queue *head, struct command_qu
 void *peek_command(struct command_queue *head);
 
 // Get user command enum of the first of the queue
-enum user_command peek_user_command(struct command_queue *head);
+enum operation peek_user_command(struct command_queue *head);
+
+struct data_write *generate_data_write(size_t address, size_t size, void *data);
+
+struct data_read *generate_data_read(size_t address, size_t size);
+
+struct data_size *generate_data_size(size_t size);
+
+struct data_id *generate_data_id(unsigned short id);
 
 struct data_write {
     size_t address;

include/debug.h

@@ -0,0 +1,10 @@
+#ifndef DISTRIBUTEDMALLOC_DEBUG_H
+#define DISTRIBUTEDMALLOC_DEBUG_H
+
+#include <stdio.h>
+
+void debug(char *msg, unsigned short id);
+
+void debug_n(char *msg, unsigned short id, unsigned nb_bytes);
+
+#endif /* !DISTRIBUTEDMALLOC_DEBUG_H */

include/globals.h

@@ -0,0 +1,8 @@
+#ifndef DISTRIBUTEDMALLOC_GLOBALS_H
+#define DISTRIBUTEDMALLOC_GLOBALS_H
+
+#define DEF_NODE_SIZE 32
+#define DEF_NODE_USER 0
+#define DEF_NODE_LEADER 1
+
+#endif /* !DISTRIBUTEDMALLOC_GLOBALS_H */

include/graph.h

@@ -9,8 +9,27 @@ struct adjacency_matrix {
     unsigned dimension;
 };
 
+struct linked_list {
+    unsigned id;
+    struct linked_list* next;
+};
+
+struct personal_map {
+    struct linked_list** paths;
+    // Import things:
+    // - paths[id] == NULL (self)
+    // - paths[0] == NULL (user)
+    unsigned nb_paths;
+    unsigned id;
+};
+
+
+
 struct adjacency_matrix* dot_reader(char* path);
+struct personal_map* compute_personal_map(struct adjacency_matrix* a, unsigned id);
 
 void free_adjacency_matrix(struct adjacency_matrix* a);
+void free_linked_list(struct linked_list* lkl); // really needs to be public ?
+void free_personal_map(struct personal_map* pm);
 
 #endif //DISTRIBUTEDMALLOC_GRAPH_H

include/leader.h

@@ -0,0 +1,30 @@
+#ifndef DISTRIBUTEDMALLOC_LEADER_H
+#define DISTRIBUTEDMALLOC_LEADER_H
+
+#include <stdlib.h>
+
+#include "node.h"
+#include "message.h"
+#include "command_queue.h"
+#include "block.h"
+
+struct leader_resources {
+    struct block_register *leader_blks;
+    struct allocation_register  *leader_reg;
+    struct command_queue *leader_command_queue;
+    unsigned short id;
+};
+
+struct address_search {
+    unsigned short id;
+    size_t r_address;
+    size_t v_address;
+    size_t n_address;
+    size_t size;
+};
+
+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);
+
+#endif /* !DISTRIBUTEDMALLOC_LEADER_H */