Add handle values to the buffering LOGFQUEUE messages for easier debugging.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18092 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2008-07-18 23:42:47 +00:00
parent 8d0126f355
commit cf369575bc

View file

@ -711,7 +711,7 @@ static void rebuffer_handle(int handle_id, size_t newpos)
rebuffer the whole track, just read enough to satisfy */ rebuffer the whole track, just read enough to satisfy */
if (newpos > h->offset && newpos - h->offset < BUFFERING_DEFAULT_FILECHUNK) if (newpos > h->offset && newpos - h->offset < BUFFERING_DEFAULT_FILECHUNK)
{ {
LOGFQUEUE("buffering >| Q_BUFFER_HANDLE"); 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);
h->ridx = h->data + newpos; h->ridx = h->data + newpos;
return; return;
@ -720,7 +720,7 @@ static void rebuffer_handle(int handle_id, size_t newpos)
h->offset = newpos; h->offset = newpos;
/* Reset the handle to its new offset */ /* Reset the handle to its new offset */
LOGFQUEUE("buffering >| Q_RESET_HANDLE"); LOGFQUEUE("buffering >| Q_RESET_HANDLE %d", handle_id);
queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id); queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id);
size_t next = (unsigned)((void *)h->next - (void *)buffer); size_t next = (unsigned)((void *)h->next - (void *)buffer);
@ -733,7 +733,7 @@ static void rebuffer_handle(int handle_id, size_t newpos)
} }
/* Now we ask for a rebuffer */ /* Now we ask for a rebuffer */
LOGFQUEUE("buffering >| Q_BUFFER_HANDLE"); 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);
} }
@ -970,7 +970,7 @@ int bufopen(const char *file, size_t offset, enum data_type type)
if (type == TYPE_CUESHEET) { if (type == TYPE_CUESHEET) {
h->fd = fd; h->fd = fd;
/* Immediately start buffering those */ /* Immediately start buffering those */
LOGFQUEUE("buffering >| Q_BUFFER_HANDLE"); LOGFQUEUE("buffering >| Q_BUFFER_HANDLE %d", h->id);
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 */
@ -1337,7 +1337,7 @@ void buffering_thread(void)
switch (ev.id) switch (ev.id)
{ {
case Q_START_FILL: case Q_START_FILL:
LOGFQUEUE("buffering < Q_START_FILL"); LOGFQUEUE("buffering < Q_START_FILL %d", (int)ev.data);
/* 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 */
send_event(EVENT_BUFFER_LOW, 0); send_event(EVENT_BUFFER_LOW, 0);
@ -1347,19 +1347,19 @@ void buffering_thread(void)
break; break;
case Q_BUFFER_HANDLE: case Q_BUFFER_HANDLE:
LOGFQUEUE("buffering < Q_BUFFER_HANDLE"); LOGFQUEUE("buffering < Q_BUFFER_HANDLE %d", (int)ev.data);
queue_reply(&buffering_queue, 1); queue_reply(&buffering_queue, 1);
buffer_handle((int)ev.data); buffer_handle((int)ev.data);
break; break;
case Q_RESET_HANDLE: case Q_RESET_HANDLE:
LOGFQUEUE("buffering < Q_RESET_HANDLE"); LOGFQUEUE("buffering < Q_RESET_HANDLE %d", (int)ev.data);
queue_reply(&buffering_queue, 1); queue_reply(&buffering_queue, 1);
reset_handle((int)ev.data); reset_handle((int)ev.data);
break; break;
case Q_CLOSE_HANDLE: case Q_CLOSE_HANDLE:
LOGFQUEUE("buffering < Q_CLOSE_HANDLE"); LOGFQUEUE("buffering < Q_CLOSE_HANDLE %d", (int)ev.data);
queue_reply(&buffering_queue, close_handle((int)ev.data)); queue_reply(&buffering_queue, close_handle((int)ev.data));
break; break;
@ -1370,7 +1370,7 @@ void buffering_thread(void)
break; break;
case Q_BASE_HANDLE: case Q_BASE_HANDLE:
LOGFQUEUE("buffering < Q_BASE_HANDLE"); LOGFQUEUE("buffering < Q_BASE_HANDLE %d", (int)ev.data);
base_handle_id = (int)ev.data; base_handle_id = (int)ev.data;
break; break;