michaelh/zephyr
1
0
Fork 0
Code Releases Activity

doxygen: move task public api docs to header

Browse source 
Change-Id: Iebefc4c4fbdfe6110029cd135fcc4b8ea59d0214
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2015-08-29 12:58:34 -04:00
commit b787b600bd
3 changed files with 221 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

167
include/microkernel/task.h
View file

@ -41,10 +41,9 @@ extern "C" {
/*
* The following task groups are reserved for system use.
* SysGen automatically generates corresponding TASKGROUPs with reserved
* GROUPIDs (in the SysGen files SgObjectCount.cpp - TaskGroupIDSetter
* constructor; and SgSystem.cpp - AddDefaultObjects method).
* These files must be updated if any changes are made to the reserved groups.
* sysgen automatically generates corresponding TASKGROUPs with reserved
* GROUPIDs
* sysgen must be updated if any changes are made to the reserved groups.
*/
#define EXE_GROUP 1 /* TASKGROUP EXE */
@ -55,13 +54,81 @@ extern struct k_task _k_task_list[];
extern void _task_ioctl(ktask_t, int);
extern void _task_group_ioctl(ktask_group_t, int);
/**
* @brief Yield the CPU to another task
*
* This routine yields the processor to the next equal priority task that is
* runnable. Using task_yield(), it is possible to achieve the effect of round
* robin scheduling. If no task with the same priority is runnable then no task
* switch occurs and the calling task resumes execution.
*
* @return N/A
*/
extern void task_yield(void);
/**
* @brief Set the priority of a task
*
* This routine changes the priority of the specified task.
*
* The call has immediate effect. If the calling task is no longer the highest
* priority runnable task, a task switch occurs.
*
* The priority should be specified in the range 0 to 62. 0 is the highest
* priority.
* @param task Task whose priority is to be set
* @param prio New priority
* @return N/A
*/
extern void task_priority_set(ktask_t task, kpriority_t prio);
/**
* @brief Set the entry point of a task
*
* This routine sets the entry point of a task to a given routine. It is only
* needed if the entry point is different from that specified in the project
* file. It must be called before task_start() to have any effect, so it
* cannot work with members of the EXE group or of any group that automatically
* starts when the application is loaded.
*
* The routine is executed when the task is started
*
* @param task Task to operate on.
* @pram func Entry point
* @return N/A
*/
extern void task_entry_set(ktask_t task, void (*func)(void));
/**
* @brief Install an abort handler
*
* This routine installs an abort handler for the calling task.
*
* The abort handler is run when the calling task is aborted by a _TaskAbort()
* or task_group_abort() call.
*
* Each call to task_abort_handler_set() replaces the previously installed
* handler.
*
* To remove an abort handler, set the parameter to NULL as below:
* task_abort_handler_set (NULL)
* @param func Abort handler
* @return N/A
*/
extern void task_abort_handler_set(void (*func)(void));
/**
* @brief Issue a custom call from within the microkernel server fiber
*
* This routine issues a request to execute a function from within the context
* of the microkernel server fiber.
*
* @param func function to call from within the microkernel server fiber
* @param argp argument to pass to custom function
*
* @return return value from custom <func> call
*/
extern int task_offload_to_fiber(int (*)(), void *);
/*
@ -82,25 +149,117 @@ extern int task_offload_to_fiber(int (*)(), void *);
#define TASK_GROUP_BLOCK 4
#define TASK_GROUP_UNBLOCK 5
/**
* @brief Get task identifier
*
* @return identifier for current task
*/
extern ktask_t task_id_get();
/**
* @brief Get task priority
*
* @return priority of current task
*/
extern kpriority_t task_priority_get();
/**
* @brief Start a task
* @param t Task to start
* @return N/A
*/
#define task_start(t) _task_ioctl(t, TASK_START)
/**
* @brief Abort a task
* @param t Task to abort
* @return N/A
*/
#define task_abort(t) _task_ioctl(t, TASK_ABORT)
/**
* @brief Suspend a task
* @param t Task to suspend
* @return N/A
*/
#define task_suspend(t) _task_ioctl(t, TASK_SUSPEND)
/**
* @brief Resume a task
* @param t Task to resume
* @return N/A
*/
#define task_resume(t) _task_ioctl(t, TASK_RESUME)
/**
* @brief Get task groups for task
*
* @return task groups associated with current task
*/
extern uint32_t task_group_mask_get();
/**
* @brief Add task to task group(s)
*
* @param groups Task Groups
* @return N/A
*/
extern void task_group_join(uint32_t groups);
/**
* @brief Remove task from task group(s)
* @param groups Task Groups
* @return N/A
*/
extern void task_group_leave(uint32_t groups);
/**
* @brief Start a task group
* @param g Task group to start
* @return N/A
*/
#define task_group_start(g) _task_group_ioctl(g, TASK_GROUP_START)
/**
* @brief Abort a task group
* @param g Task group to abort
* @return N/A
*/
#define task_group_abort(g) _task_group_ioctl(g, TASK_GROUP_ABORT)
/**
* @brief Suspend a task group
* @param g Task group to suspend
* @return N/A
*/
#define task_group_suspend(g) _task_group_ioctl(g, TASK_GROUP_SUSPEND)
/**
* @brief Resume a task group
* @param g Task group to resume
* @return N/A
*/
#define task_group_resume(g) _task_group_ioctl(g, TASK_GROUP_RESUME)
/**
* @brief Get task identifier
*
* @return identifier for current task
*/
#define isr_task_id_get() task_id_get()
/**
* @brief Get task priority
*
* @return priority of current task
*/
#define isr_task_priority_get() task_priority_get()
/**
* @brief Get task groups for task
*
* @return task groups associated with current task
*/
#define isr_task_group_mask_get() task_group_mask_get()
/**

16
kernel/microkernel/k_offload.c
View file

@ -34,33 +34,19 @@
#include <sections.h>
/**
*
* @brief Process an "offload to fiber" request
*
* This routine simply invokes the requested function from within the context
* of the _k_server() fiber and saves the result.
* @param A Arguments
*
* @return N/A
*/
void _k_offload_to_fiber(struct k_args *A)
{
A->args.u1.rval = (*A->args.u1.func)(A->args.u1.argp);
}
/**
*
* @brief Issue a custom call from within the microkernel server fiber
*
* @func: function to call from within the microkernel server fiber
* @argp: argument to pass to custom function
*
* This routine issues a request to execute a function from within the context
* of the microkernel server fiber.
*
* @return return value from custom <func> call
*/
int task_offload_to_fiber(int (*func)(), void *argp)
{
struct k_args A;

165
kernel/microkernel/k_task.c
View file

@ -45,12 +45,6 @@
extern struct k_task _k_task_list_start[];
extern struct k_task _k_task_list_end[];
/**
*
* @brief Get task identifer
*
* @return identifier for current task
*/
ktask_t task_id_get(void)
{
@ -58,7 +52,6 @@ ktask_t task_id_get(void)
}
/**
*
* @brief Reset the specified task state bits
*
* This routine resets the specified task state bits. When a task's state bits
@ -66,13 +59,11 @@ ktask_t task_id_get(void)
* bitmask of the TF_xxx bits. Each TF_xxx bit indicates a reason why the task
* must not be scheduled to run.
*
* @param X Pointer to task
* @param bits Bitmask of TF_xxx bits to reset
* @return N/A
*/
void _k_state_bit_reset(struct k_task *X, /* ptr to task */
uint32_t bits /* bitmask of TF_xxx
bits to reset */
)
void _k_state_bit_reset(struct k_task *X, uint32_t bits)
{
uint32_t f_old = X->state; /* old state bits */
uint32_t f_new = f_old & ~bits; /* new state bits */
@ -110,21 +101,17 @@ void _k_state_bit_reset(struct k_task *X, /* ptr to task */
}
/**
*
* @brief Set specified task state bits
*
* This routine sets the specified task state bits. When a task's state bits
* are non-zero, the task will not be scheduled to run. The task's state bits
* are a bitmask of the TF_xxx bits. Each TF_xxx bit indicates a reason why
* the task must not be scheduled to run.
*
* @param task_ptr Task pointer
* @param bitmask of TF_xxx bits to set
* @return N/A
*/
void _k_state_bit_set(
struct k_task *task_ptr,
uint32_t bits /* bitmask of TF_xxx bits to set */
)
void _k_state_bit_set(struct k_task *task_ptr, uint32_t bits)
{
uint32_t old_state_bits = task_ptr->state;
uint32_t new_state_bits = old_state_bits | bits;
@ -196,19 +183,17 @@ void _k_state_bit_set(
}
/**
*
* @brief Initialize and start a task
*
* @param X Pointer to task control block
* @param func Entry point for task
* @return N/A
*/
static void start_task(struct k_task *X, /* ptr to task control block */
void (*func)(void) /* entry point for task */
)
static void start_task(struct k_task *X, void (*func)(void))
{
unsigned int task_options;
/* Note: the field X->worksize now represents the task size in bytes */
/* Note: the field X->worksize now represents the task size in bytes */
task_options = 0;
_START_TASK_ARCH(X, &task_options);
@ -238,14 +223,12 @@ static void start_task(struct k_task *X, /* ptr to task control block */
}
/**
*
* @brief Abort a task
*
* This routine aborts the specified task.
*
* @param X Task pointer
* @return N/A
*/
static void abort_task(struct k_task *X)
{
@ -266,17 +249,13 @@ static void abort_task(struct k_task *X)
#ifndef CONFIG_ARCH_HAS_TASK_ABORT
/**
*
* @brief Microkernel handler for fatal task errors
*
* To be invoked when a task aborts implicitly, either by returning from its
* entry point or due to a software or hardware fault.
*
* @return does not return
*
* \NOMANUAL
*/
FUNC_NORETURN void _TaskAbort(void)
{
_task_ioctl(_k_current_task->id, TASK_ABORT);
@ -291,41 +270,21 @@ FUNC_NORETURN void _TaskAbort(void)
}
#endif
/**
*
* @brief Install an abort handler
*
* This routine installs an abort handler for the calling task.
*
* The abort handler is run when the calling task is aborted by a _TaskAbort()
* or task_group_abort() call.
*
* Each call to task_abort_handler_set() replaces the previously installed
* handler.
*
* To remove an abort handler, set the parameter to NULL as below:
* task_abort_handler_set (NULL)
*
* @return N/A
*/
void task_abort_handler_set(void (*func)(void) /* abort handler */
)
void task_abort_handler_set(void (*func)(void))
{
_k_current_task->fn_abort = func;
}
/**
*
* @brief Handle a task operation request
*
* This routine handles any one of the following task operation requests:
* starting either a kernel or user task, aborting a task, suspending a task,
* resuming a task, blocking a task or unblocking a task
*
* @param A Arguments
* @return N/A
*/
void _k_task_op(struct k_args *A)
{
ktask_t Tid = A->args.g1.task;
@ -354,15 +313,12 @@ void _k_task_op(struct k_args *A)
}
/**
*
* @brief Task operations
*
* @param task Task on which to operate
* @param opt Task operation
* @return N/A
*/
void _task_ioctl(ktask_t task, /* task on which to operate */
int opt /* task operation */
)
void _task_ioctl(ktask_t task, int opt)
{
struct k_args A;
@ -373,16 +329,14 @@ void _task_ioctl(ktask_t task, /* task on which to operate */
}
/**
*
* @brief Handle task group operation request
*
* This routine handles any one of the following task group operations requests:
* starting either kernel or user tasks, aborting tasks, suspending tasks,
* resuming tasks, blocking tasks or unblocking tasks
*
* @param A Arguments
* @return N/A
*/
void _k_task_group_op(struct k_args *A)
{
ktask_group_t grp = A->args.g1.group;
@ -424,15 +378,12 @@ void _k_task_group_op(struct k_args *A)
}
/**
*
* @brief Task group operations
*
* @param group Task group
* @param opt Operation
* @return N/A
*/
void _task_group_ioctl(ktask_group_t group, /* task group */
int opt /* operation */
)
void _task_group_ioctl(ktask_group_t group, int opt)
{
struct k_args A;
@ -442,61 +393,37 @@ void _task_group_ioctl(ktask_group_t group, /* task group */
KERNEL_ENTRY(&A);
}
/**
*
* @brief Get task groups for task
*
* @return task groups associated with current task
*/
kpriority_t task_group_mask_get(void)
{
return _k_current_task->group;
}
/**
*
* @brief Add task to task group(s)
*
* @return N/A
*/
void task_group_join(uint32_t groups)
{
_k_current_task->group |= groups;
}
/**
*
* @brief Remove task from task group(s)
*
* @return N/A
*/
void task_group_leave(uint32_t groups)
{
_k_current_task->group &= ~groups;
}
/**
*
* @brief Get task priority
*
* @return priority of current task
*/
kpriority_t task_priority_get(void)
{
return _k_current_task->priority;
}
/**
*
* @brief Handle task set priority request
*
* @param A Arguments
* @return N/A
*/
void _k_task_priority_set(struct k_args *A)
{
ktask_t Tid = A->args.g1.task;
@ -510,24 +437,8 @@ void _k_task_priority_set(struct k_args *A)
FREEARGS(A);
}
/**
*
* @brief Set the priority of a task
*
* This routine changes the priority of the specified task.
*
* The call has immediate effect. If the calling task is no longer the highest
* priority runnable task, a task switch occurs.
*
* The priority should be specified in the range 0 to 62. 0 is the highest
* priority.
*
* @return N/A
*/
void task_priority_set(ktask_t task, /* task whose priority is to be set */
kpriority_t prio /* new priority */
)
void task_priority_set(ktask_t task, kpriority_t prio)
{
struct k_args A;
@ -538,12 +449,11 @@ void task_priority_set(ktask_t task, /* task whose priority is to be set */
}
/**
*
* @brief Handle task yield request
*
* @param A Arguments
* @return N/A
*/
void _k_task_yield(struct k_args *A)
{
struct k_tqhd *H = _k_task_priority_list + _k_current_task->priority;
@ -558,17 +468,6 @@ void _k_task_yield(struct k_args *A)
}
}
/**
*
* @brief Yield the CPU to another task
*
* This routine yields the processor to the next equal priority task that is
* runnable. Using task_yield(), it is possible to achieve the effect of round
* robin scheduling. If no task with the same priority is runnable then no task
* switch occurs and the calling task resumes execution.
*
* @return N/A
*/
void task_yield(void)
{
@ -578,24 +477,8 @@ void task_yield(void)
KERNEL_ENTRY(&A);
}
/**
*
* @brief Set the entry point of a task
*
* This routine sets the entry point of a task to a given routine. It is only
* needed if the entry point is different from that specified in the project
* file. It must be called before task_start() to have any effect, so it
* cannot work with members of the EXE group or of any group that automatically
* starts when the application is loaded.
*
* The routine is executed when the task is started
*
* @return N/A
*/
void task_entry_set(ktask_t task, /* task */
void (*func)(void) /* entry point */
)
void task_entry_set(ktask_t task, void (*func)(void))
{
struct k_task *X = (struct k_task *)task;