| /shark/trunk/include/kernel/iqueue.h |
|---|
| File deleted |
| /shark/trunk/include/kernel/func.h |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: func.h,v 1.2 2002-11-11 08:36:01 pj Exp $ |
| CVS : $Id: func.h,v 1.1.1.1 2002-03-29 14:12:51 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2002-11-11 08:36:01 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-03-29 14:12:51 $ |
| ------------ |
| Kernel functions: |
| 89,6 → 89,15 |
| /* if a source use printk() it should include log.h not func.h */ |
| #include <kernel/log.h> |
| #if 0 |
| #ifdef __DEBUG_ON__ |
| #define printk(fmt,args...) \ |
| VM_printf(fmt,##args) |
| #else |
| #define printk(fmt,args...) |
| #endif |
| #endif |
| /*---------------------------------------------------------------------*/ |
| /* Kernel global functions: initialization & termination... */ |
| /*---------------------------------------------------------------------*/ |
| 136,7 → 145,7 |
| int set_exchandler_text(); |
| /*---------------------------------------------------------------------*/ |
| /* Kernel global functions: scheduler, */ |
| /* Kernel global functions: scheduler, queues */ |
| /*---------------------------------------------------------------------*/ |
| /*+ This is the generic scheduler. |
| 148,6 → 157,26 |
| the end of an event list +*/ |
| void event_need_reschedule(); |
| /* Simple QUEUE management functions */ |
| void q_insert (PID p, QUEUE *q); |
| void q_timespec_insert (PID p, QUEUE *q); |
| void q_extract (PID p, QUEUE *q); |
| PID q_getfirst ( QUEUE *q); |
| void q_insertfirst (PID p, QUEUE *q); |
| /* QQUEUE management functions */ |
| void qq_init ( QQUEUE *q); |
| void qq_insert (PID p, QQUEUE *q); |
| void qq_timespec_insert (PID p, QQUEUE *q); |
| void qq_extract (PID p, QQUEUE *q); |
| PID qq_getfirst ( QQUEUE *q); |
| void qq_insertfirst (PID p, QQUEUE *q); |
| void qq_insertlast (PID p, QQUEUE *q); |
| PID qq_queryfirst ( QQUEUE *q); |
| PID qq_querylast ( QQUEUE *q); |
| void task_makefree(void *ret); |
| void check_killed_async(void); |
| 192,6 → 221,15 |
| return ll_context_from(); |
| } |
| #ifdef __TEST1__ |
| extern int useds; |
| extern int testactive; |
| extern struct timespec s_send[]; |
| #endif |
| /*+ this functions are called every time a context is changed +*/ |
| void kern_after_dispatch(void); |
| 205,6 → 243,10 |
| { |
| ll_context_to(c); |
| kern_after_dispatch(); |
| #ifdef __TEST1__ |
| if (testactive) ll_gettime(TIME_EXACT,&s_send[useds-1] ); |
| #endif |
| sti(); |
| } |
| 497,6 → 539,9 |
| Pending activations are discarded +*/ |
| void task_sleep(void); |
| /*+ This function suspend the actual task for a minimum delay time +*/ |
| void task_delay(DWORD delay); |
| /*+ This primitives refers the group id which is supplied |
| by the application, not by the kernel +*/ |
| int group_activate(WORD g); |
| /shark/trunk/include/kernel/int_sem.h |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: int_sem.h,v 1.2 2002-11-11 08:36:01 pj Exp $ |
| CVS : $Id: int_sem.h,v 1.1.1.1 2002-03-29 14:12:51 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2002-11-11 08:36:01 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-03-29 14:12:51 $ |
| ------------ |
| Internal semaphores. |
| 63,13 → 63,12 |
| #define __INT_SEM_H__ |
| #include <kernel/types.h> |
| #include <kernel/iqueue.h> |
| /* this is the structure normally pointed by the opt field in the |
| mutex_t structure */ |
| typedef struct { |
| int count; |
| IQUEUE blocked; |
| QQUEUE blocked; |
| } internal_sem_t; |
| /shark/trunk/include/kernel/kern.h |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: kern.h,v 1.2 2002-11-11 08:36:01 pj Exp $ |
| CVS : $Id: kern.h,v 1.1.1.1 2002-03-29 14:12:51 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2002-11-11 08:36:01 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-03-29 14:12:51 $ |
| ------------ |
| Main kernel include file. |
| 67,8 → 67,6 |
| //#include <kernel/err.h> |
| //#include <kernel/exc.h> |
| #include <kernel/var.h> |
| #include <kernel/iqueue.h> |
| #include <kernel/func.h> |
| /shark/trunk/include/kernel/descr.h |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: descr.h,v 1.2 2002-11-11 08:36:01 pj Exp $ |
| CVS : $Id: descr.h,v 1.1.1.1 2002-03-29 14:12:51 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2002-11-11 08:36:01 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-03-29 14:12:51 $ |
| ------------ |
| Kernel main data structures |
| 70,7 → 70,6 |
| #include <ll/ll.h> |
| #include <kernel/model.h> |
| #include <kernel/types.h> |
| #include <kernel/iqueue.h> |
| #include <limits.h> |
| /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 141,8 → 140,8 |
| struct _task_handler_rec *cleanup_stack; |
| /*+ The cleanup stack +*/ |
| QUEUE next,prev; /*+ Next/Prev Index in the queue +*/ |
| int errnumber; |
| /* Job Execution Time fields */ |
| 175,7 → 174,8 |
| * the generic kernel, with exclusion of delay_timer that is used |
| * also in cond_timedwait |
| */ |
| DWORD priority; /*+ A priority field +*/ |
| struct timespec timespec_priority; /*+ Another priority field +*/ |
| int delay_timer; /*+ A field useful to store the delay timer +*/ |
| int wcet; /*+ a worst case time execution +*/ |
| 219,6 → 219,8 |
| 0 if the level can manage the model, |
| -1 if not +*/ |
| // void (*level_init)(); /*+ initialization of the level module +*/ |
| // void (*level_end)(); /*+ level termination (at system end... +*/ |
| void (*level_status)(LEVEL l);/*+ print level statistics... +*/ |
| PID (*level_scheduler)(LEVEL l); |
| 284,6 → 286,9 |
| task in the EXE state. +*/ |
| void (*task_delay)(LEVEL l, PID p,DWORD tickdelay); |
| /* guest CALLS: |
| these functions are called from an Aperiodic Server Level for the task |
| that are inserted in the local queues */ |
| 319,6 → 324,7 |
| /*+ the task is killed +*/ |
| void (*guest_sleep)(LEVEL l, PID p); |
| void (*guest_delay)(LEVEL l, PID p, TIME tickdelay); |
| } level_des; |
| 432,7 → 438,7 |
| +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ |
| typedef struct condition_struct { |
| IQUEUE waiters; /*+ queue for tasks waiting on the condition +*/ |
| QUEUE waiters; /*+ queue for tasks waiting on the condition +*/ |
| mutex_t *used_for_waiting; |
| } cond_t; |
| /shark/trunk/include/kernel/types.h |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: types.h,v 1.2 2002-11-11 08:36:01 pj Exp $ |
| CVS : $Id: types.h,v 1.1.1.1 2002-03-29 14:12:51 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2002-11-11 08:36:01 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-03-29 14:12:51 $ |
| ------------ |
| **/ |
| 49,9 → 49,27 |
| * |
| */ |
| /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| HARTIK SYSTEM TYPES |
| +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ |
| #ifndef __KERNEL_TYPES_H__ |
| #define __KERNEL_TYPES_H__ |
| /*+ Used to manage task queues +*/ |
| typedef int QUEUE; |
| /*+ Used to manage task queues with tail +*/ |
| typedef struct { |
| int first; /*+ first element of a task queue, NIL if empty +*/ |
| int last; /*+ last element of a task qqueue, NIL if empty +*/ |
| } QQUEUE; |
| /*+ Used to manage mutex queues +*/ |
| //typedef int MQUEUE; |
| #define TASK void * |
| /*+ ... a task index +*/ |
| /shark/trunk/include/kernel/config.h |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: config.h,v 1.2 2002-11-11 08:36:01 pj Exp $ |
| CVS : $Id: config.h,v 1.1.1.1 2002-03-29 14:12:51 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2002-11-11 08:36:01 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-03-29 14:12:51 $ |
| ------------ |
| Kernel configuration macros: |
| 57,6 → 57,28 |
| #ifndef __KERNEL_CONFIG_H__ |
| #define __KERNEL_CONFIG_H__ |
| /*+ Define this if you use the CABs... +*/ |
| #define __CAB__ |
| /*+ Define this if you use the ports... +*/ |
| #define __PORT__ |
| /*+ Define this if you use the tracer... +*/ |
| #define __TRACE__ |
| //#undef __TRACE__ |
| /*+ Define this if you want the printk messages... +*/ |
| #define __DEBUG_ON__ |
| #undef __DEBUG_ON__ |
| /*+ checks the Memory at the kern_mem_init... +*/ |
| #undef __MEM_DEBUG__ |
| /*+ defined if we are compiling test1.c with init1.c +*/ |
| //#define __TEST1__ |
| /*+ defined if we are compiling testG.c +*/ |
| //#define TESTG |
| /shark/trunk/include/kernel/var.h |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: var.h,v 1.2 2002-11-11 08:36:01 pj Exp $ |
| CVS : $Id: var.h,v 1.1.1.1 2002-03-29 14:12:51 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2002-11-11 08:36:01 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-03-29 14:12:51 $ |
| ------------ |
| Kernel global variables |
| 70,7 → 70,7 |
| extern PID exec; /*+ task suggested by the scheduler +*/ |
| extern PID exec_shadow; /*+ task really executed +*/ |
| extern IQUEUE freedesc; /*+ Free descriptor handled as a queue +*/ |
| extern QUEUE freedesc; /*+ Free descriptor handled as a queue +*/ |
| extern TIME sys_tick; /*+ System tick (in usec) +*/ |
| extern struct timespec schedule_time; |