CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Tue Jul 20 19:44:36 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y externs1.h init.c tree.c Log Message: lint: use consistent naming scheme for functions that build nodes No functional change. To generate a diff of this commit: cvs rdiff -u -r1.329 -r1.330 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.119 -r1.120 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.202 -r1.203 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.317 -r1.318 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/lint1/cgram.y diff -u src/usr.bin/xlint/lint1/cgram.y:1.329 src/usr.bin/xlint/lint1/cgram.y:1.330 --- src/usr.bin/xlint/lint1/cgram.y:1.329 Tue Jul 20 19:35:53 2021 +++ src/usr.bin/xlint/lint1/cgram.y Tue Jul 20 19:44:36 2021 @@ -1,5 +1,5 @@ %{ -/* $NetBSD: cgram.y,v 1.329 2021/07/20 19:35:53 rillig Exp $ */ +/* $NetBSD: cgram.y,v 1.330 2021/07/20 19:44:36 rillig Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -35,7 +35,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: cgram.y,v 1.329 2021/07/20 19:35:53 rillig Exp $"); +__RCSID("$NetBSD: cgram.y,v 1.330 2021/07/20 19:44:36 rillig Exp $"); #endif #include @@ -412,13 +412,13 @@ primary_expression: /* XXX really necessary? */ if (yychar < 0) yychar = yylex(); - $$ = new_name_node(getsym($1), yychar); + $$ = build_name(getsym($1), yychar); } | T_CON { - $$ = expr_new_constant(gettyp($1->v_tspec), $1); + $$ = build_constant(gettyp($1->v_tspec), $1); } | string { - $$ = new_string_node($1); + $$ = build_string($1); } | T_LPAREN expression T_RPAREN { if ($2 != NULL) @@ -473,10 +473,10 @@ postfix_expression: $$ = build_unary(INDIR, build_binary($1, PLUS, $3)); } | postfix_expression T_LPAREN T_RPAREN { - $$ = new_function_call_node($1, NULL); + $$ = build_function_call($1, NULL); } | postfix_expression T_LPAREN argument_expression_list T_RPAREN { - $$ = new_function_call_node($1, $3); + $$ = build_function_call($1, $3); } | postfix_expression point_or_arrow T_NAME { $$ = build_member_access($1, $2, $3); @@ -492,7 +492,7 @@ postfix_expression: if (!Sflag) /* compound literals are a C9X/GCC extension */ gnuism(319); - $$ = new_name_node(*current_initsym(), 0); + $$ = build_name(*current_initsym(), 0); end_initialization(); } | T_LPAREN compound_statement_lbrace gcc_statement_expr_list { @@ -504,7 +504,7 @@ postfix_expression: /* ({ }) is a GCC extension */ gnuism(320); } compound_statement_rbrace T_RPAREN { - $$ = new_name_node(*current_initsym(), 0); + $$ = build_name(*current_initsym(), 0); end_initialization(); } ; @@ -564,10 +564,10 @@ point_or_arrow: /* helper for 'postfix /* K 7.1, C90 ???, C99 6.5.2, C11 6.5.2 */ argument_expression_list: assignment_expression { - $$ = new_function_argument_node(NULL, $1); + $$ = build_function_argument(NULL, $1); } | argument_expression_list T_COMMA assignment_expression { - $$ = new_function_argument_node($1, $3); + $$ = build_function_argument($1, $3); } ; Index: src/usr.bin/xlint/lint1/externs1.h diff -u src/usr.bin/xlint/lint1/externs1.h:1.119 src/usr.bin/xlint/lint1/externs1.h:1.120 --- src/usr.bin/xlint/lint1/externs1.h:1.119 Tue Jul 20 19:35:53 2021 +++ src/usr.bin/xlint/lint1/externs1.h Tue Jul 20 19:44:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: externs1.h,v 1.119 2021/07/20 19:35:53 rillig Exp $ */ +/* $NetBSD: externs1.h,v 1.120 2021/07/20 19:44:36 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -204,9 +204,9 @@ extern int to_int_constant(tnode_t *, bo extern const tnode_t *before_conversion(const tnode_t *); extern type_t *derive_type(type_t *, tspec_t); extern type_t *expr_derive_type(type_t *, tspec_t); -extern tnode_t *expr_new_constant(type_t *, val_t *); -extern tnode_t *new_name_node(sym_t *, int); -extern tnode_t *new_string_node(strg_t *); +extern tnode_t *build_constant(type_t *, val_t *); +extern tnode_t *build_name(sym_t *, int); +extern tnode_t *build_string(strg_t *); extern sym_t *struct_or_union_member(tnode_t *, op_t, sym_t *); extern tnode_t *build_generic_selection(const tnode_t *, struct generic_association *); @@ -224,8 +224,8 @@ extern tnode_t *build_sizeof(const type_ extern tnode_t *build_offsetof(const type_t *, const sym_t *); extern tnode_t *build_alignof(const type_t *); extern tnode_t *cast(tnode_t *, type_t *); -extern tnode_t *new_function_argument_node(tnode_t *, tnode_t *); -extern tnode_t *new_function_call_node(tnode_t *, tnode_t *); +extern tnode_t *build_function_argument(tnode_t *, tnode_t *); +extern tnode_t *build_function_call(tnode_t *, tnode_t *); extern val_t *constant(tnode_t *, bool); extern void expr(tnode_t *, bool, bool, bool,
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Tue Jul 20 19:44:36 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y externs1.h init.c tree.c Log Message: lint: use consistent naming scheme for functions that build nodes No functional change. To generate a diff of this commit: cvs rdiff -u -r1.329 -r1.330 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.119 -r1.120 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.202 -r1.203 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.317 -r1.318 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Tue Jul 20 19:35:53 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y externs1.h func.c init.c tree.c Log Message: lint: split 'build' into build_binary and build_unary No functional change. To generate a diff of this commit: cvs rdiff -u -r1.328 -r1.329 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.118 -r1.119 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.113 -r1.114 src/usr.bin/xlint/lint1/func.c cvs rdiff -u -r1.201 -r1.202 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.316 -r1.317 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/lint1/cgram.y diff -u src/usr.bin/xlint/lint1/cgram.y:1.328 src/usr.bin/xlint/lint1/cgram.y:1.329 --- src/usr.bin/xlint/lint1/cgram.y:1.328 Thu Jul 15 20:05:49 2021 +++ src/usr.bin/xlint/lint1/cgram.y Tue Jul 20 19:35:53 2021 @@ -1,5 +1,5 @@ %{ -/* $NetBSD: cgram.y,v 1.328 2021/07/15 20:05:49 rillig Exp $ */ +/* $NetBSD: cgram.y,v 1.329 2021/07/20 19:35:53 rillig Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -35,7 +35,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: cgram.y,v 1.328 2021/07/15 20:05:49 rillig Exp $"); +__RCSID("$NetBSD: cgram.y,v 1.329 2021/07/20 19:35:53 rillig Exp $"); #endif #include @@ -470,7 +470,7 @@ generic_association: postfix_expression: primary_expression | postfix_expression T_LBRACK expression T_RBRACK { - $$ = build(INDIR, build(PLUS, $1, $3), NULL); + $$ = build_unary(INDIR, build_binary($1, PLUS, $3)); } | postfix_expression T_LPAREN T_RPAREN { $$ = new_function_call_node($1, NULL); @@ -482,7 +482,7 @@ postfix_expression: $$ = build_member_access($1, $2, $3); } | postfix_expression T_INCDEC { - $$ = build($2 == INC ? INCAFT : DECAFT, $1, NULL); + $$ = build_unary($2 == INC ? INCAFT : DECAFT, $1); } | T_LPAREN type_name T_RPAREN { /* C99 6.5.2.5 "Compound literals" */ sym_t *tmp = mktempsym($2); @@ -575,32 +575,32 @@ argument_expression_list: unary_expression: postfix_expression | T_INCDEC unary_expression { - $$ = build($1 == INC ? INCBEF : DECBEF, $2, NULL); + $$ = build_unary($1 == INC ? INCBEF : DECBEF, $2); } | T_AMPER cast_expression { - $$ = build(ADDR, $2, NULL); + $$ = build_unary(ADDR, $2); } | T_ASTERISK cast_expression { - $$ = build(INDIR, $2, NULL); + $$ = build_unary(INDIR, $2); } | T_ADDITIVE cast_expression { if (tflag && $1 == PLUS) { /* unary + is illegal in traditional C */ warning(100); } - $$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL); + $$ = build_unary($1 == PLUS ? UPLUS : UMINUS, $2); } | T_COMPLEMENT cast_expression { - $$ = build(COMPL, $2, NULL); + $$ = build_unary(COMPL, $2); } | T_LOGNOT cast_expression { - $$ = build(NOT, $2, NULL); + $$ = build_unary(NOT, $2); } | T_REAL cast_expression { /* GCC c_parser_unary_expression */ - $$ = build(REAL, $2, NULL); + $$ = build_unary(REAL, $2); } | T_IMAG cast_expression { /* GCC c_parser_unary_expression */ - $$ = build(IMAG, $2, NULL); + $$ = build_unary(IMAG, $2); } | T_EXTENSION cast_expression { /* GCC c_parser_unary_expression */ $$ = $2; @@ -649,41 +649,41 @@ expression_opt: /* K ???, C90 ???, C99 6.5.5 to 6.5.15, C11 6.5.5 to 6.5.15 */ conditional_expression: conditional_expression T_ASTERISK conditional_expression { - $$ = build(MULT, $1, $3); + $$ = build_binary($1, MULT, $3); } | conditional_expression T_MULTIPLICATIVE conditional_expression { - $$ = build($2, $1, $3); + $$ = build_binary($1, $2, $3); } | conditional_expression T_ADDITIVE conditional_expression { - $$ = build($2, $1, $3); + $$ = build_binary($1, $2, $3); } | conditional_expression T_SHIFT conditional_expression { - $$ = build($2, $1, $3); + $$ = build_binary($1, $2, $3); } | conditional_expression T_RELATIONAL conditional_expression { - $$ = build($2, $1, $3); + $$ = build_binary($1, $2, $3); } | conditional_expression T_EQUALITY conditional_expression { - $$ = build($2, $1, $3); + $$ = build_binary($1, $2, $3); } | conditional_expression T_AMPER conditional_expression { - $$ = build(BITAND, $1, $3); + $$ = build_binary($1, BITAND, $3); } | conditional_expression T_BITXOR conditional_expression { - $$ = build(BITXOR, $1, $3); + $$ = build_binary($1, BITXOR, $3); } | conditional_expression T_BITOR conditional_expression { - $$ = build(BITOR, $1, $3); + $$ = build_binary($1, BITOR, $3); } | conditional_expression T_LOGAND conditional_expression { - $$ = build(LOGAND, $1, $3); + $$ = build_binary($1, LOGAND, $3); } | conditional_expression T_LOGOR conditional_expression { - $$ = build(LOGOR, $1, $3); + $$ = build_binary($1, LOGOR, $3); } | conditional_expression T_QUEST
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Tue Jul 20 19:35:53 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y externs1.h func.c init.c tree.c Log Message: lint: split 'build' into build_binary and build_unary No functional change. To generate a diff of this commit: cvs rdiff -u -r1.328 -r1.329 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.118 -r1.119 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.113 -r1.114 src/usr.bin/xlint/lint1/func.c cvs rdiff -u -r1.201 -r1.202 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.316 -r1.317 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded/files
Module Name:src Committed By: rhialto Date: Tue Jul 20 19:31:23 UTC 2021 Modified Files: src/distrib/utils/embedded/files: ec2_init Log Message: Extract just the random bits to feed to /dev/urandom. This makes no difference in the randomness of the pool, but it improves on the estimation (if any) of how many random bits were obtained. Also make the ftp -q time out a bit longer since I got some time outs. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/files/ec2_init Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded/files
Module Name:src Committed By: rhialto Date: Tue Jul 20 19:31:23 UTC 2021 Modified Files: src/distrib/utils/embedded/files: ec2_init Log Message: Extract just the random bits to feed to /dev/urandom. This makes no difference in the randomness of the pool, but it improves on the estimation (if any) of how many random bits were obtained. Also make the ftp -q time out a bit longer since I got some time outs. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/files/ec2_init Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/embedded/files/ec2_init diff -u src/distrib/utils/embedded/files/ec2_init:1.3 src/distrib/utils/embedded/files/ec2_init:1.4 --- src/distrib/utils/embedded/files/ec2_init:1.3 Thu Jul 15 19:03:17 2021 +++ src/distrib/utils/embedded/files/ec2_init Tue Jul 20 19:31:23 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ec2_init,v 1.3 2021/07/15 19:03:17 rhialto Exp $ +# $NetBSD: ec2_init,v 1.4 2021/07/20 19:31:23 rhialto Exp $ # # PROVIDE: ec2_init # REQUIRE: NETWORKING @@ -28,6 +28,11 @@ ec2_newuser() useradd -g users -G wheel,operator -m "${EC2_USER}" } +extract_random_seed() +{ + sed -n -e '/random_seed/s/.*"random_seed": *"\([A-Za-z0-9+/=]*\)".*/\1/p' +} + ec2_init() { ( @@ -38,7 +43,7 @@ ec2_init() try=0 while [ $((try++)) -lt 20 ] do - HOSTNAME=$(ftp -o - -q 1 "${METADATA_URL}${HOSTNAME_URL}") + HOSTNAME=$(ftp -o - -q 2 "${METADATA_URL}${HOSTNAME_URL}") if [ -n "$HOSTNAME" ]; then echo "Setting EC2 hostname: ${HOSTNAME}" echo "$HOSTNAME" > /etc/myname @@ -53,7 +58,7 @@ ec2_init() id "${EC2_USER}" >/dev/null 2>&1 || ec2_newuser # fetch the public key from Amazon Web Services - EC2_SSH_KEY=$(ftp -o - -q 1 "${METADATA_URL}${SSH_KEY_URL}") + EC2_SSH_KEY=$(ftp -o - -q 2 "${METADATA_URL}${SSH_KEY_URL}") if [ -n "$EC2_SSH_KEY" ]; then # A key pair is associated with this instance, add it @@ -71,10 +76,11 @@ ec2_init() fi fi - # May contain a "random_seed". Everything else doesn't matter. - OS_METADATA="$(ftp -o - -q 1 ${OS_METADATA_URL})" + # May contain a "random_seed". + OS_METADATA="$(ftp -o - -q 2 ${OS_METADATA_URL})" if echo "$OS_METADATA" | grep -q random_seed; then - echo "$OS_METADATA" >> /dev/urandom + echo "$OS_METADATA" | extract_random_seed | + base64 -di >> /dev/urandom fi ) }
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: rhialto Date: Tue Jul 20 19:27:51 UTC 2021 Modified Files: src/distrib/amd64/liveimage/emuimage: ec2_init Log Message: Don't override /etc/rc.conf if it sets ec2_init. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/liveimage/emuimage/ec2_init Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: rhialto Date: Tue Jul 20 19:27:51 UTC 2021 Modified Files: src/distrib/amd64/liveimage/emuimage: ec2_init Log Message: Don't override /etc/rc.conf if it sets ec2_init. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/liveimage/emuimage/ec2_init Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/liveimage/emuimage/ec2_init diff -u src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 src/distrib/amd64/liveimage/emuimage/ec2_init:1.4 --- src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 Thu Jul 15 17:20:25 2021 +++ src/distrib/amd64/liveimage/emuimage/ec2_init Tue Jul 20 19:27:51 2021 @@ -1,4 +1,4 @@ -# $NetBSD: ec2_init,v 1.3 2021/07/15 17:20:25 rhialto Exp $ +# $NetBSD: ec2_init,v 1.4 2021/07/20 19:27:51 rhialto Exp $ is_ec2() { val=NO @@ -23,4 +23,9 @@ is_ec2() { printf $val } -ec2_init=$(is_ec2) +# Don't override /etc/rc.conf +if [ -z "$ec2_init" ] +then + ec2_init=$(is_ec2) +fi +
CVS commit: src/usr.bin/xlint/arch/aarch64
Module Name:src Committed By: rillig Date: Tue Jul 20 18:43:06 UTC 2021 Modified Files: src/usr.bin/xlint/arch/aarch64: targparam.h Log Message: lint: make char unsigned on aarch64 This fixes tests msg_074 and msg_076, which previously warned for '\xff': conversion of 'int' to 'char' is out of range [119] The commit from 2014-08-10 that first defined char as signed had the remark "Enough for a distribution build". At that time, there was no unit test for lint1 that would have detected the signedness of char. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/xlint/arch/aarch64/targparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/arch/aarch64/targparam.h diff -u src/usr.bin/xlint/arch/aarch64/targparam.h:1.5 src/usr.bin/xlint/arch/aarch64/targparam.h:1.6 --- src/usr.bin/xlint/arch/aarch64/targparam.h:1.5 Sun Jun 27 08:43:46 2021 +++ src/usr.bin/xlint/arch/aarch64/targparam.h Tue Jul 20 18:43:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: targparam.h,v 1.5 2021/06/27 08:43:46 rillig Exp $ */ +/* $NetBSD: targparam.h,v 1.6 2021/07/20 18:43:06 rillig Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* * Machine-dependent target parameters for lint1. */ -#include "schar.h" +#include "uchar.h" #include "lp64.h" /*
CVS commit: src/usr.bin/xlint/arch/aarch64
Module Name:src Committed By: rillig Date: Tue Jul 20 18:43:06 UTC 2021 Modified Files: src/usr.bin/xlint/arch/aarch64: targparam.h Log Message: lint: make char unsigned on aarch64 This fixes tests msg_074 and msg_076, which previously warned for '\xff': conversion of 'int' to 'char' is out of range [119] The commit from 2014-08-10 that first defined char as signed had the remark "Enough for a distribution build". At that time, there was no unit test for lint1 that would have detected the signedness of char. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/xlint/arch/aarch64/targparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Jul 20 16:41:27 UTC 2021 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: PR 56303: do not borrow from the default swap allocation if we are in tiny ram conditions and will need to enable swap early. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/sysinst/bsddisklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/bsddisklabel.c diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.58 src/usr.sbin/sysinst/bsddisklabel.c:1.59 --- src/usr.sbin/sysinst/bsddisklabel.c:1.58 Sat Feb 13 15:31:35 2021 +++ src/usr.sbin/sysinst/bsddisklabel.c Tue Jul 20 16:41:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: bsddisklabel.c,v 1.58 2021/02/13 15:31:35 martin Exp $ */ +/* $NetBSD: bsddisklabel.c,v 1.59 2021/07/20 16:41:27 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -1153,7 +1153,8 @@ fill_defaults(struct partition_usage_set continue; free_space -= wanted->infos[i].size; } - if (free_space < 0 && swap < wanted->num) { + if (free_space < 0 && swap < wanted->num && + get_ramsize() > TINY_RAM_SIZE) { /* steel from swap partition */ daddr_t d = wanted->infos[swap].size; daddr_t inc = roundup(-free_space, align);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Jul 20 16:41:27 UTC 2021 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: PR 56303: do not borrow from the default swap allocation if we are in tiny ram conditions and will need to enable swap early. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/sysinst/bsddisklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Jul 20 16:40:12 UTC 2021 Modified Files: src/usr.sbin/sysinst: util.c Log Message: RAM size will not change during installation, do the sysctl() dance only once. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/util.c diff -u src/usr.sbin/sysinst/util.c:1.57 src/usr.sbin/sysinst/util.c:1.58 --- src/usr.sbin/sysinst/util.c:1.57 Sun Jan 31 22:45:47 2021 +++ src/usr.sbin/sysinst/util.c Tue Jul 20 16:40:12 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.57 2021/01/31 22:45:47 rillig Exp $ */ +/* $NetBSD: util.c,v 1.58 2021/07/20 16:40:12 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -264,11 +264,14 @@ file_mode_match(const char *path, unsign uint64_t get_ramsize(void) { - uint64_t ramsize; - size_t len = sizeof ramsize; - int mib[2] = {CTL_HW, HW_PHYSMEM64}; + static uint64_t ramsize; - sysctl(mib, 2, , , NULL, 0); + if (ramsize == 0) { + size_t len = sizeof ramsize; + int mib[2] = {CTL_HW, HW_PHYSMEM64}; + + sysctl(mib, 2, , , NULL, 0); + } /* Find out how many Megs ... round up. */ return (ramsize + MEG - 1) / MEG;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Jul 20 16:40:12 UTC 2021 Modified Files: src/usr.sbin/sysinst: util.c Log Message: RAM size will not change during installation, do the sysctl() dance only once. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ddb
Module Name:src Committed By: christos Date: Tue Jul 20 11:39:16 UTC 2021 Modified Files: src/sys/ddb: db_panic.c Log Message: need for COHERENCY_UNIT To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/ddb/db_panic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ddb
Module Name:src Committed By: christos Date: Tue Jul 20 11:39:16 UTC 2021 Modified Files: src/sys/ddb: db_panic.c Log Message: need for COHERENCY_UNIT To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/ddb/db_panic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ddb/db_panic.c diff -u src/sys/ddb/db_panic.c:1.9 src/sys/ddb/db_panic.c:1.10 --- src/sys/ddb/db_panic.c:1.9 Sat Jan 26 21:08:41 2019 +++ src/sys/ddb/db_panic.c Tue Jul 20 07:39:16 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: db_panic.c,v 1.9 2019/01/27 02:08:41 pgoyette Exp $ */ +/* $NetBSD: db_panic.c,v 1.10 2021/07/20 11:39:16 christos Exp $ */ /*- * Copyright (c) 2000, 2002, 2006, 2007, 2009, 2013 The NetBSD Foundation, Inc. @@ -27,8 +27,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_panic.c,v 1.9 2019/01/27 02:08:41 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_panic.c,v 1.10 2021/07/20 11:39:16 christos Exp $"); +#include #include #include
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Tue Jul 20 08:37:20 UTC 2021 Modified Files: src/sys/sys: timevar.h Log Message: no need for extern kmutex_t itimer_mutex or #include here. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/sys/timevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/timevar.h diff -u src/sys/sys/timevar.h:1.47 src/sys/sys/timevar.h:1.48 --- src/sys/sys/timevar.h:1.47 Tue Jul 20 08:36:11 2021 +++ src/sys/sys/timevar.h Tue Jul 20 08:37:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: timevar.h,v 1.47 2021/07/20 08:36:11 skrll Exp $ */ +/* $NetBSD: timevar.h,v 1.48 2021/07/20 08:37:20 skrll Exp $ */ /* * Copyright (c) 2005, 2008, 2020 The NetBSD Foundation, Inc. @@ -64,7 +64,6 @@ #include #include #include -#include struct itimer; LIST_HEAD(itlist, itimer); @@ -143,8 +142,6 @@ struct ptimers { struct itimer *pts_timers[TIMER_MAX]; }; -extern kmutex_t itimer_mutex; /* XXX */ - /* * Functions for looking at our clock: [get]{bin,nano,micro}[up]time() *
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Tue Jul 20 08:37:20 UTC 2021 Modified Files: src/sys/sys: timevar.h Log Message: no need for extern kmutex_t itimer_mutex or #include here. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/sys/timevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Tue Jul 20 08:36:11 UTC 2021 Modified Files: src/sys/sys: timevar.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/sys/timevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/timevar.h diff -u src/sys/sys/timevar.h:1.46 src/sys/sys/timevar.h:1.47 --- src/sys/sys/timevar.h:1.46 Tue Dec 8 04:09:38 2020 +++ src/sys/sys/timevar.h Tue Jul 20 08:36:11 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: timevar.h,v 1.46 2020/12/08 04:09:38 thorpej Exp $ */ +/* $NetBSD: timevar.h,v 1.47 2021/07/20 08:36:11 skrll Exp $ */ /* * Copyright (c) 2005, 2008, 2020 The NetBSD Foundation, Inc. @@ -154,7 +154,7 @@ extern kmutex_t itimer_mutex; /* XXX */ * "bin" == struct bintime == seconds + 64 bit fraction of seconds. * "nano" == struct timespec == seconds + nanoseconds. * "micro" == struct timeval == seconds + microseconds. - * + * * Functions containing "up" returns time relative to boot and * should be used for calculating time intervals. * @@ -164,8 +164,8 @@ extern kmutex_t itimer_mutex; /* XXX */ * much faster than the functions without "get" prefix and should * be used where a precision of 1/HZ (eg 10 msec on a 100HZ machine) * is acceptable or where performance is priority. - * (NB: "precision", _not_ "resolution" !) - * + * (NB: "precision", _not_ "resolution" !) + * */ void binuptime(struct bintime *);
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Tue Jul 20 08:36:11 UTC 2021 Modified Files: src/sys/sys: timevar.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/sys/timevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.