I think I just killed a simcall

diff --git a/include/simgrid/s4u/storage.hpp b/include/simgrid/s4u/storage.hpp
index e89568e..faba7d8 100644 (file)
--- a/include/simgrid/s4u/storage.hpp
+++ b/include/simgrid/s4u/storage.hpp
@@ -34,7 +34,7 @@ public:
   /** Retrieve the total amount of space of this storage element */
   sg_size_t size();
   xbt_dict_t properties();
-  xbt_dict_t content();
+  std::map<std::string, sg_size_t*>* content();
 
   /* TODO: missing API:
 XBT_PUBLIC(void) MSG_storage_set_property_value(msg_storage_t storage, const char *name, char *value,void_f_pvoid_t free_ctn);

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 6a3abc9..d2d368a 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -373,8 +373,6 @@ XBT_PUBLIC(sg_size_t) simcall_storage_get_used_size (smx_storage_t storage);
 XBT_PUBLIC(xbt_dict_t) simcall_storage_get_properties(smx_storage_t storage);
 XBT_PUBLIC(void*) SIMIX_storage_get_data(smx_storage_t storage);
 XBT_PUBLIC(void) SIMIX_storage_set_data(smx_storage_t storage, void *data);
-XBT_PUBLIC(xbt_dict_t) SIMIX_storage_get_content(smx_storage_t storage);
-XBT_PUBLIC(xbt_dict_t) simcall_storage_get_content(smx_storage_t storage);
 XBT_PUBLIC(const char*) SIMIX_storage_get_name(smx_storage_t storage);
 XBT_PUBLIC(sg_size_t) SIMIX_storage_get_size(smx_storage_t storage);
 XBT_PUBLIC(const char*) SIMIX_storage_get_host(smx_storage_t storage);

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 665dbb8..586a2dd 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -249,14 +249,6 @@ XBT_PUBLIC(int) surf_host_file_move(sg_host_t host, surf_file_t fd, const char*
  */
 XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host, surf_file_t fd, sg_offset_t offset, int origin);
 
-/**
- * @brief Get the content of a storage
- *
- * @param resource The surf storage
- * @return A xbt_dict_t with path as keys and size in bytes as values
- */
-XBT_PUBLIC(xbt_dict_t) surf_storage_get_content(surf_resource_t resource);
-
 /**
  * @brief Get the size in bytes of a storage
  *

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index c34aeb1..7c86679 100644 (file)
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -273,7 +273,7 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
 
   xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
     storage = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib,storage_name));
-    xbt_dict_t content = simcall_storage_get_content(storage);
+    xbt_dict_t content = MSG_storage_get_content(storage);
     xbt_dict_set(contents,mount_name, content,nullptr);
   }
   xbt_dict_free(&storage_list);

diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp
index cb3b97d..3341faf 100644 (file)
--- a/src/msg/msg_io.cpp
+++ b/src/msg/msg_io.cpp
@@ -5,6 +5,7 @@
 
 #include "simgrid/s4u/host.hpp"
 #include "src/msg/msg_private.h"
+#include "src/surf/storage_interface.hpp"
 #include <numeric>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)");
@@ -586,7 +587,14 @@ void *MSG_storage_get_data(msg_storage_t storage)
  */
 xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
 {
-  return SIMIX_storage_get_content(storage);
+  std::map<std::string, sg_size_t*>* content =
+      static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(storage))->getContent();
+  xbt_dict_t content_dict = xbt_dict_new_homogeneous(nullptr);
+
+  for (auto entry : *content) {
+    xbt_dict_set(content_dict, entry.first.c_str(), entry.second, nullptr);
+  }
+  return content_dict;
 }
 
 /** \ingroup msg_storage_management

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index 7f52311..48c58d7 100644 (file)
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -5,6 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/storage.hpp"
+#include "simgrid/simix.hpp"
+#include "src/surf/storage_interface.hpp"
 
 #include "xbt/lib.h"
 extern xbt_lib_t storage_lib;
@@ -63,9 +65,10 @@ xbt_dict_t Storage::properties()
   return simcall_storage_get_properties(pimpl_);
 }
 
-xbt_dict_t Storage::content()
+std::map<std::string, sg_size_t*>* Storage::content()
 {
-  return simcall_storage_get_content(pimpl_);
+  return simgrid::simix::kernelImmediate(
+      [this] { return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(this->pimpl_))->getContent(); });
 }
 
 } /* namespace s4u */

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 482750d..3b63a27 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -781,18 +781,6 @@ xbt_dict_t simcall_storage_get_properties(smx_storage_t storage)
   return simcall_BODY_storage_get_properties(storage);
 }
 
