oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PM: remove 'boottime' global variable

Browse Source
This commit is contained in:
David van Moolenbroek 2009-11-28 13:22:01 +00:00
parent 6da61b8f05
commit 45123f83d3
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
servers/pm/glo.h
View File

@ -22,9 +22,6 @@ extern _PROTOTYPE (int (*call_vec[]), (void) ); /* system call handlers */
EXTERN sigset_t core_sset; /* which signals cause core images */ EXTERN sigset_t core_sset; /* which signals cause core images */
EXTERN sigset_t ign_sset; /* which signals are by default ignored */ EXTERN sigset_t ign_sset; /* which signals are by default ignored */
EXTERN time_t boottime; /* time when the system was booted (for
* reporting to FS)
*/
EXTERN u32_t system_hz; /* System clock frequency. */ EXTERN u32_t system_hz; /* System clock frequency. */
EXTERN int abort_flag; EXTERN int abort_flag;
EXTERN char monitor_code[256]; EXTERN char monitor_code[256];

9
servers/pm/time.c
View File

@ -23,10 +23,10 @@ PUBLIC int do_time()
* rotates at a constant rate and that such things as leap seconds do not * rotates at a constant rate and that such things as leap seconds do not
* exist. * exist.
*/ */
clock_t uptime; clock_t uptime, boottime;
int s; int s;
if ( (s=getuptime(&uptime)) != OK) if ( (s=getuptime2(&uptime, &boottime)) != OK)
panic(__FILE__,"do_time couldn't get uptime", s); panic(__FILE__,"do_time couldn't get uptime", s);
mp->mp_reply.reply_time = (time_t) (boottime + (uptime/system_hz)); mp->mp_reply.reply_time = (time_t) (boottime + (uptime/system_hz));
@ -40,10 +40,9 @@ PUBLIC int do_time()
PUBLIC int do_stime() PUBLIC int do_stime()
{ {
/* Perform the stime(tp) system call. Retrieve the system's uptime (ticks /* Perform the stime(tp) system call. Retrieve the system's uptime (ticks
* since boot) and store the time in seconds at system boot in the global * since boot) and pass the new time in seconds at system boot to the kernel.
* variable 'boottime'.
*/ */
clock_t uptime; clock_t uptime, boottime;
int s; int s;
if (mp->mp_effuid != SUPER_USER) { if (mp->mp_effuid != SUPER_USER) {

5
servers/rs/service.c
View File

@ -689,6 +689,7 @@ struct
{ "UMAP", SYS_UMAP }, { "UMAP", SYS_UMAP },
{ "VIRCOPY", SYS_VIRCOPY }, { "VIRCOPY", SYS_VIRCOPY },
{ "IRQCTL", SYS_IRQCTL }, { "IRQCTL", SYS_IRQCTL },
{ "INT86", SYS_INT86 },
{ "DEVIO", SYS_DEVIO }, { "DEVIO", SYS_DEVIO },
{ "SDEVIO", SYS_SDEVIO }, { "SDEVIO", SYS_SDEVIO },
{ "VDEVIO", SYS_VDEVIO }, { "VDEVIO", SYS_VDEVIO },
@ -700,11 +701,11 @@ struct
{ "VSAFECOPY", SYS_VSAFECOPY }, { "VSAFECOPY", SYS_VSAFECOPY },
{ "SETGRANT", SYS_SETGRANT }, { "SETGRANT", SYS_SETGRANT },
{ "READBIOS", SYS_READBIOS }, { "READBIOS", SYS_READBIOS },
{ "PROFBUF", SYS_PROFBUF },
{ "STIME", SYS_STIME },
{ "MAPDMA", SYS_MAPDMA }, { "MAPDMA", SYS_MAPDMA },
{ "VMCTL", SYS_VMCTL }, { "VMCTL", SYS_VMCTL },
{ "PROFBUF", SYS_PROFBUF },
{ "SYSCTL", SYS_SYSCTL }, { "SYSCTL", SYS_SYSCTL },
{ "INT86", SYS_INT86 },
{ NULL, 0 } { NULL, 0 }
}; };