Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fixes for RES_UNIQUE (used by sound instances) - no longer add such handles to the h_find lookup data struct, because it can't handle several instances backed by the same file

Browse Source 
This was SVN commit r1239.
This commit is contained in:
janwas 2004-10-15 13:19:37 +00:00
parent 6f2c1fbb8c
commit cd24c9c6f7
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/lib/res/h_mgr.cpp
View File

@ -131,6 +131,10 @@ struct HDATA
// if set, do not actually release the resource (i.e. call dtor)
// when the handle is h_free-d, regardless of the refcount.
// set by h_alloc; reset on exit and by housekeeping.
u32 unique : 1;
// HACK: prevent adding to h_find lookup index if flags & RES_UNIQUE
// (because those handles might have several instances open,
// which the index can't currently handle)
H_Type type;
@ -245,7 +249,7 @@ static HDATA* h_data(const Handle h, const H_Type type)
void h_mgr_shutdown(void)
void h_mgr_shutdown()
{
// close open handles
for(i32 i = 0; i <= last_in_use; i++)
@ -356,6 +360,13 @@ static int free_idx(i32 idx)
// (e.g. a VFile and Tex object for the same underlying filename hash key)
//
// store index because it's smaller and Handle can easily be reconstructed
//
//
// note: there may be several RES_UNIQUE handles of the same type and key
// (e.g. sound files - several instances of a sound definition file).
// that wasn't forseen here, so we'll just refrain from adding to the index.
// that means they won't be found via h_find - no biggie.
typedef STL_HASH_MULTIMAP<uintptr_t, i32> Key2Idx;
typedef Key2Idx::iterator It;
static Key2Idx key2idx;
@ -404,6 +415,8 @@ static void remove_key(uintptr_t key, H_Type type)
int h_free(Handle& h, H_Type type)
{
HDATA* hd = h_data(h, type);
i32 idx = h_idx(h);
h = 0;
// wipe out the handle, to prevent reuse.
// TODO: should we do this after checking if valid?
@ -431,14 +444,13 @@ int h_free(Handle& h, H_Type type)
if(vtbl->dtor)
vtbl->dtor(hd->user);
if(hd->key)
if(hd->key && !hd->unique)
remove_key(hd->key, type);
free((void*)hd->fn);
memset(hd, 0, sizeof(HDATA));
i32 idx = h_idx(h);
free_idx(idx);
return 0;
@ -476,7 +488,7 @@ fail:
// any further params are passed to type's init routine
Handle h_alloc(H_Type type, const char* fn, uint flags, ...)
{
ONCE(atexit2(h_mgr_shutdown));
// ONCE(atexit2(h_mgr_shutdown));
CHECK_ERR(type_validate(type));
@ -561,7 +573,12 @@ skip_alloc:
return h;
}
if(key)
//
// now adding a new handle
//
hd->unique = (flags & RES_UNIQUE) != 0;
if(key && !hd->unique)
add_key(key, h);
// one-time init

9
source/lib/res/h_mgr.h
View File

@ -183,7 +183,10 @@ extern int h_free(Handle& h, H_Type type);
// find and return a handle by key (typically filename hash)
// currently O(n).
// currently O(log n).
//
// HACK: currently can't find RES_UNIQUE handles, because there
// may be multiple instances of them, breaking the lookup data structure.
extern Handle h_find(H_Type type, uintptr_t key);
// returns a void* pointer to the control block of the resource <h>,
@ -199,6 +202,10 @@ extern int h_reload(const char* fn);
extern int res_cur_scope;
extern void h_mgr_shutdown();
#endif // #ifndef H_MGR_H__