-/**
- * \ingroup simix_storage_management
- * \brief Returns a dict containing the content of a storage element.
- *
- * \param storage A storage element
- * \return The content of this storage element as a dict (full path file => size)
- */
-xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
-{
-  return simcall_BODY_storage_get_content(storage);
-}
-
 void simcall_run_kernel(std::function<void()> const& code)
 {
   simcall_BODY_run_kernel(&code);

diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h
index fadfc1b..a49406a 100644 (file)
--- a/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@ -1017,19 +1017,6 @@ static inline void simcall_storage_get_properties__set__result(smx_simcall_t sim
     simgrid::simix::marshal<xbt_dict_t>(simcall->result, result);
 }
 
-static inline smx_storage_t simcall_storage_get_content__get__storage(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_storage_t>(simcall->args[0]);
-}
-static inline void simcall_storage_get_content__set__storage(smx_simcall_t simcall, smx_storage_t arg) {
-    simgrid::simix::marshal<smx_storage_t>(simcall->args[0], arg);
-}
-static inline xbt_dict_t simcall_storage_get_content__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<xbt_dict_t>(simcall->result);
-}
-static inline void simcall_storage_get_content__set__result(smx_simcall_t simcall, xbt_dict_t result){
-    simgrid::simix::marshal<xbt_dict_t>(simcall->result, result);
-}
-
 static inline int simcall_mc_random__get__min(smx_simcall_t simcall) {
   return simgrid::simix::unmarshal<int>(simcall->args[0]);
 }

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index ccdeaaf..85dead4 100644 (file)
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -365,12 +365,6 @@ inline static xbt_dict_t simcall_BODY_storage_get_properties(smx_storage_t stora
     return simcall<xbt_dict_t, smx_storage_t>(SIMCALL_STORAGE_GET_PROPERTIES, storage);
   }
   
