Re: CVS commit: src/sys/arch/sparc64/sparc64
On Mon, Feb 20, 2023 at 15:41:04 +0100, Martin Husemann wrote: > On Mon, Feb 20, 2023 at 05:15:33PM +0300, Valery Ushakov wrote: > > them up, b/c you cannot amend that comment. To add to the fun, I > > think releng scripts just clone the commit message on pull ups, so > > that comment gets splattered all over the target branches too. > > Yes - I try to manually remove them (which is easy if they are at the > end of the last commit log in the batch) durint the pullup. Data point: $ hg log -b netbsd-9 | grep 'XXX.*pullup.*9' | wc -l 74 -uwe
Re: CVS commit: src/sys/arch/sparc64/sparc64
On Mon, Feb 20, 2023 at 22:35:40 +0700, Robert Elz wrote: > Date:Mon, 20 Feb 2023 16:47:01 +0300 > From:Valery Ushakov > Message-ID: > > | I wonder if we should stop abusing commit messages as pull-up > | reminders. These XXX will not convey any useful information a few > | months down the line... > > I think they're useful (if only I remembered to add them all the > times I should) - it allows someone looking at the commit log to > easily determine that the change is also intended for another branch. > Then one can check and see if it happened or not, and if not, send > a reminder if it is important/needed. > > If the pullup annotation is missing, I tend to assume that the change > is not intended to be pulled up - either it isn't applicable, or is > something new that isn't appropriate for older releases. > > That's why I will sometimes even include pullup annotations for ancient > versions of NetBSD, even though I know they will never happen (never get > submitted, much less acted upon) - just as an indication that the problem > being fixed exists from long ago. In that case they have no business being "XXX" :) -uwe
CVS commit: src/tests/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Mon Feb 20 15:47:56 UTC 2023
Modified Files:
src/tests/lib/libc/stdlib: t_getopt.sh
Log Message:
New optval test from des @ FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/stdlib/t_getopt.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/stdlib/t_getopt.sh
diff -u src/tests/lib/libc/stdlib/t_getopt.sh:1.1 src/tests/lib/libc/stdlib/t_getopt.sh:1.2
--- src/tests/lib/libc/stdlib/t_getopt.sh:1.1 Sat Jan 1 18:56:49 2011
+++ src/tests/lib/libc/stdlib/t_getopt.sh Mon Feb 20 10:47:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_getopt.sh,v 1.1 2011/01/01 23:56:49 pgoyette Exp $
+# $NetBSD: t_getopt.sh,v 1.2 2023/02/20 15:47:56 christos Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -65,6 +65,18 @@ getopt_body()
h_getopt "${load}" "foo -d - 1" "d|2"
}
+atf_test_case getopt_optval
+getopt_optval()
+{
+ atf_set "descr" "Checks getopt(3) with optional value"
+}
+getopt_optval_body()
+{
+ h_getopt "o::" "foo -o" "o=(null)|0"
+ h_getopt "o::" "foo -o1 2" "o=1|1"
+ h_getopt "o::" "foo -o 1 2" "o=(null)|2"
+}
+
atf_test_case getopt_long
getopt_long_head()
{
@@ -119,5 +131,6 @@ longopt: list, no_argument, lopt, 'l'"
atf_init_test_cases()
{
atf_add_test_case getopt
+ atf_add_test_case getopt_optval
atf_add_test_case getopt_long
}
CVS commit: src/tests/lib/libc/stdlib
Module Name:src Committed By: christos Date: Mon Feb 20 15:47:56 UTC 2023 Modified Files: src/tests/lib/libc/stdlib: t_getopt.sh Log Message: New optval test from des @ FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/stdlib/t_getopt.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/sparc64/sparc64
Date:Mon, 20 Feb 2023 16:47:01 +0300 From:Valery Ushakov Message-ID: | I wonder if we should stop abusing commit messages as pull-up | reminders. These XXX will not convey any useful information a few | months down the line... I think they're useful (if only I remembered to add them all the times I should) - it allows someone looking at the commit log to easily determine that the change is also intended for another branch. Then one can check and see if it happened or not, and if not, send a reminder if it is important/needed. If the pullup annotation is missing, I tend to assume that the change is not intended to be pulled up - either it isn't applicable, or is something new that isn't appropriate for older releases. That's why I will sometimes even include pullup annotations for ancient versions of NetBSD, even though I know they will never happen (never get submitted, much less acted upon) - just as an indication that the problem being fixed exists from long ago. kre
Re: CVS commit: src/sys/arch/sparc64/sparc64
On Mon, Feb 20, 2023 at 05:15:33PM +0300, Valery Ushakov wrote: > them up, b/c you cannot amend that comment. To add to the fun, I > think releng scripts just clone the commit message on pull ups, so > that comment gets splattered all over the target branches too. Yes - I try to manually remove them (which is easy if they are at the end of the last commit log in the batch) durint the pullup. Martin
Re: CVS commit: src/sys/arch/sparc64/sparc64
On Mon, Feb 20, 2023 at 13:57:32 +, Taylor R Campbell wrote: > > > XXX pullup-8 > > > XXX pullup-9 > > > XXX pullup-10 > > > > I wonder if we should stop abusing commit messages as pull-up > > reminders. These XXX will not convey any useful information a few > > months down the line... > > Happy to try a better mechanism if you have suggestions, but this is > the best one I've found so far! If I don't mark commits this way, I'm > almost guaranteed not to pull them up. I'm not sure any exists even with modern VCS. May be something like a branch that is not closed until it is merged (pulled-up) to all the intended destination (but then the very notion of the closed branch requires something more modern than CVS). The problem with the XXX in the commit message is that you don't easily know if you _did_ pull them up, b/c you cannot amend that comment. To add to the fun, I think releng scripts just clone the commit message on pull ups, so that comment gets splattered all over the target branches too. -uwe
Re: CVS commit: src/sys/arch/sparc64/sparc64
> Date: Mon, 20 Feb 2023 16:47:01 +0300 > From: Valery Ushakov > > On Mon, Feb 20, 2023 at 13:30:23 +, Taylor R Campbell wrote: > > > Module Name:src > > Committed By: riastradh > > Date: Mon Feb 20 13:30:23 UTC 2023 > > > > Modified Files: > > src/sys/arch/sparc64/sparc64: lock_stubs.s > > > > Log Message: > > sparc64: Add missing LoadStore ordering for mutex_enter stub. > > > > XXX pullup-8 > > XXX pullup-9 > > XXX pullup-10 > > I wonder if we should stop abusing commit messages as pull-up > reminders. These XXX will not convey any useful information a few > months down the line... Happy to try a better mechanism if you have suggestions, but this is the best one I've found so far! If I don't mark commits this way, I'm almost guaranteed not to pull them up.
Re: CVS commit: src/sys/arch/sparc64/sparc64
On Mon, Feb 20, 2023 at 13:30:23 +, Taylor R Campbell wrote: > Module Name: src > Committed By: riastradh > Date: Mon Feb 20 13:30:23 UTC 2023 > > Modified Files: > src/sys/arch/sparc64/sparc64: lock_stubs.s > > Log Message: > sparc64: Add missing LoadStore ordering for mutex_enter stub. > > XXX pullup-8 > XXX pullup-9 > XXX pullup-10 I wonder if we should stop abusing commit messages as pull-up reminders. These XXX will not convey any useful information a few months down the line... -uwe
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: riastradh Date: Mon Feb 20 13:30:47 UTC 2023 Modified Files: src/sys/arch/mips/include: asm.h Log Message: mips/asm.h: Make membar macros conditional on MULTIPROCESSOR. For !MULTIPROCESSOR, define them to be empty or nop as appropriate. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/mips/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: riastradh Date: Mon Feb 20 13:30:47 UTC 2023 Modified Files: src/sys/arch/mips/include: asm.h Log Message: mips/asm.h: Make membar macros conditional on MULTIPROCESSOR. For !MULTIPROCESSOR, define them to be empty or nop as appropriate. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/mips/include/asm.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/arch/mips/include/asm.h diff -u src/sys/arch/mips/include/asm.h:1.72 src/sys/arch/mips/include/asm.h:1.73 --- src/sys/arch/mips/include/asm.h:1.72 Mon Feb 13 12:00:18 2023 +++ src/sys/arch/mips/include/asm.h Mon Feb 20 13:30:47 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.72 2023/02/13 12:00:18 riastradh Exp $ */ +/* $NetBSD: asm.h,v 1.73 2023/02/20 13:30:47 riastradh Exp $ */ /* * Copyright (c) 1992, 1993 @@ -59,6 +59,7 @@ #if defined(_KERNEL_OPT) #include "opt_gprof.h" +#include "opt_multiprocessor.h" #endif #ifdef __ASSEMBLER__ @@ -573,7 +574,7 @@ _C_LABEL(x): #endif /* compiler define */ -#if defined(__OCTEON__) +#if defined(MULTIPROCESSOR) && defined(__OCTEON__) /* * See common/lib/libc/arch/mips/atomic/membar_ops.S for notes on * Octeon memory ordering guarantees and barriers. @@ -614,7 +615,7 @@ _C_LABEL(x): #define SYNC_REL sync 4 #define BDSYNC_PLUNGER sync 4 #define SYNC_PLUNGER sync 4 -#elif __mips >= 3 || !defined(__mips_o32) +#elif defined(MULTIPROCESSOR) && (__mips >= 3 || !defined(__mips_o32)) #define LLSCSYNC /* nothing */ #define BDSYNC sync #define BDSYNC_ACQ sync
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: riastradh Date: Mon Feb 20 13:30:36 UTC 2023 Modified Files: src/sys/arch/sparc64/sparc64: lock_stubs.s Log Message: sparc64: Rename internal barrier macros to be clearer. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/sparc64/lock_stubs.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/lock_stubs.s diff -u src/sys/arch/sparc64/sparc64/lock_stubs.s:1.12 src/sys/arch/sparc64/sparc64/lock_stubs.s:1.13 --- src/sys/arch/sparc64/sparc64/lock_stubs.s:1.12 Mon Feb 20 13:30:22 2023 +++ src/sys/arch/sparc64/sparc64/lock_stubs.s Mon Feb 20 13:30:36 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.s,v 1.12 2023/02/20 13:30:22 riastradh Exp $ */ +/* $NetBSD: lock_stubs.s,v 1.13 2023/02/20 13:30:36 riastradh Exp $ */ /*- * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc. @@ -41,11 +41,11 @@ #define CURLWP (CPUINFO_VA+CI_CURLWP) #if defined(MULTIPROCESSOR) -#define MB_READ membar #LoadLoad | #LoadStore -#define MB_MEM membar #LoadStore | #StoreStore +#define MB_ACQ membar #LoadLoad | #LoadStore +#define MB_REL membar #LoadStore | #StoreStore #else -#define MB_READ /* nothing */ -#define MB_MEM /* nothing */ +#define MB_ACQ /* nothing */ +#define MB_REL /* nothing */ #endif #if !defined(LOCKDEBUG) @@ -58,7 +58,7 @@ ENTRY(mutex_enter) sethi %hi(CURLWP), %o1 LDPTR [%o1 + %lo(CURLWP)], %o1 ! current thread CASPTR [%o0], %g0, %o1 ! compare-and-swap - MB_READ + MB_ACQ brnz,pn %o1, 1f! lock was unowned? nop retl ! - yes, done @@ -76,7 +76,7 @@ ENTRY(mutex_exit) sethi %hi(CURLWP), %o1 LDPTR [%o1 + %lo(CURLWP)], %o1 ! current thread clr %o2! new value (0) - MB_MEM + MB_REL CASPTR [%o0], %o1, %o2 ! compare-and-swap cmp %o1, %o2 bne,pn CCCR, 1f ! nope, hard case
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: riastradh Date: Mon Feb 20 13:30:36 UTC 2023 Modified Files: src/sys/arch/sparc64/sparc64: lock_stubs.s Log Message: sparc64: Rename internal barrier macros to be clearer. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/sparc64/lock_stubs.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: riastradh Date: Mon Feb 20 13:30:23 UTC 2023 Modified Files: src/sys/arch/sparc64/sparc64: lock_stubs.s Log Message: sparc64: Add missing LoadStore ordering for mutex_enter stub. XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/sparc64/lock_stubs.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/lock_stubs.s diff -u src/sys/arch/sparc64/sparc64/lock_stubs.s:1.11 src/sys/arch/sparc64/sparc64/lock_stubs.s:1.12 --- src/sys/arch/sparc64/sparc64/lock_stubs.s:1.11 Wed Apr 6 22:47:57 2022 +++ src/sys/arch/sparc64/sparc64/lock_stubs.s Mon Feb 20 13:30:22 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.s,v 1.11 2022/04/06 22:47:57 riastradh Exp $ */ +/* $NetBSD: lock_stubs.s,v 1.12 2023/02/20 13:30:22 riastradh Exp $ */ /*- * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #define CURLWP (CPUINFO_VA+CI_CURLWP) #if defined(MULTIPROCESSOR) -#define MB_READ membar #LoadLoad +#define MB_READ membar #LoadLoad | #LoadStore #define MB_MEM membar #LoadStore | #StoreStore #else #define MB_READ /* nothing */
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: riastradh Date: Mon Feb 20 13:30:23 UTC 2023 Modified Files: src/sys/arch/sparc64/sparc64: lock_stubs.s Log Message: sparc64: Add missing LoadStore ordering for mutex_enter stub. XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/sparc64/lock_stubs.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
