Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Further improve the mistakes I made in add_handle (thanks Nico_P for not beating me with them)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15376 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2007-10-30 15:09:52 +00:00
parent 7030279dd2
commit 151b7c9038
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/buffering.c
View file

@ -216,8 +216,9 @@ buf_ridx == buf_widx means the buffer is empty.
alloc_all tells us if we must immediately be able to allocate data_size alloc_all tells us if we must immediately be able to allocate data_size
returns a valid memory handle if all conditions for allocation are met. returns a valid memory handle if all conditions for allocation are met.
NULL if there memory_handle itself cannot be allocated or if the NULL if there memory_handle itself cannot be allocated or if the
data_size cannot be allocated and alloc_all is set. This function data_size cannot be allocated and alloc_all is set. This function's
has no side effects if NULL is returned. only potential side effect is to allocate space for the cur_handle
if it returns NULL.
*/ */
static struct memory_handle *add_handle(size_t data_size, const bool can_wrap, static struct memory_handle *add_handle(size_t data_size, const bool can_wrap,
const bool alloc_all) const bool alloc_all)
@ -225,7 +226,7 @@ static struct memory_handle *add_handle(size_t data_size, const bool can_wrap,
/* gives each handle a unique id, unsigned to handle wraps gracefully */ /* gives each handle a unique id, unsigned to handle wraps gracefully */
static unsigned int cur_handle_id = 1; static unsigned int cur_handle_id = 1;
size_t shift; size_t shift;
size_t new_widx = buf_widx; size_t new_widx;
size_t len; size_t len;
int overlap; int overlap;
@ -242,12 +243,12 @@ static struct memory_handle *add_handle(size_t data_size, const bool can_wrap,
return NULL; return NULL;
} else { } else {
/* Allocate the remainder of the space for the current handle */ /* Allocate the remainder of the space for the current handle */
new_widx = RINGBUF_ADD(cur_handle->widx, cur_handle->filerem); buf_widx = RINGBUF_ADD(cur_handle->widx, cur_handle->filerem);
} }
} }
/* align buf_widx to 4 bytes up */ /* align to 4 bytes up */
new_widx = (RINGBUF_ADD(new_widx, 3)) & ~3; new_widx = RINGBUF_ADD(buf_widx, 3) & ~3;
len = data_size + sizeof(struct memory_handle); len = data_size + sizeof(struct memory_handle);
@ -265,7 +266,7 @@ static struct memory_handle *add_handle(size_t data_size, const bool can_wrap,
new_widx += data_size - overlap; new_widx += data_size - overlap;
} }
/* This is how far we shifted buf_widx to align things */ /* How far we shifted buf_widx to align things, must be < buffer_len */
shift = RINGBUF_SUB(new_widx, buf_widx); shift = RINGBUF_SUB(new_widx, buf_widx);
/* How much space are we short in the actual ring buffer? */ /* How much space are we short in the actual ring buffer? */