Index: trunk/minix/servers/is/.depend =================================================================== --- trunk/minix/servers/is/.depend (revision 9) +++ (revision ) @@ -1,212 +1,0 @@ - -dmp.o: /usr/include/ansi.h -dmp.o: /usr/include/errno.h -dmp.o: /usr/include/limits.h -dmp.o: /usr/include/minix/bitmap.h -dmp.o: /usr/include/minix/callnr.h -dmp.o: /usr/include/minix/com.h -dmp.o: /usr/include/minix/config.h -dmp.o: /usr/include/minix/const.h -dmp.o: /usr/include/minix/devio.h -dmp.o: /usr/include/minix/ipc.h -dmp.o: /usr/include/minix/keymap.h -dmp.o: /usr/include/minix/sys_config.h -dmp.o: /usr/include/minix/syslib.h -dmp.o: /usr/include/minix/sysutil.h -dmp.o: /usr/include/minix/type.h -dmp.o: /usr/include/signal.h -dmp.o: /usr/include/stdio.h -dmp.o: /usr/include/stdlib.h -dmp.o: /usr/include/string.h -dmp.o: /usr/include/sys/dir.h -dmp.o: /usr/include/sys/types.h -dmp.o: /usr/include/unistd.h -dmp.o: dmp.c -dmp.o: glo.h -dmp.o: inc.h -dmp.o: proto.h - -dmp_ds.o: ../ds/store.h -dmp_ds.o: /usr/include/ansi.h -dmp_ds.o: /usr/include/errno.h -dmp_ds.o: /usr/include/limits.h -dmp_ds.o: /usr/include/minix/bitmap.h -dmp_ds.o: /usr/include/minix/callnr.h -dmp_ds.o: /usr/include/minix/com.h -dmp_ds.o: /usr/include/minix/config.h -dmp_ds.o: /usr/include/minix/const.h -dmp_ds.o: /usr/include/minix/devio.h -dmp_ds.o: /usr/include/minix/ipc.h -dmp_ds.o: /usr/include/minix/keymap.h -dmp_ds.o: /usr/include/minix/sys_config.h -dmp_ds.o: /usr/include/minix/syslib.h -dmp_ds.o: /usr/include/minix/sysutil.h -dmp_ds.o: /usr/include/minix/type.h -dmp_ds.o: /usr/include/signal.h -dmp_ds.o: /usr/include/stdio.h -dmp_ds.o: /usr/include/stdlib.h -dmp_ds.o: /usr/include/string.h -dmp_ds.o: /usr/include/sys/dir.h -dmp_ds.o: /usr/include/sys/types.h -dmp_ds.o: /usr/include/unistd.h -dmp_ds.o: dmp_ds.c -dmp_ds.o: glo.h -dmp_ds.o: inc.h -dmp_ds.o: proto.h - -dmp_fs.o: ../fs/const.h -dmp_fs.o: ../fs/fproc.h -dmp_fs.o: /usr/include/ansi.h -dmp_fs.o: /usr/include/errno.h -dmp_fs.o: /usr/include/limits.h -dmp_fs.o: /usr/include/minix/bitmap.h -dmp_fs.o: /usr/include/minix/callnr.h -dmp_fs.o: /usr/include/minix/com.h -dmp_fs.o: /usr/include/minix/config.h -dmp_fs.o: /usr/include/minix/const.h -dmp_fs.o: /usr/include/minix/devio.h -dmp_fs.o: /usr/include/minix/dmap.h -dmp_fs.o: /usr/include/minix/ipc.h -dmp_fs.o: /usr/include/minix/keymap.h -dmp_fs.o: /usr/include/minix/sys_config.h -dmp_fs.o: /usr/include/minix/syslib.h -dmp_fs.o: /usr/include/minix/sysutil.h -dmp_fs.o: /usr/include/minix/type.h -dmp_fs.o: /usr/include/signal.h -dmp_fs.o: /usr/include/stdio.h -dmp_fs.o: /usr/include/stdlib.h -dmp_fs.o: /usr/include/string.h -dmp_fs.o: /usr/include/sys/dir.h -dmp_fs.o: /usr/include/sys/select.h -dmp_fs.o: /usr/include/sys/time.h -dmp_fs.o: /usr/include/sys/types.h -dmp_fs.o: /usr/include/unistd.h -dmp_fs.o: dmp_fs.c -dmp_fs.o: glo.h -dmp_fs.o: inc.h -dmp_fs.o: proto.h - -dmp_kernel.o: ../../kernel/config.h -dmp_kernel.o: ../../kernel/const.h -dmp_kernel.o: ../../kernel/debug.h -dmp_kernel.o: ../../kernel/ipc.h -dmp_kernel.o: ../../kernel/priv.h -dmp_kernel.o: ../../kernel/proc.h -dmp_kernel.o: ../../kernel/protect.h -dmp_kernel.o: ../../kernel/type.h -dmp_kernel.o: /usr/include/ansi.h -dmp_kernel.o: /usr/include/errno.h -dmp_kernel.o: /usr/include/ibm/bios.h -dmp_kernel.o: /usr/include/ibm/cpu.h -dmp_kernel.o: /usr/include/ibm/interrupt.h -dmp_kernel.o: /usr/include/ibm/ports.h -dmp_kernel.o: /usr/include/limits.h -dmp_kernel.o: /usr/include/minix/bitmap.h -dmp_kernel.o: /usr/include/minix/callnr.h -dmp_kernel.o: /usr/include/minix/com.h -dmp_kernel.o: /usr/include/minix/config.h -dmp_kernel.o: /usr/include/minix/const.h -dmp_kernel.o: /usr/include/minix/devio.h -dmp_kernel.o: /usr/include/minix/endpoint.h -dmp_kernel.o: /usr/include/minix/ipc.h -dmp_kernel.o: /usr/include/minix/keymap.h -dmp_kernel.o: /usr/include/minix/sys_config.h -dmp_kernel.o: /usr/include/minix/syslib.h -dmp_kernel.o: /usr/include/minix/sysutil.h -dmp_kernel.o: /usr/include/minix/type.h -dmp_kernel.o: /usr/include/signal.h -dmp_kernel.o: /usr/include/stdio.h -dmp_kernel.o: /usr/include/stdlib.h -dmp_kernel.o: /usr/include/string.h -dmp_kernel.o: /usr/include/sys/dir.h -dmp_kernel.o: /usr/include/sys/types.h -dmp_kernel.o: /usr/include/timers.h -dmp_kernel.o: /usr/include/unistd.h -dmp_kernel.o: dmp_kernel.c -dmp_kernel.o: glo.h -dmp_kernel.o: inc.h -dmp_kernel.o: proto.h - -dmp_pm.o: ../pm/mproc.h -dmp_pm.o: /usr/include/ansi.h -dmp_pm.o: /usr/include/errno.h -dmp_pm.o: /usr/include/limits.h -dmp_pm.o: /usr/include/minix/bitmap.h -dmp_pm.o: /usr/include/minix/callnr.h -dmp_pm.o: /usr/include/minix/com.h -dmp_pm.o: /usr/include/minix/config.h -dmp_pm.o: /usr/include/minix/const.h -dmp_pm.o: /usr/include/minix/devio.h -dmp_pm.o: /usr/include/minix/ipc.h -dmp_pm.o: /usr/include/minix/keymap.h -dmp_pm.o: /usr/include/minix/sys_config.h -dmp_pm.o: /usr/include/minix/syslib.h -dmp_pm.o: /usr/include/minix/sysutil.h -dmp_pm.o: /usr/include/minix/type.h -dmp_pm.o: /usr/include/signal.h -dmp_pm.o: /usr/include/stdio.h -dmp_pm.o: /usr/include/stdlib.h -dmp_pm.o: /usr/include/string.h -dmp_pm.o: /usr/include/sys/dir.h -dmp_pm.o: /usr/include/sys/types.h -dmp_pm.o: /usr/include/timers.h -dmp_pm.o: /usr/include/unistd.h -dmp_pm.o: dmp_pm.c -dmp_pm.o: glo.h -dmp_pm.o: inc.h -dmp_pm.o: proto.h - -dmp_rs.o: ../rs/manager.h -dmp_rs.o: /usr/include/ansi.h -dmp_rs.o: /usr/include/errno.h -dmp_rs.o: /usr/include/limits.h -dmp_rs.o: /usr/include/minix/bitmap.h -dmp_rs.o: /usr/include/minix/callnr.h -dmp_rs.o: /usr/include/minix/com.h -dmp_rs.o: /usr/include/minix/config.h -dmp_rs.o: /usr/include/minix/const.h -dmp_rs.o: /usr/include/minix/devio.h -dmp_rs.o: /usr/include/minix/ipc.h -dmp_rs.o: /usr/include/minix/keymap.h -dmp_rs.o: /usr/include/minix/sys_config.h -dmp_rs.o: /usr/include/minix/syslib.h -dmp_rs.o: /usr/include/minix/sysutil.h -dmp_rs.o: /usr/include/minix/type.h -dmp_rs.o: /usr/include/signal.h -dmp_rs.o: /usr/include/stdio.h -dmp_rs.o: /usr/include/stdlib.h -dmp_rs.o: /usr/include/string.h -dmp_rs.o: /usr/include/sys/dir.h -dmp_rs.o: /usr/include/sys/types.h -dmp_rs.o: /usr/include/unistd.h -dmp_rs.o: dmp_rs.c -dmp_rs.o: glo.h -dmp_rs.o: inc.h -dmp_rs.o: proto.h - -main.o: /usr/include/ansi.h -main.o: /usr/include/errno.h -main.o: /usr/include/limits.h -main.o: /usr/include/minix/bitmap.h -main.o: /usr/include/minix/callnr.h -main.o: /usr/include/minix/com.h -main.o: /usr/include/minix/config.h -main.o: /usr/include/minix/const.h -main.o: /usr/include/minix/devio.h -main.o: /usr/include/minix/ipc.h -main.o: /usr/include/minix/keymap.h -main.o: /usr/include/minix/sys_config.h -main.o: /usr/include/minix/syslib.h -main.o: /usr/include/minix/sysutil.h -main.o: /usr/include/minix/type.h -main.o: /usr/include/signal.h -main.o: /usr/include/stdio.h -main.o: /usr/include/stdlib.h -main.o: /usr/include/string.h -main.o: /usr/include/sys/dir.h -main.o: /usr/include/sys/types.h -main.o: /usr/include/unistd.h -main.o: glo.h -main.o: inc.h -main.o: main.c -main.o: proto.h Index: trunk/minix/servers/is/Makefile =================================================================== --- trunk/minix/servers/is/Makefile (revision 9) +++ (revision ) @@ -1,41 +1,0 @@ -# Makefile for Information Server (IS) -SERVER = is - -# directories -u = /usr -i = $u/include -s = $i/sys -m = $i/minix -b = $i/ibm -k = $u/src/kernel -p = $u/src/servers/pm -f = $u/src/servers/fs - -# programs, flags, etc. -CC = exec cc -CFLAGS = -I$i -LDFLAGS = -i -LIBS = -lsys -lsysutil - -OBJ = main.o dmp.o dmp_kernel.o dmp_pm.o dmp_fs.o dmp_rs.o dmp_ds.o - -# build local binary -all build: $(SERVER) -$(SERVER): $(OBJ) - $(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS) -# install -S 256w $@ - -# install with other servers -install: $(SERVER) - install -o root -c $? /sbin/$(SERVER) - -# clean up local files -clean: - rm -f $(SERVER) *.o *.bak - -depend: - /usr/bin/mkdep "$(CC) -E $(CPPFLAGS)" *.c > .depend - -# Include generated dependencies. -include .depend - Index: trunk/minix/servers/is/dmp.c =================================================================== --- trunk/minix/servers/is/dmp.c (revision 9) +++ (revision ) @@ -1,102 +1,0 @@ -/* This file contains information dump procedures. During the initialization - * of the Information Service 'known' function keys are registered at the TTY - * server in order to receive a notification if one is pressed. Here, the - * corresponding dump procedure is called. - * - * The entry points into this file are - * handle_fkey: handle a function key pressed notification - */ - -#include "inc.h" - -/* Define hooks for the debugging dumps. This table maps function keys - * onto a specific dump and provides a description for it. - */ -#define NHOOKS 18 - -struct hook_entry { - int key; - void (*function)(void); - char *name; -} hooks[NHOOKS] = { - { F1, proctab_dmp, "Kernel process table" }, - { F2, memmap_dmp, "Process memory maps" }, - { F3, image_dmp, "System image" }, - { F4, privileges_dmp, "Process privileges" }, - { F5, monparams_dmp, "Boot monitor parameters" }, - { F6, irqtab_dmp, "IRQ hooks and policies" }, - { F7, kmessages_dmp, "Kernel messages" }, - { F9, sched_dmp, "Scheduling queues" }, - { F10, kenv_dmp, "Kernel parameters" }, - { F11, timing_dmp, "Timing details (if enabled)" }, - { SF1, mproc_dmp, "Process manager process table" }, - { SF2, sigaction_dmp, "Signals" }, - { SF3, fproc_dmp, "Filesystem process table" }, - { SF4, dtab_dmp, "Device/Driver mapping" }, - { SF5, mapping_dmp, "Print key mappings" }, - { SF6, rproc_dmp, "Reincarnation server process table" }, - { SF7, holes_dmp, "Memory free list" }, - { SF8, data_store_dmp, "Data store contents" }, -}; - -/*===========================================================================* - * handle_fkey * - *===========================================================================*/ -#define pressed(k) ((F1<=(k)&&(k)<=F12 && bit_isset(m->FKEY_FKEYS,((k)-F1+1)))\ - || (SF1<=(k) && (k)<=SF12 && bit_isset(m->FKEY_SFKEYS, ((k)-SF1+1)))) -PUBLIC int do_fkey_pressed(m) -message *m; /* notification message */ -{ - int s, h; - - /* The notification message does not convey any information, other - * than that some function keys have been pressed. Ask TTY for details. - */ - m->m_type = FKEY_CONTROL; - m->FKEY_REQUEST = FKEY_EVENTS; - if (OK != (s=sendrec(TTY_PROC_NR, m))) - report("IS", "warning, sendrec to TTY failed", s); - - /* Now check which keys were pressed: F1-F12, SF1-SF12. */ - for(h=0; h < NHOOKS; h++) - if(pressed(hooks[h].key)) - hooks[h].function(); - - /* Don't send a reply message. */ - return(EDONTREPLY); -} - -/*===========================================================================* - * key_name * - *===========================================================================*/ -PRIVATE char *key_name(int key) -{ - static char name[15]; - - if(key >= F1 && key <= F12) - sprintf(name, " F%d", key - F1 + 1); - else if(key >= SF1 && key <= SF12) - sprintf(name, "Shift+F%d", key - SF1 + 1); - else - sprintf(name, "?"); - return name; -} - - -/*===========================================================================* - * mapping_dmp * - *===========================================================================*/ -PUBLIC void mapping_dmp(void) -{ - int h; - - printf("Function key mappings for debug dumps in IS server.\n"); - printf(" Key Description\n"); - printf("-------------------------------------"); - printf("------------------------------------\n"); - - for(h=0; h < NHOOKS; h++) - printf(" %10s. %s\n", key_name(hooks[h].key), hooks[h].name); - printf("\n"); -} - Index: trunk/minix/servers/is/dmp_ds.c =================================================================== --- trunk/minix/servers/is/dmp_ds.c (revision 9) +++ (revision ) @@ -1,60 +1,0 @@ -/* This file contains procedures to dump DS data structures. - * - * The entry points into this file are - * data_store_dmp: display DS data store contents - * - * Created: - * Oct 18, 2005: by Jorrit N. Herder - */ - -#include "inc.h" -#include "../ds/store.h" - -PUBLIC struct data_store store[NR_DS_KEYS]; - -FORWARD _PROTOTYPE( char *s_flags_str, (int flags) ); - -/*===========================================================================* - * data_store_dmp * - *===========================================================================*/ -PUBLIC void data_store_dmp() -{ - struct data_store *dsp; - int i,j, n=0; - static int prev_i=0; - - - printf("Data Store (DS) contents dump\n"); - - getsysinfo(DS_PROC_NR, SI_DATA_STORE, store); - - printf("-slot- -key- -flags- -val_l1- -val_l2-\n"); - - for (i=prev_i; ids_flags & DS_IN_USE) continue; - if (++n > 22) break; - printf("%3d %8d %s [%8d] [%8d] \n", - i, dsp->ds_key, - s_flags_str(dsp->ds_flags), - dsp->ds_val_l1, - dsp->ds_val_l2 - ); - } - if (i >= NR_DS_KEYS) i = 0; - else printf("--more--\r"); - prev_i = i; -} - - -PRIVATE char *s_flags_str(int flags) -{ - static char str[5]; - str[0] = (flags & DS_IN_USE) ? 'U' : '-'; - str[1] = (flags & DS_PUBLIC) ? 'P' : '-'; - str[2] = '-'; - str[3] = '\0'; - - return(str); -} - Index: trunk/minix/servers/is/dmp_fs.c =================================================================== --- trunk/minix/servers/is/dmp_fs.c (revision 9) +++ (revision ) @@ -1,82 +1,0 @@ -/* This file contains procedures to dump to FS' data structures. - * - * The entry points into this file are - * dtab_dump: display device <-> driver mappings - * fproc_dump: display FS process table - * - * Created: - * Oct 01, 2004: by Jorrit N. Herder - */ - -#include "inc.h" -#include "../fs/const.h" -#include "../fs/fproc.h" -#include - -PUBLIC struct fproc fproc[NR_PROCS]; -PUBLIC struct dmap dmap[NR_DEVICES]; - -/*===========================================================================* - * fproc_dmp * - *===========================================================================*/ -PUBLIC void fproc_dmp() -{ - struct fproc *fp; - int i, n=0; - static int prev_i; - - getsysinfo(FS_PROC_NR, SI_PROC_TAB, fproc); - - printf("File System (FS) process table dump\n"); - printf("-nr- -pid- -tty- -umask- --uid-- --gid-- -ldr- -sus-rev-proc- -cloexec-\n"); - for (i=prev_i; ifp_pid <= 0) continue; - if (++n > 22) break; - printf("%3d %4d %2d/%d 0x%05x %2d (%d) %2d (%d) %3d %3d %3d %4d 0x%05x\n", - i, fp->fp_pid, - ((fp->fp_tty>>MAJOR)&BYTE), ((fp->fp_tty>>MINOR)&BYTE), - fp->fp_umask, - fp->fp_realuid, fp->fp_effuid, fp->fp_realgid, fp->fp_effgid, - fp->fp_sesldr, - fp->fp_suspended, fp->fp_revived, fp->fp_task, - fp->fp_cloexec - ); - } - if (i >= NR_PROCS) i = 0; - else printf("--more--\r"); - prev_i = i; -} - -/*===========================================================================* - * dmap_flags * - *===========================================================================*/ -PRIVATE char * dmap_flags(int flags) -{ - static char fl[10]; - strcpy(fl, "---"); - if(flags & DMAP_MUTABLE) fl[0] = 'M'; - if(flags & DMAP_BUSY) fl[1] = 'S'; - if(flags & DMAP_BABY) fl[2] = 'B'; - return fl; -} - -/*===========================================================================* - * dtab_dmp * - *===========================================================================*/ -PUBLIC void dtab_dmp() -{ - int i; - - getsysinfo(FS_PROC_NR, SI_DMAP_TAB, dmap); - - printf("File System (FS) device <-> driver mappings\n"); - printf("Major Driver ept Flags\n"); - printf("----- ---------- -----\n"); - for (i=0; i -#include -#include -#include "../../kernel/const.h" -#include "../../kernel/config.h" -#include "../../kernel/debug.h" -#include "../../kernel/type.h" -#include "../../kernel/proc.h" -#include "../../kernel/ipc.h" - -#define click_to_round_k(n) \ - ((unsigned) ((((unsigned long) (n) << CLICK_SHIFT) + 512) / 1024)) - -/* Declare some local dump procedures. */ -FORWARD _PROTOTYPE( char *proc_name, (int proc_nr) ); -FORWARD _PROTOTYPE( char *s_traps_str, (int flags) ); -FORWARD _PROTOTYPE( char *s_flags_str, (int flags) ); -FORWARD _PROTOTYPE( char *p_rts_flags_str, (int flags) ); - -/* Some global data that is shared among several dumping procedures. - * Note that the process table copy has the same name as in the kernel - * so that most macros and definitions from proc.h also apply here. - */ -PUBLIC struct proc proc[NR_TASKS + NR_PROCS]; -PUBLIC struct priv priv[NR_SYS_PROCS]; -PUBLIC struct boot_image image[NR_BOOT_PROCS]; - -/*===========================================================================* - * timing_dmp * - *===========================================================================*/ -PUBLIC void timing_dmp() -{ -#if ! DEBUG_TIME_LOCKS - printf("Enable the DEBUG_TIME_LOCKS definition in src/kernel/config.h\n"); -#else - static struct lock_timingdata timingdata[TIMING_CATEGORIES]; - int r, c, f, skipped = 0, printed = 0, maxlines = 23, x = 0; - static int offsetlines = 0; - - if ((r = sys_getlocktimings(&timingdata[0])) != OK) { - report("IS","warning: couldn't get copy of lock timings", r); - return; - } - - for(c = 0; c < TIMING_CATEGORIES; c++) { - int b; - if (!timingdata[c].lock_timings_range[0] || !timingdata[c].binsize) - continue; - x = printf("%-*s: misses %lu, resets %lu, measurements %lu: ", - TIMING_NAME, timingdata[c].names, - timingdata[c].misses, - timingdata[c].resets, - timingdata[c].measurements); - for(b = 0; b < TIMING_POINTS; b++) { - int w; - if (!timingdata[c].lock_timings[b]) - continue; - x += (w = printf(" %5d: %5d", timingdata[c].lock_timings_range[0] + - b*timingdata[c].binsize, - timingdata[c].lock_timings[b])); - if (x + w >= 80) { printf("\n"); x = 0; } - } - if (x > 0) printf("\n"); - } -#endif -} - -/*===========================================================================* - * kmessages_dmp * - *===========================================================================*/ -PUBLIC void kmessages_dmp() -{ - struct kmessages kmess; /* get copy of kernel messages */ - char print_buf[KMESS_BUF_SIZE+1]; /* this one is used to print */ - int start; /* calculate start of messages */ - int r; - - /* Try to get a copy of the kernel messages. */ - if ((r = sys_getkmessages(&kmess)) != OK) { - report("IS","warning: couldn't get copy of kmessages", r); - return; - } - - /* Try to print the kernel messages. First determine start and copy the - * buffer into a print-buffer. This is done because the messages in the - * copy may wrap (the kernel buffer is circular). - */ - start = ((kmess.km_next + KMESS_BUF_SIZE) - kmess.km_size) % KMESS_BUF_SIZE; - r = 0; - while (kmess.km_size > 0) { - print_buf[r] = kmess.km_buf[(start+r) % KMESS_BUF_SIZE]; - r ++; - kmess.km_size --; - } - print_buf[r] = 0; /* make sure it terminates */ - printf("Dump of all messages generated by the kernel.\n\n"); - printf("%s", print_buf); /* print the messages */ -} - -/*===========================================================================* - * monparams_dmp * - *===========================================================================*/ -PUBLIC void monparams_dmp() -{ - char val[1024]; - char *e; - int r; - - /* Try to get a copy of the boot monitor parameters. */ - if ((r = sys_getmonparams(val, sizeof(val))) != OK) { - report("IS","warning: couldn't get copy of monitor params", r); - return; - } - - /* Append new lines to the result. */ - e = val; - do { - e += strlen(e); - *e++ = '\n'; - } while (*e != 0); - - /* Finally, print the result. */ - printf("Dump of kernel environment strings set by boot monitor.\n"); - printf("\n%s\n", val); -} - -/*===========================================================================* - * irqtab_dmp * - *===========================================================================*/ -PUBLIC void irqtab_dmp() -{ - int i,r; - struct irq_hook irq_hooks[NR_IRQ_HOOKS]; - int irq_actids[NR_IRQ_VECTORS]; - struct irq_hook *e; /* irq tab entry */ - char *irq[] = { - "clock", /* 00 */ - "keyboard", /* 01 */ - "cascade", /* 02 */ - "rs232", /* 03 */ - "rs232", /* 04 */ - "NIC(eth)", /* 05 */ - "floppy", /* 06 */ - "printer", /* 07 */ - "", /* 08 */ - "", /* 09 */ - "", /* 10 */ - "", /* 11 */ - "", /* 12 */ - "", /* 13 */ - "at_wini_0", /* 14 */ - "at_wini_1", /* 15 */ - }; - - if ((r = sys_getirqhooks(irq_hooks)) != OK) { - report("IS","warning: couldn't get copy of irq hooks", r); - return; - } - if ((r = sys_getirqactids(irq_actids)) != OK) { - report("IS","warning: couldn't get copy of irq mask", r); - return; - } - -#if 0 - printf("irq_actids:"); - for (i= 0; iproc_nr_e==NONE) { - printf(" \n"); - continue; - } - printf("%10d ", e->proc_nr_e); - printf(" %9.9s (%02d) ", irq[e->irq], e->irq); - printf(" %s", (e->policy & IRQ_REENABLE) ? "reenable" : " - "); - printf(" %d", e->notify_id); - if (irq_actids[e->irq] & (1 << i)) - printf("masked"); - printf("\n"); - } - printf("\n"); -} - -/*===========================================================================* - * image_dmp * - *===========================================================================*/ -PUBLIC void image_dmp() -{ - int m, i,j,r; - struct boot_image *ip; - static char ipc_to[BITCHUNK_BITS*2]; - - if ((r = sys_getimage(image)) != OK) { - report("IS","warning: couldn't get copy of image table", r); - return; - } - printf("Image table dump showing all processes included in system image.\n"); - printf("---name-- -nr- -flags- -traps- -sq- ----pc- -stack- -ipc_to[0]--------\n"); - for (m=0; mipc_to & (1<proc_name, ip->proc_nr, - s_flags_str(ip->flags), s_traps_str(ip->trap_mask), - ip->priority, (long)ip->initial_pc, ip->stksize, ipc_to); - } - printf("\n"); -} - -/*===========================================================================* - * sched_dmp * - *===========================================================================*/ -PUBLIC void sched_dmp() -{ - struct proc *rdy_head[NR_SCHED_QUEUES]; - struct kinfo kinfo; - register struct proc *rp; - vir_bytes ptr_diff; - int r; - - /* First obtain a scheduling information. */ - if ((r = sys_getschedinfo(proc, rdy_head)) != OK) { - report("IS","warning: couldn't get copy of process table", r); - return; - } - /* Then obtain kernel addresses to correct pointer information. */ - if ((r = sys_getkinfo(&kinfo)) != OK) { - report("IS","warning: couldn't get kernel addresses", r); - return; - } - - /* Update all pointers. Nasty pointer algorithmic ... */ - ptr_diff = (vir_bytes) proc - (vir_bytes) kinfo.proc_addr; - for (r=0;rp_nextready != NIL_PROC) - rp->p_nextready = - (struct proc *)((vir_bytes) rp->p_nextready + ptr_diff); - - /* Now show scheduling queues. */ - printf("Dumping scheduling queues.\n"); - - for (r=0;rp_nr); - rp = rp->p_nextready; - } - printf("\n"); - } - printf("\n"); -} - -/*===========================================================================* - * kenv_dmp * - *===========================================================================*/ -PUBLIC void kenv_dmp() -{ - struct kinfo kinfo; - struct machine machine; - int r; - if ((r = sys_getkinfo(&kinfo)) != OK) { - report("IS","warning: couldn't get copy of kernel info struct", r); - return; - } - if ((r = sys_getmachine(&machine)) != OK) { - report("IS","warning: couldn't get copy of kernel machine struct", r); - return; - } - - printf("Dump of kinfo and machine structures.\n\n"); - printf("Machine structure:\n"); - printf("- pc_at: %3d\n", machine.pc_at); - printf("- ps_mca: %3d\n", machine.ps_mca); - printf("- processor: %3d\n", machine.processor); - printf("- protected: %3d\n", machine.prot); - printf("- vdu_ega: %3d\n", machine.vdu_ega); - printf("- vdu_vga: %3d\n\n", machine.vdu_vga); - printf("Kernel info structure:\n"); - printf("- code_base: %5u\n", kinfo.code_base); - printf("- code_size: %5u\n", kinfo.code_size); - printf("- data_base: %5u\n", kinfo.data_base); - printf("- data_size: %5u\n", kinfo.data_size); - printf("- proc_addr: %5u\n", kinfo.proc_addr); - printf("- kmem_base: %5u\n", kinfo.kmem_base); - printf("- kmem_size: %5u\n", kinfo.kmem_size); - printf("- bootdev_base: %5u\n", kinfo.bootdev_base); - printf("- bootdev_size: %5u\n", kinfo.bootdev_size); - printf("- ramdev_base: %5u\n", kinfo.ramdev_base); - printf("- ramdev_size: %5u\n", kinfo.ramdev_size); - printf("- params_base: %5u\n", kinfo.params_base); - printf("- params_size: %5u\n", kinfo.params_size); - printf("- nr_procs: %3u\n", kinfo.nr_procs); - printf("- nr_tasks: %3u\n", kinfo.nr_tasks); - printf("- release: %.6s\n", kinfo.release); - printf("- version: %.6s\n", kinfo.version); -#if DEBUG_LOCK_CHECK - printf("- relocking: %d\n", kinfo.relocking); -#endif - printf("\n"); -} - -PRIVATE char *s_flags_str(int flags) -{ - static char str[10]; - str[0] = (flags & PREEMPTIBLE) ? 'P' : '-'; - str[1] = '-'; - str[2] = (flags & BILLABLE) ? 'B' : '-'; - str[3] = (flags & SYS_PROC) ? 'S' : '-'; - str[4] = '-'; - str[5] = '\0'; - - return str; -} - -PRIVATE char *s_traps_str(int flags) -{ - static char str[10]; - str[0] = (flags & (1 << ECHO)) ? 'E' : '-'; - str[1] = (flags & (1 << SEND)) ? 'S' : '-'; - str[2] = (flags & (1 << RECEIVE)) ? 'R' : '-'; - str[3] = (flags & (1 << SENDREC)) ? 'B' : '-'; - str[4] = (flags & (1 << NOTIFY)) ? 'N' : '-'; - str[5] = '\0'; - - return str; -} - -/*===========================================================================* - * privileges_dmp * - *===========================================================================*/ -PUBLIC void privileges_dmp() -{ - register struct proc *rp; - static struct proc *oldrp = BEG_PROC_ADDR; - register struct priv *sp; - static char ipc_to[NR_SYS_PROCS + 1 + NR_SYS_PROCS/8]; - int r, i,j, n = 0; - - /* First obtain a fresh copy of the current process and system table. */ - if ((r = sys_getprivtab(priv)) != OK) { - report("IS","warning: couldn't get copy of system privileges table", r); - return; - } - if ((r = sys_getproctab(proc)) != OK) { - report("IS","warning: couldn't get copy of process table", r); - return; - } - - printf("\n--nr-id-name---- -flags- -traps- -ipc_to mask------------------------ \n"); - - for (rp = oldrp; rp < END_PROC_ADDR; rp++) { - if (isemptyp(rp)) continue; - if (++n > 23) break; - if (proc_nr(rp) == IDLE) printf("(%2d) ", proc_nr(rp)); - else if (proc_nr(rp) < 0) printf("[%2d] ", proc_nr(rp)); - else printf(" %2d ", proc_nr(rp)); - r = -1; - for (sp = &priv[0]; sp < &priv[NR_SYS_PROCS]; sp++) - if (sp->s_proc_nr == rp->p_nr) { r ++; break; } - if (r == -1 && ! (rp->p_rts_flags & SLOT_FREE)) { - sp = &priv[USER_PRIV_ID]; - } - printf("(%02u) %-7.7s %s %s ", - sp->s_id, rp->p_name, - s_flags_str(sp->s_flags), s_traps_str(sp->s_trap_mask) - ); - for (i=j=0; i < NR_SYS_PROCS; i++, j++) { - ipc_to[j] = get_sys_bit(sp->s_ipc_to, i) ? '1' : '0'; - if (i % 8 == 7) ipc_to[++j] = ' '; - } - ipc_to[j] = '\0'; - - printf(" %s \n", ipc_to); - } - if (rp == END_PROC_ADDR) rp = BEG_PROC_ADDR; else printf("--more--\r"); - oldrp = rp; - -} - -/*===========================================================================* - * sendmask_dmp * - *===========================================================================*/ -PUBLIC void sendmask_dmp() -{ - register struct proc *rp; - static struct proc *oldrp = BEG_PROC_ADDR; - int r, i,j, n = 0; - - /* First obtain a fresh copy of the current process table. */ - if ((r = sys_getproctab(proc)) != OK) { - report("IS","warning: couldn't get copy of process table", r); - return; - } - - printf("\n\n"); - printf("Sendmask dump for process table. User processes (*) don't have []."); - printf("\n"); - printf("The rows of bits indicate to which processes each process may send."); - printf("\n\n"); - -#if DEAD_CODE - printf(" "); - for (j=proc_nr(BEG_PROC_ADDR); j< INIT_PROC_NR+1; j++) { - printf("%3d", j); - } - printf(" *\n"); - - for (rp = oldrp; rp < END_PROC_ADDR; rp++) { - if (isemptyp(rp)) continue; - if (++n > 20) break; - - printf("%8s ", rp->p_name); - if (proc_nr(rp) == IDLE) printf("(%2d) ", proc_nr(rp)); - else if (proc_nr(rp) < 0) printf("[%2d] ", proc_nr(rp)); - else printf(" %2d ", proc_nr(rp)); - - for (j=proc_nr(BEG_PROC_ADDR); jp_sendmask, j)) printf(" 1 "); - else printf(" 0 "); - } - printf("\n"); - } - if (rp == END_PROC_ADDR) { printf("\n"); rp = BEG_PROC_ADDR; } - else printf("--more--\r"); - oldrp = rp; -#endif -} - -PRIVATE char *p_rts_flags_str(int flags) -{ - static char str[10]; - str[0] = (flags & NO_MAP) ? 'M' : '-'; - str[1] = (flags & SENDING) ? 'S' : '-'; - str[2] = (flags & RECEIVING) ? 'R' : '-'; - str[3] = (flags & SIGNALED) ? 'I' : '-'; - str[4] = (flags & SIG_PENDING) ? 'P' : '-'; - str[5] = (flags & P_STOP) ? 'T' : '-'; - str[6] = '\0'; - - return str; -} - -/*===========================================================================* - * proctab_dmp * - *===========================================================================*/ -#if (CHIP == INTEL) -PUBLIC void proctab_dmp() -{ -/* Proc table dump */ - - register struct proc *rp; - static struct proc *oldrp = BEG_PROC_ADDR; - int r, n = 0; - phys_clicks text, data, size; - - /* First obtain a fresh copy of the current process table. */ - if ((r = sys_getproctab(proc)) != OK) { - report("IS","warning: couldn't get copy of process table", r); - return; - } - - printf("\n-nr-----gen---endpoint--name--- -prior-quant- -user---sys----size-rts flags-\n"); - - for (rp = oldrp; rp < END_PROC_ADDR; rp++) { - if (isemptyp(rp)) continue; - if (++n > 23) break; - text = rp->p_memmap[T].mem_phys; - data = rp->p_memmap[D].mem_phys; - size = rp->p_memmap[T].mem_len - + ((rp->p_memmap[S].mem_phys + rp->p_memmap[S].mem_len) - data); - if (proc_nr(rp) == IDLE) printf("(%2d) ", proc_nr(rp)); - else if (proc_nr(rp) < 0) printf("[%2d] ", proc_nr(rp)); - else printf(" %2d ", proc_nr(rp)); - printf(" %5d %10d ", _ENDPOINT_G(rp->p_endpoint), rp->p_endpoint); - printf(" %-8.8s %02u/%02u %02d/%02u %6lu%6lu %6uK %s", - rp->p_name, - rp->p_priority, rp->p_max_priority, - rp->p_ticks_left, rp->p_quantum_size, - rp->p_user_time, rp->p_sys_time, - click_to_round_k(size), - p_rts_flags_str(rp->p_rts_flags)); - if (rp->p_rts_flags & (SENDING|RECEIVING)) { - printf(" %-7.7s", proc_name(_ENDPOINT_P(rp->p_getfrom_e))); - } - printf("\n"); - } - if (rp == END_PROC_ADDR) rp = BEG_PROC_ADDR; else printf("--more--\r"); - oldrp = rp; -} -#endif /* (CHIP == INTEL) */ - -/*===========================================================================* - * memmap_dmp * - *===========================================================================*/ -PUBLIC void memmap_dmp() -{ - register struct proc *rp; - static struct proc *oldrp = proc; - int r, n = 0; - phys_clicks size; - - /* First obtain a fresh copy of the current process table. */ - if ((r = sys_getproctab(proc)) != OK) { - report("IS","warning: couldn't get copy of process table", r); - return; - } - - printf("\n-nr/name--- --pc-- --sp-- -----text----- -----data----- ----stack----- --size-\n"); - for (rp = oldrp; rp < END_PROC_ADDR; rp++) { - if (isemptyp(rp)) continue; - if (++n > 23) break; - size = rp->p_memmap[T].mem_len - + ((rp->p_memmap[S].mem_phys + rp->p_memmap[S].mem_len) - - rp->p_memmap[D].mem_phys); - printf("%3d %-7.7s%7lx%7lx %4x %4x %4x %4x %4x %4x %4x %4x %4x %5uK\n", - proc_nr(rp), - rp->p_name, - (unsigned long) rp->p_reg.pc, - (unsigned long) rp->p_reg.sp, - rp->p_memmap[T].mem_vir, rp->p_memmap[T].mem_phys, rp->p_memmap[T].mem_len, - rp->p_memmap[D].mem_vir, rp->p_memmap[D].mem_phys, rp->p_memmap[D].mem_len, - rp->p_memmap[S].mem_vir, rp->p_memmap[S].mem_phys, rp->p_memmap[S].mem_len, - click_to_round_k(size)); - } - if (rp == END_PROC_ADDR) rp = proc; - else printf("--more--\r"); - oldrp = rp; -} - -/*===========================================================================* - * proc_name * - *===========================================================================*/ -PRIVATE char *proc_name(proc_nr) -int proc_nr; -{ - if (proc_nr == ANY) return "ANY"; - return cproc_addr(proc_nr)->p_name; -} - Index: trunk/minix/servers/is/dmp_pm.c =================================================================== --- trunk/minix/servers/is/dmp_pm.c (revision 9) +++ (revision ) @@ -1,140 +1,0 @@ -/* This file contains procedures to dump to PM' data structures. - * - * The entry points into this file are - * mproc_dmp: display PM process table - * - * Created: - * May 11, 2005: by Jorrit N. Herder - */ - -#include "inc.h" -#include "../pm/mproc.h" -#include -#include -#include - -PUBLIC struct mproc mproc[NR_PROCS]; - -/*===========================================================================* - * mproc_dmp * - *===========================================================================*/ -PRIVATE char *flags_str(int flags) -{ - static char str[10]; - str[0] = (flags & WAITING) ? 'W' : '-'; - str[1] = (flags & ZOMBIE) ? 'Z' : '-'; - str[2] = (flags & PAUSED) ? 'P' : '-'; - str[3] = (flags & ALARM_ON) ? 'A' : '-'; - str[4] = (flags & TRACED) ? 'T' : '-'; - str[5] = (flags & STOPPED) ? 'S' : '-'; - str[6] = (flags & SIGSUSPENDED) ? 'U' : '-'; - str[7] = (flags & REPLY) ? 'R' : '-'; - str[8] = (flags & ONSWAP) ? 'O' : '-'; - str[9] = (flags & SWAPIN) ? 'I' : '-'; - str[10] = (flags & DONT_SWAP) ? 'D' : '-'; - str[11] = (flags & PRIV_PROC) ? 'P' : '-'; - str[12] = '\0'; - - return str; -} - -PUBLIC void mproc_dmp() -{ - struct mproc *mp; - int i, n=0; - static int prev_i = 0; - - printf("Process manager (PM) process table dump\n"); - - getsysinfo(PM_PROC_NR, SI_PROC_TAB, mproc); - - printf("-process- -nr-prnt- -pid/ppid/grp- -uid--gid- -nice- -flags------\n"); - for (i=prev_i; imp_pid == 0 && i != PM_PROC_NR) continue; - if (++n > 22) break; - printf("%8.8s %4d%4d %4d%4d%4d ", - mp->mp_name, i, mp->mp_parent, mp->mp_pid, mproc[mp->mp_parent].mp_pid, mp->mp_procgrp); - printf("%d(%d) %d(%d) ", - mp->mp_realuid, mp->mp_effuid, mp->mp_realgid, mp->mp_effgid); - printf(" %3d %s ", - mp->mp_nice, flags_str(mp->mp_flags)); - printf("\n"); - } - if (i >= NR_PROCS) i = 0; - else printf("--more--\r"); - prev_i = i; -} - -/*===========================================================================* - * sigaction_dmp * - *===========================================================================*/ -PUBLIC void sigaction_dmp() -{ - struct mproc *mp; - int i, n=0; - static int prev_i = 0; - clock_t uptime; - - printf("Process manager (PM) signal action dump\n"); - - getsysinfo(PM_PROC_NR, SI_PROC_TAB, mproc); - getuptime(&uptime); - - printf("-process- -nr- --ignore- --catch- --block- -tomess-- -pending-- -alarm---\n"); - for (i=prev_i; imp_pid == 0 && i != PM_PROC_NR) continue; - if (++n > 22) break; - printf("%8.8s %3d ", mp->mp_name, i); - printf(" 0x%06x 0x%06x 0x%06x 0x%06x ", - mp->mp_ignore, mp->mp_catch, mp->mp_sigmask, mp->mp_sig2mess); - printf("0x%06x ", mp->mp_sigpending); - if (mp->mp_flags & ALARM_ON) printf("%8u", mp->mp_timer.tmr_exp_time-uptime); - else printf(" -"); - printf("\n"); - } - if (i >= NR_PROCS) i = 0; - else printf("--more--\r"); - prev_i = i; -} - -/*===========================================================================* - * holes_dmp * - *===========================================================================*/ -PUBLIC void holes_dmp(void) -{ - static struct pm_mem_info pmi; - int h; - int largest_bytes = 0, total_bytes = 0; - - if(getsysinfo(PM_PROC_NR, SI_MEM_ALLOC, &pmi) != OK) { - printf("Obtaining memory hole list failed.\n"); - return; - } - printf("Available memory stats\n"); - - for(h = 0; h < _NR_HOLES; h++) { - if(pmi.pmi_holes[h].h_base && pmi.pmi_holes[h].h_len) { - int bytes; - bytes = (pmi.pmi_holes[h].h_len << CLICK_SHIFT); - printf("%08lx: %6d kB\n", - pmi.pmi_holes[h].h_base << CLICK_SHIFT, bytes / 1024); - if(bytes > largest_bytes) largest_bytes = bytes; - total_bytes += bytes; - } - } - printf("\n" - "Total memory free: %7d kB\n" - "Largest chunk: %7d kB\n" - "Uncontiguous rest: %7d kB (%d%% of total free)\n" - "Memory high watermark: %7d kB\n", - total_bytes/1024, - largest_bytes/1024, - (total_bytes-largest_bytes)/1024, - 100*(total_bytes/100-largest_bytes/100)/total_bytes, - (pmi.pmi_hi_watermark/1024 << CLICK_SHIFT)); - - return; -} - Index: trunk/minix/servers/is/dmp_rs.c =================================================================== --- trunk/minix/servers/is/dmp_rs.c (revision 9) +++ (revision ) @@ -1,62 +1,0 @@ -/* This file contains procedures to dump RS data structures. - * - * The entry points into this file are - * rproc_dump: display RS system process table - * - * Created: - * Oct 03, 2005: by Jorrit N. Herder - */ - -#include "inc.h" -#include "../rs/manager.h" - -PUBLIC struct rproc rproc[NR_SYS_PROCS]; - -FORWARD _PROTOTYPE( char *s_flags_str, (int flags) ); - -/*===========================================================================* - * rproc_dmp * - *===========================================================================*/ -PUBLIC void rproc_dmp() -{ - struct rproc *rp; - int i,j, n=0; - static int prev_i=0; - - getsysinfo(RS_PROC_NR, SI_PROC_TAB, rproc); - - printf("Reincarnation Server (RS) system process table dump\n"); - printf("-----proc---pid-flag--dev- -T---checked----alive-starts-backoff-command (argc)-\n"); - for (i=prev_i; ir_flags & RS_IN_USE) continue; - if (++n > 22) break; - printf("%9d %5d %s %3d/%2d %3u %8u %8u %4dx %3d %s (%d)", - rp->r_proc_nr_e, rp->r_pid, - s_flags_str(rp->r_flags), - rp->r_dev_nr, rp->r_dev_style, - rp->r_period, - rp->r_check_tm, rp->r_alive_tm, - rp->r_restarts, rp->r_backoff, - rp->r_cmd, - rp->r_argc - ); - printf("\n"); - } - if (i >= NR_SYS_PROCS) i = 0; - else printf("--more--\r"); - prev_i = i; -} - - -PRIVATE char *s_flags_str(int flags) -{ - static char str[5]; - str[0] = (flags & RS_IN_USE) ? 'U' : '-'; - str[1] = (flags & RS_EXITING) ? 'E' : '-'; - str[2] = '-'; - str[3] = '\0'; - - return(str); -} - Index: trunk/minix/servers/is/glo.h =================================================================== --- trunk/minix/servers/is/glo.h (revision 9) +++ (revision ) @@ -1,18 +1,0 @@ -/* Global variables. */ - -/* Parameters needed to keep diagnostics at IS. */ -#define DIAG_BUF_SIZE 1024 -extern char diag_buf[DIAG_BUF_SIZE]; /* buffer for messages */ -extern int diag_next; /* next index to be written */ -extern int diag_size; /* size of all messages */ - -/* Flag to indicate system-wide panic. */ -extern int sys_panic; /* if set, shutdown can be done */ - -/* The parameters of the call are kept here. */ -extern message m_in; /* the input message itself */ -extern message m_out; /* the output message used for reply */ -extern int who_e; /* caller's proc number */ -extern int callnr; /* system call number */ -extern int dont_reply; /* normally 0; set to 1 to inhibit reply */ - Index: trunk/minix/servers/is/inc.h =================================================================== --- trunk/minix/servers/is/inc.h (revision 9) +++ (revision ) @@ -1,33 +1,0 @@ -/* Header file for the system information server. - * - * Created: - * Jul 13, 2004 by Jorrit N. Herder - */ - -#define _SYSTEM 1 /* get OK and negative error codes */ -#define _MINIX 1 /* tell headers to include MINIX stuff */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "proto.h" -#include "glo.h" - Index: trunk/minix/servers/is/is.h =================================================================== --- trunk/minix/servers/is/is.h (revision 9) +++ (revision ) @@ -1,33 +1,0 @@ -/* Header file for the system information server. - * - * Created: - * Jul 13, 2004 by Jorrit N. Herder - */ - -#define _SYSTEM 1 /* get OK and negative error codes */ -#define _MINIX 1 /* tell headers to include MINIX stuff */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "proto.h" -#include "glo.h" - Index: trunk/minix/servers/is/main.c =================================================================== --- trunk/minix/servers/is/main.c (revision 9) +++ (revision ) @@ -1,173 +1,0 @@ -/* System Information Service. - * This service handles the various debugging dumps, such as the process - * table, so that these no longer directly touch kernel memory. Instead, the - * system task is asked to copy some table in local memory. - * - * Created: - * Apr 29, 2004 by Jorrit N. Herder - */ - -#include "inc.h" - -/* Set debugging level to 0, 1, or 2 to see no, some, all debug output. */ -#define DEBUG_LEVEL 1 -#define DPRINTF if (DEBUG_LEVEL > 0) printf - -/* Allocate space for the global variables. */ -message m_in; /* the input message itself */ -message m_out; /* the output message used for reply */ -int who_e; /* caller's proc number */ -int callnr; /* system call number */ - -extern int errno; /* error number set by system library */ - -/* Declare some local functions. */ -FORWARD _PROTOTYPE(void init_server, (int argc, char **argv) ); -FORWARD _PROTOTYPE(void sig_handler, (void) ); -FORWARD _PROTOTYPE(void exit_server, (void) ); -FORWARD _PROTOTYPE(void get_work, (void) ); -FORWARD _PROTOTYPE(void reply, (int whom, int result) ); - -/*===========================================================================* - * main * - *===========================================================================*/ -PUBLIC int main(int argc, char **argv) -{ -/* This is the main routine of this service. The main loop consists of - * three major activities: getting new work, processing the work, and - * sending the reply. The loop never terminates, unless a panic occurs. - */ - int result; - sigset_t sigset; - - /* Initialize the server, then go to work. */ - init_server(argc, argv); - - /* Main loop - get work and do it, forever. */ - while (TRUE) { - - /* Wait for incoming message, sets 'callnr' and 'who'. */ - get_work(); - - switch (callnr) { - case SYS_SIG: - printf("got SYS_SIG message\n"); - sigset = m_in.NOTIFY_ARG; - for ( result=0; result< _NSIG; result++) { - if (sigismember(&sigset, result)) - printf("signal %d found\n", result); - } - continue; - case PROC_EVENT: - sig_handler(); - continue; - case FKEY_PRESSED: - result = do_fkey_pressed(&m_in); - break; - case DEV_PING: - notify(m_in.m_source); - continue; - default: - report("IS","warning, got illegal request from:", m_in.m_source); - result = EINVAL; - } - - /* Finally send reply message, unless disabled. */ - if (result != EDONTREPLY) { - reply(who_e, result); - } - } - return(OK); /* shouldn't come here */ -} - -/*===========================================================================* - * init_server * - *===========================================================================*/ -PRIVATE void init_server(int argc, char **argv) -{ -/* Initialize the information service. */ - int fkeys, sfkeys; - int i, s; - struct sigaction sigact; - - /* Install signal handler. Ask PM to transform signal into message. */ - sigact.sa_handler = SIG_MESS; - sigact.sa_mask = ~0; /* block all other signals */ - sigact.sa_flags = 0; /* default behaviour */ - if (sigaction(SIGTERM, &sigact, NULL) < 0) - report("IS","warning, sigaction() failed", errno); - - /* Set key mappings. IS takes all of F1-F12 and Shift+F1-F6. */ - fkeys = sfkeys = 0; - for (i=1; i<=12; i++) bit_set(fkeys, i); - for (i=1; i<= 8; i++) bit_set(sfkeys, i); - if ((s=fkey_map(&fkeys, &sfkeys)) != OK) - report("IS", "warning, fkey_map failed:", s); -} - -/*===========================================================================* - * sig_handler * - *===========================================================================*/ -PRIVATE void sig_handler() -{ - sigset_t sigset; - int sig; - - /* Try to obtain signal set from PM. */ - if (getsigset(&sigset) != 0) return; - - /* Check for known signals. */ - if (sigismember(&sigset, SIGTERM)) { - exit_server(); - } -} - -/*===========================================================================* - * exit_server * - *===========================================================================*/ -PRIVATE void exit_server() -{ -/* Shut down the information service. */ - int fkeys, sfkeys; - int i,s; - - /* Release the function key mappings requested in init_server(). - * IS took all of F1-F12 and Shift+F1-F6. - */ - fkeys = sfkeys = 0; - for (i=1; i<=12; i++) bit_set(fkeys, i); - for (i=1; i<= 7; i++) bit_set(sfkeys, i); - if ((s=fkey_unmap(&fkeys, &sfkeys)) != OK) - report("IS", "warning, unfkey_map failed:", s); - - /* Done. Now exit. */ - exit(0); -} - -/*===========================================================================* - * get_work * - *===========================================================================*/ -PRIVATE void get_work() -{ - int status = 0; - status = receive(ANY, &m_in); /* this blocks until message arrives */ - if (OK != status) - panic("IS","failed to receive message!", status); - who_e = m_in.m_source; /* message arrived! set sender */ - callnr = m_in.m_type; /* set function call number */ -} - -/*===========================================================================* - * reply * - *===========================================================================*/ -PRIVATE void reply(who, result) -int who; /* destination */ -int result; /* report result to replyee */ -{ - int send_status; - m_out.m_type = result; /* build reply message */ - send_status = send(who, &m_out); /* send the message */ - if (OK != send_status) - panic("IS", "unable to send reply!", send_status); -} - Index: trunk/minix/servers/is/proto.h =================================================================== --- trunk/minix/servers/is/proto.h (revision 9) +++ (revision ) @@ -1,36 +1,0 @@ -/* Function prototypes. */ - -/* main.c */ -_PROTOTYPE( int main, (int argc, char **argv) ); - -/* dmp.c */ -_PROTOTYPE( int do_fkey_pressed, (message *m) ); -_PROTOTYPE( void mapping_dmp, (void) ); - -/* dmp_kernel.c */ -_PROTOTYPE( void proctab_dmp, (void) ); -_PROTOTYPE( void memmap_dmp, (void) ); -_PROTOTYPE( void privileges_dmp, (void) ); -_PROTOTYPE( void sendmask_dmp, (void) ); -_PROTOTYPE( void image_dmp, (void) ); -_PROTOTYPE( void irqtab_dmp, (void) ); -_PROTOTYPE( void kmessages_dmp, (void) ); -_PROTOTYPE( void sched_dmp, (void) ); -_PROTOTYPE( void monparams_dmp, (void) ); -_PROTOTYPE( void kenv_dmp, (void) ); -_PROTOTYPE( void timing_dmp, (void) ); - -/* dmp_pm.c */ -_PROTOTYPE( void mproc_dmp, (void) ); -_PROTOTYPE( void sigaction_dmp, (void) ); -_PROTOTYPE( void holes_dmp, (void) ); - -/* dmp_fs.c */ -_PROTOTYPE( void dtab_dmp, (void) ); -_PROTOTYPE( void fproc_dmp, (void) ); - -/* dmp_rs.c */ -_PROTOTYPE( void rproc_dmp, (void) ); - -/* dmp_ds.c */ -_PROTOTYPE( void data_store_dmp, (void) );