From 6c05fba8daf5e02dbdfe10d7431f1ca3181823a6 Mon Sep 17 00:00:00 2001 From: suter Date: Wed, 13 Nov 2013 10:10:57 +0100 Subject: [PATCH 1/1] update storage.xml to prepare the field for the new example. impacts io.tesh, hence revalidation --- buildtools/Cmake/DefinePackages.cmake | 1 + examples/msg/io/io.tesh | 34 ++++---- examples/platforms/content/small_content.txt | 30 +++++++ examples/platforms/storage.xml | 90 ++++++++++---------- 4 files changed, 93 insertions(+), 62 deletions(-) create mode 100644 examples/platforms/content/small_content.txt diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index c8652bdef0..23b4b965ee 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1027,6 +1027,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/lcg_sept2004_grid.xml examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml + examples/platforms/content/small_content.txt examples/platforms/content/storage_content.txt examples/platforms/content/win_storage_content.txt examples/platforms/data_center.xml diff --git a/examples/msg/io/io.tesh b/examples/msg/io/io.tesh index bf4bdc249d..65a31f80f0 100644 --- a/examples/msg/io/io.tesh +++ b/examples/msg/io/io.tesh @@ -9,27 +9,27 @@ $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.f > Full name: './doc/simgrid/examples/platforms/g5k.xml' > Size: 17028 > Mount point: '/home' -> Storage Id: 'Disk4' -> Storage Type: 'single_SSD' +> Storage Id: 'Disk1' +> Storage Type: 'single_HDD' > Content Type: 'txt_unix' > [ 0.000000] (1:0@denise) Open file './doc/simgrid/examples/platforms/g5k.xml' -> [ 0.000005] (2:1@alice) Have read 482 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml -> [ 0.000040] (4:3@bob) Have read 4028 on ./doc/simgrid/examples/platforms/nancy.xml -> [ 0.000170] (1:0@denise) Have read 17028 on ./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.000226] (3:2@carl) Have read 22645 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml -> [ 0.003338] (2:1@alice) Have written 100000 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml -> [ 0.003374] (4:3@bob) Have written 100000 on ./doc/simgrid/examples/platforms/nancy.xml -> [ 0.003504] (1:0@denise) Have written 100000 on ./doc/simgrid/examples/platforms/g5k.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.003560] (3:2@carl) Have written 100000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml -> [ 0.004343] (2:1@alice) Have read 100481 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml (of size 100481) -> [ 0.004343] (2:1@alice) Close file './doc/simgrid/examples/platforms/One_cluster_no_backbone.xml' -> [ 0.004414] (4:3@bob) Have read 104027 on ./doc/simgrid/examples/platforms/nancy.xml (of size 104027) -> [ 0.004414] (4:3@bob) Close file './doc/simgrid/examples/platforms/nancy.xml' -> [ 0.004604] (1:0@denise) Have read 110000 on ./doc/simgrid/examples/platforms/g5k.xml (of size 117027) -> [ 0.004604] (1:0@denise) Close file './doc/simgrid/examples/platforms/g5k.xml' -> [ 0.004660] (3:2@carl) Have read 110000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml (of size 122644) -> [ 0.004660] (3:2@carl) Close file './doc/simgrid/examples/platforms/g5k_cabinets.xml' -> [ 0.004660] (0:@) Simulation time 0.00465978 +> [ 0.004782] (3:2@carl) Have read 110000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml (of size 122644) +> [ 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 $ ${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' diff --git a/examples/platforms/content/small_content.txt b/examples/platforms/content/small_content.txt new file mode 100644 index 0000000000..fddb4a26c1 --- /dev/null +++ b/examples/platforms/content/small_content.txt @@ -0,0 +1,30 @@ +./doc/simgrid/examples/cxx/autoDestination/autoDestination_platform.xml 2133932 +./doc/simgrid/examples/smpi/mc_bugged2.c 1387 +./doc/simgrid/examples/smpi/NAS/README 1857 +./doc/simgrid/examples/smpi/NAS/MPI_dummy/README 2406 +./doc/simgrid/examples/smpi/NAS/common/randdp.c 1441 +./doc/simgrid/examples/smpi/NAS/sys/README 1461 +./doc/simgrid/examples/smpi/NAS/SP/README 926 +./doc/simgrid/examples/smpi/NAS/FT/README 276 +./doc/simgrid/examples/smpi/NAS/DT/README 999 +./doc/simgrid/examples/smpi/NAS/EP/README 347 +./doc/simgrid/examples/smpi/NAS/EP/randlc.c 3300 +./doc/simgrid/examples/smpi/NAS/MG/README 5465 +./doc/simgrid/examples/xbt/sem_basic.c 1970 +./doc/simgrid/examples/msg/README 4805 +./doc/simgrid/examples/msg/icomms/small_platform.xml 972 +./doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml 654 +./doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c 6217 +./doc/simgrid/examples/msg/trace/test9.xml 598 +./doc/simgrid/html/group__XBT__str.html 36192 +./include/smpi/mpif.h 4826 +./include/xbt/fifo.h 3626 +./include/msg/datatypes.h 4635 +./include/mc/modelchecker.h 96 +./include/surf/simgrid_dtd.h 23583 +./include/instr/instr.h 5750 +./include/simdag/simdag.h 10325 +./include/simix/simix.h 13003 +./lib/libsimgrid.so.3.6.2 12710497 +./bin/smpicc 918 +./bin/tesh 356434 \ No newline at end of file diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml index c1eb980bb7..142ee854a1 100644 --- a/examples/platforms/storage.xml +++ b/examples/platforms/storage.xml @@ -12,51 +12,51 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.20.1