From: vsr <vsr@opencascade.com>
Date: Tue, 13 Mar 2012 14:14:56 +0000 (+0000)
Subject: Register temporary files in the container; automatically remove temporary files on... 
X-Git-Tag: V6_5_0a1~36
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cd670260a9b0a156fadcaf99bd9ab8a336a01930;p=modules%2Fkernel.git

Register temporary files in the container; automatically remove temporary files on shutdown.
---

diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx
index 30a91f44d..ca31feb8e 100644
--- a/src/Container/Container_i.cxx
+++ b/src/Container/Container_i.cxx
@@ -335,6 +335,9 @@ void Engines_Container_i::Shutdown()
 {
   MESSAGE("Engines_Container_i::Shutdown()");
 
+  // Clear registered temporary files
+  clearTemporaryFiles();
+
   /* For each component contained in this container
   * tell it to self-destroy
   */
@@ -1733,3 +1736,29 @@ int findpathof(const std::string& path, std::string& pth, const std::string& fil
   }
   return found;
 }
+
+void Engines_Container_i::registerTemporaryFile( const std::string& fileName )
+{
+  _tmp_files.remove( fileName );
+  _tmp_files.push_back( fileName );
+}
+
+void Engines_Container_i::unregisterTemporaryFile( const std::string& fileName )
+{
+  _tmp_files.remove( fileName );
+}
+
+void Engines_Container_i::clearTemporaryFiles()
+{
+  std::list<std::string>::const_iterator it;
+  for ( it = _tmp_files.begin(); it != _tmp_files.end(); ++it ) {
+#ifdef WIN32
+    std::string command = "del /F ";
+#else
+    std::string command = "rm -f ";
+#endif
+    command += *it;
+    system( command.c_str() );
+  }
+  _tmp_files.clear();
+}
diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx
index 52b293c39..a11efb9e1 100644
--- a/src/Container/SALOME_Container_i.hxx
+++ b/src/Container/SALOME_Container_i.hxx
@@ -44,6 +44,7 @@
 #include <sys/types.h>
 #include <omnithread.h>
 #include <map>
+#include <list>
 #include <string>
 
 class SALOME_NamingService;
@@ -129,6 +130,10 @@ public:
   int getArgc() { return _argc; }
   char **getArgv() { return _argv; }
 
+  void registerTemporaryFile( const std::string& fileName );
+  void unregisterTemporaryFile( const std::string& fileName );
+  void clearTemporaryFiles();
+
 protected:
 
   static std::map<std::string, int> _cntInstances_map;
@@ -149,6 +154,7 @@ protected:
   std::map<std::string,Engines::EngineComponent_var> _listInstances_map;
   std::map<std::string,Engines::fileRef_var> _fileRef_map;
   std::map<std::string,Engines::Salome_file_var> _Salome_file_map;
+  std::list<std::string> _tmp_files;
   Engines::fileTransfer_var _fileTransfer;
 
   int    _argc ;