diff options
| author | mread <qt-info@nokia.com> | 2010-09-29 14:56:14 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-09-30 14:48:41 (GMT) |
| commit | e742dc8d9d7274aa0a80c4a79042ebfc8ff539bc (patch) | |
| tree | 837cf89a07c0eefc8ac07333d6046960598e32e3 /src/corelib | |
| parent | 47a5f678f5eefffd456d3454364d806ba29e8920 (diff) | |
| download | Qt-e742dc8d9d7274aa0a80c4a79042ebfc8ff539bc.zip Qt-e742dc8d9d7274aa0a80c4a79042ebfc8ff539bc.tar.gz Qt-e742dc8d9d7274aa0a80c4a79042ebfc8ff539bc.tar.bz2 | |
hybrid allocator integration review updates
Disabling BTrace use in the heap checking macros without disabling any
of the rest of the heap checking functionality.
Task-number: QT-3967
Reviewed-by: Shane Kearns
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/symbian/debugfunction.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/arch/symbian/heap_hybrid.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/arch/symbian/qt_heapsetup_symbian.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/src/corelib/arch/symbian/debugfunction.cpp b/src/corelib/arch/symbian/debugfunction.cpp index ecffc64..f4daf03 100644 --- a/src/corelib/arch/symbian/debugfunction.cpp +++ b/src/corelib/arch/symbian/debugfunction.cpp @@ -45,15 +45,9 @@ #define RAllocator RHybridHeap #define GM (&iGlobalMallocState) -#ifdef ENABLE_BTRACE #define __HEAP_CORRUPTED_TRACE(t,p,l) BTraceContext12(BTrace::EHeap, BTrace::EHeapCorruption, (TUint32)t, (TUint32)p, (TUint32)l); #define __HEAP_CORRUPTED_TEST(c,x, p,l) if (!c) { if (iFlags & (EMonitorMemory+ETraceAllocs) ) __HEAP_CORRUPTED_TRACE(this,p,l) HEAP_PANIC(x); } #define __HEAP_CORRUPTED_TEST_STATIC(c,t,x,p,l) if (!c) { if (t && (t->iFlags & (EMonitorMemory+ETraceAllocs) )) __HEAP_CORRUPTED_TRACE(t,p,l) HEAP_PANIC(x); } -#else -#define __HEAP_CORRUPTED_TRACE(t,p,l) -#define __HEAP_CORRUPTED_TEST(c,x, p,l) -#define __HEAP_CORRUPTED_TEST_STATIC(c,t,x,p,l) -#endif TInt RHybridHeap::DebugFunction(TInt aFunc, TAny* a1, TAny* a2) { diff --git a/src/corelib/arch/symbian/heap_hybrid.cpp b/src/corelib/arch/symbian/heap_hybrid.cpp index f650b5b..b5fcdbd 100644 --- a/src/corelib/arch/symbian/heap_hybrid.cpp +++ b/src/corelib/arch/symbian/heap_hybrid.cpp @@ -93,7 +93,6 @@ #define __INIT_COUNTERS(i) iCellCount=i,iTotalAllocSize=i #define __POWER_OF_2(x) (!((x)&((x)-1))) -#ifdef ENABLE_BTRACE #define __DL_BFR_CHECK(M,P) \ if ( MEMORY_MONITORED ) \ if ( !IS_ALIGNED(P) || ((TUint8*)(P)<M->iSeg.iBase) || ((TUint8*)(P)>(M->iSeg.iBase+M->iSeg.iSize))) \ @@ -113,11 +112,6 @@ BTraceContext12(BTrace::EHeap, BTrace::EHeapCorruption, (TUint32)this, (TUint32)P, (TUint32)0), HEAP_PANIC(ETHeapBadCellAddress) #endif -#else -#define __DL_BFR_CHECK(M,P) -#define __SLAB_BFR_CHECK(S,P,B) -#define __PAGE_BFR_CHECK(P) -#endif #ifdef _MSC_VER // This is required while we are still using VC6 to compile, so as to avoid warnings that cannot be fixed diff --git a/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp b/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp index d6b7351..b8193f1 100644 --- a/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp +++ b/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp @@ -88,6 +88,14 @@ void Panic(TCdtPanic reason) User::Panic(KCat, reason); } +// disabling the BTrace components of heap checking macros +#ifndef ENABLE_BTRACE +int noBTrace() +{ + return 0; +} +#endif + #else /* QT_USE_NEW_SYMBIAN_ALLOCATOR */ #include <e32std.h> diff --git a/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h index 55c8fb2..7b569fd 100644 --- a/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h +++ b/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h @@ -97,6 +97,12 @@ #define NO_NAMED_LOCAL_CHUNKS #endif +// disabling the BTrace components of heap checking macros +#ifndef ENABLE_BTRACE +extern int noBTrace(); +#define BTraceContext12(a,b,c,d,e) noBTrace() +#endif + #ifndef QT_SYMBIAN_HAVE_U32STD_H struct SThreadCreateInfo { |