Merge pull request #28 from SidoShiro/cli-improve

Cli improve

Author: SidoShiro

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/message.h

@@ -17,6 +17,7 @@ enum operation {
     OP_TEST,
     OP_NONE,
     OP_DUMP,
+    OP_DUMP_ALL,
     OP_LEADER_OK,
     OP_ALIVE,
     OP_LEADER_AGAIN

src/cli/cli.c

@@ -42,14 +42,20 @@ char *read_cmd() {
 char **split_cmd(char *cmd) {
     char **tokens = NULL;
     char *token;
+    int w = 0;
     ssize_t nb_tok = 1;
     token = strtok(cmd, " ");
+    if (token && 0 == strcmp(token, "w"))
+        w++;
     /* walk through other tokens */
     while (token != NULL) {
         tokens = realloc(tokens, nb_tok * sizeof(char *));
         tokens[nb_tok - 1] = token;
         nb_tok++;
-        token = strtok(NULL, " ");
+        if (nb_tok == 4 && w == 1)
+            token = strtok(NULL, "\0");
+        else
+            token = strtok(NULL, " ");
     }
     tokens = realloc(tokens, nb_tok * sizeof(char *));
     tokens[nb_tok - 1] = NULL;
@@ -83,6 +89,7 @@ void execute(char **args, unsigned short leader) {
                " w `address` `datasize` `data` | write at the address the data of size datasize          |\n"
                " r `address` `datasize`        | read datasize bytes at address                          |\n"
                " d `address`                   | dump in as text all data of the block stored in address |\n"
+               " d net                         | dump all allocation                                     |\n"
                " d `address` `file`            | dump address data in file                               |\n"
                " snap                          | give user a snap of the network (print)                 |\n"
                " snap `file`                   | same as snap but stored in file                         |\n"
@@ -180,7 +187,7 @@ void execute(char **args, unsigned short leader) {
     } else if (0 == strcmp(args[0], "d")) {
         // ERRORS
         if (l <= 1) {
-            error_msg("d requires minimum 1 argument and maximum 2 : 'address' and 'file'");
+            error_msg("d requires minimum 1 argument and maximum 2 : 'address' | 'net and 'file'");
             return;
         } else if (l >= 4) {
             error_msg("d do not support more than 2 arguments, check command h");
@@ -189,12 +196,17 @@ void execute(char **args, unsigned short leader) {
 
         // Execution
         size_t address = 0;
-        if (1 == sscanf(args[1], "%zu", &address)) {
+        if (0 == strcmp(args[1], "net")) {
+            printf("Execute DUMP_ALL");
+            send_command(OP_DUMP_ALL, NULL, leader);
+        } else if (1 == sscanf(args[1], "%zu", &address)) {
 
             // d address
             if (l == 2) {
                 printf("Execute Dump of %zu\n", address);
-
+                struct data_address *d_a = generate_data_address(address);
+                send_command(OP_DUMP, d_a, leader);
+                free(d_a);
             }
 
             // d address file

src/cli/user.c

@@ -87,6 +87,29 @@ void send_read(void *data, unsigned short leader) {
     free(m);
 }
 
+void send_dump(void *data, unsigned short leader) {
+    MPI_Request r;
+    // MPI_Status st;
+    struct data_address *d_a = data;
+    struct message *m = generate_message(DEF_NODE_USER, leader, DEF_NODE_LEADER,
+                                         d_a->address, 0, OP_DUMP);
+
+    MPI_Isend((void *) m, sizeof(struct message), MPI_BYTE, m->id_t, 0, MPI_COMM_WORLD, &r);
+
+    free(m);
+}
+
+void send_dump_all(unsigned short leader) {
+    MPI_Request r;
+    // MPI_Status st;
+    struct message *m = generate_message(DEF_NODE_USER, leader, DEF_NODE_LEADER,
+                                         0, 0, OP_DUMP_ALL);
+
+    MPI_Isend((void *) m, sizeof(struct message), MPI_BYTE, m->id_t, 0, MPI_COMM_WORLD, &r);
+
+    free(m);
+}
+
 void send_command(enum operation op, void *data, unsigned short leader) {
     switch (op) {
         case OP_OK:
@@ -103,6 +126,14 @@ void send_command(enum operation op, void *data, unsigned short leader) {
             debug("Send Read", 0);
             send_read(data, leader);
             break;
+        case OP_DUMP:
+            debug("Send Dump", 0);
+            send_dump(data, leader);
+            break;
+        case OP_DUMP_ALL:
+            debug("Send Dump All", 0);
+            send_dump_all(leader);
+            break;
         default:
             break;
     }

src/utils/command_queue.c

@@ -82,3 +82,10 @@ struct data_id *generate_data_id(unsigned short id) {
     d_i->id = id;
     return d_i;
 }
+
+
+struct data_address *generate_data_address(size_t address) {
+    struct data_address *d_a = malloc(sizeof(struct data_address));
+    d_a->address = address;
+    return d_a;
+}