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

logging improvements

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15472 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2007-11-05 15:24:21 +00:00
parent cd5d95090e
commit 555a764dad
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
apps/buffering.c
View file

@ -656,10 +656,10 @@ static void rebuffer_handle(int handle_id, size_t newpos)
h->offset = newpos; h->offset = newpos;
LOGFQUEUE("buffering >| buffering Q_RESET_HANDLE"); LOGFQUEUE("buffering >| Q_RESET_HANDLE");
queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id); queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id);
LOGFQUEUE("buffering >| buffering Q_BUFFER_HANDLE"); LOGFQUEUE("buffering >| Q_BUFFER_HANDLE");
queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id); queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id);
h->ridx = h->data; h->ridx = h->data;
@ -849,7 +849,7 @@ int bufopen(const char *file, size_t offset, enum data_type type)
if (type == TYPE_CODEC || type == TYPE_CUESHEET || type == TYPE_IMAGE) { if (type == TYPE_CODEC || type == TYPE_CUESHEET || type == TYPE_IMAGE) {
h->fd = fd; h->fd = fd;
/* Immediately start buffering those */ /* Immediately start buffering those */
LOGFQUEUE("buffering >| buffering Q_BUFFER_HANDLE"); LOGFQUEUE("buffering >| Q_BUFFER_HANDLE");
queue_send(&buffering_queue, Q_BUFFER_HANDLE, h->id); queue_send(&buffering_queue, Q_BUFFER_HANDLE, h->id);
} else { } else {
/* Other types will get buffered in the course of normal operations */ /* Other types will get buffered in the course of normal operations */
@ -1085,16 +1085,16 @@ ssize_t buf_handle_offset(int handle_id)
void buf_request_buffer_handle(int handle_id) void buf_request_buffer_handle(int handle_id)
{ {
LOGFQUEUE("buffering >| buffering Q_FILL_BUFFER"); LOGFQUEUE("buffering >| Q_FILL_BUFFER");
queue_send(&buffering_queue, Q_FILL_BUFFER, 0); queue_send(&buffering_queue, Q_FILL_BUFFER, 0);
LOGFQUEUE("buffering >| buffering Q_BUFFER_HANDLE %d", handle_id); LOGFQUEUE("buffering >| Q_BUFFER_HANDLE %d", handle_id);
queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id); queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id);
} }
void buf_set_base_handle(int handle_id) void buf_set_base_handle(int handle_id)
{ {
LOGFQUEUE("buffering > buffering Q_BASE_HANDLE %d", handle_id); LOGFQUEUE("buffering > Q_BASE_HANDLE %d", handle_id);
queue_post(&buffering_queue, Q_BASE_HANDLE, handle_id); queue_post(&buffering_queue, Q_BASE_HANDLE, handle_id);
} }
@ -1162,6 +1162,7 @@ void unregister_buffer_low_callback(buffer_low_callback func)
static void call_buffer_low_callbacks(void) static void call_buffer_low_callbacks(void)
{ {
logf("call_buffer_low_callbacks()");
int i; int i;
for (i = 0; i < MAX_BUF_CALLBACKS; i++) for (i = 0; i < MAX_BUF_CALLBACKS; i++)
{ {
@ -1174,16 +1175,21 @@ static void call_buffer_low_callbacks(void)
} }
} }
static void shrink_buffer(struct memory_handle *h) { static void shrink_buffer_inner(struct memory_handle *h) {
if (h == NULL) if (h == NULL)
return; return;
shrink_buffer(h->next); shrink_buffer_inner(h->next);
shrink_handle(h); shrink_handle(h);
} }
static void shrink_buffer(void) {
logf("shrink_buffer()");
shrink_buffer_inner(first_handle);
}
void buffering_thread(void) void buffering_thread(void)
{ {
bool filling = false; bool filling = false;
@ -1200,10 +1206,11 @@ void buffering_thread(void)
/* Call buffer callbacks here because this is one of two ways /* Call buffer callbacks here because this is one of two ways
* to begin a full buffer fill */ * to begin a full buffer fill */
call_buffer_low_callbacks(); call_buffer_low_callbacks();
shrink_buffer(first_handle); shrink_buffer();
filling = true; filling = true;
queue_reply(&buffering_queue, 1); queue_reply(&buffering_queue, 1);
break; break;
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);
@ -1286,7 +1293,7 @@ void buffering_thread(void)
{ {
/* This is a new fill, shrink the buffer up first */ /* This is a new fill, shrink the buffer up first */
if (!filling) if (!filling)
shrink_buffer(first_handle); shrink_buffer();
filling = fill_buffer(); filling = fill_buffer();
update_data_counters(); update_data_counters();
} }
@ -1303,7 +1310,7 @@ void buffering_thread(void)
{ {
if (data_counters.remaining > 0 && if (data_counters.remaining > 0 &&
data_counters.useful <= conf_watermark) { data_counters.useful <= conf_watermark) {
shrink_buffer(first_handle); shrink_buffer();
filling = fill_buffer(); filling = fill_buffer();
} }
} }