2005-10-09 21:58:25 +02:00
|
|
|
/* This file contains the clock task, which handles time related functions.
|
|
|
|
* Important events that are handled by the CLOCK include setting and
|
|
|
|
* monitoring alarm timers and deciding when to (re)schedule processes.
|
2005-04-21 16:53:53 +02:00
|
|
|
* The CLOCK offers a direct interface to kernel processes. System services
|
2005-07-14 17:12:12 +02:00
|
|
|
* can access its services through system calls, such as sys_setalarm(). The
|
2005-10-09 21:58:25 +02:00
|
|
|
* CLOCK task thus is hidden from the outside world.
|
2005-04-21 16:53:53 +02:00
|
|
|
*
|
|
|
|
* Changes:
|
Split of architecture-dependent and -independent functions for i386,
mainly in the kernel and headers. This split based on work by
Ingmar Alting <iaalting@cs.vu.nl> done for his Minix PowerPC architecture
port.
. kernel does not program the interrupt controller directly, do any
other architecture-dependent operations, or contain assembly any more,
but uses architecture-dependent functions in arch/$(ARCH)/.
. architecture-dependent constants and types defined in arch/$(ARCH)/include.
. <ibm/portio.h> moved to <minix/portio.h>, as they have become, for now,
architecture-independent functions.
. int86, sdevio, readbios, and iopenable are now i386-specific kernel calls
and live in arch/i386/do_* now.
. i386 arch now supports even less 86 code; e.g. mpx86.s and klib86.s have
gone, and 'machine.protected' is gone (and always taken to be 1 in i386).
If 86 support is to return, it should be a new architecture.
. prototypes for the architecture-dependent functions defined in
kernel/arch/$(ARCH)/*.c but used in kernel/ are in kernel/proto.h
. /etc/make.conf included in makefiles and shell scripts that need to
know the building architecture; it defines ARCH=<arch>, currently only
i386.
. some basic per-architecture build support outside of the kernel (lib)
. in clock.c, only dequeue a process if it was ready
. fixes for new include files
files deleted:
. mpx/klib.s - only for choosing between mpx/klib86 and -386
. klib86.s - only for 86
i386-specific files files moved (or arch-dependent stuff moved) to arch/i386/:
. mpx386.s (entry point)
. klib386.s
. sconst.h
. exception.c
. protect.c
. protect.h
. i8269.c
2006-12-22 16:22:27 +01:00
|
|
|
* Aug 18, 2006 removed direct hardware access etc, MinixPPC (Ingmar Alting)
|
2005-10-09 21:58:25 +02:00
|
|
|
* Oct 08, 2005 reordering and comment editing (A. S. Woodhull)
|
2005-04-21 16:53:53 +02:00
|
|
|
* Mar 18, 2004 clock interface moved to SYSTEM task (Jorrit N. Herder)
|
|
|
|
* Sep 30, 2004 source code documentation updated (Jorrit N. Herder)
|
2005-08-05 11:41:15 +02:00
|
|
|
* Sep 24, 2004 redesigned alarm timers (Jorrit N. Herder)
|
2005-04-21 16:53:53 +02:00
|
|
|
*
|
2009-11-06 10:04:15 +01:00
|
|
|
* Clock task is notified by the clock's interrupt handler when a timer
|
|
|
|
* has expired.
|
2005-04-21 16:53:53 +02:00
|
|
|
*
|
|
|
|
* In addition to the main clock_task() entry point, which starts the main
|
|
|
|
* loop, there are several other minor entry points:
|
|
|
|
* clock_stop: called just before MINIX shutdown
|
|
|
|
* get_uptime: get realtime since boot in clock ticks
|
2005-08-05 11:41:15 +02:00
|
|
|
* set_timer: set a watchdog timer (+)
|
|
|
|
* reset_timer: reset a watchdog timer (+)
|
2005-04-21 16:53:53 +02:00
|
|
|
* read_clock: read the counter of channel 0 of the 8253A timer
|
|
|
|
*
|
2005-08-05 11:41:15 +02:00
|
|
|
* (+) The CLOCK task keeps tracks of watchdog timers for the entire kernel.
|
2005-10-09 21:58:25 +02:00
|
|
|
* It is crucial that watchdog functions not block, or the CLOCK task may
|
2005-04-21 16:53:53 +02:00
|
|
|
* be blocked. Do not send() a message when the receiver is not expecting it.
|
2005-07-14 17:12:12 +02:00
|
|
|
* Instead, notify(), which always returns, should be used.
|
2005-04-21 16:53:53 +02:00
|
|
|
*/
|
|
|
|
|
2012-11-15 12:06:41 +01:00
|
|
|
#include "kernel/kernel.h"
|
Merge of David's ptrace branch. Summary:
o Support for ptrace T_ATTACH/T_DETACH and T_SYSCALL
o PM signal handling logic should now work properly, even with debuggers
being present
o Asynchronous PM/VFS protocol, full IPC support for senda(), and
AMF_NOREPLY senda() flag
DETAILS
Process stop and delay call handling of PM:
o Added sys_runctl() kernel call with sys_stop() and sys_resume()
aliases, for PM to stop and resume a process
o Added exception for sending/syscall-traced processes to sys_runctl(),
and matching SIGKREADY pseudo-signal to PM
o Fixed PM signal logic to deal with requests from a process after
stopping it (so-called "delay calls"), using the SIGKREADY facility
o Fixed various PM panics due to race conditions with delay calls versus
VFS calls
o Removed special PRIO_STOP priority value
o Added SYS_LOCK RTS kernel flag, to stop an individual process from
running while modifying its process structure
Signal and debugger handling in PM:
o Fixed debugger signals being dropped if a second signal arrives when
the debugger has not retrieved the first one
o Fixed debugger signals being sent to the debugger more than once
o Fixed debugger signals unpausing process in VFS; removed PM_UNPAUSE_TR
protocol message
o Detached debugger signals from general signal logic and from being
blocked on VFS calls, meaning that even VFS can now be traced
o Fixed debugger being unable to receive more than one pending signal in
one process stop
o Fixed signal delivery being delayed needlessly when multiple signals
are pending
o Fixed wait test for tracer, which was returning for children that were
not waited for
o Removed second parallel pending call from PM to VFS for any process
o Fixed process becoming runnable between exec() and debugger trap
o Added support for notifying the debugger before the parent when a
debugged child exits
o Fixed debugger death causing child to remain stopped forever
o Fixed consistently incorrect use of _NSIG
Extensions to ptrace():
o Added T_ATTACH and T_DETACH ptrace request, to attach and detach a
debugger to and from a process
o Added T_SYSCALL ptrace request, to trace system calls
o Added T_SETOPT ptrace request, to set trace options
o Added TO_TRACEFORK trace option, to attach automatically to children
of a traced process
o Added TO_ALTEXEC trace option, to send SIGSTOP instead of SIGTRAP upon
a successful exec() of the tracee
o Extended T_GETUSER ptrace support to allow retrieving a process's priv
structure
o Removed T_STOP ptrace request again, as it does not help implementing
debuggers properly
o Added MINIX3-specific ptrace test (test42)
o Added proper manual page for ptrace(2)
Asynchronous PM/VFS interface:
o Fixed asynchronous messages not being checked when receive() is called
with an endpoint other than ANY
o Added AMF_NOREPLY senda() flag, preventing such messages from
satisfying the receive part of a sendrec()
o Added asynsend3() that takes optional flags; asynsend() is now a
#define passing in 0 as third parameter
o Made PM/VFS protocol asynchronous; reintroduced tell_fs()
o Made PM_BASE request/reply number range unique
o Hacked in a horrible temporary workaround into RS to deal with newly
revealed RS-PM-VFS race condition triangle until VFS is asynchronous
System signal handling:
o Fixed shutdown logic of device drivers; removed old SIGKSTOP signal
o Removed is-superuser check from PM's do_procstat() (aka getsigset())
o Added sigset macros to allow system processes to deal with the full
signal set, rather than just the POSIX subset
Miscellaneous PM fixes:
o Split do_getset into do_get and do_set, merging common code and making
structure clearer
o Fixed setpriority() being able to put to sleep processes using an
invalid parameter, or revive zombie processes
o Made find_proc() global; removed obsolete proc_from_pid()
o Cleanup here and there
Also included:
o Fixed false-positive boot order kernel warning
o Removed last traces of old NOTIFY_FROM code
THINGS OF POSSIBLE INTEREST
o It should now be possible to run PM at any priority, even lower than
user processes
o No assumptions are made about communication speed between PM and VFS,
although communication must be FIFO
o A debugger will now receive incoming debuggee signals at kill time
only; the process may not yet be fully stopped
o A first step has been made towards making the SYSTEM task preemptible
2009-09-30 11:57:22 +02:00
|
|
|
#include <minix/endpoint.h>
|
Userspace scheduling
- cotributed by Bjorn Swift
- In this first phase, scheduling is moved from the kernel to the PM
server. The next steps are to a) moving scheduling to its own server
and b) include useful information in the "out of quantum" message,
so that the scheduler can make use of this information.
- The kernel process table now keeps record of who is responsible for
scheduling each process (p_scheduler). When this pointer is NULL,
the process will be scheduled by the kernel. If such a process runs
out of quantum, the kernel will simply renew its quantum an requeue
it.
- When PM loads, it will take over scheduling of all running
processes, except system processes, using sys_schedctl().
Essentially, this only results in taking over init. As children
inherit a scheduler from their parent, user space programs forked by
init will inherit PM (for now) as their scheduler.
- Once a process has been assigned a scheduler, and runs out of
quantum, its RTS_NO_QUANTUM flag will be set and the process
dequeued. The kernel will send a message to the scheduler, on the
process' behalf, informing the scheduler that it has run out of
quantum. The scheduler can take what ever action it pleases, based
on its policy, and then reschedule the process using the
sys_schedule() system call.
- Balance queues does not work as before. While the old in-kernel
function used to renew the quantum of processes in the highest
priority run queue, the user-space implementation only acts on
processes that have been bumped down to a lower priority queue.
This approach reacts slower to changes than the old one, but saves
us sending a sys_schedule message for each process every time we
balance the queues. Currently, when processes are moved up a
priority queue, their quantum is also renewed, but this can be
fiddled with.
- do_nice has been removed from kernel. PM answers to get- and
setpriority calls, updates it's own nice variable as well as the
max_run_queue. This will be refactored once scheduling is moved to a
separate server. We will probably have PM update it's local nice
value and then send a message to whoever is scheduling the process.
- changes to fix an issue in do_fork() where processes could run out
of quantum but bypassing the code path that handles it correctly.
The future plan is to remove the policy from do_fork() and implement
it in userspace too.
2010-03-29 13:07:20 +02:00
|
|
|
#include <assert.h>
|
2005-04-21 16:53:53 +02:00
|
|
|
|
2009-11-06 10:04:15 +01:00
|
|
|
#include "clock.h"
|
|
|
|
|
2011-07-29 20:36:42 +02:00
|
|
|
#ifdef USE_WATCHDOG
|
2010-01-16 21:53:55 +01:00
|
|
|
#include "watchdog.h"
|
|
|
|
#endif
|
|
|
|
|
Split of architecture-dependent and -independent functions for i386,
mainly in the kernel and headers. This split based on work by
Ingmar Alting <iaalting@cs.vu.nl> done for his Minix PowerPC architecture
port.
. kernel does not program the interrupt controller directly, do any
other architecture-dependent operations, or contain assembly any more,
but uses architecture-dependent functions in arch/$(ARCH)/.
. architecture-dependent constants and types defined in arch/$(ARCH)/include.
. <ibm/portio.h> moved to <minix/portio.h>, as they have become, for now,
architecture-independent functions.
. int86, sdevio, readbios, and iopenable are now i386-specific kernel calls
and live in arch/i386/do_* now.
. i386 arch now supports even less 86 code; e.g. mpx86.s and klib86.s have
gone, and 'machine.protected' is gone (and always taken to be 1 in i386).
If 86 support is to return, it should be a new architecture.
. prototypes for the architecture-dependent functions defined in
kernel/arch/$(ARCH)/*.c but used in kernel/ are in kernel/proto.h
. /etc/make.conf included in makefiles and shell scripts that need to
know the building architecture; it defines ARCH=<arch>, currently only
i386.
. some basic per-architecture build support outside of the kernel (lib)
. in clock.c, only dequeue a process if it was ready
. fixes for new include files
files deleted:
. mpx/klib.s - only for choosing between mpx/klib86 and -386
. klib86.s - only for 86
i386-specific files files moved (or arch-dependent stuff moved) to arch/i386/:
. mpx386.s (entry point)
. klib386.s
. sconst.h
. exception.c
. protect.c
. protect.h
. i8269.c
2006-12-22 16:22:27 +01:00
|
|
|
/* Function prototype for PRIVATE functions.
|
|
|
|
*/
|
2012-03-25 20:25:53 +02:00
|
|
|
static void load_update(void);
|
2005-04-21 16:53:53 +02:00
|
|
|
|
|
|
|
/* The CLOCK's timers queue. The functions in <timers.h> operate on this.
|
2005-10-09 21:58:25 +02:00
|
|
|
* Each system process possesses a single synchronous alarm timer. If other
|
2005-07-19 14:21:36 +02:00
|
|
|
* kernel parts want to use additional timers, they must declare their own
|
|
|
|
* persistent (static) timer structure, which can be passed to the clock
|
2005-04-21 16:53:53 +02:00
|
|
|
* via (re)set_timer().
|
|
|
|
* When a timer expires its watchdog function is run by the CLOCK task.
|
|
|
|
*/
|
2012-03-25 20:25:53 +02:00
|
|
|
static timer_t *clock_timers; /* queue of CLOCK timers */
|
|
|
|
static clock_t next_timeout; /* realtime that next timer expires */
|
2005-04-21 16:53:53 +02:00
|
|
|
|
Split of architecture-dependent and -independent functions for i386,
mainly in the kernel and headers. This split based on work by
Ingmar Alting <iaalting@cs.vu.nl> done for his Minix PowerPC architecture
port.
. kernel does not program the interrupt controller directly, do any
other architecture-dependent operations, or contain assembly any more,
but uses architecture-dependent functions in arch/$(ARCH)/.
. architecture-dependent constants and types defined in arch/$(ARCH)/include.
. <ibm/portio.h> moved to <minix/portio.h>, as they have become, for now,
architecture-independent functions.
. int86, sdevio, readbios, and iopenable are now i386-specific kernel calls
and live in arch/i386/do_* now.
. i386 arch now supports even less 86 code; e.g. mpx86.s and klib86.s have
gone, and 'machine.protected' is gone (and always taken to be 1 in i386).
If 86 support is to return, it should be a new architecture.
. prototypes for the architecture-dependent functions defined in
kernel/arch/$(ARCH)/*.c but used in kernel/ are in kernel/proto.h
. /etc/make.conf included in makefiles and shell scripts that need to
know the building architecture; it defines ARCH=<arch>, currently only
i386.
. some basic per-architecture build support outside of the kernel (lib)
. in clock.c, only dequeue a process if it was ready
. fixes for new include files
files deleted:
. mpx/klib.s - only for choosing between mpx/klib86 and -386
. klib86.s - only for 86
i386-specific files files moved (or arch-dependent stuff moved) to arch/i386/:
. mpx386.s (entry point)
. klib386.s
. sconst.h
. exception.c
. protect.c
. protect.h
. i8269.c
2006-12-22 16:22:27 +01:00
|
|
|
/* The time is incremented by the interrupt handler on each clock tick.
|
|
|
|
*/
|
2012-03-25 20:25:53 +02:00
|
|
|
static clock_t realtime = 0; /* real time clock */
|
2005-04-21 16:53:53 +02:00
|
|
|
|
2009-11-06 10:04:15 +01:00
|
|
|
/*
|
2010-09-15 16:09:46 +02:00
|
|
|
* The boot processos timer interrupt handler. In addition to non-boot cpus it
|
2009-11-06 10:04:15 +01:00
|
|
|
* keeps real time and notifies the clock task if need be
|
2005-04-21 16:53:53 +02:00
|
|
|
*/
|
2012-03-25 20:25:53 +02:00
|
|
|
int timer_int_handler(void)
|
2009-11-06 10:04:15 +01:00
|
|
|
{
|
2010-09-15 16:10:09 +02:00
|
|
|
/* Update user and system accounting times. Charge the current process
|
|
|
|
* for user time. If the current process is not billable, that is, if a
|
|
|
|
* non-user process is running, charge the billable process for system
|
|
|
|
* time as well. Thus the unbillable process' user time is the billable
|
|
|
|
* user's system time.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct proc * p, * billp;
|
|
|
|
|
|
|
|
/* FIXME watchdog for slave cpus! */
|
2011-07-29 20:36:42 +02:00
|
|
|
#ifdef USE_WATCHDOG
|
2010-09-15 16:10:09 +02:00
|
|
|
/*
|
|
|
|
* we need to know whether local timer ticks are happening or whether
|
|
|
|
* the kernel is locked up. We don't care about overflows as we only
|
|
|
|
* need to know that it's still ticking or not
|
|
|
|
*/
|
|
|
|
watchdog_local_timer_ticks++;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (cpu_is_bsp(cpuid))
|
|
|
|
realtime++;
|
|
|
|
|
|
|
|
/* Update user and system accounting times. Charge the current process
|
|
|
|
* for user time. If the current process is not billable, that is, if a
|
|
|
|
* non-user process is running, charge the billable process for system
|
|
|
|
* time as well. Thus the unbillable process' user time is the billable
|
|
|
|
* user's system time.
|
|
|
|
*/
|
2009-11-06 10:04:15 +01:00
|
|
|
|
2010-09-15 16:10:09 +02:00
|
|
|
p = get_cpulocal_var(proc_ptr);
|
|
|
|
billp = get_cpulocal_var(bill_ptr);
|
2009-11-06 10:04:15 +01:00
|
|
|
|
2010-09-15 16:10:09 +02:00
|
|
|
p->p_user_time++;
|
2009-11-06 10:04:15 +01:00
|
|
|
|
2010-09-15 16:10:09 +02:00
|
|
|
if (! (priv(p)->s_flags & BILLABLE)) {
|
|
|
|
billp->p_sys_time++;
|
|
|
|
}
|
2005-04-21 16:53:53 +02:00
|
|
|
|
2010-09-15 16:10:09 +02:00
|
|
|
/* Decrement virtual timers, if applicable. We decrement both the
|
|
|
|
* virtual and the profile timer of the current process, and if the
|
|
|
|
* current process is not billable, the timer of the billed process as
|
|
|
|
* well. If any of the timers expire, do_clocktick() will send out
|
|
|
|
* signals.
|
|
|
|
*/
|
|
|
|
if ((p->p_misc_flags & MF_VIRT_TIMER)){
|
|
|
|
p->p_virt_left--;
|
|
|
|
}
|
|
|
|
if ((p->p_misc_flags & MF_PROF_TIMER)){
|
|
|
|
p->p_prof_left--;
|
|
|
|
}
|
|
|
|
if (! (priv(p)->s_flags & BILLABLE) &&
|
|
|
|
(billp->p_misc_flags & MF_PROF_TIMER)){
|
|
|
|
billp->p_prof_left--;
|
2009-11-06 10:04:15 +01:00
|
|
|
}
|
|
|
|
|
2010-09-15 16:10:09 +02:00
|
|
|
/*
|
|
|
|
* Check if a process-virtual timer expired. Check current process, but
|
|
|
|
* also bill_ptr - one process's user time is another's system time, and
|
|
|
|
* the profile timer decreases for both!
|
|
|
|
*/
|
|
|
|
vtimer_check(p);
|
|
|
|
|
|
|
|
if (p != billp)
|
|
|
|
vtimer_check(billp);
|
|
|
|
|
|
|
|
/* Update load average. */
|
|
|
|
load_update();
|
|
|
|
|
|
|
|
if (cpu_is_bsp(cpuid)) {
|
|
|
|
/* if a timer expired, notify the clock task */
|
|
|
|
if ((next_timeout <= realtime)) {
|
|
|
|
tmrs_exptimers(&clock_timers, realtime, NULL);
|
|
|
|
next_timeout = (clock_timers == NULL) ?
|
|
|
|
TMR_NEVER : clock_timers->tmr_exp_time;
|
|
|
|
}
|
|
|
|
|
2011-08-18 14:56:34 +02:00
|
|
|
#ifdef DEBUG_SERIAL
|
No more intel/minix segments.
This commit removes all traces of Minix segments (the text/data/stack
memory map abstraction in the kernel) and significance of Intel segments
(hardware segments like CS, DS that add offsets to all addressing before
page table translation). This ultimately simplifies the memory layout
and addressing and makes the same layout possible on non-Intel
architectures.
There are only two types of addresses in the world now: virtual
and physical; even the kernel and processes have the same virtual
address space. Kernel and user processes can be distinguished at a
glance as processes won't use 0xF0000000 and above.
No static pre-allocated memory sizes exist any more.
Changes to booting:
. The pre_init.c leaves the kernel and modules exactly as
they were left by the bootloader in physical memory
. The kernel starts running using physical addressing,
loaded at a fixed location given in its linker script by the
bootloader. All code and data in this phase are linked to
this fixed low location.
. It makes a bootstrap pagetable to map itself to a
fixed high location (also in linker script) and jumps to
the high address. All code and data then use this high addressing.
. All code/data symbols linked at the low addresses is prefixed by
an objcopy step with __k_unpaged_*, so that that code cannot
reference highly-linked symbols (which aren't valid yet) or vice
versa (symbols that aren't valid any more).
. The two addressing modes are separated in the linker script by
collecting the unpaged_*.o objects and linking them with low
addresses, and linking the rest high. Some objects are linked
twice, once low and once high.
. The bootstrap phase passes a lot of information (e.g. free memory
list, physical location of the modules, etc.) using the kinfo
struct.
. After this bootstrap the low-linked part is freed.
. The kernel maps in VM into the bootstrap page table so that VM can
begin executing. Its first job is to make page tables for all other
boot processes. So VM runs before RS, and RS gets a fully dynamic,
VM-managed address space. VM gets its privilege info from RS as usual
but that happens after RS starts running.
. Both the kernel loading VM and VM organizing boot processes happen
using the libexec logic. This removes the last reason for VM to
still know much about exec() and vm/exec.c is gone.
Further Implementation:
. All segments are based at 0 and have a 4 GB limit.
. The kernel is mapped in at the top of the virtual address
space so as not to constrain the user processes.
. Processes do not use segments from the LDT at all; there are
no segments in the LDT any more, so no LLDT is needed.
. The Minix segments T/D/S are gone and so none of the
user-space or in-kernel copy functions use them. The copy
functions use a process endpoint of NONE to realize it's
a physical address, virtual otherwise.
. The umap call only makes sense to translate a virtual address
to a physical address now.
. Segments-related calls like newmap and alloc_segments are gone.
. All segments-related translation in VM is gone (vir2map etc).
. Initialization in VM is simpler as no moving around is necessary.
. VM and all other boot processes can be linked wherever they wish
and will be mapped in at the right location by the kernel and VM
respectively.
Other changes:
. The multiboot code is less special: it does not use mb_print
for its diagnostics any more but uses printf() as normal, saving
the output into the diagnostics buffer, only printing to the
screen using the direct print functions if a panic() occurs.
. The multiboot code uses the flexible 'free memory map list'
style to receive the list of free memory if available.
. The kernel determines the memory layout of the processes to
a degree: it tells VM where the kernel starts and ends and
where the kernel wants the top of the process to be. VM then
uses this entire range, i.e. the stack is right at the top,
and mmap()ped bits of memory are placed below that downwards,
and the break grows upwards.
Other Consequences:
. Every process gets its own page table as address spaces
can't be separated any more by segments.
. As all segments are 0-based, there is no distinction between
virtual and linear addresses, nor between userspace and
kernel addresses.
. Less work is done when context switching, leading to a net
performance increase. (8% faster on my machine for 'make servers'.)
. The layout and configuration of the GDT makes sysenter and syscall
possible.
2012-05-07 16:03:35 +02:00
|
|
|
if (kinfo.do_serial_debug)
|
2010-09-15 16:10:09 +02:00
|
|
|
do_ser_debug();
|
2011-08-16 17:18:55 +02:00
|
|
|
#endif
|
|
|
|
|
2010-09-15 16:10:09 +02:00
|
|
|
}
|
2009-11-06 10:04:15 +01:00
|
|
|
|
2012-10-08 03:38:03 +02:00
|
|
|
arch_timer_int_handler();
|
|
|
|
|
2009-11-06 10:04:15 +01:00
|
|
|
return(1); /* reenable interrupts */
|
2005-04-21 16:53:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*===========================================================================*
|
|
|
|
* get_uptime *
|
|
|
|
*===========================================================================*/
|
2012-03-25 20:25:53 +02:00
|
|
|
clock_t get_uptime(void)
|
2005-04-21 16:53:53 +02:00
|
|
|
{
|
Split of architecture-dependent and -independent functions for i386,
mainly in the kernel and headers. This split based on work by
Ingmar Alting <iaalting@cs.vu.nl> done for his Minix PowerPC architecture
port.
. kernel does not program the interrupt controller directly, do any
other architecture-dependent operations, or contain assembly any more,
but uses architecture-dependent functions in arch/$(ARCH)/.
. architecture-dependent constants and types defined in arch/$(ARCH)/include.
. <ibm/portio.h> moved to <minix/portio.h>, as they have become, for now,
architecture-independent functions.
. int86, sdevio, readbios, and iopenable are now i386-specific kernel calls
and live in arch/i386/do_* now.
. i386 arch now supports even less 86 code; e.g. mpx86.s and klib86.s have
gone, and 'machine.protected' is gone (and always taken to be 1 in i386).
If 86 support is to return, it should be a new architecture.
. prototypes for the architecture-dependent functions defined in
kernel/arch/$(ARCH)/*.c but used in kernel/ are in kernel/proto.h
. /etc/make.conf included in makefiles and shell scripts that need to
know the building architecture; it defines ARCH=<arch>, currently only
i386.
. some basic per-architecture build support outside of the kernel (lib)
. in clock.c, only dequeue a process if it was ready
. fixes for new include files
files deleted:
. mpx/klib.s - only for choosing between mpx/klib86 and -386
. klib86.s - only for 86
i386-specific files files moved (or arch-dependent stuff moved) to arch/i386/:
. mpx386.s (entry point)
. klib386.s
. sconst.h
. exception.c
. protect.c
. protect.h
. i8269.c
2006-12-22 16:22:27 +01:00
|
|
|
/* Get and return the current clock uptime in ticks. */
|
2005-06-17 11:09:54 +02:00
|
|
|
return(realtime);
|
2005-04-21 16:53:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*===========================================================================*
|
|
|
|
* set_timer *
|
|
|
|
*===========================================================================*/
|
2012-03-25 20:25:53 +02:00
|
|
|
void set_timer(tp, exp_time, watchdog)
|
2005-04-21 16:53:53 +02:00
|
|
|
struct timer *tp; /* pointer to timer structure */
|
|
|
|
clock_t exp_time; /* expiration realtime */
|
|
|
|
tmr_func_t watchdog; /* watchdog to be called */
|
|
|
|
{
|
|
|
|
/* Insert the new timer in the active timers list. Always update the
|
|
|
|
* next timeout time by setting it to the front of the active list.
|
|
|
|
*/
|
2005-06-17 15:36:01 +02:00
|
|
|
tmrs_settimer(&clock_timers, tp, exp_time, watchdog, NULL);
|
2005-04-21 16:53:53 +02:00
|
|
|
next_timeout = clock_timers->tmr_exp_time;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*===========================================================================*
|
|
|
|
* reset_timer *
|
|
|
|
*===========================================================================*/
|
2012-03-25 20:25:53 +02:00
|
|
|
void reset_timer(tp)
|
2005-04-21 16:53:53 +02:00
|
|
|
struct timer *tp; /* pointer to timer structure */
|
|
|
|
{
|
|
|
|
/* The timer pointed to by 'tp' is no longer needed. Remove it from both the
|
|
|
|
* active and expired lists. Always update the next timeout time by setting
|
|
|
|
* it to the front of the active list.
|
|
|
|
*/
|
2005-06-17 15:36:01 +02:00
|
|
|
tmrs_clrtimer(&clock_timers, tp, NULL);
|
2005-04-21 16:53:53 +02:00
|
|
|
next_timeout = (clock_timers == NULL) ?
|
|
|
|
TMR_NEVER : clock_timers->tmr_exp_time;
|
|
|
|
}
|
|
|
|
|
2005-11-14 16:50:46 +01:00
|
|
|
/*===========================================================================*
|
|
|
|
* load_update *
|
|
|
|
*===========================================================================*/
|
2012-03-25 20:25:53 +02:00
|
|
|
static void load_update(void)
|
2005-11-14 16:50:46 +01:00
|
|
|
{
|
|
|
|
u16_t slot;
|
2009-11-28 14:16:03 +01:00
|
|
|
int enqueued = 0, q;
|
2006-03-16 10:33:35 +01:00
|
|
|
struct proc *p;
|
2010-09-15 16:10:18 +02:00
|
|
|
struct proc **rdy_head;
|
2005-11-14 16:50:46 +01:00
|
|
|
|
|
|
|
/* Load average data is stored as a list of numbers in a circular
|
|
|
|
* buffer. Each slot accumulates _LOAD_UNIT_SECS of samples of
|
|
|
|
* the number of runnable processes. Computations can then
|
|
|
|
* be made of the load average over variable periods, in the
|
|
|
|
* user library (see getloadavg(3)).
|
|
|
|
*/
|
2008-12-11 15:15:23 +01:00
|
|
|
slot = (realtime / system_hz / _LOAD_UNIT_SECS) % _LOAD_HISTORY;
|
2005-11-14 16:50:46 +01:00
|
|
|
if(slot != kloadinfo.proc_last_slot) {
|
|
|
|
kloadinfo.proc_load_history[slot] = 0;
|
|
|
|
kloadinfo.proc_last_slot = slot;
|
|
|
|
}
|
|
|
|
|
2010-09-15 16:10:18 +02:00
|
|
|
rdy_head = get_cpulocal_var(run_q_head);
|
2006-03-16 10:33:35 +01:00
|
|
|
/* Cumulation. How many processes are ready now? */
|
2010-09-15 16:10:09 +02:00
|
|
|
for(q = 0; q < NR_SCHED_QUEUES; q++) {
|
|
|
|
for(p = rdy_head[q]; p != NULL; p = p->p_nextready) {
|
2006-03-16 10:33:35 +01:00
|
|
|
enqueued++;
|
2010-09-15 16:10:09 +02:00
|
|
|
}
|
|
|
|
}
|
2006-03-16 10:33:35 +01:00
|
|
|
|
|
|
|
kloadinfo.proc_load_history[slot] += enqueued;
|
2005-11-14 16:50:46 +01:00
|
|
|
|
|
|
|
/* Up-to-dateness. */
|
|
|
|
kloadinfo.last_clock = realtime;
|
|
|
|
}
|
|
|
|
|
2012-03-25 20:25:53 +02:00
|
|
|
int boot_cpu_init_timer(unsigned freq)
|
2009-11-06 10:04:15 +01:00
|
|
|
{
|
2010-09-15 16:11:06 +02:00
|
|
|
if (init_local_timer(freq))
|
2009-11-06 10:04:15 +01:00
|
|
|
return -1;
|
|
|
|
|
2010-09-15 16:11:06 +02:00
|
|
|
if (register_local_timer_handler(
|
2010-09-15 16:10:09 +02:00
|
|
|
(irq_handler_t) timer_int_handler))
|
2009-11-06 10:04:15 +01:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2010-09-15 16:10:09 +02:00
|
|
|
|
2012-03-25 20:25:53 +02:00
|
|
|
int app_cpu_init_timer(unsigned freq)
|
2010-09-15 16:10:09 +02:00
|
|
|
{
|
2010-09-15 16:11:06 +02:00
|
|
|
if (init_local_timer(freq))
|
2010-09-15 16:10:09 +02:00
|
|
|
return -1;
|
2011-06-09 16:09:13 +02:00
|
|
|
|
|
|
|
return 0;
|
2010-09-15 16:10:09 +02:00
|
|
|
}
|