From: Jorrit Herder Date: Fri, 22 Jul 2005 11:05:56 +0000 (+0000) Subject: Functionality moved from IS to LOG driver. X-Git-Tag: v3.1.0~571 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.host.html?a=commitdiff_plain;h=b9b334c38c8d2a2b85fac850c189089f8042ac62;p=minix.git Functionality moved from IS to LOG driver. --- diff --git a/servers/is/diag.c b/servers/is/diag.c deleted file mode 100644 index f0ccf6708..000000000 --- a/servers/is/diag.c +++ /dev/null @@ -1,173 +0,0 @@ - -#include -#include - -#include "is.h" -#include "../../kernel/const.h" -#include "../../kernel/config.h" -#include "../../kernel/type.h" - -/*==========================================================================* - * log_message * - *==========================================================================*/ -PRIVATE void log_message(char *buf) -{ -#if ENABLE_LOG - message m; - - m.m_type = DIAGNOSTICS; - m.DIAG_PRINT_BUF = buf; - m.DIAG_BUF_COUNT = strlen(buf); - - _sendrec(LOG_PROC_NR, &m); -#endif -} - - -/*==========================================================================* - * do_new_kmess * - *==========================================================================*/ -PUBLIC int do_new_kmess(m) -message *m; /* notification message */ -{ -/* Notification for a new kernel message. */ - struct kmessages kmess; /* entire kmess structure */ - char print_buf[KMESS_BUF_SIZE]; /* copy new message here */ - static int prev_next = 0; - int size, next; - int bytes; - int i, r; - - /* Try to get a fresh copy of the buffer with kernel messages. */ - if ((r=sys_getkmessages(&kmess)) != OK) { - report("IS","couldn't get copy of kmessages", r); - return; - } - - /* Print only the new part. Determine how many new bytes there are with - * help of the current and previous 'next' index. Note that the kernel - * buffer is circular. This works fine if less then KMESS_BUF_SIZE bytes - * is new data; else we miss % KMESS_BUF_SIZE here. - * Check for size being positive, the buffer might as well be emptied! - */ - if (kmess.km_size > 0) { - bytes = ((kmess.km_next + KMESS_BUF_SIZE) - prev_next) % KMESS_BUF_SIZE; - r=prev_next; /* start at previous old */ - i=0; - while (bytes > 0) { - print_buf[i] = kmess.km_buf[(r%KMESS_BUF_SIZE)]; - diag_putc( kmess.km_buf[(r%KMESS_BUF_SIZE)] ); - bytes --; - r ++; - i ++; - } - /* Now terminate the new message and print it. */ - print_buf[i] = 0; - printf(print_buf); - - /* Also send message to log device. */ - log_message(print_buf); - } - - /* Almost done, store 'next' so that we can determine what part of the - * kernel messages buffer to print next time a notification arrives. - */ - prev_next = next; - return EDONTREPLY; -} - - -/*===========================================================================* - * do_diagnostics * - *===========================================================================*/ -PUBLIC int do_diagnostics(message *m) -{ -/* The IS server handles all diagnostic messages from servers and device - * drivers. It forwards the message to the TTY driver to display it to the - * user. It also saves a copy in a local buffer so that messages can be - * reviewed at a later time. - */ - int result; - int proc_nr; - vir_bytes src; - int count; - char c; - int i = 0; - static char diagbuf[1024]; - - /* Forward the message to the TTY driver. Inform the TTY driver about the - * original sender, so that it knows where the buffer to be printed is. - * The message type, DIAGNOSTICS, remains the same. - */ - if ((proc_nr = m->DIAG_PROC_NR) == SELF) - m->DIAG_PROC_NR = proc_nr = m->m_source; - result = _sendrec(TTY, m); - - /* Now also make a copy for the private buffer at the IS server, so - * that the messages can be reviewed at a later time. - */ - src = (vir_bytes) m->DIAG_PRINT_BUF; - count = m->DIAG_BUF_COUNT; - while (count > 0) { - if (sys_datacopy(proc_nr, src, SELF, (vir_bytes) &c, 1) != OK) - break; /* stop copying on error */ - diag_putc(c); /* accumulate character */ - src ++; - count --; - diagbuf[i++] = c; - if(i == sizeof(diagbuf) - 1) { - diagbuf[i] = '\0'; - log_message(diagbuf); - i = 0; - } - } - - if(i > 0) { - /* This is safe; above code ensures i doesn't exceed upper bound. */ - diagbuf[i] = '\0'; - log_message(diagbuf); - } - - return result; -} - - -/*===========================================================================* - * diag_putc * - *===========================================================================*/ -PUBLIC void diag_putc(c) -int c; /* char to be added to diag buffer */ -{ - diag_buf[diag_next] = c; - diag_next = (diag_next + 1) % DIAG_BUF_SIZE; - if (diag_size < DIAG_BUF_SIZE) - diag_size += 1; -} - - -/*===========================================================================* - * diagnostics_dmp * - *===========================================================================*/ -PUBLIC void diagnostics_dmp() -{ - char print_buf[DIAG_BUF_SIZE+1]; /* buffer used to print */ - int start; /* calculate start of messages */ - int size, r; - - /* Reprint all diagnostic messages. First determine start and copy the - * buffer into a print-buffer. This is done because the messages in the - * copy may wrap (the buffer is circular). - */ - start = ((diag_next + DIAG_BUF_SIZE) - diag_size) % DIAG_BUF_SIZE; - r = 0; - size = diag_size; - while (size > 0) { - print_buf[r] = diag_buf[(start+r) % DIAG_BUF_SIZE]; - r ++; - size --; - } - print_buf[r] = 0; /* make sure it terminates */ - printf("Dump of diagnostics from device drivers and servers.\n\n"); - printf(print_buf); /* print the messages */ -} - diff --git a/servers/is/kputc.c b/servers/is/kputc.c deleted file mode 100644 index 180ab1afd..000000000 --- a/servers/is/kputc.c +++ /dev/null @@ -1,35 +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 IS server cannot use the regular putk() since we do not want to over- - * write kernel messages with the output of the IS. Hence, it uses a special - * putk that directly sends to the TTY task. - */ - -#include "is.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 = print_buf; - m.DIAG_PROC_NR = SELF; - m.m_type = DIAGNOSTICS; /* request TTY to output this buffer */ - _sendrec(TTY, &m); /* if it fails, we cannot do better */ - buf_count = 0; /* clear buffer for next batch */ - } - if (c != 0) { - print_buf[buf_count++] = c; - } -} -