From 515d46f4ddef2fdc3c4d244effb170d3f5d46f8f Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 1 Mar 2016 23:48:20 +0100 Subject: [PATCH] make this code a real test with a tesh --- teshsuite/msg/storage/concurrent_rw.c | 33 ++++++++++++++----- teshsuite/msg/storage/concurrent_rw.tesh | 42 ++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 teshsuite/msg/storage/concurrent_rw.tesh diff --git a/teshsuite/msg/storage/concurrent_rw.c b/teshsuite/msg/storage/concurrent_rw.c index 7ee98f9f4d..2024745368 100644 --- a/teshsuite/msg/storage/concurrent_rw.c +++ b/teshsuite/msg/storage/concurrent_rw.c @@ -7,22 +7,37 @@ #include "simgrid/msg.h" #include -#define FILENAME1 "/sd1/doc/simgrid/examples/cxx/autoDestination/Main.cxx" +#define FILENAME1 "/home/doc/simgrid/examples/platforms/g5k.xml" XBT_LOG_NEW_DEFAULT_CATEGORY(storage,"Messages specific for this simulation"); static int host(int argc, char *argv[]) { char name[2048]; - sprintf(name,"%s%i", FILENAME1,MSG_process_self_PID()); + int id = MSG_process_self_PID(); + sprintf(name,"%s%i", FILENAME1, id); msg_file_t file = MSG_file_open(name, NULL); - //MSG_file_read(file, MSG_file_get_size(file)); - MSG_file_write(file, 500000); - - XBT_INFO("Size of %s: %llu", MSG_file_get_name(file), MSG_file_get_size(file)); + XBT_INFO("process %d is writing!", id); + MSG_file_write(file, 3000000); + XBT_INFO("process %d goes to sleep for %d seconds", id, id); + MSG_process_sleep(id); + XBT_INFO("process %d is writing again!", id); + MSG_file_write(file, 3000000); + XBT_INFO("process %d goes to sleep for %d seconds", id, 6 - id); + MSG_process_sleep(6-id); + XBT_INFO("process %d is reading!", id); + MSG_file_seek(file, 0, SEEK_SET); + MSG_file_read(file, 3000000); + XBT_INFO("process %d goes to sleep for %d seconds", id, id); + MSG_process_sleep(id); + XBT_INFO("process %d is reading again!", id); + MSG_file_seek(file, 0, SEEK_SET); + MSG_file_read(file, 3000000); + + XBT_INFO("process %d => Size of %s: %llu", id, MSG_file_get_name(file), MSG_file_get_size(file)); MSG_file_close(file); - return 1; + return 0; } int main(int argc, char **argv) @@ -31,8 +46,8 @@ int main(int argc, char **argv) MSG_create_environment(argv[1]); MSG_function_register("host", host); - for(int i = 0 ; i<10; i++){ - MSG_process_create(xbt_strdup("host"), host, NULL, MSG_host_by_name(xbt_strdup("host"))); + for(int i = 0 ; i < 5; i++){ + MSG_process_create("bob", host, NULL, MSG_host_by_name(xbt_strdup("bob"))); } int res = MSG_main(); diff --git a/teshsuite/msg/storage/concurrent_rw.tesh b/teshsuite/msg/storage/concurrent_rw.tesh new file mode 100644 index 0000000000..337f01fa4e --- /dev/null +++ b/teshsuite/msg/storage/concurrent_rw.tesh @@ -0,0 +1,42 @@ +$ ./concurrent_rw $EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/../../../examples/platforms/storage/storage.xml --log=root.fmt:> [%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (1:bob@bob) process 1 is writing! +> [ 0.000000] (2:bob@bob) process 2 is writing! +> [ 0.000000] (3:bob@bob) process 3 is writing! +> [ 0.000000] (4:bob@bob) process 4 is writing! +> [ 0.000000] (5:bob@bob) process 5 is writing! +> [ 0.500000] (1:bob@bob) process 1 goes to sleep for 1 seconds +> [ 0.500000] (2:bob@bob) process 2 goes to sleep for 2 seconds +> [ 0.500000] (3:bob@bob) process 3 goes to sleep for 3 seconds +> [ 0.500000] (4:bob@bob) process 4 goes to sleep for 4 seconds +> [ 0.500000] (5:bob@bob) process 5 goes to sleep for 5 seconds +> [ 1.500000] (1:bob@bob) process 1 is writing again! +> [ 1.600000] (1:bob@bob) process 1 goes to sleep for 5 seconds +> [ 2.500000] (2:bob@bob) process 2 is writing again! +> [ 2.600000] (2:bob@bob) process 2 goes to sleep for 4 seconds +> [ 3.500000] (3:bob@bob) process 3 is writing again! +> [ 3.600000] (3:bob@bob) process 3 goes to sleep for 3 seconds +> [ 4.500000] (4:bob@bob) process 4 is writing again! +> [ 4.600000] (4:bob@bob) process 4 goes to sleep for 2 seconds +> [ 5.500000] (5:bob@bob) process 5 is writing again! +> [ 5.600000] (5:bob@bob) process 5 goes to sleep for 1 seconds +> [ 6.600000] (4:bob@bob) process 4 is reading! +> [ 6.600000] (5:bob@bob) process 5 is reading! +> [ 6.600000] (1:bob@bob) process 1 is reading! +> [ 6.600000] (2:bob@bob) process 2 is reading! +> [ 6.600000] (3:bob@bob) process 3 is reading! +> [ 6.750000] (4:bob@bob) process 4 goes to sleep for 4 seconds +> [ 6.750000] (5:bob@bob) process 5 goes to sleep for 5 seconds +> [ 6.750000] (1:bob@bob) process 1 goes to sleep for 1 seconds +> [ 6.750000] (2:bob@bob) process 2 goes to sleep for 2 seconds +> [ 6.750000] (3:bob@bob) process 3 goes to sleep for 3 seconds +> [ 7.750000] (1:bob@bob) process 1 is reading again! +> [ 7.780000] (1:bob@bob) process 1 => Size of /home/doc/simgrid/examples/platforms/g5k.xml1: 6000000 +> [ 8.750000] (2:bob@bob) process 2 is reading again! +> [ 8.780000] (2:bob@bob) process 2 => Size of /home/doc/simgrid/examples/platforms/g5k.xml2: 6000000 +> [ 9.750000] (3:bob@bob) process 3 is reading again! +> [ 9.780000] (3:bob@bob) process 3 => Size of /home/doc/simgrid/examples/platforms/g5k.xml3: 6000000 +> [ 10.750000] (4:bob@bob) process 4 is reading again! +> [ 10.780000] (4:bob@bob) process 4 => Size of /home/doc/simgrid/examples/platforms/g5k.xml4: 6000000 +> [ 11.750000] (5:bob@bob) process 5 is reading again! +> [ 11.780000] (5:bob@bob) process 5 => Size of /home/doc/simgrid/examples/platforms/g5k.xml5: 6000000 +> [ 11.780000] (0:maestro@) Simulation time 11.78 -- 2.20.1