Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: src/gpu/GrMemoryPool.cpp

Issue 22850006: Replace uses of GrAssert by SkASSERT. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebase Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/gpu/GrInOrderDrawBuffer.cpp ('k') | src/gpu/GrOvalRenderer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrMemoryPool.h" 8 #include "GrMemoryPool.h"
9 9
10 #if GR_DEBUG 10 #if GR_DEBUG
(...skipping 12 matching lines...) Expand all
23 23
24 fHead = CreateBlock(fPreallocSize); 24 fHead = CreateBlock(fPreallocSize);
25 fTail = fHead; 25 fTail = fHead;
26 fHead->fNext = NULL; 26 fHead->fNext = NULL;
27 fHead->fPrev = NULL; 27 fHead->fPrev = NULL;
28 VALIDATE; 28 VALIDATE;
29 }; 29 };
30 30
31 GrMemoryPool::~GrMemoryPool() { 31 GrMemoryPool::~GrMemoryPool() {
32 VALIDATE; 32 VALIDATE;
33 GrAssert(0 == fAllocationCnt); 33 SkASSERT(0 == fAllocationCnt);
34 GrAssert(fHead == fTail); 34 SkASSERT(fHead == fTail);
35 GrAssert(0 == fHead->fLiveCount); 35 SkASSERT(0 == fHead->fLiveCount);
36 DeleteBlock(fHead); 36 DeleteBlock(fHead);
37 }; 37 };
38 38
39 void* GrMemoryPool::allocate(size_t size) { 39 void* GrMemoryPool::allocate(size_t size) {
40 VALIDATE; 40 VALIDATE;
41 size = GrSizeAlignUp(size, kAlignment); 41 size = GrSizeAlignUp(size, kAlignment);
42 size += kPerAllocPad; 42 size += kPerAllocPad;
43 if (fTail->fFreeSize < size) { 43 if (fTail->fFreeSize < size) {
44 int blockSize = size; 44 int blockSize = size;
45 blockSize = GrMax<size_t>(blockSize, fMinAllocSize); 45 blockSize = GrMax<size_t>(blockSize, fMinAllocSize);
46 BlockHeader* block = CreateBlock(blockSize); 46 BlockHeader* block = CreateBlock(blockSize);
47 47
48 block->fPrev = fTail; 48 block->fPrev = fTail;
49 block->fNext = NULL; 49 block->fNext = NULL;
50 GrAssert(NULL == fTail->fNext); 50 SkASSERT(NULL == fTail->fNext);
51 fTail->fNext = block; 51 fTail->fNext = block;
52 fTail = block; 52 fTail = block;
53 } 53 }
54 GrAssert(fTail->fFreeSize >= size); 54 SkASSERT(fTail->fFreeSize >= size);
55 intptr_t ptr = fTail->fCurrPtr; 55 intptr_t ptr = fTail->fCurrPtr;
56 // We stash a pointer to the block header, just before the allocated space, 56 // We stash a pointer to the block header, just before the allocated space,
57 // so that we can decrement the live count on delete in constant time. 57 // so that we can decrement the live count on delete in constant time.
58 *reinterpret_cast<BlockHeader**>(ptr) = fTail; 58 *reinterpret_cast<BlockHeader**>(ptr) = fTail;
59 ptr += kPerAllocPad; 59 ptr += kPerAllocPad;
60 fTail->fPrevPtr = fTail->fCurrPtr; 60 fTail->fPrevPtr = fTail->fCurrPtr;
61 fTail->fCurrPtr += size; 61 fTail->fCurrPtr += size;
62 fTail->fFreeSize -= size; 62 fTail->fFreeSize -= size;
63 fTail->fLiveCount += 1; 63 fTail->fLiveCount += 1;
64 GR_DEBUGCODE(++fAllocationCnt); 64 GR_DEBUGCODE(++fAllocationCnt);
65 VALIDATE; 65 VALIDATE;
66 return reinterpret_cast<void*>(ptr); 66 return reinterpret_cast<void*>(ptr);
67 } 67 }
68 68
69 void GrMemoryPool::release(void* p) { 69 void GrMemoryPool::release(void* p) {
70 VALIDATE; 70 VALIDATE;
71 intptr_t ptr = reinterpret_cast<intptr_t>(p) - kPerAllocPad; 71 intptr_t ptr = reinterpret_cast<intptr_t>(p) - kPerAllocPad;
72 BlockHeader* block = *reinterpret_cast<BlockHeader**>(ptr); 72 BlockHeader* block = *reinterpret_cast<BlockHeader**>(ptr);
73 if (1 == block->fLiveCount) { 73 if (1 == block->fLiveCount) {
74 // the head block is special, it is reset rather than deleted 74 // the head block is special, it is reset rather than deleted
75 if (fHead == block) { 75 if (fHead == block) {
76 fHead->fCurrPtr = reinterpret_cast<intptr_t>(fHead) + 76 fHead->fCurrPtr = reinterpret_cast<intptr_t>(fHead) +
77 kHeaderSize; 77 kHeaderSize;
78 fHead->fLiveCount = 0; 78 fHead->fLiveCount = 0;
79 fHead->fFreeSize = fPreallocSize; 79 fHead->fFreeSize = fPreallocSize;
80 } else { 80 } else {
81 BlockHeader* prev = block->fPrev; 81 BlockHeader* prev = block->fPrev;
82 BlockHeader* next = block->fNext; 82 BlockHeader* next = block->fNext;
83 GrAssert(prev); 83 SkASSERT(prev);
84 prev->fNext = next; 84 prev->fNext = next;
85 if (next) { 85 if (next) {
86 next->fPrev = prev; 86 next->fPrev = prev;
87 } else { 87 } else {
88 GrAssert(fTail == block); 88 SkASSERT(fTail == block);
89 fTail = prev; 89 fTail = prev;
90 } 90 }
91 DeleteBlock(block); 91 DeleteBlock(block);
92 } 92 }
93 } else { 93 } else {
94 --block->fLiveCount; 94 --block->fLiveCount;
95 // Trivial reclaim: if we're releasing the most recent allocation, reuse it 95 // Trivial reclaim: if we're releasing the most recent allocation, reuse it
96 if (block->fPrevPtr == ptr) { 96 if (block->fPrevPtr == ptr) {
97 block->fFreeSize += (block->fCurrPtr - block->fPrevPtr); 97 block->fFreeSize += (block->fCurrPtr - block->fPrevPtr);
98 block->fCurrPtr = block->fPrevPtr; 98 block->fCurrPtr = block->fPrevPtr;
99 } 99 }
100 } 100 }
101 GR_DEBUGCODE(--fAllocationCnt); 101 GR_DEBUGCODE(--fAllocationCnt);
102 VALIDATE; 102 VALIDATE;
103 } 103 }
104 104
105 GrMemoryPool::BlockHeader* GrMemoryPool::CreateBlock(size_t size) { 105 GrMemoryPool::BlockHeader* GrMemoryPool::CreateBlock(size_t size) {
106 BlockHeader* block = 106 BlockHeader* block =
107 reinterpret_cast<BlockHeader*>(GrMalloc(size + kHeaderSize)); 107 reinterpret_cast<BlockHeader*>(GrMalloc(size + kHeaderSize));
108 // we assume malloc gives us aligned memory 108 // we assume malloc gives us aligned memory
109 GrAssert(!(reinterpret_cast<intptr_t>(block) % kAlignment)); 109 SkASSERT(!(reinterpret_cast<intptr_t>(block) % kAlignment));
110 block->fLiveCount = 0; 110 block->fLiveCount = 0;
111 block->fFreeSize = size; 111 block->fFreeSize = size;
112 block->fCurrPtr = reinterpret_cast<intptr_t>(block) + kHeaderSize; 112 block->fCurrPtr = reinterpret_cast<intptr_t>(block) + kHeaderSize;
113 block->fPrevPtr = 0; // gcc warns on assigning NULL to an intptr_t. 113 block->fPrevPtr = 0; // gcc warns on assigning NULL to an intptr_t.
114 return block; 114 return block;
115 } 115 }
116 116
117 void GrMemoryPool::DeleteBlock(BlockHeader* block) { 117 void GrMemoryPool::DeleteBlock(BlockHeader* block) {
118 GrFree(block); 118 GrFree(block);
119 } 119 }
120 120
121 void GrMemoryPool::validate() { 121 void GrMemoryPool::validate() {
122 #ifdef SK_DEBUG 122 #ifdef SK_DEBUG
123 BlockHeader* block = fHead; 123 BlockHeader* block = fHead;
124 BlockHeader* prev = NULL; 124 BlockHeader* prev = NULL;
125 GrAssert(block); 125 SkASSERT(block);
126 int allocCount = 0; 126 int allocCount = 0;
127 do { 127 do {
128 allocCount += block->fLiveCount; 128 allocCount += block->fLiveCount;
129 GrAssert(prev == block->fPrev); 129 SkASSERT(prev == block->fPrev);
130 if (NULL != prev) { 130 if (NULL != prev) {
131 GrAssert(prev->fNext == block); 131 SkASSERT(prev->fNext == block);
132 } 132 }
133 133
134 intptr_t b = reinterpret_cast<intptr_t>(block); 134 intptr_t b = reinterpret_cast<intptr_t>(block);
135 size_t ptrOffset = block->fCurrPtr - b; 135 size_t ptrOffset = block->fCurrPtr - b;
136 size_t totalSize = ptrOffset + block->fFreeSize; 136 size_t totalSize = ptrOffset + block->fFreeSize;
137 size_t userSize = totalSize - kHeaderSize; 137 size_t userSize = totalSize - kHeaderSize;
138 intptr_t userStart = b + kHeaderSize; 138 intptr_t userStart = b + kHeaderSize;
139 139
140 GrAssert(!(b % kAlignment)); 140 SkASSERT(!(b % kAlignment));
141 GrAssert(!(totalSize % kAlignment)); 141 SkASSERT(!(totalSize % kAlignment));
142 GrAssert(!(userSize % kAlignment)); 142 SkASSERT(!(userSize % kAlignment));
143 GrAssert(!(block->fCurrPtr % kAlignment)); 143 SkASSERT(!(block->fCurrPtr % kAlignment));
144 if (fHead != block) { 144 if (fHead != block) {
145 GrAssert(block->fLiveCount); 145 SkASSERT(block->fLiveCount);
146 GrAssert(userSize >= fMinAllocSize); 146 SkASSERT(userSize >= fMinAllocSize);
147 } else { 147 } else {
148 GrAssert(userSize == fPreallocSize); 148 SkASSERT(userSize == fPreallocSize);
149 } 149 }
150 if (!block->fLiveCount) { 150 if (!block->fLiveCount) {
151 GrAssert(ptrOffset == kHeaderSize); 151 SkASSERT(ptrOffset == kHeaderSize);
152 GrAssert(userStart == block->fCurrPtr); 152 SkASSERT(userStart == block->fCurrPtr);
153 } else { 153 } else {
154 GrAssert(block == *reinterpret_cast<BlockHeader**>(userStart)); 154 SkASSERT(block == *reinterpret_cast<BlockHeader**>(userStart));
155 } 155 }
156 prev = block; 156 prev = block;
157 } while ((block = block->fNext)); 157 } while ((block = block->fNext));
158 GrAssert(allocCount == fAllocationCnt); 158 SkASSERT(allocCount == fAllocationCnt);
159 GrAssert(prev == fTail); 159 SkASSERT(prev == fTail);
160 #endif 160 #endif
161 } 161 }
OLDNEW
« no previous file with comments | « src/gpu/GrInOrderDrawBuffer.cpp ('k') | src/gpu/GrOvalRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698