i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BBlockCache: Don't cache anything if a debug heap is in use.

Browse Source 
Otherwise, BMessage allocations and frees don't really get
checked by the debug heaps, which isn't helpful. Use a
public debug heap function with a weak definition to detect this.

While at it, drop the full MIT license from the header and use
the common shorthand.

Should help with diagnosing #18905.
This commit is contained in:
Augustin Cavalier
2025-02-27 21:32:44 -05:00
parent bc376a296b
commit 5341b58f5f
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/BlockCache.cpp
+17 -19
View File
@@ -1,36 +1,22 @@
/* /*
* Copyright (c) 2003 Marcus Overhagen * Copyright (c) 2003 Marcus Overhagen
* * Distributed under the terms of the MIT License.
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/ */
#include <BlockCache.h> #include <BlockCache.h>
#include <Debug.h> #include <Debug.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <new> #include <new>
extern "C" void heap_debug_get_allocation_info() __attribute__((weak));
#define MAGIC1 0x9183f4d9 #define MAGIC1 0x9183f4d9
#define MAGIC2 0xa6b3c87d #define MAGIC2 0xa6b3c87d
struct BBlockCache::_FreeBlock { struct BBlockCache::_FreeBlock {
DEBUG_ONLY( uint32 magic1; ) DEBUG_ONLY( uint32 magic1; )
_FreeBlock *next; _FreeBlock *next;
@@ -67,6 +53,10 @@ BBlockCache::BBlockCache(uint32 blockCount, size_t blockSize,
break; break;
} }
// If a debug heap is in use, don't cache anything.
if (heap_debug_get_allocation_info != NULL)
return;
// To properly maintain a list of free buffers, a buffer must be // To properly maintain a list of free buffers, a buffer must be
// large enough to contain the _FreeBlock struct that is used. // large enough to contain the _FreeBlock struct that is used.
if (blockSize < sizeof(_FreeBlock)) if (blockSize < sizeof(_FreeBlock))
@@ -109,6 +99,9 @@ BBlockCache::~BBlockCache()
void * void *
BBlockCache::Get(size_t blockSize) BBlockCache::Get(size_t blockSize)
{ {
if (heap_debug_get_allocation_info != NULL)
return fAlloc(blockSize);
if (!fLocker.Lock()) if (!fLocker.Lock())
return 0; return 0;
void *pointer; void *pointer;
@@ -134,6 +127,11 @@ BBlockCache::Get(size_t blockSize)
void void
BBlockCache::Save(void *pointer, size_t blockSize) BBlockCache::Save(void *pointer, size_t blockSize)
{ {
if (heap_debug_get_allocation_info != NULL) {
fFree(pointer);
return;
}
if (!fLocker.Lock()) if (!fLocker.Lock())
return; return;
if (blockSize == fBlockSize && fFreeBlocks < fBlockCount) { if (blockSize == fBlockSize && fFreeBlocks < fBlockCount) {