From: Martin Quinson Date: Sun, 24 Jul 2016 19:52:22 +0000 (+0200) Subject: cosmetics X-Git-Tag: v3_14~722 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/56cb1c2b4dd10665f4652cdc47bc7324b511fe91?hp=2b5c56b4c427b0b0be7c970c86cf62b85106251f cosmetics - Remove from content.txt some files that I just killed, and adapt the examples using that content.txt --- diff --git a/TODO b/TODO index fbcc497739..cbe2792d23 100644 --- a/TODO +++ b/TODO @@ -25,6 +25,6 @@ * Replace XBT with the C++ standard library -* Some XBT datacontainers seem to overlap. Kill some of them all. +* Some XBT datacontainers seem to overlap. Kill some/all of them. - replace fifo with dynars - replace set with SWAG diff --git a/examples/msg/io-file/io-file.tesh b/examples/msg/io-file/io-file.tesh index 560bb8a7cc..c0ee4ddbc1 100644 --- a/examples/msg/io-file/io-file.tesh +++ b/examples/msg/io-file/io-file.tesh @@ -15,8 +15,8 @@ $ ${bindir:=.}/io-file ${srcdir:=.}/storage/storage.xml "--log=root.fmt:[%10.6r] > File Descriptor Id: 0 > [ 0.000000] (1:host@denise) Open file '/home/doc/simgrid/examples/platforms/g5k.xml' > [ 0.000000] (2:host@alice) Capacity of the storage element 'c:\Windows\setupact.log' is stored on: 2391537133 / 536870912000 -> [ 0.000000] (3:host@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 36942866 / 536870912000 -> [ 0.000000] (4:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 36942866 / 536870912000 +> [ 0.000000] (3:host@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 36933331 / 536870912000 +> [ 0.000000] (4:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 36933331 / 536870912000 > [ 0.000000] (1:host@denise) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k.xml' is stored on: 13221994 / 536870912000 > [ 0.000040] (4:host@bob) Have read 4028 from '/home/doc/simgrid/examples/platforms/nancy.xml' > [ 0.000085] (1:host@denise) Have read 17028 from '/home/doc/simgrid/examples/platforms/g5k.xml' @@ -33,10 +33,10 @@ $ ${bindir:=.}/io-file ${srcdir:=.}/storage/storage.xml "--log=root.fmt:[%10.6r] > [ 0.002725] (2:host@alice) Have read 110000 from 'c:\Windows\setupact.log' (of size 201663) > [ 0.002725] (2:host@alice) Coming back to the beginning of the stream for file 'c:\Windows\setupact.log' > [ 0.003374] (4:host@bob) Have written 100000 in '/home/doc/simgrid/examples/platforms/nancy.xml'. Size now is: 104028 -> [ 0.003374] (4:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 37042866 / 536870912000 +> [ 0.003374] (4:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 37033331 / 536870912000 > [ 0.003374] (4:host@bob) Coming back to the beginning of the stream for file '/home/doc/simgrid/examples/platforms/nancy.xml' > [ 0.003560] (3:host@carl) Have written 100000 in '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml'. Size now is: 122645 -> [ 0.003560] (3:host@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 37042866 / 536870912000 +> [ 0.003560] (3:host@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 37033331 / 536870912000 > [ 0.003560] (3:host@carl) Coming back to the beginning of the stream for file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' > [ 0.004135] (1:host@denise) Have written 110000 in '/home/doc/simgrid/examples/platforms/g5k.xml'. Size now is: 110000 > [ 0.004135] (1:host@denise) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k.xml' is stored on: 13314966 / 536870912000 @@ -49,9 +49,9 @@ $ ${bindir:=.}/io-file ${srcdir:=.}/storage/storage.xml "--log=root.fmt:[%10.6r] > [ 0.004660] (3:host@carl) Have read 110000 from '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' (of size 122645) > [ 0.004660] (3:host@carl) Coming back to the beginning of the stream for file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' > [ 0.008081] (4:host@bob) Have written 110000 in '/home/doc/simgrid/examples/platforms/nancy.xml'. Size now is: 110000 -> [ 0.008081] (4:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 37048838 / 536870912000 +> [ 0.008081] (4:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 37039303 / 536870912000 > [ 0.008081] (4:host@bob) Close file '/home/doc/simgrid/examples/platforms/nancy.xml' > [ 0.008326] (3:host@carl) Have written 110000 in '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml'. Size now is: 110000 -> [ 0.008326] (3:host@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 37030221 / 536870912000 +> [ 0.008326] (3:host@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 37020686 / 536870912000 > [ 0.008326] (3:host@carl) Close file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' > [ 0.008326] (0:maestro@) Simulation time 0.00832645 diff --git a/examples/platforms/storage/content/storage_content.txt b/examples/platforms/storage/content/storage_content.txt index 53a74b5952..ec8ccf8991 100644 --- a/examples/platforms/storage/content/storage_content.txt +++ b/examples/platforms/storage/content/storage_content.txt @@ -82,12 +82,10 @@ /doc/simgrid/examples/smpi/compute2.c 628 /doc/simgrid/examples/smpi/sendrecv.c 1652 /doc/simgrid/examples/smpi/allreduce.c 2135 -/doc/simgrid/examples/smpi/mvmul.c 7069 /doc/simgrid/examples/smpi/alltoallv.c 4441 /doc/simgrid/examples/smpi/smpi_traced.c 8529 /doc/simgrid/examples/smpi/compute3.c 816 /doc/simgrid/examples/smpi/reduce.c 3545 -/doc/simgrid/examples/smpi/bcbench.c 2466 /doc/simgrid/examples/smpi/ttest01.c 1273 /doc/simgrid/examples/smpi/compute.c 622 /doc/simgrid/examples/smpi/barrier.c 766