fix kill and revive

Author: itectori

src/cli/user.c

@@ -149,7 +149,7 @@ void send_kill(struct data_id *data, unsigned short leader) {
 
 void send_revive(struct data_id *data, unsigned short leader) {
     struct message *m = generate_message(USER_NODE, leader, data->id, 0, 0, OP_REVIVE);
-    MPI_Send(m, sizeof(struct message), MPI_BYTE, leader, TAG_REVIVE, MPI_COMM_WORLD);
+    MPI_Send(m, sizeof(struct message), MPI_BYTE, leader, TAG_MSG, MPI_COMM_WORLD);
     free(m);
 }
 

src/network/leader.c

@@ -208,8 +208,7 @@ void get_command(struct leader_resources *l_r, unsigned short user) {
             case OP_REVIVE: {
                 debug("Leader recv OP KILL from User", l_r->id);
                 n_command->command = m->op;
-                struct data_id *id = calloc(1, sizeof(struct data_id));
-                n_command->data = id;
+                n_command->data = generate_data_id(m->id_o);
                 l_r->leader_command_queue = push_command(l_r->leader_command_queue, n_command);
                 break;
             }
@@ -504,8 +503,10 @@ void execute_command(struct leader_resources *l_r, int *die) {
                 printf("KILL %u\n", id->id);
                 fflush(0);
                 add_dead(l_r, id->id);
-                if (id->id == l_r->id)
+                if (id->id == l_r->id) {
+                    debug("KILL LEADER __", id->id);
                     *die = 1;
+                }
                 else {
                     struct message *m_kill = generate_message(l_r->id, id->id, 0, 0, 0, OP_KILL);
                     MPI_Send(m_kill, sizeof(struct message), MPI_BYTE, id->id, TAG_MSG, MPI_COMM_WORLD);

src/network/node.c

@@ -51,10 +51,28 @@ void read_on_node(struct node *n, size_t address, char *data, size_t size) {
 
 void wait_if_dead(struct node *n) {
     while (n->is_dead) {
+        debug("WAITING FOR REVIVE", n->id);
         struct message m;
         MPI_Recv(&m, sizeof(struct message), MPI_BYTE, MPI_ANY_SOURCE, TAG_REVIVE, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
-        if (m.op == OP_REVIVE)
+        if (m.op == OP_REVIVE) {
+            debug("REVIVE __", n->id);
             n->is_dead = 0;
+            int f = 0;
+            MPI_Request request;
+            do {
+                struct message bin;
+                MPI_Irecv(&bin, sizeof(struct message), MPI_BYTE, MPI_ANY_SOURCE, TAG_MSG, MPI_COMM_WORLD, &request);
+                MPI_Test(&request, &f, MPI_STATUS_IGNORE);
+            } while (f);
+            MPI_Cancel(&request);
+            f = 0;
+            do {
+                struct message bin;
+                MPI_Irecv(&bin, sizeof(struct message), MPI_BYTE, MPI_ANY_SOURCE, TAG_ELECTION, MPI_COMM_WORLD, &request);
+                MPI_Test(&request, &f, MPI_STATUS_IGNORE);
+            } while (f);
+            MPI_Cancel(&request);
+        }
     }
 }
 
@@ -95,6 +113,7 @@ void node_cycle(struct node *n) {
                 free(data);
                 break;
             case OP_KILL:
+                debug("KILLED __", n->id);
                 n->is_dead = 1;
                 break;
             default: