From: suter Date: Wed, 13 Nov 2013 09:52:24 +0000 (+0100) Subject: yet another update X-Git-Tag: v3_11_beta~322 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cf6a47ee6e6c3b4b884c577ba9d7324ae4f32783 yet another update --- diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c index ef7808f66f..9e07765119 100644 --- a/examples/msg/io/file.c +++ b/examples/msg/io/file.c @@ -16,7 +16,7 @@ */ #define FILENAME1 "./doc/simgrid/examples/platforms/g5k.xml" -#define FILENAME2 "./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml" +#define FILENAME2 ".\\Windows\\setupact.log" #define FILENAME3 "./doc/simgrid/examples/platforms/g5k_cabinets.xml" #define FILENAME4 "./doc/simgrid/examples/platforms/nancy.xml" @@ -40,11 +40,13 @@ int host(int argc, char *argv[]) if(!strcmp(MSG_process_get_name(MSG_process_self()),"0")){ file = MSG_file_open(mount,FILENAME1, NULL); MSG_file_dump(file); - } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1")) + } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1")) { + free(mount); + mount = xbt_strdup("/windows"); file = MSG_file_open(mount,FILENAME2, NULL); - else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2")) + } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2")){ file = MSG_file_open(mount,FILENAME3, NULL); - else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3")) + } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3")) file = MSG_file_open(mount,FILENAME4, NULL); else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self())); diff --git a/examples/msg/io/io.tesh b/examples/msg/io/io.tesh index 65a31f80f0..e612c10a90 100644 --- a/examples/msg/io/io.tesh +++ b/examples/msg/io/io.tesh @@ -2,88 +2,56 @@ $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Number of host '4' -> [ 0.000000] (2:1@alice) Open file './doc/simgrid/examples/platforms/One_cluster_no_backbone.xml' +> [ 0.000000] (2:1@alice) Open file '.\Windows\setupact.log' > [ 0.000000] (3:2@carl) Open file './doc/simgrid/examples/platforms/g5k_cabinets.xml' > [ 0.000000] (4:3@bob) Open file './doc/simgrid/examples/platforms/nancy.xml' > [ 0.000000] (1:0@denise) File Descriptor information: > Full name: './doc/simgrid/examples/platforms/g5k.xml' > Size: 17028 > Mount point: '/home' -> Storage Id: 'Disk1' -> Storage Type: 'single_HDD' +> Storage Id: 'Disk4' +> Storage Type: 'single_SSD' > Content Type: 'txt_unix' > [ 0.000000] (1:0@denise) Open file './doc/simgrid/examples/platforms/g5k.xml' -> [ 0.000002] (2:1@alice) Have read 482 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml -> [ 0.000081] (4:3@bob) Have read 4028 on ./doc/simgrid/examples/platforms/nancy.xml -> [ 0.000225] (1:0@denise) Have read 17028 on ./doc/simgrid/examples/platforms/g5k.xml +> [ 0.000040] (4:3@bob) Have read 4028 on ./doc/simgrid/examples/platforms/nancy.xml +> [ 0.000085] (1:0@denise) Have read 17028 on ./doc/simgrid/examples/platforms/g5k.xml > [ 0.000226] (3:2@carl) Have read 22645 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml -> [ 0.001669] (2:1@alice) Have written 100000 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml -> [ 0.002297] (2:1@alice) Have read 100480 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml (of size 100480) -> [ 0.002297] (2:1@alice) Close file './doc/simgrid/examples/platforms/One_cluster_no_backbone.xml' +> [ 0.000508] (2:1@alice) Have read 101663 on .\Windows\setupact.log +> [ 0.001752] (1:0@denise) Have written 100000 on ./doc/simgrid/examples/platforms/g5k.xml +> [ 0.002175] (2:1@alice) Have written 100000 on .\Windows\setupact.log +> [ 0.002439] (1:0@denise) Have read 110000 on ./doc/simgrid/examples/platforms/g5k.xml (of size 117026) +> [ 0.002439] (1:0@denise) Close file './doc/simgrid/examples/platforms/g5k.xml' +> [ 0.002862] (2:1@alice) Have read 110000 on .\Windows\setupact.log (of size 201662) +> [ 0.002862] (2:1@alice) Close file '.\Windows\setupact.log' +> [ 0.003374] (4:3@bob) Have written 100000 on ./doc/simgrid/examples/platforms/nancy.xml > [ 0.003560] (3:2@carl) Have written 100000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml -> [ 0.004782] (3:2@carl) Have read 110000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml (of size 122644) +> [ 0.004529] (4:3@bob) Have read 104023 on ./doc/simgrid/examples/platforms/nancy.xml (of size 104023) +> [ 0.004529] (4:3@bob) Close file './doc/simgrid/examples/platforms/nancy.xml' +> [ 0.004782] (3:2@carl) Have read 110000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml (of size 122641) > [ 0.004782] (3:2@carl) Close file './doc/simgrid/examples/platforms/g5k_cabinets.xml' -> [ 0.006603] (4:3@bob) Have written 100000 on ./doc/simgrid/examples/platforms/nancy.xml -> [ 0.006892] (1:0@denise) Have written 100000 on ./doc/simgrid/examples/platforms/g5k.xml -> [ 0.008626] (4:3@bob) Have read 104025 on ./doc/simgrid/examples/platforms/nancy.xml (of size 104025) -> [ 0.008626] (4:3@bob) Close file './doc/simgrid/examples/platforms/nancy.xml' -> [ 0.008981] (1:0@denise) Have read 110000 on ./doc/simgrid/examples/platforms/g5k.xml (of size 117025) -> [ 0.008981] (1:0@denise) Close file './doc/simgrid/examples/platforms/g5k.xml' -> [ 0.008981] (0:@) Simulation time 0.00898084 +> [ 0.004782] (0:@) Simulation time 0.00478201 $ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Number of host '4' > [ 0.000000] (1:0@denise) Open file './doc/simgrid/examples/platforms/g5k.xml' > [ 0.000000] (1:0@denise) Unlink file './doc/simgrid/examples/platforms/g5k.xml' > [ 0.000000] (1:0@denise) Open file './doc/simgrid/examples/platforms/g5k.xml' -> [ 0.003333] (1:0@denise) Have written 100000 on ./doc/simgrid/examples/platforms/g5k.xml -> [ 0.003333] (1:0@denise) Close file './doc/simgrid/examples/platforms/g5k.xml' -> [ 0.003333] (1:0@denise) -> [ 0.003333] (1:0@denise) ls ./ -> [ 0.003333] (1:0@denise) DIR : include -> [ 0.003333] (1:0@denise) DIR : lib -> [ 0.003333] (1:0@denise) DIR : bin -> [ 0.003333] (1:0@denise) DIR : doc -> [ 0.003333] (1:0@denise) -> [ 0.003333] (1:0@denise) ls ./doc/simgrid/examples/platforms/ -> [ 0.003333] (1:0@denise) FILE : lcg_sept2004_grid.xml -> [ 0.003333] (1:0@denise) FILE : prop.xml -> [ 0.003333] (1:0@denise) FILE : multicore_machine.xml -> [ 0.003333] (1:0@denise) FILE : g5k.xml -> [ 0.003333] (1:0@denise) FILE : vivaldi.xml -> [ 0.003333] (1:0@denise) FILE : gdx.xml -> [ 0.003333] (1:0@denise) FILE : griffon.xml -> [ 0.003333] (1:0@denise) FILE : Two_clusters.xml -> [ 0.003333] (1:0@denise) FILE : One_cluster_no_backbone.xml -> [ 0.003333] (1:0@denise) FILE : median_harvard.xml -> [ 0.003333] (1:0@denise) FILE : nancy.xml -> [ 0.003333] (1:0@denise) FILE : One_cluster.xml -> [ 0.003333] (1:0@denise) FILE : g5k_cabinets.xml -> [ 0.003333] (1:0@denise) FILE : gridpp_grid_2004.xml -> [ 0.003333] (1:0@denise) -> [ 0.003333] (1:0@denise) ls ./doc/simgrid/examples/msg/ -> [ 0.003333] (1:0@denise) DIR : parallel_contexts -> [ 0.003333] (1:0@denise) DIR : alias -> [ 0.003333] (1:0@denise) DIR : trace -> [ 0.003333] (1:0@denise) FILE : small_platform.xml -> [ 0.003333] (1:0@denise) DIR : priority -> [ 0.003333] (1:0@denise) DIR : tracing -> [ 0.003333] (1:0@denise) DIR : properties -> [ 0.003333] (1:0@denise) FILE : README -> [ 0.003333] (1:0@denise) DIR : chord -> [ 0.003333] (1:0@denise) DIR : mc -> [ 0.003333] (1:0@denise) DIR : gtnets -> [ 0.003333] (1:0@denise) DIR : suspend -> [ 0.003333] (1:0@denise) FILE : small_platform_with_routers.xml -> [ 0.003333] (1:0@denise) DIR : pmm -> [ 0.003333] (1:0@denise) FILE : msg_platform.xml -> [ 0.003333] (1:0@denise) DIR : token_ring -> [ 0.003333] (1:0@denise) DIR : actions -> [ 0.003333] (1:0@denise) FILE : small_platform_with_failures.xml -> [ 0.003333] (1:0@denise) DIR : ns3 -> [ 0.003333] (1:0@denise) DIR : sendrecv -> [ 0.003333] (1:0@denise) DIR : parallel_task -> [ 0.003333] (1:0@denise) DIR : masterslave -> [ 0.003333] (1:0@denise) DIR : icomms -> [ 0.003333] (1:0@denise) DIR : migration -> [ 0.003333] (0:@) Simulation time 0.00333333 \ No newline at end of file +> [ 0.001667] (1:0@denise) Have written 100000 on ./doc/simgrid/examples/platforms/g5k.xml +> [ 0.001667] (1:0@denise) Close file './doc/simgrid/examples/platforms/g5k.xml' +> [ 0.001667] (1:0@denise) +> [ 0.001667] (1:0@denise) ls ./ +> [ 0.001667] (1:0@denise) DIR : include +> [ 0.001667] (1:0@denise) DIR : lib +> [ 0.001667] (1:0@denise) DIR : bin +> [ 0.001667] (1:0@denise) DIR : doc +> [ 0.001667] (1:0@denise) +> [ 0.001667] (1:0@denise) ls ./doc/simgrid/examples/platforms/ +> [ 0.001667] (1:0@denise) FILE : g5k.xml +> [ 0.001667] (1:0@denise) +> [ 0.001667] (1:0@denise) ls ./doc/simgrid/examples/msg/ +> [ 0.001667] (1:0@denise) DIR : alias +> [ 0.001667] (1:0@denise) DIR : trace +> [ 0.001667] (1:0@denise) FILE : README +> [ 0.001667] (1:0@denise) DIR : parallel_task +> [ 0.001667] (1:0@denise) DIR : icomms +> [ 0.001667] (0:@) Simulation time 0.00166667 \ No newline at end of file diff --git a/examples/platforms/content/small_content.txt b/examples/platforms/content/small_content.txt index fddb4a26c1..41bab56704 100644 --- a/examples/platforms/content/small_content.txt +++ b/examples/platforms/content/small_content.txt @@ -1,4 +1,4 @@ -./doc/simgrid/examples/cxx/autoDestination/autoDestination_platform.xml 2133932 +./doc/simgrid/examples/platforms/g5k.xml 17028 ./doc/simgrid/examples/smpi/mc_bugged2.c 1387 ./doc/simgrid/examples/smpi/NAS/README 1857 ./doc/simgrid/examples/smpi/NAS/MPI_dummy/README 2406 diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml index 142ee854a1..7ee2c200cd 100644 --- a/examples/platforms/storage.xml +++ b/examples/platforms/storage.xml @@ -25,8 +25,8 @@ + content="content/win_storage_content.txt" + content_type="txt_windows" /> - + @@ -45,8 +45,8 @@ - - + + diff --git a/examples/simdag/io/io.tesh b/examples/simdag/io/io.tesh index ea293c34ce..928bd2e624 100644 --- a/examples/simdag/io/io.tesh +++ b/examples/simdag/io/io.tesh @@ -1,8 +1,8 @@ #! ./tesh $ ${bindir:=.}/io/sd_io ${srcdir:=.}/examples/platforms/storage.xml -> [0.000000] [sd_io/INFO] Workstation 'denise' mounts '/sd1' > [0.000000] [sd_io/INFO] Workstation 'denise' mounts '/home' -> [0.000000] [sd_io/INFO] Workstation 'alice' mounts '/home' +> [0.000000] [sd_io/INFO] Workstation 'denise' mounts '/windows' +> [0.000000] [sd_io/INFO] Workstation 'alice' mounts '/windows' > [0.000000] [sd_io/INFO] Workstation 'carl' mounts '/home' > [0.000000] [sd_io/INFO] Workstation 'bob' mounts '/home'