Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2be8ce3)
Remove surf from the content from the examples of simulated filesystems
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Sat, 18 Feb 2023 10:07:33 +0000 (11:07 +0100)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Sat, 18 Feb 2023 10:16:43 +0000 (11:16 +0100)
docs/source/tuto_network_calibration/network_calibration_tutorial.rst patch | blob | history
examples/c/comm-pingpong/comm-pingpong.tesh patch | blob | history
examples/c/io-file-remote/io-file-remote.tesh patch | blob | history
examples/c/io-file-remote/io-file-remote_d.xml patch | blob | history
examples/c/io-file-system/io-file-system.tesh patch | blob | history
examples/cpp/io-file-remote/s4u-io-file-remote.tesh patch | blob | history
examples/cpp/io-file-remote/s4u-io-file-remote_d.xml patch | blob | history
examples/cpp/io-file-system/s4u-io-file-system.tesh patch | blob | history
examples/platforms/storage/content/small_content.txt patch | blob | history
examples/platforms/storage/content/storage_content.txt patch | blob | history
teshsuite/s4u/storage_client_server/storage_client_server.tesh patch | blob | history

diff --git a/docs/source/tuto_network_calibration/network_calibration_tutorial.rst b/docs/source/tuto_network_calibration/network_calibration_tutorial.rst
index 70f5748..99a2054 100644 (file)
--- a/docs/source/tuto_network_calibration/network_calibration_tutorial.rst
+++ b/docs/source/tuto_network_calibration/network_calibration_tutorial.rst
@@ -646,7 +646,7 @@ The execution is similar for both modes. The only change is the platform library
     [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/privatization' to '1'
     [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/np' to '2'
     [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/hostfile' to '/tmp/host.txt'
-    [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9'
+    [0.000000] [xbt_cfg/INFO] Configuration change: Set 'precision/work-amount' to '1e-9'
     [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
     [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/simulate-computation' to '0'
     [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/display-timing' to 'yes'
diff --git a/examples/c/comm-pingpong/comm-pingpong.tesh b/examples/c/comm-pingpong/comm-pingpong.tesh
index 3557478..2adb74f 100644 (file)
--- a/examples/c/comm-pingpong/comm-pingpong.tesh
+++ b/examples/c/comm-pingpong/comm-pingpong.tesh
@@ -39,7 +39,7 @@ $ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xm
 > [145.639041] (1:pinger@Tremblay) Pong time (bandwidth bound): 145.638
 > [145.639041] (0:maestro@) Total simulation time: 145.639
 
-p Testing the surf network constant model
+p Testing the network constant model
 
 $ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform_routing_none.xml comm-pingpong_d.xml "--cfg=cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
diff --git a/examples/c/io-file-remote/io-file-remote.tesh b/examples/c/io-file-remote/io-file-remote.tesh
index c6dbc02..6246761 100644 (file)
--- a/examples/c/io-file-remote/io-file-remote.tesh
+++ b/examples/c/io-file-remote/io-file-remote.tesh
@@ -5,15 +5,15 @@ $ ${bindir:=.}/c-io-file-remote ${platfdir}/hosts_with_disks.xml io-file-remote_
 > [  0.000000] (0@     ) Init: bob: 35/511964 MiB used/free on 'Disk1@bob'
 > [  0.000000] (0@     ) Init: bob: 0/512000 MiB used/free on 'Disk2@bob'
 > [  0.000000] (0@     ) Init: carl: 35/511964 MiB used/free on 'Disk1@bob'
-> [  0.000000] (1@alice) Opened file '/include/surf/simgrid_dtd.h'
+> [  0.000000] (1@alice) Opened file '/include/simgrid_dtd.h'
 > [  0.000000] (1@alice) File Descriptor information:
->              Full path: '/include/surf/simgrid_dtd.h'
+>              Full path: '/include/simgrid_dtd.h'
 >              Size: 23583
 >              Mount point: '/'
 >              Disk Id: 'Disk1'
 >              Host Id: 'alice'
 >              File Descriptor Id: 0
-> [  0.000000] (1@alice) Try to write 23 MiB to '/include/surf/simgrid_dtd.h'
+> [  0.000000] (1@alice) Try to write 23 MiB to '/include/simgrid_dtd.h'
 > [  0.000000] (2@  bob) Opened file '/scratch/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (2@  bob) File Descriptor information:
 >              Full path: '/scratch/doc/simgrid/examples/platforms/g5k.xml'
@@ -23,20 +23,20 @@ $ ${bindir:=.}/c-io-file-remote ${platfdir}/hosts_with_disks.xml io-file-remote_
 >              Host Id: 'bob'
 >              File Descriptor Id: 0
 > [  0.000000] (2@  bob) Try to write 16 MiB to '/scratch/doc/simgrid/examples/platforms/g5k.xml'
-> [  0.000000] (3@ carl) Opened file '/scratch/include/surf/simgrid_dtd.h'
+> [  0.000000] (3@ carl) Opened file '/scratch/include/simgrid_dtd.h'
 > [  0.000000] (3@ carl) File Descriptor information:
->              Full path: '/scratch/include/surf/simgrid_dtd.h'
+>              Full path: '/scratch/include/simgrid_dtd.h'
 >              Size: 23583
 >              Mount point: '/scratch'
 >              Disk Id: 'Disk1'
 >              Host Id: 'bob'
 >              File Descriptor Id: 0
-> [  0.000000] (3@ carl) Try to write 23 MiB to '/scratch/include/surf/simgrid_dtd.h'
-> [  0.301862] (1@alice) Have written 23 MiB to '/include/surf/simgrid_dtd.h'.
-> [  0.301862] (1@alice) Move '/include/surf/simgrid_dtd.h' (of size 24148992) from 'alice' to 'bob'
+> [  0.000000] (3@ carl) Try to write 23 MiB to '/scratch/include/simgrid_dtd.h'
+> [  0.301862] (1@alice) Have written 23 MiB to '/include/simgrid_dtd.h'.
+> [  0.301862] (1@alice) Move '/include/simgrid_dtd.h' (of size 24148992) from 'alice' to 'bob'
 > [  0.660757] (2@  bob) Have written 16 MiB to '/scratch/doc/simgrid/examples/platforms/g5k.xml'.
 > [  0.660757] (2@  bob) Copy '/scratch/doc/simgrid/examples/platforms/g5k.xml' (of size 17436672) from 'bob' to 'alice'
-> [  1.234522] (3@ carl) Have written 23 MiB to '/scratch/include/surf/simgrid_dtd.h'.
+> [  1.234522] (3@ carl) Have written 23 MiB to '/scratch/include/simgrid_dtd.h'.
 > [  1.643366] (0@     ) End: 29/511970 MiB used/free on 'Disk1@alice'
 > [  1.643366] (0@     ) End: 97/511902 MiB used/free on 'Disk1@bob'
 > [  1.643366] (0@     ) End: 0/512000 MiB used/free on 'Disk2@bob'
diff --git a/examples/c/io-file-remote/io-file-remote_d.xml b/examples/c/io-file-remote/io-file-remote_d.xml
index d14901b..205ca81 100644 (file)
--- a/examples/c/io-file-remote/io-file-remote_d.xml
+++ b/examples/c/io-file-remote/io-file-remote_d.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
   <actor host="alice" function="host">
-    <argument value = "/include/surf/simgrid_dtd.h"/>
+    <argument value = "/include/simgrid_dtd.h"/>
     <argument value = "bob"/>
-    <argument value = "/scratch/include/surf/simgrid_dtd.h"/>
+    <argument value = "/scratch/include/simgrid_dtd.h"/>
     <argument value = "1"/>
   </actor>
   <actor host="bob" function="host">
@@ -14,6 +14,6 @@
     <argument value = "0"/>
   </actor>
   <actor host="carl" function="host">
-    <argument value = "/scratch/include/surf/simgrid_dtd.h"/>
+    <argument value = "/scratch/include/simgrid_dtd.h"/>
   </actor>
 </platform>
diff --git a/examples/c/io-file-system/io-file-system.tesh b/examples/c/io-file-system/io-file-system.tesh
index 3953211..2010ece 100644 (file)
--- a/examples/c/io-file-system/io-file-system.tesh
+++ b/examples/c/io-file-system/io-file-system.tesh
@@ -2,20 +2,20 @@
 
 $ ${bindir:=.}/c-io-file-system ${platfdir}/hosts_with_disks.xml
 > [bob:host:(1) 0.000000] [io_file_system/INFO] Storage info on bob:
-> [bob:host:(1) 0.000000] [io_file_system/INFO]     Disk1 (/scratch) Used: 36933331; Free: 536833978669; Total: 536870912000.
+> [bob:host:(1) 0.000000] [io_file_system/INFO]     Disk1 (/scratch) Used: 36924298; Free: 536833987702; Total: 536870912000.
 > [bob:host:(1) 0.000000] [io_file_system/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
 > [bob:host:(1) 0.005000] [io_file_system/INFO] Create a 200000 bytes file named '/scratch/tmp/data.txt' on /scratch
 > [bob:host:(1) 0.005000] [io_file_system/INFO] Storage info on bob:
-> [bob:host:(1) 0.005000] [io_file_system/INFO]     Disk1 (/scratch) Used: 37133331; Free: 536833778669; Total: 536870912000.
+> [bob:host:(1) 0.005000] [io_file_system/INFO]     Disk1 (/scratch) Used: 37124298; Free: 536833787702; Total: 536870912000.
 > [bob:host:(1) 0.005000] [io_file_system/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
 > [bob:host:(1) 0.007000] [io_file_system/INFO] Read 200000 bytes on /scratch/tmp/data.txt
 > [bob:host:(1) 0.009500] [io_file_system/INFO] Write 100000 bytes on /scratch/tmp/data.txt
 > [bob:host:(1) 0.009500] [io_file_system/INFO] Move '/scratch/tmp/data.txt' to '/scratch/tmp/simgrid.readme'
 > [bob:host:(1) 0.009500] [io_file_system/INFO] User data attached to the file: 777
 > [bob:host:(1) 0.009500] [io_file_system/INFO] Storage info on bob:
-> [bob:host:(1) 0.009500] [io_file_system/INFO]     Disk1 (/scratch) Used: 37233331; Free: 536833678669; Total: 536870912000.
+> [bob:host:(1) 0.009500] [io_file_system/INFO]     Disk1 (/scratch) Used: 37224298; Free: 536833687702; Total: 536870912000.
 > [bob:host:(1) 0.009500] [io_file_system/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
 > [bob:host:(1) 0.009500] [io_file_system/INFO] Unlink file: '/scratch/tmp/simgrid.readme'
 > [bob:host:(1) 0.009500] [io_file_system/INFO] Storage info on bob:
-> [bob:host:(1) 0.009500] [io_file_system/INFO]     Disk1 (/scratch) Used: 36933331; Free: 536833978669; Total: 536870912000.
+> [bob:host:(1) 0.009500] [io_file_system/INFO]     Disk1 (/scratch) Used: 36924298; Free: 536833987702; Total: 536870912000.
 > [bob:host:(1) 0.009500] [io_file_system/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
diff --git a/examples/cpp/io-file-remote/s4u-io-file-remote.tesh b/examples/cpp/io-file-remote/s4u-io-file-remote.tesh
index 180ba09..2660d76 100644 (file)
--- a/examples/cpp/io-file-remote/s4u-io-file-remote.tesh
+++ b/examples/cpp/io-file-remote/s4u-io-file-remote.tesh
@@ -5,15 +5,15 @@ $ ${bindir:=.}/s4u-io-file-remote ${platfdir}/hosts_with_disks.xml s4u-io-file-r
 > [  0.000000] (0@     ) Init: bob: 35/511964 MiB used/free on 'Disk1@bob'
 > [  0.000000] (0@     ) Init: bob: 0/512000 MiB used/free on 'Disk2@bob'
 > [  0.000000] (0@     ) Init: carl: 35/511964 MiB used/free on 'Disk1@bob'
-> [  0.000000] (1@alice) Opened file '/include/surf/simgrid_dtd.h'
+> [  0.000000] (1@alice) Opened file '/include/simgrid_dtd.h'
 > [  0.000000] (1@alice) File Descriptor information:
->              Full path: '/include/surf/simgrid_dtd.h'
+>              Full path: '/include/simgrid_dtd.h'
 >              Size: 23583
 >              Mount point: '/'
 >              Disk Id: 'Disk1'
 >              Host Id: 'alice'
 >              File Descriptor Id: 0
-> [  0.000000] (1@alice) Try to write 23 MiB to '/include/surf/simgrid_dtd.h'
+> [  0.000000] (1@alice) Try to write 23 MiB to '/include/simgrid_dtd.h'
 > [  0.000000] (2@  bob) Opened file '/scratch/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (2@  bob) File Descriptor information:
 >              Full path: '/scratch/doc/simgrid/examples/platforms/g5k.xml'
@@ -23,20 +23,20 @@ $ ${bindir:=.}/s4u-io-file-remote ${platfdir}/hosts_with_disks.xml s4u-io-file-r
 >              Host Id: 'bob'
 >              File Descriptor Id: 0
 > [  0.000000] (2@  bob) Try to write 16 MiB to '/scratch/doc/simgrid/examples/platforms/g5k.xml'
-> [  0.000000] (3@ carl) Opened file '/scratch/include/surf/simgrid_dtd.h'
+> [  0.000000] (3@ carl) Opened file '/scratch/include/simgrid_dtd.h'
 > [  0.000000] (3@ carl) File Descriptor information:
->              Full path: '/scratch/include/surf/simgrid_dtd.h'
+>              Full path: '/scratch/include/simgrid_dtd.h'
 >              Size: 23583
 >              Mount point: '/scratch'
 >              Disk Id: 'Disk1'
 >              Host Id: 'bob'
 >              File Descriptor Id: 0
-> [  0.000000] (3@ carl) Try to write 23 MiB to '/scratch/include/surf/simgrid_dtd.h'
-> [  0.301862] (1@alice) Have written 23 MiB to '/include/surf/simgrid_dtd.h'.
-> [  0.301862] (1@alice) Move '/include/surf/simgrid_dtd.h' (of size 24148992) from 'alice' to 'bob'
+> [  0.000000] (3@ carl) Try to write 23 MiB to '/scratch/include/simgrid_dtd.h'
+> [  0.301862] (1@alice) Have written 23 MiB to '/include/simgrid_dtd.h'.
+> [  0.301862] (1@alice) Move '/include/simgrid_dtd.h' (of size 24148992) from 'alice' to 'bob'
 > [  0.660757] (2@  bob) Have written 16 MiB to '/scratch/doc/simgrid/examples/platforms/g5k.xml'.
 > [  0.660757] (2@  bob) Copy '/scratch/doc/simgrid/examples/platforms/g5k.xml' (of size 17436672) from 'bob' to 'alice'
-> [  1.234522] (3@ carl) Have written 23 MiB to '/scratch/include/surf/simgrid_dtd.h'.
+> [  1.234522] (3@ carl) Have written 23 MiB to '/scratch/include/simgrid_dtd.h'.
 > [  1.643366] (0@     ) End: 29/511970 MiB used/free on 'Disk1@alice'
 > [  1.643366] (0@     ) End: 97/511902 MiB used/free on 'Disk1@bob'
 > [  1.643366] (0@     ) End: 0/512000 MiB used/free on 'Disk2@bob'
diff --git a/examples/cpp/io-file-remote/s4u-io-file-remote_d.xml b/examples/cpp/io-file-remote/s4u-io-file-remote_d.xml
index d14901b..205ca81 100644 (file)
--- a/examples/cpp/io-file-remote/s4u-io-file-remote_d.xml
+++ b/examples/cpp/io-file-remote/s4u-io-file-remote_d.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
   <actor host="alice" function="host">
-    <argument value = "/include/surf/simgrid_dtd.h"/>
+    <argument value = "/include/simgrid_dtd.h"/>
     <argument value = "bob"/>
-    <argument value = "/scratch/include/surf/simgrid_dtd.h"/>
+    <argument value = "/scratch/include/simgrid_dtd.h"/>
     <argument value = "1"/>
   </actor>
   <actor host="bob" function="host">
@@ -14,6 +14,6 @@
     <argument value = "0"/>
   </actor>
   <actor host="carl" function="host">
-    <argument value = "/scratch/include/surf/simgrid_dtd.h"/>
+    <argument value = "/scratch/include/simgrid_dtd.h"/>
   </actor>
 </platform>
diff --git a/examples/cpp/io-file-system/s4u-io-file-system.tesh b/examples/cpp/io-file-system/s4u-io-file-system.tesh
index b2ad152..226c5c6 100644 (file)
--- a/examples/cpp/io-file-system/s4u-io-file-system.tesh
+++ b/examples/cpp/io-file-system/s4u-io-file-system.tesh
@@ -2,20 +2,20 @@
 
 $ ${bindir:=.}/s4u-io-file-system ${platfdir}/hosts_with_disks.xml
 > [bob:host:(1) 0.000000] [s4u_test/INFO] Storage info on bob:
-> [bob:host:(1) 0.000000] [s4u_test/INFO]     Disk1 (/scratch) Used: 36933331; Free: 536833978669; Total: 536870912000.
+> [bob:host:(1) 0.000000] [s4u_test/INFO]     Disk1 (/scratch) Used: 36924298; Free: 536833987702; Total: 536870912000.
 > [bob:host:(1) 0.000000] [s4u_test/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
 > [bob:host:(1) 0.005000] [s4u_test/INFO] Create a 200000 bytes file named '/scratch/tmp/data.txt' on /scratch
 > [bob:host:(1) 0.005000] [s4u_test/INFO] Storage info on bob:
-> [bob:host:(1) 0.005000] [s4u_test/INFO]     Disk1 (/scratch) Used: 37133331; Free: 536833778669; Total: 536870912000.
+> [bob:host:(1) 0.005000] [s4u_test/INFO]     Disk1 (/scratch) Used: 37124298; Free: 536833787702; Total: 536870912000.
 > [bob:host:(1) 0.005000] [s4u_test/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
 > [bob:host:(1) 0.007000] [s4u_test/INFO] Read 200000 bytes on /scratch/tmp/data.txt
 > [bob:host:(1) 0.009500] [s4u_test/INFO] Write 100000 bytes on /scratch/tmp/data.txt
 > [bob:host:(1) 0.009500] [s4u_test/INFO] Move '/scratch/tmp/data.txt' to '/scratch/tmp/simgrid.readme'
 > [bob:host:(1) 0.009500] [s4u_test/INFO] User data attached to the file: 777
 > [bob:host:(1) 0.009500] [s4u_test/INFO] Storage info on bob:
-> [bob:host:(1) 0.009500] [s4u_test/INFO]     Disk1 (/scratch) Used: 37233331; Free: 536833678669; Total: 536870912000.
+> [bob:host:(1) 0.009500] [s4u_test/INFO]     Disk1 (/scratch) Used: 37224298; Free: 536833687702; Total: 536870912000.
 > [bob:host:(1) 0.009500] [s4u_test/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
 > [bob:host:(1) 0.009500] [s4u_test/INFO] Unlink file: '/scratch/tmp/simgrid.readme'
 > [bob:host:(1) 0.009500] [s4u_test/INFO] Storage info on bob:
-> [bob:host:(1) 0.009500] [s4u_test/INFO]     Disk1 (/scratch) Used: 36933331; Free: 536833978669; Total: 536870912000.
+> [bob:host:(1) 0.009500] [s4u_test/INFO]     Disk1 (/scratch) Used: 36924298; Free: 536833987702; Total: 536870912000.
 > [bob:host:(1) 0.009500] [s4u_test/INFO]     Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000.
diff --git a/examples/platforms/storage/content/small_content.txt b/examples/platforms/storage/content/small_content.txt
index 80d00dd..f638bcc 100644 (file)
--- a/examples/platforms/storage/content/small_content.txt
+++ b/examples/platforms/storage/content/small_content.txt
@@ -21,7 +21,7 @@
 /include/xbt/fifo.h  3626
 /include/msg/datatypes.h 4635
 /include/mc/modelchecker.h  96
-/include/surf/simgrid_dtd.h  23583
+/include/simgrid_dtd.h  23583
 /include/instr/instr.h  5750
 /include/simdag/simdag.h  10325
 /include/simix/simix.h  13003
diff --git a/examples/platforms/storage/content/storage_content.txt b/examples/platforms/storage/content/storage_content.txt
index 6744799..bd76cbf 100644 (file)
--- a/examples/platforms/storage/content/storage_content.txt
+++ b/examples/platforms/storage/content/storage_content.txt
@@ -296,7 +296,7 @@
 /doc/simgrid/html/publis_intra.html  435
 /doc/simgrid/html/simgrid_logo_small.png  8326
 /doc/simgrid/html/group__SURF__resources.html  4203
-/doc/simgrid/html/structsurf__cpu__model__extension__public.html  2751
+/doc/simgrid/html/structsimgrid__cpu__model__extension__public.html  2751
 /doc/simgrid/html/tabs.css 1095
 /doc/simgrid/html/group__XBT__set.html  6991
 /doc/simgrid/html/group__XBT__set__curs.html  9653
@@ -309,11 +309,11 @@
 /doc/simgrid/html/nav_f.png 159
 /doc/simgrid/html/group__XBT__queue.html  23050
 /doc/simgrid/html/group__XBT__fifo__cons.html  9876
-/doc/simgrid/html/structsurf__model.html  17707
+/doc/simgrid/html/structsimgrid__model.html  17707
 /doc/simgrid/html/MSG_ex_asynchronous_communications.html  43212
 /doc/simgrid/html/Paje_MSG_screenshot_thn.jpg  30326
-/doc/simgrid/html/structsurf__network__model__extension__public.html  2783
-/doc/simgrid/html/structsurf__model__description.html 2621
+/doc/simgrid/html/structsimgrid__network__model__extension__public.html  2783
+/doc/simgrid/html/structsimgrid__model__description.html 2621
 /doc/simgrid/html/group__m__host__management.html 19042
 /doc/simgrid/html/group__XBT__fifo__perl.html  14045
 /doc/simgrid/html/modules.html  12734
@@ -321,7 +321,6 @@
 /doc/simgrid/html/group__XBT__fifo.html  6191
 /doc/simgrid/html/group__XBT__parmap.html  3765
 /doc/simgrid/html/tracing.html  58483
-/doc/simgrid/html/structs__surf__metric__t.html 2523
 /doc/simgrid/html/classsimgrid_1_1msg_1_1Task.html 1519
 /doc/simgrid/html/group__XBT__swag.html  5923
 /doc/simgrid/html/functions_vars.html  11436
@@ -380,7 +379,7 @@
 /doc/simgrid/html/group__XBT__dict__basic.html 20935
 /doc/simgrid/html/group__XBT__graph.html  23682
 /doc/simgrid/html/group__XBT__mallocator.html  6444
-/doc/simgrid/html/structsurf__workstation__model__extension__public.html 11076
+/doc/simgrid/html/structsimgrid__workstation__model__extension__public.html 11076
 /doc/simgrid/html/publis.html 435
 /doc/simgrid/html/group__XBT__misc.html  4663
 /doc/simgrid/html/simdag.html 226
@@ -409,7 +408,7 @@
 /doc/simgrid/html/options.html  7629
 /doc/simgrid/html/group__XBT__dict__nnul.html  18891
 /doc/simgrid/html/win_install_04.png  52033
-/doc/simgrid/html/structsurf__action.html  8353
+/doc/simgrid/html/structsimgrid__action.html  8353
 /doc/simgrid/html/group__XBT__ex.html  32537
 /doc/simgrid/html/group__SURF__API.html  6659
 /doc/simgrid/html/doxygen.css 12350
@@ -430,7 +429,7 @@
 /doc/simgrid/html/group__SD__task__management.html 60347
 /doc/simgrid/html/group__XBT__syscall.html  10095
 /doc/simgrid/html/group__XBT__heap.html  18482
-/doc/simgrid/html/structsurf__action__state.html 7301
+/doc/simgrid/html/structsimgrid__action__state.html 7301
 /doc/simgrid/html/tab_s.png 189
 /doc/simgrid/html/tab_h.png 192
 /doc/simgrid/html/nav_h.png  97
@@ -476,9 +475,7 @@
 /include/msg/msg.h  12038
 /include/simgrid_config.h 3641
 /include/mc/modelchecker.h  96
-/include/surf/simgrid_dtd.h  23583
-/include/surf/surf_routing.h  1167
-/include/surf/surfxml_parse.h  5343
+/include/simgrid_dtd.h  23583
 /include/instr/instr.h  5750
 /include/simdag/simdag.h  10325
 /include/simdag/datatypes.h  3715
diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.tesh b/teshsuite/s4u/storage_client_server/storage_client_server.tesh
index 463c56c..10822fe 100644 (file)
--- a/teshsuite/s4u/storage_client_server/storage_client_server.tesh
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.tesh
@@ -32,9 +32,9 @@ $ ./storage_client_server ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.
 > [  0.000000] (server@alice)   /include/mc/modelchecker.h size: 96 bytes
 > [  0.000000] (server@alice)   /include/msg/datatypes.h size: 4635 bytes
 > [  0.000000] (server@alice)   /include/simdag/simdag.h size: 10325 bytes
+> [  0.000000] (server@alice)   /include/simgrid_dtd.h size: 23583 bytes
 > [  0.000000] (server@alice)   /include/simix/simix.h size: 13003 bytes
 > [  0.000000] (server@alice)   /include/smpi/mpif.h size: 4826 bytes
-> [  0.000000] (server@alice)   /include/surf/simgrid_dtd.h size: 23583 bytes
 > [  0.000000] (server@alice)   /include/xbt/fifo.h size: 3626 bytes
 > [  0.000000] (server@alice)   /lib/libsimgrid.so.3.6.2 size: 12710497 bytes
 > [  0.000000] (server@alice) Server waiting for transfers ...
@@ -80,9 +80,9 @@ $ ./storage_client_server ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.
 > [  1.207952] (server@alice)   /include/mc/modelchecker.h size: 96 bytes
 > [  1.207952] (server@alice)   /include/msg/datatypes.h size: 4635 bytes
 > [  1.207952] (server@alice)   /include/simdag/simdag.h size: 10325 bytes
+> [  1.207952] (server@alice)   /include/simgrid_dtd.h size: 23583 bytes
 > [  1.207952] (server@alice)   /include/simix/simix.h size: 13003 bytes
 > [  1.207952] (server@alice)   /include/smpi/mpif.h size: 4826 bytes
-> [  1.207952] (server@alice)   /include/surf/simgrid_dtd.h size: 23583 bytes
 > [  1.207952] (server@alice)   /include/xbt/fifo.h size: 3626 bytes
 > [  1.207952] (server@alice)   /lib/libsimgrid.so.3.6.2 size: 12710497 bytes
 > [  1.207952] (server@alice)   /tmp/tata.c size: 6217 bytes
Clone of SimGrid repository with local patches