Changeset 1060 for branches/Carsten_PtrWork2/Source/System/Cluster/Base/OSGRemoteAspect.cpp

Timestamp:

02/12/08 09:51:59 (9 months ago)

Author:

cneumann

Message:

fixed: - pointer fields: sync/copyFromBin order of inc/dec refcount

(always inc new pointer first, then dec old pointer)

• cluster server: commented out writing of .osg file on each frame
  
• multi display window: merged fix from trunk (r1058)
  
• tutorial 12: empty address check
  

added: - pointer field handles: implemented equal and share

Files:

• branches/Carsten_PtrWork2/Source/System/Cluster/Base/OSGRemoteAspect.cpp (modified) (21 diffs)

branches/Carsten_PtrWork2/Source/System/Cluster/Base/OSGRemoteAspect.cpp

@@ -156 +156 @@
-            case NEWTYPE:
-            {
+                FDEBUG(("RemoteAspect::receiveSync: NEWTYPE"));
+            
-                connection.getValue(remoteTypeId);
-                connection.getValue(name);
-
+                FPDEBUG((" remoteTypeId [%d] name [%s]\n", remoteTypeId, name.c_str()));
+                
-                // find local type
-                fcType = FieldContainerFactory::the()->findType(name.c_str());
@@ -180 +184 @@
-            case CREATED:
-            {
+                FDEBUG(("RemoteAspect::receiveSync: CREATED"));
+            
-                connection.getValue(remoteTypeId);
-                connection.getValue(remoteId);
-
+                FPDEBUG((" remoteTypeId [%d] remoteId [%d]\n", remoteTypeId, remoteId));
+                
-                localTypeI = _localType.find(remoteTypeId);
-
@@ -206 +214 @@
-                        
-                        newContainers.push_back(fcPtr);
-    
+
-                        // remove this node, when aspect is removed
-                        _receivedFC.insert(getContainerId(fcPtr));
@@ -228 +236 @@
-            case CHANGED:
-            {
+                FDEBUG(("RemoteAspect::receiveSync: CHANGED"));
+            
-                connection.getValue(remoteId);
-                connection.getValue(mask);
-                connection.getValue(len);
+                
+                FPDEBUG((" [%d]\n", remoteId));
-                
-                if(getLocalId(remoteId, localId))
@@ -260 +272 @@
-            case SYNCENDED:
-            {
+                FDEBUG(("RemoteAspect::receiveSync: SYNCENDED\n"));
+            
-                finish = true;
-                break;
@@ -266 +280 @@
-            case ADDEXTERNALREFED:
-            {
+                FDEBUG(("RemoteAspect::receiveSync: ADDEXTERNALREFED"));
+            
-                connection.getValue(remoteId);
-
+                FPDEBUG((" [%d]\n", remoteId));
+                
-                if(getLocalId(remoteId, localId))
-                {
@@ -288 +306 @@
-            case SUBEXTERNALREFED:
-            {
+                FDEBUG(("RemoteAspect::receiveSync: SUBEXTERNALREFED"));
+            
-                connection.getValue(remoteId);
-
+                FPDEBUG((" [%d]\n", remoteId));
+                
-                if(getLocalId(remoteId,localId))
-                {
@@ -310 +332 @@
-            case IDMAPPING:
-            {
+                FDEBUG(("RemoteAspect::receiveSync: IDMAPPING"));
+            
-                connection.getValue(remoteId);
-                connection.getValue(localAspect);
-                connection.getValue(localId);
-
+                FPDEBUG((" remoteId [%d] localAspect [%d] localId [%d]\n",
+                    remoteId, localAspect, localId));
+                
-                if(localAspect != _aspectId)
-                {
@@ -344 +371 @@
-        commitChangesAndClear();
-    }
-
+
-    // unregister mapper into factory
-    factory->setMapper(NULL);
@@ -387 +414 @@
-    handleFCMapping(connection);
-
+    FDEBUG(("RemoteAspect:sendSync: Dumping list CL sizes:\n"));
+    changeList->dumpListSizes();
+    changeList->dump();
+    
-    for(  changedI  = changeList->beginCreated();
-          changedI != changeList->endCreated  (); 
@@ -415 +446 @@
-                connection.putValue(typeId);
-                connection.putValue(typeName);
+                
+                FDEBUG(("RemoteAspect::sendSync: NEWTYPE typeId [%d] typeName [%s]\n", typeId, typeName.c_str()));
-            }
-            
@@ -422 +455 @@
-            connection.putValue((*changedI)->uiContainerId);
-            
+            FDEBUG(("RemoteAspect::sendSync: CREATED typeId [%d] containerId [%d]\n", typeId, (*changedI)->uiContainerId));            
-#if 0
-            fprintf(stderr, "Send Create %d %d\n",
@@ -440 +474 @@
-        ++changedI)
-    {
-        fcPtr = fcFactory->getContainer((*changedI)->uiContainerId);
-
-        if(fcPtr == NullFC)
-        {
-            continue;
-        }
-        if((*changedI)->uiEntryDesc == ContainerChangeEntry::Change)
-        {
+            fcPtr = fcFactory->getContainer((*changedI)->uiContainerId);
+        
+            if(fcPtr == NullFC)
+                continue;           // skip, if object is destroyed
-        
-            mask  = (*changedI)->whichField;
@@ -460 +492 @@
-                mask &= TypeTraits<BitVector>::BitsSet ^ filterI->second;
-            }
-
-
-#if 0
@@ -485 +516 @@
-                fcPtr->copyToBin(connection, mask);
-
-Changed: %s ID:%d Mask:%lld
+RemoteAspect::sendSync: CHANGED [%s] ID [%d] Mask [%lld]
-                        fcPtr->getType().getName().str(),
-                        getContainerId(fcPtr), 
@@ -493 +524 @@
-        else if((*changedI)->uiEntryDesc == ContainerChangeEntry::AddExternalReference)
-        {
+            FDEBUG(("RemoteAspect::sendSync: ADDEXTERNALREFED\n"));
+        
-            UInt32  id = (*changedI)->uiContainerId;
-            
@@ -501 +534 @@
-            connection.putValue(cmd);
-            connection.putValue(id);
+            
+            FDEBUG(("RemoteAspect::sendSync: transmitted ADDEXTERNALREFED id [%d]\n", id));
-        }   
-        else if((*changedI)->uiEntryDesc == ContainerChangeEntry::SubExternalReference)
-        {
+            FDEBUG(("RemoteAspect::sendSync: SUBEXTERNALREFED\n"));
+        
-            UInt32  id = (*changedI)->uiContainerId;
-            
@@ -513 +550 @@
-            connection.putValue(cmd);
-            connection.putValue(id);
+            
+            FDEBUG(("RemoteAspect::sendSync: transmitted SUBEXTERNALREFED id [%d]\n", id));
-        }
-    }
@@ -615 +654 @@
- */
-
-const FieldContainerPtr &
+FieldContainerPtrConst 
-{
-    bool    result;
@@ -637 +676 @@
- */
-
-const FieldContainerPtr &
+FieldContainerPtrConst 
-{
-    bool    result;
@@ -659 +698 @@
- */
-
-const FieldContainerPtr &
+FieldContainerPtrConst 
-{
-    bool    result;