add ring queue/message queue/mail queue, binary heap/priority queue/priority message queue/priority mail queue

1. remove the old msg queue and queue:
i. msg queue is not a common and reusable/flexible component(need user to config the msg pool size and this componet can only be used by tos_queue)
ii. tos_queue can only deliver the pointer message(cannot do a memory buffer deliver)

2. add ring queue(tos_ring_q) componet
rinq queue can be reused by tos_chr_fifi/tos_msg_q/tos_mail_q as the foundational data container

3. add message queue(tos_msg_q)
a little like the old queue mechanism, supply the capability to deliver a pointer message

4. add mail queue(tos_mail_q)
supply the capability to deliver a memory buffer

5. add binary heap(tos_bin_heap)
the basement componet to implement priority queue

6. add priority queue(tos_prio_q)
can be reused by the priority message/mail queue  as the foundational data container.

7. add priority message queue(tos_prio_msg_q)
a message(pointer) deliver mechanism, supply the capability of delivering the message with priority(message with higher priority comes faster to the pender than with lower)

8. add priority mail queue(tos_prio_mail_q)
a mail(memory buffer) deliver mechanism, supply the capability of delivering the mail with priority(mail with higher priority comes faster to the pender than with lower)
This commit is contained in:
daishengdong
2019-10-28 15:50:46 +08:00
parent f35b725a59
commit d0b8d0675e
127 changed files with 26661 additions and 14013 deletions

View File

@@ -51,7 +51,7 @@ struct ble_npl_event {
};
struct ble_npl_eventq {
k_queue_t q;
k_msg_q_t q;
};
struct ble_npl_callout {

View File

@@ -27,18 +27,21 @@ volatile int ble_npl_in_critical = 0;
void
npl_tencentos_tiny_eventq_init(struct ble_npl_eventq *evq)
{
tos_queue_create(&evq->q);
void *msg_pool = tos_mmheap_alloc(sizeof(void *));
if (!msg_pool) {
return;
}
#define EVENT_Q_MSG_CNT 32
tos_msg_q_create(&evq->q, msg_pool, EVENT_Q_MSG_CNT);
}
struct ble_npl_event *
npl_tencentos_tiny_eventq_get(struct ble_npl_eventq *evq, ble_npl_time_t tmo)
{
k_err_t err;
size_t msg_size;
struct ble_npl_event *ev = NULL;
err = tos_queue_pend(&evq->q, (void **)&ev, &msg_size, tmo);
if (err != K_ERR_NONE) {
if (tos_msg_q_pend(&evq->q, (void **)&ev, tmo) != K_ERR_NONE) {
return NULL;
}
@@ -60,7 +63,7 @@ npl_tencentos_tiny_eventq_put(struct ble_npl_eventq *evq, struct ble_npl_event *
ev->queued = true;
err = tos_queue_post(&evq->q, ev, sizeof(struct ble_npl_event));
err = tos_msg_q_post(&evq->q, ev);
assert(err == K_ERR_NONE);
}
@@ -69,11 +72,36 @@ void
npl_tencentos_tiny_eventq_remove(struct ble_npl_eventq *evq,
struct ble_npl_event *ev)
{
k_err_t err;
int i, count;
struct ble_npl_event *ev_received;
TOS_CPU_CPSR_ALLOC();
if (!ev->queued) {
return;
}
tos_queue_remove(&evq->q, ev);
/*
* XXX We cannot extract element from inside TencentOS tiny message queue so as a quick
* workaround we'll just remove all elements and add them back except the
* one we need to remove. This is silly, but works for now
*/
TOS_CPU_INT_DISABLE();
count = evq->q.ring_q.total;
for (i = 0; i < count; ++i) {
err = tos_msg_q_pend(&evq->q, (void **)&ev_received, TOS_TIME_NOWAIT);
TOS_ASSERT(err == K_ERR_NONE);
if (ev_received == ev) {
continue;
}
err = tos_msg_q_post(&evq->q, ev_received);
TOS_ASSERT(err == K_ERR_NONE);
}
TOS_CPU_INT_ENABLE();
ev->queued = false;
}
@@ -81,7 +109,7 @@ npl_tencentos_tiny_eventq_remove(struct ble_npl_eventq *evq,
bool
npl_tencentos_tiny_eventq_is_empty(struct ble_npl_eventq *evq)
{
return tos_list_empty(&evq->q.msg_queue.queue_head);
return tos_ring_q_is_empty(&evq->q.ring_q);
}
ble_npl_error_t