From 4b4b35167f2fc34b97eac3e8e0ae31b5ac61d74b Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 16 Sep 2019 16:18:32 +0200 Subject: [PATCH] do not use win_storage_content.txt anymore --- examples/platforms/storage/storage.xml | 6 ++--- teshsuite/msg/io-file/io-file.c | 2 +- teshsuite/msg/io-file/io-file.tesh | 22 +++++++++---------- .../msg/io-raw-storage/io-raw-storage.tesh | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml index 8d99f5c2cb..ca64a72b9e 100644 --- a/examples/platforms/storage/storage.xml +++ b/examples/platforms/storage/storage.xml @@ -18,7 +18,7 @@ + content="content/small_content.txt"/> @@ -27,13 +27,13 @@ - + - + diff --git a/teshsuite/msg/io-file/io-file.c b/teshsuite/msg/io-file/io-file.c index 5910d5b83b..a2feefc1ec 100644 --- a/teshsuite/msg/io-file/io-file.c +++ b/teshsuite/msg/io-file/io-file.c @@ -20,7 +20,7 @@ static int host(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[]) switch (MSG_process_self_PID()) { case 1: - file = MSG_file_open("c:\\Windows\\setupact.log", NULL); + file = MSG_file_open("/tmp/include/surf/simgrid_dtd.h", NULL); st_name = "Disk2"; break; case 2: diff --git a/teshsuite/msg/io-file/io-file.tesh b/teshsuite/msg/io-file/io-file.tesh index 636d10e7db..87589ece32 100644 --- a/teshsuite/msg/io-file/io-file.tesh +++ b/teshsuite/msg/io-file/io-file.tesh @@ -2,8 +2,8 @@ $ ${bindir:=.}/io-file ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of host '4' -> [ 0.000000] (1:host@alice) Open file 'c:\Windows\setupact.log' -> [ 0.000000] (1:host@alice) Capacity of the storage element 'c:\Windows\setupact.log' is stored on: 2391537133 / 536870912000 +> [ 0.000000] (1:host@alice) Open file '/tmp/include/surf/simgrid_dtd.h' +> [ 0.000000] (1:host@alice) Capacity of the storage element '/tmp/include/surf/simgrid_dtd.h' is stored on: 13221994 / 536870912000 > [ 0.000000] (2:host@bob) Open file '/home/doc/simgrid/examples/platforms/nancy.xml' > [ 0.000000] (2:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 36933331 / 536870912000 > [ 0.000000] (3:host@carl) Open file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' @@ -19,18 +19,18 @@ $ ${bindir:=.}/io-file ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]% > [ 0.000000] (4:host@denise) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k.xml' is stored on: 13221994 / 536870912000 > [ 0.000040] (2:host@bob) Have read 4028 from '/home/doc/simgrid/examples/platforms/nancy.xml' > [ 0.000085] (4:host@denise) Have read 17028 from '/home/doc/simgrid/examples/platforms/g5k.xml' +> [ 0.000118] (1:host@alice) Have read 23583 from '/tmp/include/surf/simgrid_dtd.h' > [ 0.000226] (3:host@carl) Have read 22645 from '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' -> [ 0.000508] (1:host@alice) Have read 101663 from 'c:\Windows\setupact.log' > [ 0.001752] (4:host@denise) Have written 100000 in '/home/doc/simgrid/examples/platforms/g5k.xml'. Size now is: 117028 > [ 0.001752] (4:host@denise) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k.xml' is stored on: 13321994 / 536870912000 > [ 0.001752] (4:host@denise) Coming back to the beginning of the stream for file '/home/doc/simgrid/examples/platforms/g5k.xml' -> [ 0.002175] (1:host@alice) Have written 100000 in 'c:\Windows\setupact.log'. Size now is: 201663 -> [ 0.002175] (1:host@alice) Capacity of the storage element 'c:\Windows\setupact.log' is stored on: 2391637133 / 536870912000 -> [ 0.002175] (1:host@alice) Coming back to the beginning of the stream for file 'c:\Windows\setupact.log' +> [ 0.001785] (1:host@alice) Have written 100000 in '/tmp/include/surf/simgrid_dtd.h'. Size now is: 123583 +> [ 0.001785] (1:host@alice) Capacity of the storage element '/tmp/include/surf/simgrid_dtd.h' is stored on: 13321994 / 536870912000 +> [ 0.001785] (1:host@alice) Coming back to the beginning of the stream for file '/tmp/include/surf/simgrid_dtd.h' > [ 0.002302] (4:host@denise) Have read 110000 from '/home/doc/simgrid/examples/platforms/g5k.xml' (of size 117028) > [ 0.002302] (4:host@denise) Coming back to the beginning of the stream for file '/home/doc/simgrid/examples/platforms/g5k.xml' -> [ 0.002725] (1:host@alice) Have read 110000 from 'c:\Windows\setupact.log' (of size 201663) -> [ 0.002725] (1:host@alice) Coming back to the beginning of the stream for file 'c:\Windows\setupact.log' +> [ 0.002335] (1:host@alice) Have read 110000 from '/tmp/include/surf/simgrid_dtd.h' (of size 123583) +> [ 0.002335] (1:host@alice) Coming back to the beginning of the stream for file '/tmp/include/surf/simgrid_dtd.h' > [ 0.003374] (2:host@bob) Have written 100000 in '/home/doc/simgrid/examples/platforms/nancy.xml'. Size now is: 104028 > [ 0.003374] (2:host@bob) Capacity of the storage element '/home/doc/simgrid/examples/platforms/nancy.xml' is stored on: 37033331 / 536870912000 > [ 0.003374] (2:host@bob) Coming back to the beginning of the stream for file '/home/doc/simgrid/examples/platforms/nancy.xml' @@ -40,11 +40,11 @@ $ ${bindir:=.}/io-file ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]% > [ 0.004135] (4:host@denise) Have written 110000 in '/home/doc/simgrid/examples/platforms/g5k.xml'. Size now is: 110000 > [ 0.004135] (4:host@denise) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k.xml' is stored on: 13314966 / 536870912000 > [ 0.004135] (4:host@denise) Close file '/home/doc/simgrid/examples/platforms/g5k.xml' +> [ 0.004168] (1:host@alice) Have written 110000 in '/tmp/include/surf/simgrid_dtd.h'. Size now is: 110000 +> [ 0.004168] (1:host@alice) Capacity of the storage element '/tmp/include/surf/simgrid_dtd.h' is stored on: 13308411 / 536870912000 +> [ 0.004168] (1:host@alice) Unlink file '/tmp/include/surf/simgrid_dtd.h' > [ 0.004414] (2:host@bob) Have read 104028 from '/home/doc/simgrid/examples/platforms/nancy.xml' (of size 104028) > [ 0.004414] (2:host@bob) Coming back to the beginning of the stream for file '/home/doc/simgrid/examples/platforms/nancy.xml' -> [ 0.004558] (1:host@alice) Have written 110000 in 'c:\Windows\setupact.log'. Size now is: 110000 -> [ 0.004558] (1:host@alice) Capacity of the storage element 'c:\Windows\setupact.log' is stored on: 2391545470 / 536870912000 -> [ 0.004558] (1:host@alice) Unlink file 'c:\Windows\setupact.log' > [ 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] (2:host@bob) Have written 110000 in '/home/doc/simgrid/examples/platforms/nancy.xml'. Size now is: 110000 diff --git a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh index efad2194b9..d94788e8a8 100644 --- a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh +++ b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh @@ -2,7 +2,7 @@ $ ${bindir}/io-raw-storage ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:@denise) *** Storage info on denise *** -> [ 0.000000] (1:@denise) Storage name: Disk2, mount name: c: +> [ 0.000000] (1:@denise) Storage name: Disk2, mount name: /tmp > [ 0.000000] (1:@denise) Storage name: Disk4, mount name: /home > [ 0.003333] (1:@denise) Wrote 200000 bytes on 'Disk4' > [ 0.004333] (1:@denise) Read 200000 bytes on 'Disk4' -- 2.20.1