Handle overlaps better when executing DiffCommands.

[ardour.git] / libs / pbd / file_manager.cc

diff --git a/libs/pbd/file_manager.cc b/libs/pbd/file_manager.cc
index 25d171b9590c92373995b6ab858204a10022c138..50f0f2b22d63407a5798fedb07fe2cb71f0d371c 100644 (file)
--- a/libs/pbd/file_manager.cc
+++ b/libs/pbd/file_manager.cc
@@ -24,6 +24,12 @@
 #include <fcntl.h>
 #include <cassert>
 #include <iostream>
+#include <cstdio>
+
+#ifdef __APPLE__
+#include <mach/mach_time.h>
+#endif
+
 #include "pbd/compose.h"
 #include "pbd/file_manager.h"
 #include "pbd/debug.h"
@@ -33,32 +39,6 @@ using namespace PBD;
 
 FileManager* FileDescriptor::_manager;
 
-namespace PBD {
-
-/** Class to limit the number of files held open */
-class FileManager
-{
-public:
-       FileManager ();
-       
-       void add (FileDescriptor *);
-       void remove (FileDescriptor *);
-
-       void release (FileDescriptor *);
-       bool allocate (FileDescriptor *);
-
-private:
-       
-       void close (FileDescriptor *);
-
-       std::list<FileDescriptor*> _files; ///< files we know about
-       Glib::Mutex _mutex; ///< mutex for _files, _open and FileDescriptor contents
-       int _open; ///< number of open files
-       int _max_open; ///< maximum number of open files
-};
-
-}
-
 FileManager::FileManager ()
        : _open (0)
 {
@@ -120,24 +100,28 @@ FileManager::allocate (FileDescriptor* d)
                                DEBUG::FileManager,
                                string_compose (
                                        "closed file for %1 to release file handle; now have %2 of %3 open\n",
-                                       (*oldest)->_name, _open, _max_open
+                                       (*oldest)->_path, _open, _max_open
                                        )
                                );
                }
 
                if (d->open ()) {
-                       DEBUG_TRACE (DEBUG::FileManager, string_compose ("open of %1 failed.\n", d->_name));
+                       DEBUG_TRACE (DEBUG::FileManager, string_compose ("open of %1 failed.\n", d->_path));
                        return true;
                }
 
                _open++;
 
-               DEBUG_TRACE (DEBUG::FileManager, string_compose ("opened file for %1; now have %2 of %3 open.\n", d->_name, _open, _max_open));
+               DEBUG_TRACE (DEBUG::FileManager, string_compose ("opened file for %1; now have %2 of %3 open.\n", d->_path, _open, _max_open));
        }
 
+#ifdef __APPLE__
+       d->_last_used = mach_absolute_time();
+#else
        struct timespec t;
        clock_gettime (CLOCK_MONOTONIC, &t);
        d->_last_used = t.tv_sec + (double) t.tv_nsec / 10e9;
+#endif
 
        d->_refcount++;
        
@@ -164,7 +148,7 @@ FileManager::remove (FileDescriptor* d)
                close (d);
                DEBUG_TRACE (
                        DEBUG::FileManager,
-                       string_compose ("closed file for %1; file is being removed; now have %2 of %3 open\n", d->_name, _open, _max_open)
+                       string_compose ("closed file for %1; file is being removed; now have %2 of %3 open\n", d->_path, _open, _max_open)
                        );
        }
 
@@ -184,7 +168,7 @@ FileManager::close (FileDescriptor* d)
 FileDescriptor::FileDescriptor (string const & n, bool w)
        : _refcount (0)
        , _last_used (0)
-       , _name (n)
+       , _path (n)
        , _writeable (w)
 {
 
@@ -207,64 +191,6 @@ FileDescriptor::release ()
        manager()->release (this);
 }
 
-/** @param n Filename.
- *  @param w true to open writeable, otherwise false.
- *  @param i SF_INFO for the file.
- */
-
-SndFileDescriptor::SndFileDescriptor (string const & n, bool w, SF_INFO* i)
-       : FileDescriptor (n, w)
-       , _sndfile (0)
-       , _info (i)
-{
-       manager()->add (this);
-}
-
-SndFileDescriptor::~SndFileDescriptor ()
-{
-       manager()->remove (this);
-}
-
-/** @return SNDFILE*, or 0 on error */
-SNDFILE*
-SndFileDescriptor::allocate ()
-{
-       bool const f = manager()->allocate (this);
-       if (f) {
-               return 0;
-       }
-
-       /* this is ok thread-wise because allocate () has incremented
-          the Descriptor's refcount, so the file will not be closed
-       */
-       return _sndfile;
-}
-
-void
-SndFileDescriptor::close ()
-{
-       /* we must have a lock on the FileManager's mutex */
-
-       sf_close (_sndfile);
-       _sndfile = 0;
-}
-
-bool
-SndFileDescriptor::is_open () const
-{
-       /* we must have a lock on the FileManager's mutex */
-
-       return _sndfile != 0;
-}
-
-bool
-SndFileDescriptor::open ()
-{
-       /* we must have a lock on the FileManager's mutex */
-       
-       _sndfile = sf_open (_name.c_str(), _writeable ? SFM_RDWR : SFM_READ, _info);
-       return (_sndfile == 0);
-}
 
 
 /** @param n Filename.
@@ -298,7 +224,7 @@ FdFileDescriptor::open ()
 {
        /* we must have a lock on the FileManager's mutex */
        
-       _fd = ::open (_name.c_str(), _writeable ? (O_RDWR | O_CREAT) : O_RDONLY, _mode);
+       _fd = ::open (_path.c_str(), _writeable ? (O_RDWR | O_CREAT) : O_RDONLY, _mode);
        return (_fd == -1);
 }
 
@@ -327,6 +253,12 @@ FdFileDescriptor::allocate ()
 }
 
 
+void
+FileDescriptor::set_path (const string& p)
+{
+        _path = p;
+}
+
 /** @param n Filename.
  *  @param w true to open writeable, otherwise false.
  */
@@ -357,7 +289,7 @@ StdioFileDescriptor::open ()
 {
        /* we must have a lock on the FileManager's mutex */
        
-       _file = fopen (_name.c_str(), _mode.c_str());
+       _file = fopen (_path.c_str(), _mode.c_str());
        return (_file == 0);
 }