PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

15
osal/cmsis_os/cmsis_os.c
View File

@@ -383,7 +383,7 @@ void *osPoolAlloc(osPoolId pool_id)
}
/**
* @brief Allocate a memory block from a memory pool and set memory block to zero
* @brief Allocate a memory block from a memory pool and set memory block to zero
* @param[in] pool_id memory pool ID obtain referenced with \ref osPoolCreate.
* @return address of the allocated memory block or NULL in case of no memory available.
*/
@@ -415,7 +415,7 @@ osStatus osPoolFree(osPoolId pool_id, void *block)
#endif // Memory Pool Management available
#endif // TOS_CFG_MMBLK_EN
#if TOS_CFG_QUEUE_EN > 0u
#if TOS_CFG_MESSAGE_QUEUE_EN > 0u
// ==== Message Queue Management Functions ====
#if (defined (osFeature_MessageQ) && (osFeature_MessageQ != 0)) // Message Queues available
@@ -436,8 +436,8 @@ osMessageQId osMessageCreate(const osMessageQDef_t *queue_def, osThreadId thread
thread_id = thread_id; // make compiler happy
err = tos_queue_create((k_queue_t *)queue_def->queue);
return err == K_ERR_NONE ? (k_queue_t *)queue_def->queue : NULL;
err = tos_msg_q_create((k_msg_q_t *)queue_def->queue, queue_def->pool, queue_def->queue_sz);
return err == K_ERR_NONE ? (k_msg_q_t *)queue_def->queue : NULL;
}
/**
@@ -449,7 +449,7 @@ osMessageQId osMessageCreate(const osMessageQDef_t *queue_def, osThreadId thread
*/
osStatus osMessagePut(osMessageQId queue_id, uint32_t info, uint32_t millisec)
{
return errno_knl2cmsis(tos_queue_post((k_queue_t *)queue_id, (void *)info, sizeof(uint32_t)));
return errno_knl2cmsis(tos_msg_q_post((k_msg_q_t *)queue_id, &info));
}
/**
@@ -464,7 +464,6 @@ osEvent osMessageGet(osMessageQId queue_id, uint32_t millisec)
k_err_t err;
k_tick_t timeout;
void *msg_body = NULL;
size_t msg_size = 0;
if (millisec == osWaitForever) {
timeout = TOS_TIME_FOREVER;
@@ -472,7 +471,7 @@ osEvent osMessageGet(osMessageQId queue_id, uint32_t millisec)
timeout = tos_millisec2tick(millisec);
}
err = tos_queue_pend((k_queue_t *)queue_id, &msg_body, &msg_size, timeout);
err = tos_msg_q_pend((k_msg_q_t *)queue_id, &msg_body, timeout);
if (err == K_ERR_NONE) {
event.def.message_id = queue_id;
event.status = errno_knl2cmsis(err);
@@ -486,5 +485,5 @@ osEvent osMessageGet(osMessageQId queue_id, uint32_t millisec)
}
#endif // Message Queues available
#endif // TOS_CFG_QUEUE_EN
#endif // TOS_CFG_MESSAGE_QUEUE_EN

28
osal/cmsis_os/cmsis_os.h
View File

@@ -21,7 +21,7 @@
* Version 1.02
* Control functions for short timeouts in microsecond resolution:
* Added: osKernelSysTick, osKernelSysTickFrequency, osKernelSysTickMicroSec
* Removed: osSignalGet
* Removed: osSignalGet
*----------------------------------------------------------------------------
*
* Copyright (c) 2013 ARM LIMITED
@@ -245,14 +245,14 @@ typedef k_mmblk_pool_t *osPoolId;
/// Message ID identifies the message queue (pointer to a message queue control block).
/// \note CAN BE CHANGED: \b os_messageQ_cb is implementation specific in every CMSIS-RTOS.
#if TOS_CFG_QUEUE_EN > 0u
typedef k_queue_t *osMessageQId;
#if TOS_CFG_MESSAGE_QUEUE_EN > 0u
typedef k_msg_q_t *osMessageQId;
#endif
/// Mail ID identifies the mail queue (pointer to a mail queue control block).
/// \note CAN BE CHANGED: \b os_mailQ_cb is implementation specific in every CMSIS-RTOS.
#if TOS_CFG_QUEUE_EN > 0u
typedef k_queue_t *osMailQId;
#if TOS_CFG_MAIL_QUEUE_EN > 0u
typedef k_mail_q_t *osMailQId;
#endif
/// Thread Definition structure contains startup information of a thread.
@@ -308,12 +308,12 @@ typedef struct os_pool_def {
/// Definition structure for message queue.
/// \note CAN BE CHANGED: \b os_messageQ_def is implementation specific in every CMSIS-RTOS.
#if TOS_CFG_QUEUE_EN > 0u
#if TOS_CFG_MESSAGE_QUEUE_EN > 0u
typedef struct os_messageQ_def {
uint32_t queue_sz; ///< number of elements in the queue
uint32_t item_sz; ///< size of an item
void *pool; ///< memory array for messages
k_queue_t *queue; ///< queue handler
k_msg_q_t *queue; ///< queue handler
} osMessageQDef_t;
/// Definition structure for mail queue.
@@ -340,7 +340,7 @@ typedef struct {
} def; ///< event definition
} osEvent;
#endif // TOS_CFG_QUEUE_EN
#endif // TOS_CFG_MESSAGE_QUEUE_EN
// ==== Kernel Control Functions ====
@@ -361,9 +361,9 @@ int32_t osKernelRunning(void);
#if (defined (osFeature_SysTick) && (osFeature_SysTick != 0)) // System Timer available
/// Get the RTOS kernel system timer counter
/// Get the RTOS kernel system timer counter
/// \note MUST REMAIN UNCHANGED: \b osKernelSysTick shall be consistent in every CMSIS-RTOS.
/// \return RTOS kernel system timer as 32-bit value
/// \return RTOS kernel system timer as 32-bit value
uint32_t osKernelSysTick(void);
/// The RTOS kernel system timer frequency in Hz
@@ -513,7 +513,7 @@ osStatus osTimerDelete(osTimerId timer_id);
#endif // TOS_CFG_TIMER_EN
#if TOS_CFG_QUEUE_EN > 0u
#if TOS_CFG_MESSAGE_QUEUE_EN > 0u
// ==== Signal Management ====
/// Set the specified Signal Flags of an active thread.
@@ -537,7 +537,7 @@ int32_t osSignalClear(osThreadId thread_id, int32_t signals);
/// \note MUST REMAIN UNCHANGED: \b osSignalWait shall be consistent in every CMSIS-RTOS.
osEvent osSignalWait(int32_t signals, uint32_t millisec);
#endif // TOS_CFG_QUEUE_EN
#endif // TOS_CFG_MESSAGE_QUEUE_EN
#if TOS_CFG_MUTEX_EN > 0u
// ==== Mutex Management ====
@@ -700,7 +700,7 @@ osStatus osPoolFree(osPoolId pool_id, void *block);
#endif // Memory Pool Management available
#endif // TOS_CFG_MMBLK_EN
#if TOS_CFG_QUEUE_EN > 0u
#if TOS_CFG_MESSAGE_QUEUE_EN > 0u
// ==== Message Queue Management Functions ====
#if (defined (osFeature_MessageQ) && (osFeature_MessageQ != 0)) // Message Queues available
@@ -822,7 +822,7 @@ osEvent osMailGet(osMailQId queue_id, uint32_t millisec);
osStatus osMailFree(osMailQId queue_id, void *mail);
#endif // Mail Queues available
#endif // TOS_CFG_QUEUE_EN
#endif // TOS_CFG_MESSAGE_QUEUE_EN
#ifdef __cplusplus