From owner-freebsd-current Wed Oct 9 2: 9:30 2002 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFE1F37B401; Wed, 9 Oct 2002 02:09:23 -0700 (PDT) Received: from vbook.express.ru (asplinux.ru [195.133.213.194]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3D7E43E3B; Wed, 9 Oct 2002 02:09:22 -0700 (PDT) (envelope-from vova@express.ru) Received: from vova by vbook.express.ru with local (Exim 3.36 #1) id 17zCqG-0000H6-00; Wed, 09 Oct 2002 13:09:20 +0400 Subject: Re: DDB sysctl function From: "Vladimir B. " Grebenschikov To: "Vladimir B. " Grebenschikov Cc: Maxime Henrion , freebsd-current@freebsd.org In-Reply-To: <1034110999.1146.3.camel@vbook.express.ru> References: <1034097697.1548.2.camel@vbook.express.ru> <20021008182532.GM57622@elvis.mu.org> <1034110999.1146.3.camel@vbook.express.ru> Content-Type: multipart/mixed; boundary="=-go0q3/WdXuzbpaT+zG9O" X-Mailer: Ximian Evolution 1.0.7 Date: 09 Oct 2002 13:09:20 +0400 Message-Id: <1034154560.900.6.camel@vbook.express.ru> Mime-Version: 1.0 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-go0q3/WdXuzbpaT+zG9O Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: quoted-printable =F7 Wed, 09.10.2002, =D7 01:03, Vladimir B. Grebenschikov =CE=C1=D0=C9=D3= =C1=CC: > =F7 Tue, 08.10.2002, =D7 22:25, Maxime Henrion =CE=C1=D0=C9=D3=C1=CC:=20 > > Vladimir B. Grebenschikov wrote: > > > Hi=20 > > >=20 > > > Attached diff introduces new ddb interface - access to sysctl interfa= ce=20 > > [...] > >=20 > > Looks like this would be very useful. I have a few comments, mainly > > about style though. >=20 > Attached fixed patch=20 sorry, I have attached wong file=20 =20 > > - There is a TOK_STRING_SIZE macro which defines the size of the the > > db_tok_string variable. Use it instead of declaring several 1k > > variables on the stack. >=20 > It is not token buffers - it is buffers for sysctl data interchange, > const 1024 changed to SYSCTL_DATA_BUFSIZE define.=20 >=20 > > - I'm not sure if using the context of the init process to do sysctl > > calls is the right way to go. However, it is not very clear what you > > should use to do this, at least to me. >=20 > kernel_sysctl need thread pointer, it may be used in sysctl handlers.=20 >=20 > > - You remove the "static" keyword for the db_examine() function to make > > it available in your code; that's OK, but you should then put the > > prototype in some header and not duplicate it in your code. > > - Don't use the __P() macro, it is deprecated now and shouldn't be adde= d > > in new code. > > - Use the /usr/share/examples/etc/bsd-style-copyright file to put a > > proper copyright in your new files. There is room for your name and > > the date there. > > - Wrap lines at 80 characters. :-) >=20 > fixed >=20 > > Cheers, > > Maxime --=20 Vladimir B. Grebenschikov vova@sw.ru, SWsoft, Inc. --=-go0q3/WdXuzbpaT+zG9O Content-Disposition: attachment; filename=ddb_sysctl.diff Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=ddb_sysctl.diff; charset=KOI8-R Index: ddb/db_command.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /ext/ncvs/src/sys/ddb/db_command.c,v retrieving revision 1.46 diff -u -r1.46 db_command.c --- ddb/db_command.c 1 Oct 2002 21:59:46 -0000 1.46 +++ ddb/db_command.c 8 Oct 2002 19:53:05 -0000 @@ -422,6 +422,8 @@ { "gdb", db_gdb, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, + { "sysctl", db_sysctl_cmd, CS_OWN, 0 }, + { "sysctlw", db_sysctlw_cmd, CS_OWN, 0 }, { (char *)0, } }; =20 Index: ddb/db_examine.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /ext/ncvs/src/sys/ddb/db_examine.c,v retrieving revision 1.29 diff -u -r1.29 db_examine.c --- ddb/db_examine.c 25 Jun 2002 15:59:24 -0000 1.29 +++ ddb/db_examine.c 8 Oct 2002 20:10:10 -0000 @@ -44,7 +44,6 @@ =20 static char db_examine_format[TOK_STRING_SIZE] =3D "x"; =20 -static void db_examine(db_addr_t, char *, int); static void db_search(db_addr_t, int, db_expr_t, db_expr_t, u_int); =20 /* @@ -67,7 +66,7 @@ db_examine((db_addr_t) addr, db_examine_format, count); } =20 -static void +void db_examine(addr, fmt, count) register db_addr_t addr; Index: ddb/db_sysctl_cmd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: ddb/db_sysctl_cmd.c diff -N ddb/db_sysctl_cmd.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ddb/db_sysctl_cmd.c 8 Oct 2002 20:13:05 -0000 @@ -0,0 +1,135 @@ +/*- + * Copyright (c) 2002 Potatin Mike + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURP= OSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENT= IAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STR= ICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY W= AY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: $ + */ + +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include + +#define SYSCTL_DATA_BUFSIZE 256 + +void +db_sysctlw_cmd(d1, d2, d3, d4) + db_expr_t d1; + boolean_t d2; + db_expr_t d3; + char * d4; +{ + int t; + int pcount; + int mib[128]; + size_t ret =3D 0; + size_t readcount =3D SYSCTL_DATA_BUFSIZE; + size_t wsize; + char wbuf[SYSCTL_DATA_BUFSIZE]; + char buf[SYSCTL_DATA_BUFSIZE]; + int err; + + pcount =3D 0; + while((t =3D db_read_token()) =3D=3D tNUMBER) { + mib[pcount] =3D db_tok_number; + pcount++; + if((t =3D db_read_token()) !=3D tDOT) { + break; + } + } + + switch (t) { + case tIDENT: + strcpy(wbuf, db_tok_string); + wsize =3D strlen(wbuf); + break; + case tNUMBER: + *(int*)wbuf =3D db_tok_number; + wsize =3D sizeof(int); + break; + default: + db_printf("no ident\n"); + db_flush_lex(); + return; + } + + db_skip_to_eol(); + + if(((err =3D kernel_sysctl( + FIRST_THREAD_IN_PROC(initproc),=20 + mib, pcount, buf, &readcount,=20 + wbuf, wsize, &ret))) =3D=3D 0) { + db_examine((db_addr_t) buf, "x", ret/sizeof(int)); + } else { + db_printf("sysctl error %d %d\n", err, ret); + } +} + +void +db_sysctl_cmd(d1, d2, d3, d4) + db_expr_t d1; + boolean_t d2; + db_expr_t d3; + char * d4; +{ + int t; + int pcount; + int mib[128]; + size_t ret =3D 0; + size_t readcount =3D SYSCTL_DATA_BUFSIZE; + char buf[SYSCTL_DATA_BUFSIZE]; + int err; + char modif[16]=3D"x"; + + pcount =3D 0; + while((t =3D db_read_token()) =3D=3D tNUMBER) { + mib[pcount] =3D db_tok_number; + pcount++; + if((t =3D db_read_token()) !=3D tDOT) + break; + } + + if(t =3D=3D tIDENT) + strncpy(modif, db_tok_string, 15); +=09 + db_skip_to_eol(); + + if(((err =3D kernel_sysctl( + FIRST_THREAD_IN_PROC(initproc),=20 + mib, pcount, buf,=20 + &readcount, NULL, 0, &ret))) =3D=3D 0) { + db_examine((db_addr_t) buf, modif, ret/sizeof(int)); + } else { + db_printf("sysctl error %d %d\n", err, ret); + } +} Index: ddb/ddb.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /ext/ncvs/src/sys/ddb/ddb.h,v retrieving revision 1.30 diff -u -r1.30 ddb.h --- ddb/ddb.h 21 Sep 2002 17:29:36 -0000 1.30 +++ ddb/ddb.h 8 Oct 2002 20:09:28 -0000 @@ -84,6 +84,7 @@ db_addr_t db_disasm(db_addr_t loc, boolean_t altfmt); /* instruction disassembler */ void db_error(const char *s); +void db_examine(db_addr_t, char *, int); int db_expression(db_expr_t *valuep); int db_get_variable(db_expr_t *valuep); void db_iprintf(const char *,...) __printflike(1, 2); @@ -125,6 +126,8 @@ db_cmdfcn_t db_trace_until_matching_cmd; db_cmdfcn_t db_watchpoint_cmd; db_cmdfcn_t db_write_cmd; +db_cmdfcn_t db_sysctl_cmd; +db_cmdfcn_t db_sysctlw_cmd; =20 #if 0 db_cmdfcn_t db_help_cmd; Index: conf/files =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /ext/ncvs/src/sys/conf/files,v retrieving revision 1.713 diff -u -r1.713 files --- conf/files 5 Oct 2002 16:35:26 -0000 1.713 +++ conf/files 8 Oct 2002 19:53:05 -0000 @@ -218,6 +218,7 @@ ddb/db_variables.c optional ddb ddb/db_watch.c optional ddb ddb/db_write_cmd.c optional ddb +ddb/db_sysctl_cmd.c optional ddb dev/aac/aac.c optional aac dev/aac/aac_debug.c optional aac dev/aac/aac_disk.c optional aac --=-go0q3/WdXuzbpaT+zG9O-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message