devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Temporary work around for the situation where a single codec request is for more data than a single file_chunk and that file gets stuck. This should be fixed differently as it could lead to unresponsive behavior from the buffering thread for the duration of a file load.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15390 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2007-11-01 05:12:55 +00:00
parent 7127199230
commit ff9cdb464a
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/buffering.c
View file

@ -540,7 +540,7 @@ static bool yield_codec(void)
/* Buffer data for the given handle. Return the amount of data buffered /* Buffer data for the given handle. Return the amount of data buffered
or -1 if the handle wasn't found */ or -1 if the handle wasn't found */
static ssize_t buffer_handle(int handle_id) static ssize_t buffer_handle(int handle_id, bool force)
{ {
logf("buffer_handle(%d)", handle_id); logf("buffer_handle(%d)", handle_id);
struct memory_handle *h = find_handle(handle_id); struct memory_handle *h = find_handle(handle_id);
@ -575,13 +575,17 @@ static ssize_t buffer_handle(int handle_id)
size_t copy_n = MIN( MIN(h->filerem, conf_filechunk), size_t copy_n = MIN( MIN(h->filerem, conf_filechunk),
buffer_len - h->widx); buffer_len - h->widx);
/* stop copying if it would overwrite the reading position /* stop copying if it would overwrite the reading position */
or the next handle */ if (RINGBUF_ADD_CROSS(h->widx, copy_n, buf_ridx) >= 0)
if (RINGBUF_ADD_CROSS(h->widx, copy_n, buf_ridx) >= 0 || (h->next &&
RINGBUF_ADD_CROSS(h->widx, copy_n, (unsigned)
((void *)h->next - (void *)buffer)) > 0))
break; break;
/* This would read into the next handle, this is broken */
if (h->next && RINGBUF_ADD_CROSS(h->widx, copy_n,
(unsigned)((void *)h->next - (void *)buffer)) > 0) {
logf("Handle allocation short");
break;
}
/* rc is the actual amount read */ /* rc is the actual amount read */
int rc = read(h->fd, &buffer[h->widx], copy_n); int rc = read(h->fd, &buffer[h->widx], copy_n);
@ -611,7 +615,7 @@ static ssize_t buffer_handle(int handle_id)
* cpu boost for this thread. If the codec's low data * cpu boost for this thread. If the codec's low data
* situation was very short lived that could leave us filling * situation was very short lived that could leave us filling
* w/o boost */ * w/o boost */
if (yield_codec()) if (!force && yield_codec())
break; break;
} }
@ -733,7 +737,7 @@ static void fill_buffer(void)
struct memory_handle *m = first_handle; struct memory_handle *m = first_handle;
while (queue_empty(&buffering_queue) && m) { while (queue_empty(&buffering_queue) && m) {
if (m->filerem > 0) { if (m->filerem > 0) {
buffer_handle(m->id); buffer_handle(m->id, false);
} }
m = m->next; m = m->next;
} }
@ -1152,7 +1156,7 @@ void buffering_thread(void)
case Q_BUFFER_HANDLE: case Q_BUFFER_HANDLE:
LOGFQUEUE("buffering < Q_BUFFER_HANDLE"); LOGFQUEUE("buffering < Q_BUFFER_HANDLE");
queue_reply(&buffering_queue, 1); queue_reply(&buffering_queue, 1);
buffer_handle((int)ev.data); buffer_handle((int)ev.data, true);
break; break;
case Q_RESET_HANDLE: case Q_RESET_HANDLE: