webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp
branchRCL_3
changeset 91 30342f40acbf
parent 59 1f3c3f2f5b0a
child 93 79859ed3eea9
equal deleted inserted replaced
84:800203832575 91:30342f40acbf
    52 // MemoryManager::CreateAllocator
    52 // MemoryManager::CreateAllocator
    53 //-----------------------------------------------------------------------------
    53 //-----------------------------------------------------------------------------
    54 EXPORT_C void MemoryManager::CreateFastAllocator()
    54 EXPORT_C void MemoryManager::CreateFastAllocator()
    55     {
    55     {
    56     // create the right memory pool
    56     // create the right memory pool
    57     MEM_LOGF(_L8("MemoryManager::CreateFastAllocator - s_pool=%x"), s_pool);
    57     MEM_LOG_CREATE();    
    58 #ifdef __NEW_ALLOCATOR__
    58 #ifdef __NEW_ALLOCATOR__
    59     CMemoryPool *pool = new CNewSymbianHeapPool();
    59     CMemoryPool *pool = new CNewSymbianHeapPool();
    60     pool->Create();
    60     pool->Create();
    61     RSymbianDlAllocatorWrapper* allocator = new RSymbianDlAllocatorWrapper((CNewSymbianHeapPool*)pool);
    61     RSymbianDlAllocatorWrapper* allocator = new RSymbianDlAllocatorWrapper((CNewSymbianHeapPool*)pool);
       
    62     User::SwitchAllocator(allocator);
    62     MEM_LOGF(_L8("MemoryManager::CreateFastAllocator - new pool=%x, allocator=%x"), pool, allocator);
    63     MEM_LOGF(_L8("MemoryManager::CreateFastAllocator - new pool=%x, allocator=%x"), pool, allocator);
    63     User::SwitchAllocator(allocator);
       
    64 #endif
    64 #endif
    65     }
    65     }
    66 
    66 
    67 //-----------------------------------------------------------------------------
    67 //-----------------------------------------------------------------------------
    68 // MemoryManager::InitAllocator
    68 // MemoryManager::InitAllocator
    84 // MemoryManager::SwitchToFastAllocator
    84 // MemoryManager::SwitchToFastAllocator
    85 //-----------------------------------------------------------------------------
    85 //-----------------------------------------------------------------------------
    86 EXPORT_C RAllocator* MemoryManager::SwitchToFastAllocator()
    86 EXPORT_C RAllocator* MemoryManager::SwitchToFastAllocator()
    87     {
    87     {
    88     // create the right memory pool
    88     // create the right memory pool
    89     //__ASSERT_DEBUG( s_pool == 0, User::Panic( KMemManPanicDes, 0 ) );
    89     __ASSERT_DEBUG( s_pool == 0, User::Panic( KMemManPanicDes, 0 ) );
    90     MEM_LOGF(_L8("MemoryManager::SwitchToFastAllocator - s_pool=%x"), s_pool);
    90     MEM_LOGF(_L8("MemoryManager::SwitchToFastAllocator - s_pool=%x"), s_pool);
    91 #ifdef __NEW_ALLOCATOR__
    91 #ifdef __NEW_ALLOCATOR__
    92     s_pool = new CNewSymbianHeapPool();
    92     s_pool = new CNewSymbianHeapPool();
    93     s_pool->Create();
    93     s_pool->Create();
    94     RSymbianDlAllocatorWrapper* allocator = new RSymbianDlAllocatorWrapper((CNewSymbianHeapPool*)s_pool);
    94     RSymbianDlAllocatorWrapper* allocator = new RSymbianDlAllocatorWrapper((CNewSymbianHeapPool*)s_pool);
   141 //-----------------------------------------------------------------------------
   141 //-----------------------------------------------------------------------------
   142 // MemoryManager::AddCollector
   142 // MemoryManager::AddCollector
   143 //-----------------------------------------------------------------------------
   143 //-----------------------------------------------------------------------------
   144 EXPORT_C void MemoryManager::AddCollector( MMemoryCollector* aCollector )
   144 EXPORT_C void MemoryManager::AddCollector( MMemoryCollector* aCollector )
   145     {
   145     {
   146     MEM_LOGF(_L8("MemoryManager::AddCollector - s_pool=%x"), s_pool);
       
   147     Pool()->AddCollector( aCollector );
   146     Pool()->AddCollector( aCollector );
   148     }
   147     }
   149 
   148 
   150 //-----------------------------------------------------------------------------
   149 //-----------------------------------------------------------------------------
   151 // MemoryManager::RemoveCollector
   150 // MemoryManager::RemoveCollector
   158 //-----------------------------------------------------------------------------
   157 //-----------------------------------------------------------------------------
   159 // MemoryManager::AddStopper
   158 // MemoryManager::AddStopper
   160 //-----------------------------------------------------------------------------
   159 //-----------------------------------------------------------------------------
   161 EXPORT_C void MemoryManager::AddStopper( MOOMStopper* aStopper )
   160 EXPORT_C void MemoryManager::AddStopper( MOOMStopper* aStopper )
   162     {
   161     {
   163     MEM_LOGF(_L8("MemoryManager::AddStopper - s_pool=%x"), s_pool);
       
   164     Pool()->AddStopper( aStopper );
   162     Pool()->AddStopper( aStopper );
   165     }
   163     }
   166 
   164 
   167 //-----------------------------------------------------------------------------
   165 //-----------------------------------------------------------------------------
   168 // MemoryManager::RemoveStopper
   166 // MemoryManager::RemoveStopper
   242 EXPORT_C TUint MemoryManager::MemorySize( TAny* aPtr )
   240 EXPORT_C TUint MemoryManager::MemorySize( TAny* aPtr )
   243     {
   241     {
   244     return Pool()->MemorySize( aPtr );
   242     return Pool()->MemorySize( aPtr );
   245     }
   243     }
   246 
   244 
       
   245 
       
   246 EXPORT_C void MemoryManager::DumpMemoryLogs()
       
   247     {
       
   248 #if defined(OOM_LOGGING) && defined (__NEW_ALLOCATOR__)
       
   249     CNewSymbianHeapPool *hPool = (CNewSymbianHeapPool *)Pool();
       
   250     hPool->DumpHeapLogs(0);
       
   251 #endif    
       
   252     }