head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.8
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.6
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.4
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.2
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.2.0.160
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.158
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.156
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.154
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.152
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.150
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.148
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.146
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.144
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.142
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.140
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.138
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.136
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.134
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.132
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.130
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.128
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.126
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.124
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.120
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.100
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.122
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.118
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.116
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.114
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.112
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.110
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.108
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.106
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.104
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.102
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.98
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.96
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.94
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.92
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.90
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.88
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.86
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.84
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.82
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.80
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.78
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.76
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.74
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.72
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.70
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.68
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.66
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.64
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.62
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.60
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.58
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.56
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.54
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.52
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.50
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.48
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.46
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.44
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.42
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.40
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.38
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.36
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.34
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.32
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.30
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.28
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.26
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.24
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.22
	pkgsrc-2008Q1:1.2.0.20
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.18
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.16
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.14
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.12
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.10
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.8
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.6
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.4
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.2
	pkgsrc-2005Q4-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2025.04.21.16.23.10;	author wiz;	state Exp;
branches;
next	1.2;
commitid	1PRmG0Dd9ECGaWRF;

1.2
date	2005.11.07.15.46.26;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2005.10.31.17.09.45;	author tv;	state Exp;
branches;
next	;


desc
@@


1.3
log
@bytebench: remove Interix support
@
text
@$NetBSD: patch-ag,v 1.2 2005/11/07 15:46:26 joerg Exp $

--- src/fstime.c.orig	1999-07-28 21:47:02.000000000 +0000
+++ src/fstime.c
@@@@ -88,7 +88,7 @@@@ int			g;
 int			i;
 void			stop_count();
 void			clean_up();
-int			sigalarm = 0;
+static volatile sig_atomic_t		sigalarm = 0;
 
 /******************** MAIN ****************************/
 
@@@@ -149,7 +149,6 @@@@ int w_test(void)
 	unsigned long counted = 0L;
 	unsigned long tmp;
 	long f_blocks;
-	extern int sigalarm;
 
 	/* Sync and let it settle */
 	sync();
@@@@ -176,6 +175,8 @@@@ int w_test(void)
 		lseek(f, 0L, 0); /* rewind */
 	}
 
+	fsync(f);
+
 	/* stop clock */
 	fprintf(stderr, "%d second sample\n", seconds);
 	write_score = counted/((long)seconds * COUNTPERK);
@@@@ -191,8 +192,6 @@@@ int r_test(void)
 {
 	unsigned long counted = 0L;
 	unsigned long tmp;
-	extern int sigalarm;
-	extern int errno;
 
 	/* Sync and let it settle */
 	sync();
@@@@ -229,6 +228,8 @@@@ int r_test(void)
 			counted += COUNTPERBUF;
 	}
 
+	fsync(f);
+
 	/* stop clock */
 	fprintf(stderr, "%d second sample\n", seconds);
 	read_score = counted / ((long)seconds * COUNTPERK);
@@@@ -244,7 +245,6 @@@@ int c_test(void)
 {
 	unsigned long counted = 0L;
 	unsigned long tmp;
-	extern int sigalarm;
 
 	sync();
 	sleep(2 + seconds/4);
@@@@ -309,7 +309,6 @@@@ int c_test(void)
 
 void stop_count(void)
 {
-	extern int sigalarm;
 	sigalarm = 1;
 }
 
@


1.2
log
@Don't declare errno manually, depend on errno.h for it. While here,
fix the signal handling to use a volatile variable. Compilers can
optimise the access otherwise. Bump revision, since this is a bugfix.

Reviewed by jlam and the maintainer.
@
text
@d1 1
a1 1
$NetBSD$
d14 1
a14 1
@@@@ -149,13 +149,14 @@@@ int w_test(void)
a19 1
+#ifndef __INTERIX
d22 1
a22 8
 	sleep(2);
 	sync();
 	sleep(1);
+#endif
 
 	signal(SIGALRM,stop_count);
 	sigalarm = 0; /* reset alarm flag */
@@@@ -176,6 +177,8 @@@@ int w_test(void)
d31 1
a31 1
@@@@ -191,14 +194,14 @@@@ int r_test(void)
a37 1
+#ifndef __INTERIX
d40 1
a40 8
 	sleep(2 + seconds/4);
 	sync();
 	sleep(1 + seconds/4);
+#endif
 
 	/* rewind */
 	errno = 0;
@@@@ -229,6 +232,8 @@@@ int r_test(void)
d49 1
a49 1
@@@@ -244,7 +249,6 @@@@ int c_test(void)
d57 1
a57 1
@@@@ -309,7 +313,6 @@@@ int c_test(void)
@


1.1
log
@4.1.0nb1: Interix has no sync(2).  Use fsync(2) there instead.

While there, use fsync(2) on all hosts.  Without this, the fstime benchmark
will be disproportionately biased toward OS's and hardware that buffer
larger amounts of data in memory before [background] syncing.
@
text
@d3 1
a3 1
--- src/fstime.c.orig	1999-07-28 17:47:02.000000000 -0400
d5 12
a16 1
@@@@ -151,11 +151,13 @@@@ int w_test(void)
d18 1
a18 1
 	extern int sigalarm;
d30 1
a30 1
@@@@ -176,6 +178,8 @@@@ int w_test(void)
d39 6
a44 3
@@@@ -194,11 +198,13 @@@@ int r_test(void)
 	extern int sigalarm;
 	extern int errno;
d56 1
a56 1
@@@@ -229,6 +235,8 @@@@ int r_test(void)
d65 16
@