Changeset 1042 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGMChildFCPointerField.inl

Timestamp:

01/25/08 14:32:12 (1 year ago)

Author:

cneumann

Message:

fixed: MT sync for child fields (should not link parents)

more reliable thread exit for MT test

Files:

• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGMChildFCPointerField.inl (modified) (5 diffs)

branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGMChildFCPointerField.inl

@@ -111 +111 @@
-}
-
+/*! Clears the field, adjusting the reference count of pointed to objects, but
+    NOT their parent links.
+ */
+template <class ObjectT, Int32 NamespaceI, class AllocatorT>
+inline void
+MChildFCPointerField<ObjectT, NamespaceI, AllocatorT>::clearNoUnlink(void)
+{
+    StorageIter vI = this->editRawStorage().begin();
+    StorageIter vE = this->editRawStorage().end  ();
+    
+    for(; vI != vE; ++vI)
+    {
+        decRefCount(*vI);
+    }
+    
+    this->editRawStorage().clear();
+}
+
+/*! Resizes the field, adjusting the reference count of pointed to objects, but
+    NOT their parent links.
+ */
+template <class ObjectT, Int32 NamespaceI, class AllocatorT>
+inline void
+MChildFCPointerField<ObjectT, NamespaceI, AllocatorT>::resizeNoUnlink(
+    size_t newSize)
+{
+    UInt32 oldSize = this->size();
+    
+    if(newSize < oldSize)
+    {
+        StorageIter vI = this->editRawStorage().begin() + newSize;
+        StorageIter vE = this->editRawStorage().end  ();
+        
+        for(; vI != vE; ++vI)
+        {
+            decRefCount(*vI);
+        }
+    }
+    
+    this->editRawStorage().resize(newSize);
+}
+
-/*-------------------------------------------------------------------------*/
-/* MChildFCPointerField<class ObjectT,                                     */
@@ -553 +595 @@
-                     AllocatorT >::copyFromBin(BinaryDataHandler &pMem)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        StorageIter vI = this->editRawStorage().begin();
@@ -575 +611 @@
-        {
-            incRefCount(*vI);
-            linkParent (*vI);
-        }
+    }
+    else
+    {
+        this->clearNoUnlink();
-    }
-}
@@ -999 +1038 @@
-    UInt32 newSize = source. size();
-
+    // be careful to operate on raw storage, otherwise parent/child linking is
+    // done, which is not necessary, since by assumption we sync to a correctly
+    // linked aspect.
+    
-    if(newSize > 0)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
+
-            
-        StorageConstIter sI = source.getRawStorage ().begin();
@@ -1034 +1066 @@
-    else
-    {
-clear
+this->clearNoUnlink
-    }
-}