diff options
| author | mread <qt-info@nokia.com> | 2010-10-01 12:13:42 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-10-01 12:28:41 (GMT) |
| commit | c168be1aa3dc4f7ccc70d530244fc97af0b4d1e1 (patch) | |
| tree | 3e4154b0d85c29232caaecc452308302a37a547e /src/corelib | |
| parent | bd53ef2094a020789e9543156c524cd90a2d5302 (diff) | |
| download | Qt-c168be1aa3dc4f7ccc70d530244fc97af0b4d1e1.zip Qt-c168be1aa3dc4f7ccc70d530244fc97af0b4d1e1.tar.gz Qt-c168be1aa3dc4f7ccc70d530244fc97af0b4d1e1.tar.bz2 | |
fixed hybrid heap Symbian udeb build issues
Fixed name collision with TAllocFail
Added definition for EDebugHdrSize and fixed scope issue
Added definition for SRAllocatorBurstFail
Added a definition for global enum ETHeapBadDebugFailParameter
Tested compilation on:
Symbian^3 RnD - armv5_urel, armv5_udeb, winscw_urel, winscw_udeb
S60 3.1 SDK - armv5_urel, armv5_udeb
S60 5.0 SDK - armv5_urel, armv5_udeb
Symbian^3 PDK - armv5_urel, armv5_udeb
Symbian^4 RnD - armv5_urel, armv5_udeb
Basic functional testing on N8 armv5_urel
Task-number: QTBUG-14168
Reviewed-by: Shane Kearns
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/symbian/debugfunction.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/arch/symbian/heap_hybrid_p.h | 6 | ||||
| -rw-r--r-- | src/corelib/arch/symbian/qt_hybridheap_symbian_p.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/corelib/arch/symbian/debugfunction.cpp b/src/corelib/arch/symbian/debugfunction.cpp index f3b5d2d..91f6917 100644 --- a/src/corelib/arch/symbian/debugfunction.cpp +++ b/src/corelib/arch/symbian/debugfunction.cpp @@ -549,7 +549,7 @@ void ResetAllocCellLevels(TAny* aPtr, RHybridHeap::TCellType aType, TAny* aCell, if (aType == RHybridHeap::EGoodAllocatedCell) { - RHybridHeap::SDebugCell* DbgCell = (RHybridHeap::SDebugCell*)((TUint8*)aCell-RHeap::EDebugHdrSize); + RHybridHeap::SDebugCell* DbgCell = (RHybridHeap::SDebugCell*)((TUint8*)aCell-RHybridHeap::EDebugHdrSize); DbgCell->nestingLevel = 0; } } diff --git a/src/corelib/arch/symbian/heap_hybrid_p.h b/src/corelib/arch/symbian/heap_hybrid_p.h index 736af72..95fb3d4 100644 --- a/src/corelib/arch/symbian/heap_hybrid_p.h +++ b/src/corelib/arch/symbian/heap_hybrid_p.h @@ -103,11 +103,15 @@ public: EGetSize=48, EGetMaxLength, EGetBase, EAlignInteger, EAlignAddr }; enum TDebugOp { EWalk = 128, EHybridHeap }; - enum TAllocFail + enum THybridAllocFail { ERandom, ETrueRandom, EDeterministic, EHybridNone, EFailNext, EReset, EBurstRandom, EBurstTrueRandom, EBurstDeterministic, EBurstFailNext, ECheckFailure, }; + enum { EDebugHdrSize = sizeof(SDebugCell) }; +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS + struct SRAllocatorBurstFail {TInt iBurst; TInt iRate; TInt iUnused[2];}; +#endif struct HeapInfo { diff --git a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h index 5827aca..92cfe0e 100644 --- a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h +++ b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h @@ -100,6 +100,9 @@ inline int noBTrace() {return 0;} #define BTraceContext12(a,b,c,d,e) noBTrace() #endif +// declare ETHeapBadDebugFailParameter, where missing +#define ETHeapBadDebugFailParameter ((TCdtPanic)213) + #ifndef QT_SYMBIAN_HAVE_U32STD_H struct SThreadCreateInfo { |