forked from len0rd/rockbox
Add queue_send synchronous message sending. Right now only for SWCODEC. Actual usage to be added to playback and recording shortly in upcoming commits.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11776 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis
parent
63a1cb52b4
commit
43c15921e4
6 changed files with 442 additions and 33 deletions
|
|
@ -86,13 +86,74 @@ void yield(void)
|
|||
/****************************************************************************
|
||||
* Queue handling stuff
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
/* Moves waiting thread's descriptor to the current sender when a
|
||||
message is dequeued */
|
||||
static void queue_fetch_sender(struct queue_sender_list *send,
|
||||
unsigned int i)
|
||||
{
|
||||
int old_level = set_irq_level(HIGHEST_IRQ_LEVEL);
|
||||
struct queue_sender **spp = &send->senders[i];
|
||||
|
||||
if(*spp)
|
||||
{
|
||||
send->curr_sender = *spp;
|
||||
*spp = NULL;
|
||||
}
|
||||
|
||||
set_irq_level(old_level);
|
||||
}
|
||||
|
||||
/* Puts the specified return value in the waiting thread's return value
|
||||
and wakes the thread - a sender should be confirmed to exist first */
|
||||
static void queue_release_sender(struct queue_sender **sender, void *retval)
|
||||
{
|
||||
(*sender)->retval = retval;
|
||||
wakeup_thread(&(*sender)->thread);
|
||||
*sender = NULL;
|
||||
}
|
||||
|
||||
/* Releases any waiting threads that are queued with queue_send -
|
||||
reply with NULL */
|
||||
static void queue_release_all_senders(struct event_queue *q)
|
||||
{
|
||||
if(q->send)
|
||||
{
|
||||
unsigned int i;
|
||||
for(i = q->read; i != q->write; i++)
|
||||
{
|
||||
struct queue_sender **spp =
|
||||
&q->send->senders[i & QUEUE_LENGTH_MASK];
|
||||
if(*spp)
|
||||
{
|
||||
queue_release_sender(spp, NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Enables queue_send on the specified queue - caller allocates the extra
|
||||
data structure */
|
||||
void queue_enable_queue_send(struct event_queue *q,
|
||||
struct queue_sender_list *send)
|
||||
{
|
||||
q->send = send;
|
||||
memset(send, 0, sizeof(*send));
|
||||
}
|
||||
#endif /* HAVE_EXTENDED_MESSAGING_AND_NAME */
|
||||
|
||||
|
||||
void queue_init(struct event_queue *q, bool register_queue)
|
||||
{
|
||||
q->read = 0;
|
||||
q->write = 0;
|
||||
q->read = 0;
|
||||
q->write = 0;
|
||||
q->thread = NULL;
|
||||
|
||||
if (register_queue)
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
q->send = NULL; /* No message sending by default */
|
||||
#endif
|
||||
|
||||
if(register_queue)
|
||||
{
|
||||
/* Add it to the all_queues array */
|
||||
all_queues[num_queues++] = q;
|
||||
|
|
@ -118,6 +179,12 @@ void queue_delete(struct event_queue *q)
|
|||
|
||||
if(found)
|
||||
{
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
/* Release waiting threads and reply to any dequeued message
|
||||
waiting for one. */
|
||||
queue_release_all_senders(q);
|
||||
queue_reply(q, NULL);
|
||||
#endif
|
||||
/* Move the following queues up in the list */
|
||||
for(;i < num_queues-1;i++)
|
||||
{
|
||||
|
|
@ -130,24 +197,44 @@ void queue_delete(struct event_queue *q)
|
|||
|
||||
void queue_wait(struct event_queue *q, struct event *ev)
|
||||
{
|
||||
if (q->read == q->write)
|
||||
unsigned int rd;
|
||||
|
||||
if(q->read == q->write)
|
||||
{
|
||||
block_thread(&q->thread);
|
||||
}
|
||||
|
||||
*ev = q->events[(q->read++) & QUEUE_LENGTH_MASK];
|
||||
rd = q->read++ & QUEUE_LENGTH_MASK;
|
||||
*ev = q->events[rd];
|
||||
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
if(q->send && q->send->senders[rd])
|
||||
{
|
||||
/* Get data for a waiting thread if one */
|
||||
queue_fetch_sender(q->send, rd);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks)
|
||||
{
|
||||
if (q->read == q->write && ticks > 0)
|
||||
if(q->read == q->write && ticks > 0)
|
||||
{
|
||||
block_thread_w_tmo(&q->thread, ticks);
|
||||
}
|
||||
|
||||
if (q->read != q->write)
|
||||
if(q->read != q->write)
|
||||
{
|
||||
*ev = q->events[(q->read++) & QUEUE_LENGTH_MASK];
|
||||
unsigned int rd = q->read++ & QUEUE_LENGTH_MASK;
|
||||
*ev = q->events[rd];
|
||||
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
if(q->send && q->send->senders[rd])
|
||||
{
|
||||
/* Get data for a waiting thread if one */
|
||||
queue_fetch_sender(q->send, rd);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -157,20 +244,81 @@ void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks)
|
|||
|
||||
void queue_post(struct event_queue *q, long id, void *data)
|
||||
{
|
||||
int wr;
|
||||
int oldlevel;
|
||||
int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
|
||||
unsigned int wr = q->write++ & QUEUE_LENGTH_MASK;
|
||||
|
||||
oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
|
||||
wr = (q->write++) & QUEUE_LENGTH_MASK;
|
||||
|
||||
q->events[wr].id = id;
|
||||
q->events[wr].id = id;
|
||||
q->events[wr].data = data;
|
||||
|
||||
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
if(q->send)
|
||||
{
|
||||
struct queue_sender **spp = &q->send->senders[wr];
|
||||
|
||||
if(*spp)
|
||||
{
|
||||
/* overflow protect - unblock any thread waiting at this index */
|
||||
queue_release_sender(spp, NULL);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
wakeup_thread(&q->thread);
|
||||
|
||||
set_irq_level(oldlevel);
|
||||
}
|
||||
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
void * queue_send(struct event_queue *q, long id, void *data)
|
||||
{
|
||||
int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
|
||||
unsigned int wr = q->write++ & QUEUE_LENGTH_MASK;
|
||||
|
||||
q->events[wr].id = id;
|
||||
q->events[wr].data = data;
|
||||
|
||||
if(q->send)
|
||||
{
|
||||
struct queue_sender **spp = &q->send->senders[wr];
|
||||
struct queue_sender sender;
|
||||
|
||||
if(*spp)
|
||||
{
|
||||
/* overflow protect - unblock any thread waiting at this index */
|
||||
queue_release_sender(spp, NULL);
|
||||
}
|
||||
|
||||
*spp = &sender;
|
||||
sender.thread = NULL;
|
||||
|
||||
wakeup_thread(&q->thread);
|
||||
set_irq_level_and_block_thread(&sender.thread, oldlevel);
|
||||
return sender.retval;
|
||||
}
|
||||
|
||||
/* Function as queue_post if sending is not enabled */
|
||||
wakeup_thread(&q->thread);
|
||||
set_irq_level(oldlevel);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#if 0 /* not used now but probably will be later */
|
||||
/* Query if the last message dequeued was added by queue_send or not */
|
||||
bool queue_in_queue_send(struct event_queue *q)
|
||||
{
|
||||
return q->send && q->send->curr_sender;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Replies with retval to any dequeued message sent with queue_send */
|
||||
void queue_reply(struct event_queue *q, void *retval)
|
||||
{
|
||||
if(q->send && q->send->curr_sender)
|
||||
{
|
||||
queue_release_sender(&q->send->curr_sender, retval);
|
||||
}
|
||||
}
|
||||
#endif /* HAVE_EXTENDED_MESSAGING_AND_NAME */
|
||||
|
||||
bool queue_empty(const struct event_queue* q)
|
||||
{
|
||||
return ( q->read == q->write );
|
||||
|
|
@ -179,6 +327,13 @@ bool queue_empty(const struct event_queue* q)
|
|||
void queue_clear(struct event_queue* q)
|
||||
{
|
||||
int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
|
||||
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
/* Release all thread waiting in the queue for a reply -
|
||||
dequeued sent message will be handled by owning thread */
|
||||
queue_release_all_senders(q);
|
||||
#endif
|
||||
|
||||
q->read = 0;
|
||||
q->write = 0;
|
||||
set_irq_level(oldlevel);
|
||||
|
|
@ -188,9 +343,27 @@ void queue_remove_from_head(struct event_queue *q, long id)
|
|||
{
|
||||
int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
|
||||
|
||||
while (q->read != q->write &&
|
||||
q->events[(q->read) & QUEUE_LENGTH_MASK].id == id)
|
||||
while(q->read != q->write)
|
||||
{
|
||||
unsigned int rd = q->read & QUEUE_LENGTH_MASK;
|
||||
|
||||
if(q->events[rd].id != id)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
|
||||
if(q->send)
|
||||
{
|
||||
struct queue_sender **spp = &q->send->senders[rd];
|
||||
|
||||
if(*spp)
|
||||
{
|
||||
/* Release any thread waiting on this message */
|
||||
queue_release_sender(spp, NULL);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
q->read++;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue