From owner-p4-projects@FreeBSD.ORG Sat May 1 14:54:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6110A16A4D0; Sat, 1 May 2004 14:54:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F08716A4CE for ; Sat, 1 May 2004 14:54:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 057C843D1F for ; Sat, 1 May 2004 14:54:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i41LscGe031175 for ; Sat, 1 May 2004 14:54:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i41Lscd6031172 for perforce@freebsd.org; Sat, 1 May 2004 14:54:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 1 May 2004 14:54:38 -0700 (PDT) Message-Id: <200405012154.i41Lscd6031172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 52048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2004 21:54:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=52048 Change 52048 by marcel@marcel_nfs on 2004/05/01 14:54:36 Add 3 sysctls: debug.kdb.available - this lists the availably KDB backends (RO). debug.kdb.current - the current backend (RW). debug.kdb.enter - enter KDB when written to. These sysctls replace debug.enter_debugger. Affected files ... .. //depot/projects/gdb/sys/kern/subr_kdb.c#11 edit Differences ... ==== //depot/projects/gdb/sys/kern/subr_kdb.c#11 (text+ko) ==== @@ -31,9 +31,11 @@ #include #include #include +#include #include #include #include +#include #include @@ -46,6 +48,94 @@ KDB_BACKEND(null, NULL, NULL, NULL); SET_DECLARE(kdb_dbbe_set, struct kdb_dbbe); +static int kdb_sysctl_available(SYSCTL_HANDLER_ARGS); +static int kdb_sysctl_current(SYSCTL_HANDLER_ARGS); +static int kdb_sysctl_enter(SYSCTL_HANDLER_ARGS); + +SYSCTL_NODE(_debug, OID_AUTO, kdb, CTLFLAG_RW, NULL, "KDB nodes"); + +SYSCTL_PROC(_debug_kdb, OID_AUTO, available, CTLTYPE_STRING | CTLFLAG_RD, 0, 0, + kdb_sysctl_available, "A", "list of available KDB backends"); + +SYSCTL_PROC(_debug_kdb, OID_AUTO, current, CTLTYPE_STRING | CTLFLAG_RW, 0, 0, + kdb_sysctl_current, "A", "currently selected KDB backend"); + +SYSCTL_PROC(_debug_kdb, OID_AUTO, enter, CTLTYPE_INT | CTLFLAG_RW, 0, 0, + kdb_sysctl_enter, "I", "set to enter the debugger"); + +static int +kdb_sysctl_available(SYSCTL_HANDLER_ARGS) +{ + struct kdb_dbbe *be, **iter; + char *avail, *p; + ssize_t len, sz; + int error; + + sz = 0; + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + if (be->dbbe_active == 0) + sz += strlen(be->dbbe_name) + 1; + } + sz++; + avail = malloc(sz, M_TEMP, M_WAITOK); + p = avail; + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + if (be->dbbe_active == 0) { + len = snprintf(p, sz, "%s ", be->dbbe_name); + p += len; + sz -= len; + } + } + KASSERT(sz >= 0, ("%s", __func__)); + error = sysctl_handle_string(oidp, avail, 0, req); + free(avail, M_TEMP); + return (error); +} + +static int +kdb_sysctl_current(SYSCTL_HANDLER_ARGS) +{ + char buf[16]; + struct kdb_dbbe *be, **iter; + int error; + + strncpy(buf, kdb_dbbe->dbbe_name, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + error = sysctl_handle_string(oidp, buf, sizeof(buf), req); + if (error != 0 || req->newptr == NULL) + return (error); + if (kdb_active) + return (EBUSY); + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + if (be->dbbe_active == 0 && strcmp(be->dbbe_name, buf) == 0) { + kdb_dbbe = be; + return (0); + } + } + return (EINVAL); +} + +static int +kdb_sysctl_enter(SYSCTL_HANDLER_ARGS) +{ + int error, i; + + error = sysctl_wire_old_buffer(req, sizeof(int)); + if (error == 0) { + i = 0; + error = sysctl_handle_int(oidp, &i, 0, req); + } + if (error != 0 || req->newptr == NULL) + return (error); + if (kdb_active) + return (EBUSY); + kdb_enter("sysctl debug.kdb.enter"); + return (0); +} + /* * Solaris implements a new BREAK which is initiated by a character sequence * CR ~ ^b which is similar to a familiar pattern used on Sun servers by the