--- /dev/null
+#ifndef ADDON_CACHE_C
+#define ADDON_CACHE_C
+
+#include "addon_cache.h"
+
+static addon_cache_node *addon_cache_nodeptr( addon_cache *cache, void *item ){
+ if( !item ) return NULL;
+ else return item + cache->offset;
+}
+
+static void *addon_cache_item( addon_cache *cache, u16 index ){
+ if( index == ADDON_CACHE_NIL ) return NULL;
+ else return cache->buffer + cache->stride*(size_t)index;
+}
+
+static void addon_cache_init( addon_cache *cache ){
+ cache->head = 0;
+ cache->tail = cache->count -1;
+ for( i32 ib=0; ib < cache->count; ib++ ){
+ void *vb = addon_cache_item( cache, ib );
+ addon_cache_node *nb = addon_cache_nodeptr( cache, vb );
+
+ i32 ia = ib-1, ic = ib+1;
+ nb->l = ia>=0? ia: ADDON_CACHE_NIL,
+ nb->r = ic<cache->count? ic: ADDON_CACHE_NIL;
+ nb->ref_count = 0;
+ }
+}
+
+static u16 addon_item_index( addon_cache *cache, void *item ){
+ return (item - cache->buffer) / cache->stride;
+}
+
+static void *addon_cache_lru( addon_cache *cache ){
+ u16 head = cache->head;
+ if( head == ADDON_CACHE_NIL ) return NULL;
+
+ void *item = addon_cache_item( cache, head );
+ addon_cache_node *node = addon_cache_nodeptr( cache, item );
+
+ if( cache->head == cache->tail ) cache->tail = ADDON_CACHE_NIL;
+ cache->head = node->r;
+
+ node->l = ADDON_CACHE_NIL;
+ node->r = ADDON_CACHE_NIL;
+ return item;
+}
+
+static void addon_cache_watch( addon_cache *cache, void *item ){
+ addon_cache_node *node = addon_cache_nodeptr( cache, item );
+
+ if( node->ref_count >= 32 )
+ vg_fatal_error( "dynamic board watch missmatch (limit is 32)\n" );
+
+ node->ref_count ++;
+}
+
+/* if after this no more watches, places back into the volatile list */
+static void addon_cache_unwatch( addon_cache *cache, void *item ){
+ addon_cache_node *node = addon_cache_nodeptr( cache, item );
+
+ if( node->ref_count == 0 )
+ vg_fatal_error( "dynamic board unwatch missmatch (no watchers)\n" );
+
+ node->ref_count --;
+ if( !node->ref_count ){
+ void *item_head = addon_cache_item( cache, cache->head ),
+ *item_tail = addon_cache_item( cache, cache->tail );
+ addon_cache_node *head = addon_cache_nodeptr( cache, item_head ),
+ *tail = addon_cache_nodeptr( cache, item_tail );
+
+ u16 index = addon_item_index( cache, item );
+ if( tail ) tail->r = index;
+ node->l = cache->tail;
+ cache->tail = index;
+ if( !head ) cache->head = index;
+ }
+}
+
+#endif /* ADDON_CACHE_C */
}
}
-#if 0
- /* lru eviction. should be a linked list maybe... */
- double min_time = 1e300;
- struct cache_board *min_board = NULL;
-
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
- for( u32 i=0; i<SKATESHOP_BOARD_CACHE_MAX; i++ ){
- struct cache_board *cache_ptr = &global_skateshop.cache[i];
-
- if( cache_ptr->state == k_cache_board_state_load_request ) continue;
- if( cache_ptr->ref_count ) continue;
-
- if( cache_ptr->last_use_time < min_time ){
- min_time = cache_ptr->last_use_time;
- min_board = cache_ptr;
- }
- }
-#else
-
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
- struct cache_board *min_board = lru_volatile_cache_board();
-
-#endif
+ SDL_AtomicLock( &addon_system.sl_cache );
+ struct cache_board *min_board =
+ addon_cache_lru( &addon_system.board_cache );
if( min_board ){
if( min_board->state == k_cache_board_state_loaded ){
min_board->reg_ptr = reg;
min_board->reg_index = registry_index;
- min_board->ref_count = 0;
min_board->state = k_cache_board_state_load_request;
}
else{
vg_error( "No free boards to load registry!\n" );
}
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
return min_board;
}
struct shop_view_slot *slot = &global_skateshop.shop_view_slots[i];
u32 request_id = page*SKATESHOP_VIEW_SLOT_MAX + i;
- if( slot->cache_ptr ) unwatch_cache_board( slot->cache_ptr );
+ addon_cache *cache = &addon_system.board_cache;
+ if( slot->cache_ptr )
+ addon_cache_unwatch( cache, slot->cache_ptr );
slot->cache_ptr = skateshop_cache_fetch_board( request_id );
- if( slot->cache_ptr ) watch_cache_board( slot->cache_ptr );
+ if( slot->cache_ptr )
+ addon_cache_watch( cache, slot->cache_ptr );
}
}
*/
VG_STATIC void skateshop_async_board_loaded( void *payload, u32 size )
{
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
+ SDL_AtomicLock( &addon_system.sl_cache );
struct cache_board *cache_ptr = payload;
cache_ptr->state = k_cache_board_state_loaded;
cache_ptr->reg_ptr->userdata = cache_ptr;
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
vg_success( "Async board loaded (%s)\n", cache_ptr->reg_ptr->foldername );
}
vg_info( "Running load loop\n" );
char path_buf[4096];
- for( u32 i=0; i<SKATESHOP_BOARD_CACHE_MAX; i++ ){
- struct cache_board *cache_ptr = &global_skateshop.cache[i];
+ for( u32 i=0; i<CACHE_BOARD_MAX; i++ ){
+ struct cache_board *cache_ptr = &addon_system.boards[i];
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
+ SDL_AtomicLock( &addon_system.sl_cache );
if( cache_ptr->state == k_cache_board_state_load_request ){
if( cache_ptr->reg_index >= addon_count(k_workshop_file_type_board) ){
/* should maybe have a different value for this case */
cache_ptr->state = k_cache_board_state_none;
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
continue;
}
/* continue with the request */
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
addon_reg *reg = get_addon_from_index( k_workshop_file_type_board,
cache_ptr->reg_index );
cache_ptr->reg_ptr = reg;
/* load content files
* --------------------------------- */
-
vg_str content_path = folder;
-
vg_msg root = {0};
root.buf = reg->metadata;
root.len = reg->metadata_len;
continue;
file_is_broken:;
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
+ SDL_AtomicLock( &addon_system.sl_cache );
cache_ptr->state = k_cache_board_state_none;
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
}
else
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
}
}
* -----------------------------------------------------------------------------
*/
-/* adds one more watch */
-VG_STATIC void watch_cache_board( struct cache_board *ptr ){
- if( ptr->ref_count >= 32 ){
- vg_fatal_error( "dynamic board watch missmatch (limit is 32)\n" );
- }
-
- ptr->ref_count ++;
-}
-
-/* if after this no more watches, places back into the volatile list */
-VG_STATIC void unwatch_cache_board( struct cache_board *ptr ){
- if( ptr->ref_count == 0 ){
- vg_fatal_error( "dynamic board unwatch missmatch (no watchers)\n" );
- }
-
- ptr->ref_count --;
- if( !ptr->ref_count ){
- struct cache_board *head = global_skateshop.cache_head,
- *tail = global_skateshop.cache_tail;
-
- if( tail ) tail->right = ptr;
- ptr->left = tail;
- global_skateshop.cache_tail = ptr;
-
- if( !head ) global_skateshop.cache_head = ptr;
- }
-}
-
-/* retrieve oldest pointer from the volatile list (and remove it) */
-VG_STATIC struct cache_board *lru_volatile_cache_board(void){
- struct cache_board *head = global_skateshop.cache_head,
- *tail = global_skateshop.cache_tail;
-
- if( head ){
- if( head == tail ) global_skateshop.cache_tail = NULL;
- global_skateshop.cache_head = head->right;
-
- head->left = NULL;
- head->right = NULL;
- return head;
- }
- else return NULL;
-}
-
/*
* VG event init
*/
VG_STATIC void skateshop_init(void){
- u32 cache_size = sizeof(struct cache_board)*SKATESHOP_BOARD_CACHE_MAX;
- global_skateshop.cache = vg_linear_alloc( vg_mem.rtmemory, cache_size );
- memset( global_skateshop.cache, 0, cache_size );
-
- for( i32 ib=0; ib<SKATESHOP_BOARD_CACHE_MAX; ib++ ){
- i32 ia = ib-1, ic = ib+1;
- struct cache_board *arr = global_skateshop.cache,
- *pb = &arr[ib],
- *pa = ia>=0? &arr[ia]: NULL,
- *pc = ic<SKATESHOP_BOARD_CACHE_MAX? &arr[ic]: NULL;
- pb->left = pa;
- pb->right = pc;
-
- pb->state = k_cache_board_state_none;
- pb->reg_ptr= NULL;
- pb->reg_index = 0xffffffff;
- pb->ref_count = 0;
- }
-
- global_skateshop.cache_head = global_skateshop.cache;
- global_skateshop.cache_tail =
- &global_skateshop.cache[SKATESHOP_BOARD_CACHE_MAX-1];
+ u32 cache_size = sizeof(struct cache_board)*CACHE_BOARD_MAX;
+ addon_system.boards = vg_linear_alloc( vg_mem.rtmemory, cache_size );
+ memset( addon_system.boards, 0, cache_size );
+
+ for( i32 i=0; i<CACHE_BOARD_MAX; i++ ){
+ struct cache_board *board = &addon_system.boards[i];
+ board->state = k_cache_board_state_none;
+ board->reg_ptr= NULL;
+ board->reg_index = 0xffffffff;
+ }
+
+ addon_cache *cache = &addon_system.board_cache;
+ cache->buffer = addon_system.boards;
+ cache->count = CACHE_BOARD_MAX;
+ cache->stride = sizeof( struct cache_board );
+ cache->offset = offsetof( struct cache_board, cachenode );
+ addon_cache_init( cache );
}
VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void)
addon_reg *reg = get_addon_from_index(k_workshop_file_type_board,
global_skateshop.selected_board_id);
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
+ SDL_AtomicLock( &addon_system.sl_cache );
if( reg->userdata ){
struct cache_board *cache_ptr = reg->userdata;
if( cache_ptr->state == k_cache_board_state_loaded ){
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
return cache_ptr;
}
}
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
}
return NULL;
global_skateshop.selected_board_id );
if( localplayer.board_view_slot ){
- unwatch_cache_board( localplayer.board_view_slot );
+ addon_cache_unwatch( &addon_system.board_cache,
+ localplayer.board_view_slot );
}
localplayer.board_view_slot = selected_cache;
- watch_cache_board( localplayer.board_view_slot );
+ addon_cache_watch( &addon_system.board_cache,
+ localplayer.board_view_slot );
global_skateshop_exit();
skaterift_write_savedata();
return;
mdl_entity_id_id(shop->boards.id_display));
int visibility[ SKATESHOP_VIEW_SLOT_MAX ];
- SDL_AtomicLock( &global_skateshop.sl_cache_access );
+ SDL_AtomicLock( &addon_system.sl_cache );
for( u32 i=0; i<SKATESHOP_VIEW_SLOT_MAX; i++ ){
struct shop_view_slot *slot = &global_skateshop.shop_view_slots[i];
else if( slot->cache_ptr->state != k_cache_board_state_loaded )
visibility[i] = 0;
}
- SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
+ SDL_AtomicUnlock( &addon_system.sl_cache );
/* Render loaded boards in the view slots */
for( u32 i=0; i<slot_count; i++ ){
projects / carveJwlIkooP6JGAAIwe30JlM.git / commitdiff