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

Change add_handle to never have side effects on the buffer if it fails. It actually seems ok and I'm not sure if's responsible for anything, but it's more sane and keeps buffer_handle from regressing buf_widx later if buffering cur_handle.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29291 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-02-13 10:44:13 +00:00
parent e8e0ca2c57
commit b474d0d98f
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/buffering.c
View file

@ -243,10 +243,7 @@ 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's data_size cannot be allocated and alloc_all is set. */
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, bool can_wrap, static struct memory_handle *add_handle(size_t data_size, bool can_wrap,
bool alloc_all) bool alloc_all)
{ {
@ -263,6 +260,8 @@ static struct memory_handle *add_handle(size_t data_size, bool can_wrap,
mutex_lock(&llist_mutex); mutex_lock(&llist_mutex);
mutex_lock(&llist_mod_mutex); mutex_lock(&llist_mod_mutex);
new_widx = buf_widx;
if (cur_handle && cur_handle->filerem > 0) { if (cur_handle && cur_handle->filerem > 0) {
/* the current handle hasn't finished buffering. We can only add /* the current handle hasn't finished buffering. We can only add
a new one if there is already enough free space to finish a new one if there is already enough free space to finish
@ -275,12 +274,12 @@ static struct memory_handle *add_handle(size_t data_size, 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 */
buf_widx = ringbuf_add(cur_handle->widx, cur_handle->filerem); new_widx = ringbuf_add(cur_handle->widx, cur_handle->filerem);
} }
} }
/* align to 4 bytes up */ /* align to 4 bytes up */
new_widx = ringbuf_add(buf_widx, 3) & ~3; new_widx = ringbuf_add(new_widx, 3) & ~3;
len = data_size + sizeof(struct memory_handle); len = data_size + sizeof(struct memory_handle);