From: Frederic Suter Date: Mon, 16 Sep 2019 13:36:17 +0000 (+0200) Subject: rework old storage example to get rid of win_storage_content.txt X-Git-Tag: v3.24~81 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fab34c137a959a6ee3fc4b0786aadb195bd5db2d rework old storage example to get rid of win_storage_content.txt --- diff --git a/MANIFEST.in b/MANIFEST.in index 46022c76e7..29d9cef6e0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1867,7 +1867,6 @@ include examples/platforms/small_platform_profile.xml include examples/platforms/small_platform_with_routers.xml include examples/platforms/storage/content/small_content.txt include examples/platforms/storage/content/storage_content.txt -include examples/platforms/storage/content/win_storage_content.txt include examples/platforms/storage/remote_io.xml include examples/platforms/storage/storage.xml include examples/platforms/syscoord/generate_peer_platform.pl diff --git a/examples/platforms/storage/content/win_storage_content.txt b/examples/platforms/storage/content/win_storage_content.txt deleted file mode 100644 index 48972cabdd..0000000000 --- a/examples/platforms/storage/content/win_storage_content.txt +++ /dev/null @@ -1,36 +0,0 @@ -\Windows\avastSS.scr 41664 -\Windows\bfsvc.exe 75264 -\Windows\bootstat.dat 67584 -\Windows\CoreSingleLanguage.xml 31497 -\Windows\csup.txt 12 -\Windows\dchcfg64.exe 335464 -\Windows\dcmdev64.exe 93288 -\Windows\DirectX.log 10486 -\Windows\DPINST.LOG 18944 -\Windows\DtcInstall.log 1955 -\Windows\explorer.exe 2380944 -\Windows\font1.sii 4907 -\Windows\font2.sii 8698 -\Windows\hapint.exe 382056 -\Windows\HelpPane.exe 883712 -\Windows\hh.exe 17408 -\Windows\MEMORY.DMP 2384027342 -\Windows\mib.bin 43131 -\Windows\notepad.exe 243712 -\Windows\PFRO.log 6770 -\Windows\Professional.xml 31881 -\Windows\regedit.exe 159232 -\Windows\setupact.log 101663 -\Windows\setuperr.log 0 -\Windows\splwow64.exe 126464 -\Windows\Starter.xml 31537 -\Windows\system.ini 219 -\Windows\twain_32.dll 50176 -\Windows\vmgcoinstall.log 1585 -\Windows\win.ini 92 -\Windows\WindowsUpdate.log 1518934 -\Windows\winhlp32.exe 10752 -\Windows\WLXPGSS.SCR 322048 -\Windows\WMSysPr9.prx 316640 -\Windows\write.exe 10752 -\Windows\_isusr32.dll 180320 \ No newline at end of file diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml index c19c354941..da1a035631 100644 --- a/examples/platforms/storage/remote_io.xml +++ b/examples/platforms/storage/remote_io.xml @@ -14,10 +14,10 @@ + content="content/storage_content.txt" /> - + @@ -26,7 +26,7 @@ - + diff --git a/teshsuite/msg/io-file-remote/io-file-remote.tesh b/teshsuite/msg/io-file-remote/io-file-remote.tesh index 298dda1464..a3127a0589 100644 --- a/teshsuite/msg/io-file-remote/io-file-remote.tesh +++ b/teshsuite/msg/io-file-remote/io-file-remote.tesh @@ -2,16 +2,16 @@ $ ${bindir:=.}/io-file-remote ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" > [ 0.000000] (0@ ) Init: 12/476824 MiB used/free on 'Disk1' -> [ 0.000000] (0@ ) Init: 2280/474556 MiB used/free on 'Disk2' -> [ 0.000000] (1@alice) Opened file 'c:\Windows\setupact.log' +> [ 0.000000] (0@ ) Init: 35/476801 MiB used/free on 'Disk2' +> [ 0.000000] (1@alice) Opened file '/tmp/doc/simgrid/examples/msg/chord/chord10k.xml' > [ 0.000000] (1@alice) File Descriptor information: -> Full path: 'c:\Windows\setupact.log' -> Size: 101663 -> Mount point: 'c:' +> Full path: '/tmp/doc/simgrid/examples/msg/chord/chord10k.xml' +> Size: 1624671 +> Mount point: '/tmp' > Storage Id: 'Disk2' > Storage Type: 'SATA-II_HDD' > File Descriptor Id: 0 -> [ 0.000000] (1@alice) Try to read 101663 from 'c:\Windows\setupact.log' +> [ 0.000000] (1@alice) Try to read 1624671 from '/tmp/doc/simgrid/examples/msg/chord/chord10k.xml' > [ 0.000000] (2@ bob) Opened file '/scratch/lib/libsimgrid.so.3.6.2' > [ 0.000000] (2@ bob) File Descriptor information: > Full path: '/scratch/lib/libsimgrid.so.3.6.2' @@ -30,23 +30,23 @@ $ ${bindir:=.}/io-file-remote ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/ > Storage Type: 'SATA-II_HDD' > File Descriptor Id: 0 > [ 0.000000] (3@ carl) Try to read 12710497 from '/scratch/lib/libsimgrid.so.3.6.2' -> [ 0.000000] (4@ dave) Opened file 'c:\Windows\bootstat.dat' +> [ 0.000000] (4@ dave) Opened file '/tmp/doc/simgrid/examples/simdag/dax/Montage_50.xml' > [ 0.000000] (4@ dave) File Descriptor information: -> Full path: 'c:\Windows\bootstat.dat' -> Size: 67584 -> Mount point: 'c:' +> Full path: '/tmp/doc/simgrid/examples/simdag/dax/Montage_50.xml' +> Size: 48868 +> Mount point: '/tmp' > Storage Id: 'Disk2' > Storage Type: 'SATA-II_HDD' > File Descriptor Id: 0 -> [ 0.000000] (4@ dave) Try to read 67584 from 'c:\Windows\bootstat.dat' -> [ 0.001469] (4@ dave) Have read 67584 from 'c:\Windows\bootstat.dat'. Offset is now at: 67584 -> [ 0.001469] (4@ dave) Seek back to the begining of the stream... -> [ 0.001469] (4@ dave) Offset is now at: 0 -> [ 0.001469] (4@ dave) Opened file 'c:\Windows\Professional.xml' -> [ 0.001469] (4@ dave) Try to write 31 MiB to 'c:\Windows\Professional.xml' -> [ 0.003741] (1@alice) Have read 101663 from 'c:\Windows\setupact.log'. Offset is now at: 101663 -> [ 0.003741] (1@alice) Seek back to the begining of the stream... -> [ 0.003741] (1@alice) Offset is now at: 0 +> [ 0.000000] (4@ dave) Try to read 48868 from '/tmp/doc/simgrid/examples/simdag/dax/Montage_50.xml' +> [ 0.001062] (4@ dave) Have read 48868 from '/tmp/doc/simgrid/examples/simdag/dax/Montage_50.xml'. Offset is now at: 48868 +> [ 0.001062] (4@ dave) Seek back to the begining of the stream... +> [ 0.001062] (4@ dave) Offset is now at: 0 +> [ 0.001062] (4@ dave) Opened file '/tmp/doc/simgrid/examples/simdag/scheduling/Montage_25.xml' +> [ 0.001062] (4@ dave) Try to write 22 MiB to '/tmp/doc/simgrid/examples/simdag/scheduling/Montage_25.xml' +> [ 0.050039] (1@alice) Have read 1624671 from '/tmp/doc/simgrid/examples/msg/chord/chord10k.xml'. Offset is now at: 1624671 +> [ 0.050039] (1@alice) Seek back to the begining of the stream... +> [ 0.050039] (1@alice) Offset is now at: 0 > [ 0.276315] (3@ carl) Have read 12710497 from '/scratch/lib/libsimgrid.so.3.6.2'. Offset is now at: 12710497 > [ 0.276315] (3@ carl) Seek back to the begining of the stream... > [ 0.276315] (3@ carl) Offset is now at: 0 @@ -55,10 +55,10 @@ $ ${bindir:=.}/io-file-remote ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/ > [ 0.387036] (2@ bob) Offset is now at: 0 > [ 0.387036] (2@ bob) Opened file '/scratch/doc/simgrid/examples/platforms/g5k.xml' > [ 0.387036] (2@ bob) Try to write 16 MiB to '/scratch/doc/simgrid/examples/platforms/g5k.xml' -> [ 0.528211] (4@ dave) Have written 32646144 bytes to 'c:\Windows\Professional.xml'. -> [ 0.528211] (4@ dave) Move 'c:\Windows\Professional.xml' (of size 32646144) from 'dave' to 'carl' +> [ 0.391211] (4@ dave) Have written 23641088 bytes to '/tmp/doc/simgrid/examples/simdag/scheduling/Montage_25.xml'. +> [ 0.391211] (4@ dave) Move '/tmp/doc/simgrid/examples/simdag/scheduling/Montage_25.xml' (of size 23641088) from 'dave' to 'carl' > [ 0.819921] (2@ bob) Have written 17436672 bytes to '/scratch/doc/simgrid/examples/platforms/g5k.xml'. > [ 0.819921] (2@ bob) Copy '/scratch/doc/simgrid/examples/platforms/g5k.xml' (of size 17436672) from 'bob' to 'alice' -> [ 1.843969] (0@ ) End: 60/476776 MiB used/free on 'Disk1' -> [ 1.843969] (0@ ) End: 2297/474539 MiB used/free on 'Disk2' -> [ 1.843969] (0@ ) Simulation time 1.84397 +> [ 1.598229] (0@ ) End: 51/476785 MiB used/free on 'Disk1' +> [ 1.598229] (0@ ) End: 51/476785 MiB used/free on 'Disk2' +> [ 1.598229] (0@ ) Simulation time 1.59823 diff --git a/teshsuite/msg/io-file-remote/io-file-remote_d.xml b/teshsuite/msg/io-file-remote/io-file-remote_d.xml index 3b3f1ab705..1200d95db8 100644 --- a/teshsuite/msg/io-file-remote/io-file-remote_d.xml +++ b/teshsuite/msg/io-file-remote/io-file-remote_d.xml @@ -2,23 +2,23 @@ - + - + - - + + - + diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 6b18fd179c..888b0e1094 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1148,7 +1148,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/simulacrum_7_hosts.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt - examples/platforms/storage/content/win_storage_content.txt examples/platforms/storage/remote_io.xml examples/platforms/storage/storage.xml examples/platforms/small_platform.xml