Merge pull request #38 from SidoShiro/dev

Submission

Author: itectori

CMakeLists.txt

@@ -23,18 +23,23 @@ set(SRCS
     src/cli/user.c
     src/network/communication.c
     src/network/data_communication.c
-    src/utils/queue.c)
+    src/utils/queue.c src/network/leader_utils.c)
 
 
 set(MAIN src/main/main.c)
 
 set(TEST_MAIN test/main_test.c)
 
+set(FAILURE_DEMO src/demo/main_election_with_failures.c)
+
 
 include_directories("include/")
 include_directories(SYSTEM ${MPI_INCLUDE_PATH})
 
+
 add_executable(dmalloc ${SRCS} ${MAIN} ${MPI_C_LIBRARIES})
 
-include_directories("include/")
 add_executable(test_dmalloc ${SRCS} ${TEST_MAIN} ${MPI_C_LIBRARIES})
+
+add_executable(failure_demo ${SRCS} ${FAILURE_DEMO} ${MPI_C_LIBRARIES})
+

DEMO.md

@@ -0,0 +1,27 @@
+# Demo
+
+## P1
+
+* Explications
+
+* Utilisation classique
+  * Caractères
+
+## P2
+
+* Images
+
+* Stocker, la récrire  dans un nouveau fichier + feh
+
+* Stocker, modifier, récrire dans un nouveau fichier + feh 
+
+## P3
+
+* Leader election
+* Kill Leader, New Leader
+
+
+## P4
+
+* Etienne utilisé
+

README.md

@@ -37,11 +37,30 @@ default is 20.
 
 # Todo
 
-* command line
-* graph loading
-  * from .dot (network and capacities of each node)
-  * map generation
-* leader election
+* New features
+* Byzantine
+* Snap
+
+## Command Line of dmalloc
+
+dmalloc commands:
+
+| **Command**                   | **Desc.**                                               |
+| h                             | display all available commands with their description   |
+| t                             | show table of allocations                               |
+| m `size`                      | return `address` to cmd user of the required allocation |
+| f `address`                   | free address, Warning if already free                   |
+| w `address` `datasize` `data` | write at the address the data of size datasize          |
+| w `address` `file`            | write all content of file at address                    |
+| w `address` `file` `datasize` | write datasize bytes from file to the address           |
+| r `address` `datasize`        | read datasize bytes at address                          |
+| r `address` `file`            | read all bytes of the block at address into file        |
+| r `address` `file` `datasize` | read datasize bytes at address into file                |
+| d `address`                   | dump in as text all data of the block stored in address |
+| d net                         | dump all allocation                                     |
+| kill `node_id`                | kill node refered by `id`                               |
+| revive `node_id`              | revive `id`                                             |
+
 
 ## Important structs/classes
 
@@ -76,22 +95,6 @@ default is 20.
     * size
     * id (the machine containing this address)
 
-## Command Line
-
-| **Command**                       | **Desc.**                                               |
-|-----------------------------------|---------------------------------------------------------|
-| h                                 | display all available commands with their description   |
-| m `size`                          | return `address` to cmd user of the required allocation |
-| f `address`                       | free address, Warning if already free                   |
-| w `address` `datasize` `data`     | write at the address the data of size datasize          |
-| r `address` `datasize`            | read datasize bytes at address                          |
-| d `address`                       | dump in as text all data of the block stored in address |
-| d `address` `file`                | dump address data in file                               |
-| snap                              | give user a snap of the network (print)                 |
-| snap `file`                       | same as snap but stored in file                         |
-| dnet                              | write a .dot file of the network                        |
-| kill `id`                         | kill node refered by `id`                               |
-| revive `id`                       | revive `id`                                             |
 
 ## Node Life Cycles
 

demo/HarryPotterWiki

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

demo/ferrari.jpg

@@ -11,6 +11,7 @@
 #define TAG_MSG 3
 #define TAG_DATA 4
 #define TAG_ELECTION 5
+#define TAG_REVIVE 6
 
 /*
  * Send the given message 'm' to the destination node

demo/loi1901

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