Merge pull request #39 from SidoShiro/dev

Last Hotfix

Author: SidoShiro

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 set(CMAKE_C_COMPILER "mpicc")
-set(CMAKE_C_FLAGS "-O3 -std=c11 -Werror -Wall -Wextra -pedantic -fsanitize=address")
+set(CMAKE_C_FLAGS "-O3 -std=c11 -Werror -Wall -Wextra -pedantic") #  -fsanitize=address")
 
 project(DistributedMalloc)
 
@@ -30,7 +30,7 @@ set(MAIN src/main/main.c)
 
 set(TEST_MAIN test/main_test.c)
 
-set(FAILURE_DEMO src/demo/main_election_with_failures.c)
+set(FAILURE_DEMO demo/main_election_with_failures.c)
 
 
 include_directories("include/")

src/demo/demo_dog.jpg demo/demo_dog.jpgsrc/demo/demo_dog.jpg renamed to demo/demo_dog.jpg

@@ -1 +1 @@
-localhost slots=1000
+localhost slots=100

src/demo/main_election_with_failures.c demo/main_election_with_failures.csrc/demo/main_election_with_failures.c renamed to demo/main_election_with_failures.c

@@ -1,7 +1,7 @@
 #ifndef DISTRIBUTEDMALLOC_GLOBALS_H
 #define DISTRIBUTEDMALLOC_GLOBALS_H
 
-#define DEF_NODE_SIZE 10000
+#define DEF_NODE_SIZE 1024
 #define DEF_NODE_USER 0
 #define DEF_NODE_LEADER 1
 

simplegraph.dot doc/simplegraph.dotsimplegraph.dot renamed to doc/simplegraph.dot

@@ -1,3 +1,4 @@
+mkdir build/
 rm -rf build/*
 cd build
 cmake ..

simplegraph.png doc/simplegraph.pngsimplegraph.png renamed to doc/simplegraph.png

@@ -65,17 +65,6 @@ char **split_cmd(char *cmd) {
     return tokens;
 }
 
-void print_args(char **args) {
-    char *tok;
-    ssize_t i = 0;
-    do {
-        tok = args[i];
-        i++;
-        if (tok != NULL)
-            printf("%s\n", tok);
-    } while (tok != NULL);
-}
-
 void error_msg(char *msg) {
     warnx("%s\n", msg);
 }
@@ -196,6 +185,9 @@ void execute(char **args, unsigned short leader) {
                 struct data_write *d_w = generate_data_write(address, datasize, buffer_write_file);
                 send_command(OP_WRITE, d_w, leader);
                 // OLD error_msg("w requires an argument 'datasize' which can be casted as a positive integer");
+                fclose(file_write);
+                free(d_w->data);
+                free(d_w);
             }
         } else {
             error_msg("w requires an argument 'address' which can be casted as a positive integer");
@@ -253,6 +245,9 @@ void execute(char **args, unsigned short leader) {
                 if (r_c != d_w->size)
                     error_msg("WARNING: file bytes write different from bytes asked");
                 // OLD error_msg("r requires an argument 'datasize' which can be casted as a positive integer");
+                free(d_w->data);
+                free(d_w);
+                fclose(file_read);
             }
         } else {
             error_msg("r require an argument 'address' which can be casted as a positive integer");
@@ -314,6 +309,7 @@ void execute(char **args, unsigned short leader) {
             struct data_id *d_i = generate_data_id(id);
             printf("Execute Kill on %zu \n", id);
             send_command(OP_KILL, d_i, leader);
+            free(d_i);
         } else {
             error_msg("k require an argument 'node_id' which can be casted as a positive integer");
         }
@@ -333,6 +329,7 @@ void execute(char **args, unsigned short leader) {
             struct data_id *d_i = generate_data_id(id);
             printf("Execute Revive on %zu \n", id);
             send_command(OP_REVIVE, d_i, leader);
+            free(d_i);
         } else {
             error_msg("revive require an argument 'node_id' which can be casted as a positive integer");
         }

hostfile

@@ -81,6 +81,11 @@ void send_read(void *data, unsigned short leader) {
     struct message m2;
     MPI_Status st2;
     MPI_Recv(&m2, sizeof(struct message), MPI_BYTE, m->id_t, TAG_MSG, MPI_COMM_WORLD, &st2);
+    if (m2.size == 0 && d_r->size != 0) {
+        debug("Impossible to read, may have been an error", 0);
+        free(m);
+        return;
+    }
     debug("RECV OK with datasize read", 0);
     size_t real_data_size = m2.size;
     MPI_Status st3;