Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename SYSCTL kernel call to DIAGCTL

Browse Source 
Change-Id: I1b17373f01808d887dcbeab493838946fbef4ef6
This commit is contained in:
David van Moolenbroek
2013-09-21 00:58:46 +02:00
committed by Lionel Sambuc
parent 9fab85c2de
commit de975579a4
18 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/proto.h
View File

@@ -137,8 +137,8 @@ void hook_ipc_clear(struct proc *proc);
int verify_grant(endpoint_t, endpoint_t, cp_grant_id_t, vir_bytes, int,
vir_bytes, vir_bytes *, endpoint_t *);
/* system/do_sysctl.c */
int do_sysctl(struct proc * caller, message *m);
/* system/do_diagctl.c */
int do_diagctl(struct proc * caller, message *m);
#if SPROFILE
/* profile.c */

2
kernel/system.c
View File

@@ -241,7 +241,7 @@ void system_init(void)
/* System control. */
map(SYS_ABORT, do_abort); /* abort MINIX */
map(SYS_GETINFO, do_getinfo); /* request system information */
map(SYS_SYSCTL, do_sysctl); /* misc system manipulation */
map(SYS_DIAGCTL, do_diagctl); /* diagnostics-related functionality */
/* Profiling. */
map(SYS_SPROF, do_sprofile); /* start/stop statistical profiling */

2
kernel/system/Makefile.inc
View File

@@ -25,7 +25,7 @@ SRCS+= \
do_privctl.c \
do_safecopy.c \
do_safememset.c \
do_sysctl.c \
do_diagctl.c \
do_getksig.c \
do_endksig.c \
do_kill.c \

28
kernel/system/do_sysctl.c → kernel/system/do_diagctl.c
View File

@@ -1,35 +1,35 @@
/* The kernel call implemented in this file:
* m_type: SYS_SYSCTL
* m_type: SYS_DIAGCTL
*
* The parameters for this kernel call are:
* SYSCTL_CODE request
* and then request-specific arguments in SYSCTL_ARG1 and SYSCTL_ARG2.
* DIAGCTL_CODE request
* and then request-specific arguments in DIAGCTL_ARG1 and DIAGCTL_ARG2.
*/
#include "kernel/system.h"
/*===========================================================================*
* do_sysctl *
* do_diagctl *
*===========================================================================*/
int do_sysctl(struct proc * caller, message * m_ptr)
int do_diagctl(struct proc * caller, message * m_ptr)
{
vir_bytes len, buf;
static char mybuf[DIAG_BUFSIZE];
int s, i, proc_nr;
switch (m_ptr->SYSCTL_CODE) {
case SYSCTL_CODE_DIAG:
buf = (vir_bytes) m_ptr->SYSCTL_ARG1;
len = (vir_bytes) m_ptr->SYSCTL_ARG2;
switch (m_ptr->DIAGCTL_CODE) {
case DIAGCTL_CODE_DIAG:
buf = (vir_bytes) m_ptr->DIAGCTL_ARG1;
len = (vir_bytes) m_ptr->DIAGCTL_ARG2;
if(len < 1 || len > DIAG_BUFSIZE) {
printf("do_sysctl: diag for %d: len %d out of range\n",
printf("do_diagctl: diag for %d: len %d out of range\n",
caller->p_endpoint, len);
return EINVAL;
}
if((s=data_copy_vmcheck(caller, caller->p_endpoint, buf, KERNEL,
(vir_bytes) mybuf, len)) != OK) {
printf("do_sysctl: diag for %d: len %d: copy failed: %d\n",
printf("do_diagctl: diag for %d: len %d: copy failed: %d\n",
caller->p_endpoint, len, s);
return s;
}
@@ -37,13 +37,13 @@ int do_sysctl(struct proc * caller, message * m_ptr)
kputc(mybuf[i]);
kputc(END_OF_KMESS);
return OK;
case SYSCTL_CODE_STACKTRACE:
if(!isokendpt(m_ptr->SYSCTL_ARG2, &proc_nr))
case DIAGCTL_CODE_STACKTRACE:
if(!isokendpt(m_ptr->DIAGCTL_ARG2, &proc_nr))
return EINVAL;
proc_stacktrace(proc_addr(proc_nr));
return OK;
default:
printf("do_sysctl: invalid request %d\n", m_ptr->SYSCTL_CODE);
printf("do_diagctl: invalid request %d\n", m_ptr->DIAGCTL_CODE);
return(EINVAL);
}
}