diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h index c262aee..7470b86 100644 --- a/src/sys/include/ubixos/sched.h +++ b/src/sys/include/ubixos/sched.h @@ -89,6 +89,7 @@ int sched_setStatus(pidType pid, tState state); int sched_setStatus2(kTask_t *task, tState state); void sched(); +void sched_yield(); kTask_t *schedNewTask(); kTask_t *schedFindTask(uInt32 id); @@ -100,86 +101,6 @@ #endif /*** - $Log$ - Revision 1.32 2005/08/06 07:52:31 fsdfs - improved scheduler and spinlocks. they are now much faster. - - Revision 1.31 2005/08/05 09:43:57 fsdfs - - code clean up, performance tuning - - Revision 1.30 2004/09/11 22:21:11 reddawg - oInfo.cwd is now an array no longer a pointer.. - - Revision 1.29 2004/09/08 23:19:58 reddawg - hmm - - Revision 1.28 2004/09/08 22:16:02 reddawg - Fixens - - Revision 1.27 2004/09/08 21:19:32 reddawg - All good now - - Revision 1.26 2004/09/07 21:54:38 reddawg - ok reverted back to old scheduling for now.... - - Revision 1.20 2004/08/09 12:58:05 reddawg - let me know when you got the surce - - Revision 1.19 2004/08/06 22:43:04 reddawg - ok - - Revision 1.18 2004/08/06 22:32:16 reddawg - Ubix Works Again - - Revision 1.16 2004/08/04 08:17:57 reddawg - tty: we have primative ttys try f1-f5 so it is easier to use and debug - ubixos - - Revision 1.15 2004/07/29 21:32:16 reddawg - My quick lunchs breaks worth of updates.... - - Revision 1.14 2004/07/21 17:15:02 reddawg - removed garbage - - Revision 1.13 2004/07/21 14:43:14 flameshadow - add: added cwc (current working container) to the osInfo strut - - Revision 1.12 2004/07/19 02:32:21 reddawg - sched: we now set task status to dead which then makes the scheduler do some clean it could be some minor overhead but i feel this is our most efficient approach right now to prevent corruption of the queues - - Revision 1.11 2004/07/19 02:08:27 reddawg - Cleaned out the rest of debuging code also temporarily disabled the ip stack to improve boot time - - Revision 1.10 2004/07/18 05:24:15 reddawg - Fixens - - Revision 1.9 2004/07/09 13:23:20 reddawg - sched: schedInit to sched_init - Adjusted initialization routines - - Revision 1.8 2004/06/22 14:02:14 solar - Added the PLACEHOLDER state for a task - - Revision 1.7 2004/06/18 13:01:47 solar - Added nice and timeSlice members to the kTask_t type - - Revision 1.6 2004/06/17 02:12:57 reddawg - Cleaned Out Dead Code - - Revision 1.5 2004/06/16 14:04:51 reddawg - Renamed a typedef - - Revision 1.4 2004/06/14 12:20:54 reddawg - notes: many bugs repaired and ld works 100% now. - - Revision 1.3 2004/05/21 15:49:13 reddawg - The os does better housekeeping now when a task is exited - - Revision 1.2 2004/05/21 15:20:00 reddawg - Cleaned up - - END ***/ diff --git a/src/sys/kernel/endtask.c b/src/sys/kernel/endtask.c index b958afe..cab93f9 100644 --- a/src/sys/kernel/endtask.c +++ b/src/sys/kernel/endtask.c @@ -52,7 +52,7 @@ /* this function is much faster if you have the kTask_t item at hand */ void endTask2(kTask_t *task) { - sched_setStatus2(task, DEAD); + sched_setStatus(task, DEAD); /* fsdfs */ return; } diff --git a/src/sys/kernel/spinlock.c b/src/sys/kernel/spinlock.c index f17e5a2..6d077dd 100644 --- a/src/sys/kernel/spinlock.c +++ b/src/sys/kernel/spinlock.c @@ -51,7 +51,6 @@ *lock = 0x0; } -/* int spinTryLock(spinLock_t *lock) { register int locked; @@ -60,7 +59,6 @@ ); return(!locked); } -*/ void spinLock_scheduler(spinLock_t *lock) diff --git a/src/sys/kernel/tty.c b/src/sys/kernel/tty.c index cb02de0..39b79d0 100644 --- a/src/sys/kernel/tty.c +++ b/src/sys/kernel/tty.c @@ -32,6 +32,7 @@ #include #include #include +#include #include static tty_term *terms = 0x0;