Refs #4554 make sure to have a unique lock object

when cloning a workspace. So explicitely declared the copy constructors of every class up to DataItem.
mantidproject · Jan 24, 2012 · d6ae8f2 · d6ae8f2
1 parent 2f19428
commit d6ae8f2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/Workspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/Workspace.h
@@ -51,6 +51,7 @@ class MANTID_API_DLL Workspace : public Kernel::DataItem
 {
 public:
     Workspace();
+    Workspace(const Workspace & other);
     virtual ~Workspace();
 
     // DataItem interface

diff --git a/Code/Mantid/Framework/API/src/Algorithm.cpp b/Code/Mantid/Framework/API/src/Algorithm.cpp
@@ -285,6 +285,7 @@ namespace Mantid
           if (std::find(m_writeLockedWorkspaces.begin(), m_writeLockedWorkspaces.end(), ws)
               == m_writeLockedWorkspaces.end())
           {
+            std::cout << "Write-locking " << ws->name() << std::endl;
             // Write-lock it if not already
             ws->getLock()->writeLock();
             m_writeLockedWorkspaces.push_back(ws);
@@ -302,6 +303,7 @@ namespace Mantid
           if (std::find(m_writeLockedWorkspaces.begin(), m_writeLockedWorkspaces.end(), ws)
               == m_writeLockedWorkspaces.end())
           {
+            std::cout << "Read-locking " << ws->name() << std::endl;
             // Read-lock it if not already write-locked
             ws->getLock()->readLock();
             m_readLockedWorkspaces.push_back(ws);
@@ -324,13 +326,19 @@ namespace Mantid
       {
         Workspace_sptr ws = m_writeLockedWorkspaces[i];
         if (ws)
+        {
+          std::cout << "Un-write-locking " << ws->name() << std::endl;
           ws->getLock()->unlock();
+        }
       }
       for (size_t i=0; i<m_readLockedWorkspaces.size(); i++)
       {
         Workspace_sptr ws = m_readLockedWorkspaces[i];
         if (ws)
+        {
+          std::cout << "Un-read-locking " << ws->name() << std::endl;
           ws->getLock()->unlock();
+        }
       }
 
       // Don't double-unlock workspaces

diff --git a/Code/Mantid/Framework/API/src/Workspace.cpp b/Code/Mantid/Framework/API/src/Workspace.cpp
@@ -7,11 +7,21 @@ namespace API
 {
 
 /// Default constructor
-  Workspace::Workspace()
-  : DataItem(),
-    m_title(), m_comment(), m_name(), m_history()
+Workspace::Workspace()
+: DataItem(),
+  m_title(), m_comment(), m_name(), m_history()
 {}
 
+/** Copy constructor
+ * @param other :: workspace to copy
+ */
+Workspace::Workspace(const Workspace & other)
+: DataItem(other),
+  m_title(other.m_title), m_comment(other.m_comment), m_name(other.m_name), m_history(other.m_history)
+{
+}
+
+
 /// Workspace destructor
 Workspace::~Workspace()
 {

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataItem.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataItem.h
@@ -53,9 +53,8 @@ namespace Mantid
     class MANTID_KERNEL_DLL DataItem
     {
     public:
-      /// Default constructor
       DataItem();
-      /// Destructor
+      DataItem(const DataItem & other);
       virtual ~DataItem();
 
       /** @name Interface */

diff --git a/Code/Mantid/Framework/Kernel/src/DataItem.cpp b/Code/Mantid/Framework/Kernel/src/DataItem.cpp
@@ -15,13 +15,21 @@ namespace Mantid
       m_lock = new Poco::RWLock();
     }
 
+    /** Copy constructor
+     */
+    DataItem::DataItem(const DataItem & /*other*/)
+    {
+      // Always make a unique lock!
+      m_lock = new Poco::RWLock();
+    }
+
     /**
      * Destructor. Required in cpp do avoid linker errors when other projects try to inherit from DataItem
      */
     DataItem::~DataItem()
     {
-//      delete m_lock;
-//      m_lock = NULL;
+      delete m_lock;
+      m_lock = NULL;
     }
 
     /** Private method to access the RWLock object.
@@ -30,6 +38,8 @@ namespace Mantid
      */
     Poco::RWLock * DataItem::getLock()
     {
+      if (m_lock == NULL)
+        m_lock = new Poco::RWLock();
       return m_lock;
     }