. new kernel call sysctl for generic unprivileged system operations;
now used for printing diagnostic messages through the kernel message buffer. this lets processes print diagnostics without sending messages to tty and log directly, simplifying the message protocol a lot and reducing difficulties with deadlocks and other situations in which diagnostics are blackholed (e.g. grants don't work). this makes DIAGNOSTICS(_S), ASYN_DIAGNOSTICS and DIAG_REPL obsolete, although tty and log still accept the codes for 'old' binaries. This also simplifies diagnostics in several servers and drivers - only tty needs its own kputc() now. . simplifications in vfs, and some effort to get the vnode references right (consistent) even during shutdown. m_mounted_on is now NULL for root filesystems (!) (the original and new root), a less awkward special case than 'm_mounted_on == m_root_node'. root now has exactly one reference, to root, if no files are open, just like all other filesystems. m_driver_e is unused.
This commit is contained in:
@@ -204,15 +204,6 @@ struct driver *dp; /* Device dependent entry points. */
|
||||
reply_mess.DEV_MINOR = mess.DEVICE;
|
||||
reply_mess.DEV_SEL_OPS = r;
|
||||
}
|
||||
else if (mess.m_type == DIAGNOSTICS_S)
|
||||
{
|
||||
#if 0
|
||||
if (device_caller == FS_PROC_NR)
|
||||
printf("driver_task: sending DIAG_REPL to FS\n");
|
||||
#endif
|
||||
reply_mess.m_type = DIAG_REPL;
|
||||
reply_mess.REP_STATUS = r;
|
||||
}
|
||||
else
|
||||
{
|
||||
#if 0
|
||||
|
||||
@@ -16,7 +16,7 @@ LDFLAGS = -i -L../libdriver_asyn
|
||||
LIBS = -ldriver -lsys
|
||||
LIB_DEP = ../libdriver_asyn/libdriver.a
|
||||
|
||||
OBJ = log.o diag.o kputc.o
|
||||
OBJ = log.o diag.o
|
||||
|
||||
# build local binary
|
||||
all build: $(DRIVER)
|
||||
|
||||
@@ -134,7 +134,7 @@ PUBLIC int do_diagnostics(message *m, int safe)
|
||||
}
|
||||
log_append(diagbuf, i);
|
||||
|
||||
if(m->m_type == ASYN_DIAGNOSTICS) return EDONTREPLY;
|
||||
if(m->m_type == ASYN_DIAGNOSTICS_OLD) return EDONTREPLY;
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
/* A server must occasionally print some message. It uses a simple version of
|
||||
* printf() found in the system library that calls putk() to output characters.
|
||||
* The LOG driver cannot use the regular putk(). Hence, it uses a special
|
||||
* version of putk() that directly sends to the TTY task.
|
||||
*
|
||||
* Changes:
|
||||
* 21 July 2005: Created (Jorrit N. Herder)
|
||||
*/
|
||||
|
||||
#include "log.h"
|
||||
|
||||
/*===========================================================================*
|
||||
* kputc *
|
||||
*===========================================================================*/
|
||||
void kputc(c)
|
||||
int c;
|
||||
{
|
||||
/* Accumulate another character. If 0 or buffer full, print it. */
|
||||
static int buf_count; /* # characters in the buffer */
|
||||
static char print_buf[80]; /* output is buffered here */
|
||||
message m;
|
||||
|
||||
if ((c == 0 && buf_count > 0) || buf_count == sizeof(print_buf)) {
|
||||
m.DIAG_BUF_COUNT = buf_count;
|
||||
m.DIAG_PRINT_BUF_G = print_buf;
|
||||
m.m_type = DIAGNOSTICS; /* request TTY to output this buffer */
|
||||
_sendrec(TTY_PROC_NR, &m); /* if it fails, we give up */
|
||||
buf_count = 0; /* clear buffer for next batch */
|
||||
}
|
||||
if (c != 0) {
|
||||
print_buf[buf_count++] = c;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -397,12 +397,12 @@ int safe;
|
||||
* understand.
|
||||
*/
|
||||
switch(m_ptr->m_type) {
|
||||
case DIAGNOSTICS: {
|
||||
case DIAGNOSTICS_OLD: {
|
||||
r = do_diagnostics(m_ptr, 0);
|
||||
break;
|
||||
}
|
||||
case ASYN_DIAGNOSTICS:
|
||||
case DIAGNOSTICS_S:
|
||||
case ASYN_DIAGNOSTICS_OLD:
|
||||
case DIAGNOSTICS_S_OLD:
|
||||
r = do_diagnostics(m_ptr, 1);
|
||||
break;
|
||||
case DEV_STATUS: {
|
||||
|
||||
@@ -31,7 +31,6 @@ struct logdevice {
|
||||
};
|
||||
|
||||
/* Function prototypes. */
|
||||
_PROTOTYPE( void kputc, (int c) );
|
||||
_PROTOTYPE( int do_new_kmess, (message *m) );
|
||||
_PROTOTYPE( int do_diagnostics, (message *m, int safe) );
|
||||
_PROTOTYPE( void log_append, (char *buf, int len) );
|
||||
|
||||
@@ -1150,8 +1150,8 @@ int safe;
|
||||
}
|
||||
cons_putk(0); /* always terminate, even with EFAULT */
|
||||
|
||||
if(m_ptr->m_type != ASYN_DIAGNOSTICS) {
|
||||
m_ptr->m_type = DIAG_REPL;
|
||||
if(m_ptr->m_type != ASYN_DIAGNOSTICS_OLD) {
|
||||
m_ptr->m_type = DIAG_REPL_OLD;
|
||||
m_ptr->REP_STATUS = result;
|
||||
send(m_ptr->m_source, m_ptr);
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ PUBLIC int main(void)
|
||||
if (sigismember(&sigset, SIGKMESS)) do_new_kmess(&tty_mess);
|
||||
continue;
|
||||
}
|
||||
case DIAGNOSTICS: /* a server wants to print some */
|
||||
case DIAGNOSTICS_OLD: /* a server wants to print some */
|
||||
#if 0
|
||||
if (tty_mess.m_source != LOG_PROC_NR)
|
||||
{
|
||||
@@ -225,8 +225,8 @@ PUBLIC int main(void)
|
||||
#endif
|
||||
do_diagnostics(&tty_mess, 0);
|
||||
continue;
|
||||
case DIAGNOSTICS_S:
|
||||
case ASYN_DIAGNOSTICS:
|
||||
case DIAGNOSTICS_S_OLD:
|
||||
case ASYN_DIAGNOSTICS_OLD:
|
||||
do_diagnostics(&tty_mess, 1);
|
||||
continue;
|
||||
case GET_KMESS:
|
||||
|
||||
Reference in New Issue
Block a user