-inline static xbt_dict_t simcall_BODY_storage_get_content(smx_storage_t storage) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_storage_get_content(storage);
-    return simcall<xbt_dict_t, smx_storage_t>(SIMCALL_STORAGE_GET_CONTENT, storage);
-  }
-  
 inline static int simcall_BODY_mc_random(int min, int max) {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_mc_random(&SIMIX_process_self()->simcall, min, max);

diff --git a/src/simix/popping_enum.h b/src/simix/popping_enum.h
index 40a7405..d9be9e8 100644 (file)
--- a/src/simix/popping_enum.h
+++ b/src/simix/popping_enum.h
@@ -73,7 +73,6 @@ typedef enum {
   SIMCALL_STORAGE_GET_FREE_SIZE,
   SIMCALL_STORAGE_GET_USED_SIZE,
   SIMCALL_STORAGE_GET_PROPERTIES,
-  SIMCALL_STORAGE_GET_CONTENT,
   SIMCALL_MC_RANDOM,
   SIMCALL_SET_CATEGORY,
   SIMCALL_RUN_KERNEL,

diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp
index 9c7bb30..b1259c9 100644 (file)
--- a/src/simix/popping_generated.cpp
+++ b/src/simix/popping_generated.cpp
@@ -79,7 +79,6 @@ const char* simcall_names[] = {
     "SIMCALL_STORAGE_GET_FREE_SIZE",
     "SIMCALL_STORAGE_GET_USED_SIZE",
     "SIMCALL_STORAGE_GET_PROPERTIES",
-    "SIMCALL_STORAGE_GET_CONTENT",
     "SIMCALL_MC_RANDOM",
     "SIMCALL_SET_CATEGORY",
     "SIMCALL_RUN_KERNEL",
@@ -353,11 +352,6 @@ case SIMCALL_STORAGE_GET_PROPERTIES:
       SIMIX_simcall_answer(simcall);
       break;
 
-case SIMCALL_STORAGE_GET_CONTENT:
-      simgrid::simix::marshal<xbt_dict_t>(simcall->result, SIMIX_storage_get_content(simgrid::simix::unmarshal<smx_storage_t>(simcall->args[0])));
-      SIMIX_simcall_answer(simcall);
-      break;
-
 case SIMCALL_MC_RANDOM:
       simgrid::simix::marshal<int>(simcall->result, simcall_HANDLER_mc_random(simcall, simgrid::simix::unmarshal<int>(simcall->args[0]), simgrid::simix::unmarshal<int>(simcall->args[1])));
       SIMIX_simcall_answer(simcall);

diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in
index 5a0f0ed..4458171 100644 (file)
--- a/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@ -99,7 +99,6 @@ int         file_move(smx_file_t fd, const char* fullpath);
 sg_size_t  storage_get_free_size(smx_storage_t storage);
 sg_size_t  storage_get_used_size(smx_storage_t name);
 xbt_dict_t storage_get_properties(smx_storage_t storage) [[nohandler]];
-xbt_dict_t storage_get_content(smx_storage_t storage) [[nohandler]];
 
 int        mc_random(int min, int max);
 void       set_category(smx_activity_t synchro, const char* category) [[nohandler]];

diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp
index 44b42f3..fc2dbd1 100644 (file)
--- a/src/simix/smx_io.cpp
+++ b/src/simix/smx_io.cpp
@@ -244,10 +244,6 @@ const char* SIMIX_storage_get_name(smx_storage_t storage){
   return sg_storage_name(storage);
 }
 
-xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
-  return surf_storage_get_content(storage);
-}
-
 const char* SIMIX_storage_get_host(smx_storage_t storage){
   return surf_storage_get_host(storage);
 }

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 799f67c..70cb9d7 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -140,16 +140,10 @@ void Storage::turnOff() {
   }
 }
 
-xbt_dict_t Storage::getContent()
+std::map<std::string, sg_size_t*>* Storage::getContent()
 {
   /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
-
-  xbt_dict_t content_dict = xbt_dict_new_homogeneous(nullptr);
-
-  for (auto entry : *content_) {
-    xbt_dict_set(content_dict, entry.first.c_str(), entry.second, nullptr);
-  }
-  return content_dict;
+  return content_;
 }
 
 sg_size_t Storage::getFreeSize(){

diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp
index b872646..f52d57b 100644 (file)
--- a/src/surf/storage_interface.hpp
+++ b/src/surf/storage_interface.hpp
@@ -150,7 +150,7 @@ public:
    *
    * @return A xbt_dict_t with path as keys and size in bytes as values
    */
-  virtual xbt_dict_t getContent();
+  virtual std::map<std::string, sg_size_t*>* getContent();
 
   /**
    * @brief Get the available size in bytes of the current Storage

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 502eacc..94e1980 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -208,10 +208,6 @@ int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){
   return host->pimpl_->fileMove(fd, fullpath);
 }
 
-xbt_dict_t surf_storage_get_content(surf_resource_t resource){
-  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getContent();
-}
-
 sg_size_t surf_storage_get_size(surf_resource_t resource){
   return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->size_;
 }

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.cpp b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
index 5d507fd..abb3536 100644 (file)
--- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
@@ -66,14 +66,13 @@ static void display_storage_content(simgrid::s4u::Storage* storage)
   xbt_dict_cursor_t cursor = NULL;
   char* file;
   sg_size_t* psize;
-  xbt_dict_t content = storage->content();
-  if (content) {
-    xbt_dict_foreach (content, cursor, file, psize)
-      XBT_INFO("\t%s size: %llu bytes", file, *psize);
+  std::map<std::string, sg_size_t*>* content = storage->content();
+  if (!content->empty()) {
+    for (auto entry : *content)
+      XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), *entry.second);
   } else {
     XBT_INFO("\tNo content.");
   }
-  xbt_dict_free(&content);
 }
 
 static void dump_storage_by_name(char* name)
@@ -164,6 +163,7 @@ static void server()
       char* dest              = strtok_r(msg, " ", &saveptr);
       sg_size_t size_to_write = std::stoull(strtok_r(nullptr, " ", &saveptr));
       write_local_file(dest, size_to_write);
+      xbt_free(dest);
     }
   }
 

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.tesh b/teshsuite/s4u/storage_client_server/storage_client_server.tesh
index 7b8f3a9..15bd867 100644 (file)
--- a/teshsuite/s4u/storage_client_server/storage_client_server.tesh
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.tesh
@@ -6,42 +6,42 @@ $ ./storage_client_server$EXEEXT ${srcdir:=.}/../../../examples/platforms/storag
 > [  0.000000] (server@alice)  No property attached.
 > [  0.000000] (server@alice) *** Dump a storage element ***
 > [  0.000000] (server@alice) Print the content of the storage element: Disk2
-> [  0.000000] (server@alice)  \Windows\win.ini size: 92 bytes
-> [  0.000000] (server@alice)  \Windows\mib.bin size: 43131 bytes
-> [  0.000000] (server@alice)  \Windows\DtcInstall.log size: 1955 bytes
-> [  0.000000] (server@alice)  \Windows\vmgcoinstall.log size: 1585 bytes
-> [  0.000000] (server@alice)  \Windows\Starter.xml size: 31537 bytes
-> [  0.000000] (server@alice)  \Windows\_isusr32.dll size: 180320 bytes
-> [  0.000000] (server@alice)  \Windows\winhlp32.exe size: 10752 bytes
-> [  0.000000] (server@alice)  \Windows\setuperr.log size: 0 bytes
-> [  0.000000] (server@alice)  \Windows\system.ini size: 219 bytes
-> [  0.000000] (server@alice)  \Windows\Professional.xml size: 31881 bytes
-> [  0.000000] (server@alice)  \Windows\hapint.exe size: 382056 bytes
-> [  0.000000] (server@alice)  \Windows\regedit.exe size: 159232 bytes
-> [  0.000000] (server@alice)  \Windows\setupact.log size: 101663 bytes
-> [  0.000000] (server@alice)  \Windows\WindowsUpdate.log size: 1518934 bytes
-> [  0.000000] (server@alice)  \Windows\explorer.exe size: 2380944 bytes
+> [  0.000000] (server@alice)  \Windows\CoreSingleLanguage.xml size: 31497 bytes
+> [  0.000000] (server@alice)  \Windows\DPINST.LOG size: 18944 bytes
 > [  0.000000] (server@alice)  \Windows\DirectX.log size: 10486 bytes
-> [  0.000000] (server@alice)  \Windows\WMSysPr9.prx size: 316640 bytes
+> [  0.000000] (server@alice)  \Windows\DtcInstall.log size: 1955 bytes
+> [  0.000000] (server@alice)  \Windows\HelpPane.exe size: 883712 bytes
+> [  0.000000] (server@alice)  \Windows\MEMORY.DMP size: 2384027342 bytes
 > [  0.000000] (server@alice)  \Windows\PFRO.log size: 6770 bytes
-> [  0.000000] (server@alice)  \Windows\csup.txt size: 12 bytes
+> [  0.000000] (server@alice)  \Windows\Professional.xml size: 31881 bytes
+> [  0.000000] (server@alice)  \Windows\Starter.xml size: 31537 bytes
 > [  0.000000] (server@alice)  \Windows\WLXPGSS.SCR size: 322048 bytes
+> [  0.000000] (server@alice)  \Windows\WMSysPr9.prx size: 316640 bytes
+> [  0.000000] (server@alice)  \Windows\WindowsUpdate.log size: 1518934 bytes
+> [  0.000000] (server@alice)  \Windows\_isusr32.dll size: 180320 bytes
 > [  0.000000] (server@alice)  \Windows\avastSS.scr size: 41664 bytes
+> [  0.000000] (server@alice)  \Windows\bfsvc.exe size: 75264 bytes
+> [  0.000000] (server@alice)  \Windows\bootstat.dat size: 67584 bytes
+> [  0.000000] (server@alice)  \Windows\csup.txt size: 12 bytes
+> [  0.000000] (server@alice)  \Windows\dchcfg64.exe size: 335464 bytes
+> [  0.000000] (server@alice)  \Windows\dcmdev64.exe size: 93288 bytes
+> [  0.000000] (server@alice)  \Windows\explorer.exe size: 2380944 bytes
 > [  0.000000] (server@alice)  \Windows\font1.sii size: 4907 bytes
-> [  0.000000] (server@alice)  \Windows\write.exe size: 10752 bytes
 > [  0.000000] (server@alice)  \Windows\font2.sii size: 8698 bytes
-> [  0.000000] (server@alice)  \Windows\CoreSingleLanguage.xml size: 31497 bytes
-> [  0.000000] (server@alice)  \Windows\dchcfg64.exe size: 335464 bytes
-> [  0.000000] (server@alice)  \Windows\notepad.exe size: 243712 bytes
-> [  0.000000] (server@alice)  \Windows\HelpPane.exe size: 883712 bytes
+> [  0.000000] (server@alice)  \Windows\hapint.exe size: 382056 bytes
 > [  0.000000] (server@alice)  \Windows\hh.exe size: 17408 bytes
-> [  0.000000] (server@alice)  \Windows\DPINST.LOG size: 18944 bytes
-> [  0.000000] (server@alice)  \Windows\bfsvc.exe size: 75264 bytes
+> [  0.000000] (server@alice)  \Windows\mib.bin size: 43131 bytes
+> [  0.000000] (server@alice)  \Windows\notepad.exe size: 243712 bytes
+> [  0.000000] (server@alice)  \Windows\regedit.exe size: 159232 bytes
+> [  0.000000] (server@alice)  \Windows\setupact.log size: 101663 bytes
+> [  0.000000] (server@alice)  \Windows\setuperr.log size: 0 bytes
 > [  0.000000] (server@alice)  \Windows\splwow64.exe size: 126464 bytes
-> [  0.000000] (server@alice)  \Windows\MEMORY.DMP size: 2384027342 bytes
-> [  0.000000] (server@alice)  \Windows\dcmdev64.exe size: 93288 bytes
+> [  0.000000] (server@alice)  \Windows\system.ini size: 219 bytes
 > [  0.000000] (server@alice)  \Windows\twain_32.dll size: 50176 bytes
-> [  0.000000] (server@alice)  \Windows\bootstat.dat size: 67584 bytes
+> [  0.000000] (server@alice)  \Windows\vmgcoinstall.log size: 1585 bytes
+> [  0.000000] (server@alice)  \Windows\win.ini size: 92 bytes
+> [  0.000000] (server@alice)  \Windows\winhlp32.exe size: 10752 bytes
+> [  0.000000] (server@alice)  \Windows\write.exe size: 10752 bytes
 > [  0.000000] (server@alice) Server waiting for transfers ...
 > [  0.000010] (client@bob) client has read 972 on /home/doc/simgrid/examples/msg/icomms/small_platform.xml
 > [  0.000010] (client@bob) client sends 972 to alice
@@ -62,43 +62,43 @@ $ ./storage_client_server$EXEEXT ${srcdir:=.}/../../../examples/platforms/storag
 > [  1.207952] (server@alice)  No property attached.
 > [  1.207952] (server@alice) *** Dump a storage element ***
 > [  1.207952] (server@alice) Print the content of the storage element: Disk2
-> [  1.207952] (server@alice)  \Windows\titi.xml size: 654 bytes
-> [  1.207952] (server@alice)  \Windows\win.ini size: 92 bytes
-> [  1.207952] (server@alice)  \Windows\mib.bin size: 43131 bytes
-> [  1.207952] (server@alice)  \Windows\DtcInstall.log size: 1955 bytes
-> [  1.207952] (server@alice)  \Windows\vmgcoinstall.log size: 1585 bytes
-> [  1.207952] (server@alice)  \Windows\Starter.xml size: 31537 bytes
-> [  1.207952] (server@alice)  \Windows\_isusr32.dll size: 180320 bytes
-> [  1.207952] (server@alice)  \Windows\winhlp32.exe size: 10752 bytes
-> [  1.207952] (server@alice)  \Windows\setuperr.log size: 0 bytes
-> [  1.207952] (server@alice)  \Windows\system.ini size: 219 bytes
-> [  1.207952] (server@alice)  \Windows\Professional.xml size: 31881 bytes
-> [  1.207952] (server@alice)  \Windows\hapint.exe size: 382056 bytes
-> [  1.207952] (server@alice)  \Windows\regedit.exe size: 159232 bytes
-> [  1.207952] (server@alice)  \Windows\setupact.log size: 101663 bytes
-> [  1.207952] (server@alice)  \Windows\WindowsUpdate.log size: 1518934 bytes
-> [  1.207952] (server@alice)  \Windows\explorer.exe size: 2380944 bytes
+> [  1.207952] (server@alice)  \Windows\CoreSingleLanguage.xml size: 31497 bytes
+> [  1.207952] (server@alice)  \Windows\DPINST.LOG size: 18944 bytes
 > [  1.207952] (server@alice)  \Windows\DirectX.log size: 10486 bytes
-> [  1.207952] (server@alice)  \Windows\WMSysPr9.prx size: 316640 bytes
+> [  1.207952] (server@alice)  \Windows\DtcInstall.log size: 1955 bytes
+> [  1.207952] (server@alice)  \Windows\HelpPane.exe size: 883712 bytes
+> [  1.207952] (server@alice)  \Windows\MEMORY.DMP size: 2384027342 bytes
 > [  1.207952] (server@alice)  \Windows\PFRO.log size: 6770 bytes
-> [  1.207952] (server@alice)  \Windows\toto.cxx size: 972 bytes
-> [  1.207952] (server@alice)  \Windows\csup.txt size: 12 bytes
+> [  1.207952] (server@alice)  \Windows\Professional.xml size: 31881 bytes
+> [  1.207952] (server@alice)  \Windows\Starter.xml size: 31537 bytes
 > [  1.207952] (server@alice)  \Windows\WLXPGSS.SCR size: 322048 bytes
+> [  1.207952] (server@alice)  \Windows\WMSysPr9.prx size: 316640 bytes
+> [  1.207952] (server@alice)  \Windows\WindowsUpdate.log size: 1518934 bytes
+> [  1.207952] (server@alice)  \Windows\_isusr32.dll size: 180320 bytes
 > [  1.207952] (server@alice)  \Windows\avastSS.scr size: 41664 bytes
+> [  1.207952] (server@alice)  \Windows\bfsvc.exe size: 75264 bytes
+> [  1.207952] (server@alice)  \Windows\bootstat.dat size: 67584 bytes
+> [  1.207952] (server@alice)  \Windows\csup.txt size: 12 bytes
+> [  1.207952] (server@alice)  \Windows\dchcfg64.exe size: 335464 bytes
+> [  1.207952] (server@alice)  \Windows\dcmdev64.exe size: 93288 bytes
+> [  1.207952] (server@alice)  \Windows\explorer.exe size: 2380944 bytes
 > [  1.207952] (server@alice)  \Windows\font1.sii size: 4907 bytes
-> [  1.207952] (server@alice)  \Windows\write.exe size: 10752 bytes
 > [  1.207952] (server@alice)  \Windows\font2.sii size: 8698 bytes
-> [  1.207952] (server@alice)  \Windows\CoreSingleLanguage.xml size: 31497 bytes
-> [  1.207952] (server@alice)  \Windows\dchcfg64.exe size: 335464 bytes
-> [  1.207952] (server@alice)  \Windows\notepad.exe size: 243712 bytes
-> [  1.207952] (server@alice)  \Windows\tata.c size: 6217 bytes
-> [  1.207952] (server@alice)  \Windows\HelpPane.exe size: 883712 bytes
+> [  1.207952] (server@alice)  \Windows\hapint.exe size: 382056 bytes
 > [  1.207952] (server@alice)  \Windows\hh.exe size: 17408 bytes
-> [  1.207952] (server@alice)  \Windows\DPINST.LOG size: 18944 bytes
-> [  1.207952] (server@alice)  \Windows\bfsvc.exe size: 75264 bytes
+> [  1.207952] (server@alice)  \Windows\mib.bin size: 43131 bytes
+> [  1.207952] (server@alice)  \Windows\notepad.exe size: 243712 bytes
+> [  1.207952] (server@alice)  \Windows\regedit.exe size: 159232 bytes
+> [  1.207952] (server@alice)  \Windows\setupact.log size: 101663 bytes
+> [  1.207952] (server@alice)  \Windows\setuperr.log size: 0 bytes
 > [  1.207952] (server@alice)  \Windows\splwow64.exe size: 126464 bytes
-> [  1.207952] (server@alice)  \Windows\MEMORY.DMP size: 2384027342 bytes
-> [  1.207952] (server@alice)  \Windows\dcmdev64.exe size: 93288 bytes
+> [  1.207952] (server@alice)  \Windows\system.ini size: 219 bytes
+> [  1.207952] (server@alice)  \Windows\tata.c size: 6217 bytes
+> [  1.207952] (server@alice)  \Windows\titi.xml size: 654 bytes
+> [  1.207952] (server@alice)  \Windows\toto.cxx size: 972 bytes
 > [  1.207952] (server@alice)  \Windows\twain_32.dll size: 50176 bytes
-> [  1.207952] (server@alice)  \Windows\bootstat.dat size: 67584 bytes
+> [  1.207952] (server@alice)  \Windows\vmgcoinstall.log size: 1585 bytes
+> [  1.207952] (server@alice)  \Windows\win.ini size: 92 bytes
+> [  1.207952] (server@alice)  \Windows\winhlp32.exe size: 10752 bytes
+> [  1.207952] (server@alice)  \Windows\write.exe size: 10752 bytes
 > [  1.207952] (maestro@) Simulated time: 1.20795