From: Frederic Suter Date: Thu, 16 Jun 2016 08:08:14 +0000 (+0200) Subject: make pastry example functional X-Git-Tag: v3_14~988 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/93dbc62ec5070b3ec0116331aeaec3e9a40f61d0?ds=sidebyside make pastry example functional no idea what it does though --- diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index 65c146a227..de4960f8d4 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -40,7 +40,7 @@ foreach (file answer dht-kademlia node routing_table task) endforeach() foreach (file actions-comm actions-storage app-bittorrent app-chainsend app-masterworker app-pingpong async-wait - async-waitall async-waitany dht-chord dht-kademlia dht-pastry io-remote platform-properties maestro-set + async-waitall async-waitany dht-chord dht-kademlia io-remote platform-properties maestro-set task-priority) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml) endforeach() @@ -84,7 +84,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/actio foreach(x actions-comm actions-storage app-bittorrent app-chainsend app-masterworker app-pingpong app-token-ring async-wait async-waitall async-waitany cloud-capping cloud-masterworker cloud-migration cloud-simple - cloud-two-tasks dht-chord dht-kademlia platform-failures io-file io-remote io-storage task-priority + cloud-two-tasks dht-chord dht-pastry dht-kademlia platform-failures io-file io-remote io-storage task-priority process-create process-kill process-migration process-suspend platform-properties synchro-semaphore process-startkilltime) ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh) @@ -114,6 +114,3 @@ ADD_TESH(msg-app-pmm --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --set if(HAVE_NS3) ADD_TESH_FACTORIES(msg-network-ns3 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/network-ns3/network-ns3.tesh) endif() - -# This one is not usable: -# ADD_TESH_FACTORIES(msg-dht-pastry "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/dht-pastry dht-pastry.tesh) diff --git a/examples/msg/dht-pastry/dht-pastry.c b/examples/msg/dht-pastry/dht-pastry.c index d0afa78f88..d782365790 100644 --- a/examples/msg/dht-pastry/dht-pastry.c +++ b/examples/msg/dht-pastry/dht-pastry.c @@ -12,7 +12,7 @@ /* TODO: * * - handle node departure * * - handle objects on the network * - * - handle neighborood in the update */ + * - handle neighborhood in the update */ #define COMM_SIZE 10 #define COMP_SIZE 0 @@ -180,43 +180,35 @@ static state_t node_get_state(node_t node) { /* Print the node id */ static void print_node_id(node_t node) { - int i; - printf(" id: %i '%08x' ", node->id, node->id); - for (i=0;iid, i)); - printf("\n"); + XBT_INFO(" Id: %i '%08x' ", node->id, node->id); } /* * Print the node neighborhood set */ static void print_node_neighborood_set(node_t node) { - int i; - printf(" Neighborhood:\n"); - for (i=0; ineighborhood_set[i]); + XBT_INFO(" Neighborhood:"); + for (int i=0; ineighborhood_set[i]); } /* Print the routing table */ static void print_node_routing_table(node_t node) { - printf(" routing table:\n"); + XBT_INFO(" Routing table:"); for (int i=0; irouting_table[i][j]); - printf("\n"); + XBT_INFO(" %08x ", node->routing_table[i][j]); } } /* Print the node namespace set */ static void print_node_namespace_set(node_t node) { - printf(" namespace:\n"); + XBT_INFO(" Namespace:"); for (int i=0; inamespace_set[i]); - printf("\n"); + XBT_INFO(" %08x", node->namespace_set[i]); } /* Print the node information */ static void print_node(node_t node) { - printf("Node:\n"); + XBT_INFO("Node:"); print_node_id(node); print_node_neighborood_set(node); print_node_routing_table(node); @@ -331,14 +323,14 @@ static void handle_task(node_t node, msg_task_t task) { XBT_DEBUG("Task update %i !!!", node->id); /* Update namespace ses */ - printf("Task update from %i !!!\n", task_data->sender_id); + XBT_INFO("Task update from %i !!!", task_data->sender_id); + XBT_INFO("Node:"); print_node_id(node); print_node_namespace_set(node); int curr_namespace_set[NAMESPACE_SIZE]; int task_namespace_set[NAMESPACE_SIZE+1]; - // Copy the current namedspace - // and the task state namespace with state->id in the middle + // Copy the current namespace and the task state namespace with state->id in the middle i=0; for (; inamespace_set[i]; @@ -355,18 +347,13 @@ static void handle_task(node_t node, msg_task_t task) { max = -1; for (i=0; i<=NAMESPACE_SIZE; i++) { j = task_namespace_set[i]; - if (iid) min = i; if (j != -1 && max == -1 && j > node->id) max = i; } - printf("\n"); // add lower elements j = NAMESPACE_SIZE/2-1; for (i=NAMESPACE_SIZE/2-1; i>=0; i--) { - printf("i:%i, j:%i, min:%i, currj:%08x, taskmin:%08x\n", i, j, min, curr_namespace_set[j], - task_namespace_set[min]); if (min<0) { node->namespace_set[i] = curr_namespace_set[j]; j--; @@ -385,8 +372,6 @@ static void handle_task(node_t node, msg_task_t task) { // add greater elements j = NAMESPACE_SIZE/2; for (i=NAMESPACE_SIZE/2; i=NAMESPACE_SIZE) { node->namespace_set[i] = curr_namespace_set[j]; j++; @@ -404,7 +389,6 @@ static void handle_task(node_t node, msg_task_t task) { max++; } } - print_node_namespace_set(node); /* Update routing table */ for (i=shl(node->id, task_data->state->id); i [ 25.007806] (1:node@node-0.acme.org) Task update from 366680 !!! +> [ 25.007806] (1:node@node-0.acme.org) Node: +> [ 25.007806] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 25.007806] (1:node@node-0.acme.org) Namespace: +> [ 25.007806] (1:node@node-0.acme.org) ffffffff +> [ 25.007806] (1:node@node-0.acme.org) ffffffff +> [ 25.007806] (1:node@node-0.acme.org) ffffffff +> [ 25.007806] (1:node@node-0.acme.org) ffffffff +> [ 25.007806] (1:node@node-0.acme.org) ffffffff +> [ 25.007806] (1:node@node-0.acme.org) ffffffff +> [ 40.015612] (1:node@node-0.acme.org) Task update from 533744 !!! +> [ 40.015612] (1:node@node-0.acme.org) Node: +> [ 40.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 40.015612] (1:node@node-0.acme.org) Namespace: +> [ 40.015612] (1:node@node-0.acme.org) ffffffff +> [ 40.015612] (1:node@node-0.acme.org) ffffffff +> [ 40.015612] (1:node@node-0.acme.org) ffffffff +> [ 40.015612] (1:node@node-0.acme.org) ffffffff +> [ 40.015612] (1:node@node-0.acme.org) ffffffff +> [ 40.015612] (1:node@node-0.acme.org) ffffffff +> [ 40.023418] (2:node@node-1.acme.org) Task update from 533744 !!! +> [ 40.023418] (2:node@node-1.acme.org) Node: +> [ 40.023418] (2:node@node-1.acme.org) Id: 366680 '00059858' +> [ 40.023418] (2:node@node-1.acme.org) Namespace: +> [ 40.023418] (2:node@node-1.acme.org) ffffffff +> [ 40.023418] (2:node@node-1.acme.org) ffffffff +> [ 40.023418] (2:node@node-1.acme.org) 0000002a +> [ 40.023418] (2:node@node-1.acme.org) ffffffff +> [ 40.023418] (2:node@node-1.acme.org) ffffffff +> [ 40.023418] (2:node@node-1.acme.org) ffffffff +> [ 45.015612] (1:node@node-0.acme.org) Task update from 1319738 !!! +> [ 45.015612] (1:node@node-0.acme.org) Node: +> [ 45.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 45.015612] (1:node@node-0.acme.org) Namespace: +> [ 45.015612] (1:node@node-0.acme.org) ffffffff +> [ 45.015612] (1:node@node-0.acme.org) ffffffff +> [ 45.015612] (1:node@node-0.acme.org) ffffffff +> [ 45.015612] (1:node@node-0.acme.org) ffffffff +> [ 45.015612] (1:node@node-0.acme.org) ffffffff +> [ 45.015612] (1:node@node-0.acme.org) ffffffff +> [ 55.015612] (1:node@node-0.acme.org) Task update from 16509405 !!! +> [ 55.015612] (1:node@node-0.acme.org) Node: +> [ 55.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 55.015612] (1:node@node-0.acme.org) Namespace: +> [ 55.015612] (1:node@node-0.acme.org) ffffffff +> [ 55.015612] (1:node@node-0.acme.org) ffffffff +> [ 55.015612] (1:node@node-0.acme.org) ffffffff +> [ 55.015612] (1:node@node-0.acme.org) ffffffff +> [ 55.015612] (1:node@node-0.acme.org) ffffffff +> [ 55.015612] (1:node@node-0.acme.org) ffffffff +> [ 55.031224] (2:node@node-1.acme.org) Task update from 16509405 !!! +> [ 55.031224] (2:node@node-1.acme.org) Node: +> [ 55.031224] (2:node@node-1.acme.org) Id: 366680 '00059858' +> [ 55.031224] (2:node@node-1.acme.org) Namespace: +> [ 55.031224] (2:node@node-1.acme.org) ffffffff +> [ 55.031224] (2:node@node-1.acme.org) ffffffff +> [ 55.031224] (2:node@node-1.acme.org) 0000002a +> [ 55.031224] (2:node@node-1.acme.org) ffffffff +> [ 55.031224] (2:node@node-1.acme.org) ffffffff +> [ 55.031224] (2:node@node-1.acme.org) ffffffff +> [ 60.015612] (1:node@node-0.acme.org) Task update from 10874876 !!! +> [ 60.015612] (1:node@node-0.acme.org) Node: +> [ 60.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 60.015612] (1:node@node-0.acme.org) Namespace: +> [ 60.015612] (1:node@node-0.acme.org) ffffffff +> [ 60.015612] (1:node@node-0.acme.org) ffffffff +> [ 60.015612] (1:node@node-0.acme.org) ffffffff +> [ 60.015612] (1:node@node-0.acme.org) ffffffff +> [ 60.015612] (1:node@node-0.acme.org) ffffffff +> [ 60.015612] (1:node@node-0.acme.org) ffffffff +> [ 60.031224] (2:node@node-1.acme.org) Task update from 10874876 !!! +> [ 60.031224] (2:node@node-1.acme.org) Node: +> [ 60.031224] (2:node@node-1.acme.org) Id: 366680 '00059858' +> [ 60.031224] (2:node@node-1.acme.org) Namespace: +> [ 60.031224] (2:node@node-1.acme.org) ffffffff +> [ 60.031224] (2:node@node-1.acme.org) ffffffff +> [ 60.031224] (2:node@node-1.acme.org) 0000002a +> [ 60.031224] (2:node@node-1.acme.org) ffffffff +> [ 60.031224] (2:node@node-1.acme.org) ffffffff +> [ 60.031224] (2:node@node-1.acme.org) ffffffff +> [ 60.039030] (3:node@node-2.acme.org) Task update from 10874876 !!! +> [ 60.039030] (3:node@node-2.acme.org) Node: +> [ 60.039030] (3:node@node-2.acme.org) Id: 533744 '000824f0' +> [ 60.039030] (3:node@node-2.acme.org) Namespace: +> [ 60.039030] (3:node@node-2.acme.org) ffffffff +> [ 60.039030] (3:node@node-2.acme.org) 0000002a +> [ 60.039030] (3:node@node-2.acme.org) 00059858 +> [ 60.039030] (3:node@node-2.acme.org) ffffffff +> [ 60.039030] (3:node@node-2.acme.org) ffffffff +> [ 60.039030] (3:node@node-2.acme.org) ffffffff +> [ 65.031224] (4:node@node-3.acme.org) Task update from 16728096 !!! +> [ 65.031224] (4:node@node-3.acme.org) Node: +> [ 65.031224] (4:node@node-3.acme.org) Id: 1319738 '0014233a' +> [ 65.031224] (4:node@node-3.acme.org) Namespace: +> [ 65.031224] (4:node@node-3.acme.org) ffffffff +> [ 65.031224] (4:node@node-3.acme.org) ffffffff +> [ 65.031224] (4:node@node-3.acme.org) 0000002a +> [ 65.031224] (4:node@node-3.acme.org) ffffffff +> [ 65.031224] (4:node@node-3.acme.org) ffffffff +> [ 65.031224] (4:node@node-3.acme.org) ffffffff +> [ 70.015612] (1:node@node-0.acme.org) Task update from 16728096 !!! +> [ 70.015612] (1:node@node-0.acme.org) Node: +> [ 70.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 70.015612] (1:node@node-0.acme.org) Namespace: +> [ 70.015612] (1:node@node-0.acme.org) ffffffff +> [ 70.015612] (1:node@node-0.acme.org) ffffffff +> [ 70.015612] (1:node@node-0.acme.org) ffffffff +> [ 70.015612] (1:node@node-0.acme.org) ffffffff +> [ 70.015612] (1:node@node-0.acme.org) ffffffff +> [ 70.015612] (1:node@node-0.acme.org) ffffffff +> [ 75.031224] (2:node@node-1.acme.org) Task update from 10004760 !!! +> [ 75.031224] (2:node@node-1.acme.org) Node: +> [ 75.031224] (2:node@node-1.acme.org) Id: 366680 '00059858' +> [ 75.031224] (2:node@node-1.acme.org) Namespace: +> [ 75.031224] (2:node@node-1.acme.org) ffffffff +> [ 75.031224] (2:node@node-1.acme.org) ffffffff +> [ 75.031224] (2:node@node-1.acme.org) 0000002a +> [ 75.031224] (2:node@node-1.acme.org) ffffffff +> [ 75.031224] (2:node@node-1.acme.org) ffffffff +> [ 75.031224] (2:node@node-1.acme.org) ffffffff +> [ 75.054642] (5:node@node-4.acme.org) Task update from 10004760 !!! +> [ 75.054642] (5:node@node-4.acme.org) Node: +> [ 75.054642] (5:node@node-4.acme.org) Id: 16509405 '00fbe9dd' +> [ 75.054642] (5:node@node-4.acme.org) Namespace: +> [ 75.054642] (5:node@node-4.acme.org) ffffffff +> [ 75.054642] (5:node@node-4.acme.org) 0000002a +> [ 75.054642] (5:node@node-4.acme.org) 00059858 +> [ 75.054642] (5:node@node-4.acme.org) ffffffff +> [ 75.054642] (5:node@node-4.acme.org) ffffffff +> [ 75.054642] (5:node@node-4.acme.org) ffffffff +> [ 80.015612] (1:node@node-0.acme.org) Task update from 10004760 !!! +> [ 80.015612] (1:node@node-0.acme.org) Node: +> [ 80.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 80.015612] (1:node@node-0.acme.org) Namespace: +> [ 80.015612] (1:node@node-0.acme.org) ffffffff +> [ 80.015612] (1:node@node-0.acme.org) ffffffff +> [ 80.015612] (1:node@node-0.acme.org) ffffffff +> [ 80.015612] (1:node@node-0.acme.org) ffffffff +> [ 80.015612] (1:node@node-0.acme.org) ffffffff +> [ 80.015612] (1:node@node-0.acme.org) ffffffff +> [ 95.023418] (1:node@node-0.acme.org) Task update from 6518808 !!! +> [ 95.023418] (1:node@node-0.acme.org) Node: +> [ 95.023418] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [ 95.023418] (1:node@node-0.acme.org) Namespace: +> [ 95.023418] (1:node@node-0.acme.org) ffffffff +> [ 95.023418] (1:node@node-0.acme.org) ffffffff +> [ 95.023418] (1:node@node-0.acme.org) ffffffff +> [ 95.023418] (1:node@node-0.acme.org) ffffffff +> [ 95.023418] (1:node@node-0.acme.org) ffffffff +> [ 95.023418] (1:node@node-0.acme.org) ffffffff +> [100.023418] (1:node@node-0.acme.org) Task update from 2015253 !!! +> [100.023418] (1:node@node-0.acme.org) Node: +> [100.023418] (1:node@node-0.acme.org) Id: 42 '0000002a' +> [100.023418] (1:node@node-0.acme.org) Namespace: +> [100.023418] (1:node@node-0.acme.org) ffffffff +> [100.023418] (1:node@node-0.acme.org) ffffffff +> [100.023418] (1:node@node-0.acme.org) ffffffff +> [100.023418] (1:node@node-0.acme.org) ffffffff +> [100.023418] (1:node@node-0.acme.org) ffffffff +> [100.023418] (1:node@node-0.acme.org) ffffffff +> [100.039030] (4:node@node-3.acme.org) Task update from 2015253 !!! +> [100.039030] (4:node@node-3.acme.org) Node: +> [100.039030] (4:node@node-3.acme.org) Id: 1319738 '0014233a' +> [100.039030] (4:node@node-3.acme.org) Namespace: +> [100.039030] (4:node@node-3.acme.org) ffffffff +> [100.039030] (4:node@node-3.acme.org) ffffffff +> [100.039030] (4:node@node-3.acme.org) 0000002a +> [100.039030] (4:node@node-3.acme.org) ffffffff +> [100.039030] (4:node@node-3.acme.org) ffffffff +> [100.039030] (4:node@node-3.acme.org) ffffffff +> [1000.054642] (0:maestro@) Simulated time: 1000.05 diff --git a/examples/msg/dht-pastry/dht-pastry_d.xml b/examples/msg/dht-pastry/dht-pastry_d.xml deleted file mode 100644 index c81dba224c..0000000000 --- a/examples/msg/dht-pastry/dht-pastry_d.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - -