Show
Ignore:
Timestamp:
02/04/08 14:46:15 (1 year ago)
Author:
cneumann
Message:

added: MT unittest
fixed: Material: sync internal State

SimpleMaterial?: sync internal StateChunks?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldContainer.inl

    r1041 r1057  
    104104FieldContainer::subReference(void) 
    105105{ 
    106     FDEBUG(("FieldContainer::subReference [%p] START - [%d %d %d] [%s]\n", 
    107         this, _pAspectStore->getExternalRefCount(), this->_internalRefCount, this->_weakRefCount, 
     106    FINFO(("FieldContainer::subReference [%d] [%p] START - [%d %d %d] [%s]\n", 
     107        this->getId(), this, 
     108        _pAspectStore->getExternalRefCount(), this->_internalRefCount, this->_weakRefCount, 
    108109        this->getType().getCName())); 
    109110 
    …… 
    114115       (_pAspectStore->getExternalRefCount() <= 0    )   ) 
    115116    { 
    116         FDEBUG(("FieldContainer::subReference [%p] E, I - RESOLVE\n", this)); 
     117        FINFO(("FieldContainer::subReference [%d] [%p] E, I - RESOLVE\n", this->getId(), this)); 
    117118     
    118119        this->_resolveInProgress = true; 
    …… 
    121122        if(this->_weakRefCount <= 0) 
    122123        { 
    123             FDEBUG(("FieldContainer::subReference [%p] E, I, W - RESOLVE, DESTROY\n", this)); 
     124            FINFO(("FieldContainer::subReference [%d] [%p] E, I, W - RESOLVE, DESTROY\n", this->getId(), this)); 
    124125                 
    125126            this->destroyAspect(); 
    …… 
    131132    } 
    132133            
    133     FDEBUG(("FieldContainer::subReference [%p] STOP\n", this)); 
     134    FINFO(("FieldContainer::subReference [%d] [%p] STOP\n", this->getId(), this)); 
    134135} 
    135136 
    …… 
    178179FieldContainer::subExternalReference(void) 
    179180{ 
    180     FDEBUG(("FieldContainer::subExternalReference [%p]  START - [%d %d %d] [%s]\n", 
    181         this, _pAspectStore->getExternalRefCount(), this->_internalRefCount, this->_weakRefCount, 
     181    FINFO(("FieldContainer::subExternalReference [%d] [%p]  START - [%d %d %d] [%s]\n", 
     182        this->getId(), this, 
     183        _pAspectStore->getExternalRefCount(), this->_internalRefCount, this->_weakRefCount, 
    182184        this->getType().getCName())); 
    183185 
    …… 
    190192    if(_pAspectStore->getExternalRefCount() <= 0) 
    191193    { 
    192         FDEBUG(("FieldContainer::subExternalReference [%p] E\n", this)); 
     194        FINFO(("FieldContainer::subExternalReference [%d] [%p] E\n", this->getId(), this)); 
    193195     
    194196        _pAspectStore->releaseExternalReferenceCountLock(); 
    …… 
    204206               (pAspect->_internalRefCount  <= 0     )   ) 
    205207            { 
    206                 FDEBUG(("FieldContainer::subExternalReference [%p] E, I - RESOLVE\n", pAspect)); 
     208                FINFO(("FieldContainer::subExternalReference [%p] E, I - RESOLVE\n", pAspect)); 
    207209             
    208210                pAspect->_resolveInProgress = true; 
    …… 
    211213                if(pAspect->_weakRefCount <= 0) 
    212214                { 
    213                     FDEBUG(("FieldContainer::subExternalReference [%p] E, I, W - RESOLVE, DESTROY\n", pAspect)); 
     215                    FINFO(("FieldContainer::subExternalReference [%p] E, I, W - RESOLVE, DESTROY\n", pAspect)); 
    214216                 
    215217                    lastAspect = pAspect->destroyAspect(pAspect->getId(), i); 
    …… 
    230232    } 
    231233     
    232     FDEBUG(("FieldContainer::subExternalReference [%p] STOP\n", this)); 
     234    FINFO(("FieldContainer::subExternalReference [%d] [%p] STOP\n", this->getId(), this)); 
    233235} 
    234236 
    …… 
    259261FieldContainer::subWeakReference(void) 
    260262{ 
    261     FDEBUG(("FieldContainer::subWeakReference [%p] START - [%d %d %d] [%s]\n", 
    262         this, _pAspectStore->getExternalRefCount(), this->_internalRefCount, this->_weakRefCount, 
     263    FINFO(("FieldContainer::subWeakReference [%d] [%p] START - [%d %d %d] [%s]\n", 
     264        this->getId(), this, 
     265        _pAspectStore->getExternalRefCount(), this->_internalRefCount, this->_weakRefCount, 
    263266        this->getType().getCName())); 
    264267 
    …… 
    270273       (_pAspectStore->getExternalRefCount() <= 0    )   ) 
    271274    { 
    272         FDEBUG(("FieldContainer::subWeakReference [%p] E, I, W - DESTROY\n", this)); 
     275        FINFO(("FieldContainer::subWeakReference [%d] [%p] E, I, W - DESTROY\n", this->getId(), this)); 
    273276 
    274277        this->destroyAspect(); 
    275278    } 
    276279     
    277     FDEBUG(("FieldContainer::subWeakReference [%p] STOP\n", this)); 
     280    FINFO(("FieldContainer::subWeakReference [%d] [%p] STOP\n", this->getId(), this)); 
    278281} 
    279282