Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use much bigger hash tables for memory allocations now that we are

Browse Source 
allocating lots of small objects. Previous size was scaling poorly
and taking a lot of time to free, causing things like -listxml
and -validate to be a lot slower than before since the new 
driver_enumerator actually frees all of its memory at the end.

Also changed resource_pool to support a hash table size as input to
the constructor, which allows the global pool to be large, while
the machine-local pools can remain smaller.
This commit is contained in:
Aaron Giles 2011-04-19 15:08:42 +00:00
parent d3a1560433
commit a0647e8e68
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/emu/emualloc.c
View File

@ -87,7 +87,7 @@ public:
int m_line; // line number within that file int m_line; // line number within that file
UINT64 m_id; // unique id UINT64 m_id; // unique id
static const int k_hash_prime = 193; static const int k_hash_prime = 6151;
static UINT64 s_curid; // current ID static UINT64 s_curid; // current ID
static osd_lock * s_lock; // lock for managing the list static osd_lock * s_lock; // lock for managing the list
@ -113,7 +113,7 @@ private:
//************************************************************************** //**************************************************************************
// global resource pool to handle allocations outside of the emulator context // global resource pool to handle allocations outside of the emulator context
resource_pool global_resource_pool; resource_pool global_resource_pool(6151);
// dummy zeromem object // dummy zeromem object
const zeromem_t zeromem = { }; const zeromem_t zeromem = { };
@ -246,12 +246,14 @@ void dump_unfreed_mem()
// pool // pool
//------------------------------------------------- //-------------------------------------------------
resource_pool::resource_pool() resource_pool::resource_pool(int hash_size)
: m_listlock(osd_lock_alloc()), : m_hash_size(hash_size),
m_listlock(osd_lock_alloc()),
m_hash(new resource_pool_item *[hash_size]),
m_ordered_head(NULL), m_ordered_head(NULL),
m_ordered_tail(NULL) m_ordered_tail(NULL)
{ {
memset(m_hash, 0, sizeof(m_hash)); memset(m_hash, 0, hash_size * sizeof(m_hash[0]));
} }
@ -266,6 +268,7 @@ resource_pool::~resource_pool()
clear(); clear();
if (m_listlock != NULL) if (m_listlock != NULL)
osd_lock_free(m_listlock); osd_lock_free(m_listlock);
delete[] m_hash;
} }
@ -278,7 +281,7 @@ void resource_pool::add(resource_pool_item &item)
osd_lock_acquire(m_listlock); osd_lock_acquire(m_listlock);
// insert into hash table // insert into hash table
int hashval = reinterpret_cast<FPTR>(item.m_ptr) % k_hash_prime; int hashval = reinterpret_cast<FPTR>(item.m_ptr) % m_hash_size;
item.m_next = m_hash[hashval]; item.m_next = m_hash[hashval];
m_hash[hashval] = &item; m_hash[hashval] = &item;
@ -338,7 +341,7 @@ void resource_pool::remove(void *ptr)
// search for the item // search for the item
osd_lock_acquire(m_listlock); osd_lock_acquire(m_listlock);
int hashval = reinterpret_cast<FPTR>(ptr) % k_hash_prime; int hashval = reinterpret_cast<FPTR>(ptr) % m_hash_size;
for (resource_pool_item **scanptr = &m_hash[hashval]; *scanptr != NULL; scanptr = &(*scanptr)->m_next) for (resource_pool_item **scanptr = &m_hash[hashval]; *scanptr != NULL; scanptr = &(*scanptr)->m_next)
// must match the pointer // must match the pointer
@ -379,7 +382,7 @@ resource_pool_item *resource_pool::find(void *ptr)
// search for the item // search for the item
osd_lock_acquire(m_listlock); osd_lock_acquire(m_listlock);
int hashval = reinterpret_cast<FPTR>(ptr) % k_hash_prime; int hashval = reinterpret_cast<FPTR>(ptr) % m_hash_size;
resource_pool_item *item; resource_pool_item *item;
for (item = m_hash[hashval]; item != NULL; item = item->m_next) for (item = m_hash[hashval]; item != NULL; item = item->m_next)
if (item->m_ptr == ptr) if (item->m_ptr == ptr)

7
src/emu/emualloc.h
View File

@ -277,7 +277,7 @@ private:
resource_pool &operator=(const resource_pool &); resource_pool &operator=(const resource_pool &);
public: public:
resource_pool(); resource_pool(int hash_size = 193);
~resource_pool(); ~resource_pool();
void add(resource_pool_item &item); void add(resource_pool_item &item);
@ -292,10 +292,9 @@ public:
template<class T> T *add_array(T* array, int count) { add(*EMUALLOC_SELF_NEW resource_pool_array<T>(array, count)); return array; } template<class T> T *add_array(T* array, int count) { add(*EMUALLOC_SELF_NEW resource_pool_array<T>(array, count)); return array; }
private: private:
static const int k_hash_prime = 193; int m_hash_size;
osd_lock * m_listlock; osd_lock * m_listlock;
resource_pool_item * m_hash[k_hash_prime]; resource_pool_item ** m_hash;
resource_pool_item * m_ordered_head; resource_pool_item * m_ordered_head;
resource_pool_item * m_ordered_tail; resource_pool_item * m_ordered_tail;
}; };