PERFORCE change 40244 for review
Robert Watson
rwatson at FreeBSD.org
Thu Oct 23 02:34:47 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=40244
Change 40244 by rwatson at rwatson_paprika on 2003/10/22 19:33:51
Integrate trustedbsd_sebsd tools tree forward to 39070, the
last major integration of the trustedbsd_mac branch, which
brings in many of the major changes in the last four months
to the main FreeBSD tree. This includes substantial lock
pushdown, threading bug fixes, compiler upgrades, et al.
Add ministat, tinderbox fixes.
Affected files ...
.. //depot/projects/trustedbsd/sebsd/tools/tools/ath/athstats.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/Makefile#1 branch
.. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/README#1 branch
.. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/chameleon#1 branch
.. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/iguana#1 branch
.. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/ministat.c#1 branch
.. //depot/projects/trustedbsd/sebsd/tools/tools/mtxstat/mtxstat.pl#2 integrate
.. //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/powerpc.diff#2 integrate
.. //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tbmaster.pl#3 integrate
.. //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tinderbox.pl#3 integrate
Differences ...
==== //depot/projects/trustedbsd/sebsd/tools/tools/ath/athstats.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
*
- * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.1 2003/06/28 18:26:23 sam Exp $
+ * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.2 2003/09/19 17:18:32 sam Exp $
*/
/*
@@ -59,6 +59,7 @@
#include <nlist.h>
#include "../../../sys/contrib/dev/ath/ah_desc.h"
+#include "../../../sys/net80211/ieee80211_radiotap.h"
#include "../../../sys/dev/ath/if_athioctl.h"
static const struct {
==== //depot/projects/trustedbsd/sebsd/tools/tools/mtxstat/mtxstat.pl#2 (text+ko) ====
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/tools/tools/mtxstat/mtxstat.pl,v 1.1 2002/05/26 12:02:36 des Exp $
+# $FreeBSD: src/tools/tools/mtxstat/mtxstat.pl,v 1.2 2003/09/19 21:52:29 sam Exp $
#
use strict;
@@ -53,7 +53,7 @@
if ($opts{'a'}) {
usage()
if ($opts{'c'} || $opts{'m'} || $opts{'t'});
- $key = 'average';
+ $key = 'avg';
} elsif ($opts{'c'}) {
usage()
if ($opts{'m'} || $opts{'t'});
@@ -98,7 +98,7 @@
}
$data{$name}->{'total'} += $entry{'total'};
$data{$name}->{'count'} += $entry{'count'};
- $data{$name}->{'average'} =
+ $data{$name}->{'avg'} =
$data{$name}->{'total'} / $data{$name}->{'count'};
} else {
$data{$name} = \%entry;
@@ -120,11 +120,11 @@
}
}
foreach (@list) {
- printf("%12.0f %12.0f %12.0f %12.0f %s\n",
+ printf("%6.0f %12.0f %11.0f %5.0f %-40.40s\n",
$data{$_}->{'max'},
$data{$_}->{'total'},
$data{$_}->{'count'},
- $data{$_}->{'average'},
+ $data{$_}->{'avg'},
$data{$_}->{'name'});
}
}
==== //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/powerpc.diff#2 (text+ko) ====
@@ -1,12 +1,12 @@
-$FreeBSD: src/tools/tools/tinderbox/powerpc.diff,v 1.2 2003/08/01 21:54:35 des Exp $
+$FreeBSD: src/tools/tools/tinderbox/powerpc.diff,v 1.3 2003/09/09 07:01:13 des Exp $
Index: contrib/gcc/config/rs6000/freebsd.h
===================================================================
-RCS file: /usr/home/ncvs/src/contrib/gcc/config/rs6000/freebsd.h,v
+RCS file: /home/ncvs/src/contrib/gcc/config/rs6000/freebsd.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 freebsd.h
--- contrib/gcc/config/rs6000/freebsd.h 11 Jul 2003 03:40:53 -0000 1.1.1.2
-+++ contrib/gcc/config/rs6000/freebsd.h 15 Jul 2003 22:17:12 -0000
++++ contrib/gcc/config/rs6000/freebsd.h 9 Sep 2003 06:51:49 -0000
@@ -43,6 +43,23 @@
#undef LINK_SHLIB_SPEC
#define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
@@ -31,13 +31,23 @@
/************************[ Target stuff ]***********************************/
+@@ -58,6 +75,9 @@
+
+ #undef WCHAR_TYPE_SIZE
+ #define WCHAR_TYPE_SIZE 32
++
++#undef DEFAULT_SIGNED_CHAR
++#define DEFAULT_SIGNED_CHAR 1
+
+ #undef TARGET_VERSION
+ #define TARGET_VERSION fprintf (stderr, " (FreeBSD/PowerPC ELF)");
Index: contrib/gcc/config/rs6000/sysv4.h
===================================================================
-RCS file: /usr/home/ncvs/src/contrib/gcc/config/rs6000/sysv4.h,v
+RCS file: /home/ncvs/src/contrib/gcc/config/rs6000/sysv4.h,v
retrieving revision 1.1.1.6
diff -u -r1.1.1.6 sysv4.h
--- contrib/gcc/config/rs6000/sysv4.h 11 Jul 2003 03:40:53 -0000 1.1.1.6
-+++ contrib/gcc/config/rs6000/sysv4.h 15 Jul 2003 20:35:39 -0000
++++ contrib/gcc/config/rs6000/sysv4.h 9 Sep 2003 06:51:49 -0000
@@ -21,8 +21,6 @@
Boston, MA 02111-1307, USA. */
==== //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tbmaster.pl#3 (text+ko) ====
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/tools/tools/tinderbox/tbmaster.pl,v 1.34 2003/08/01 21:15:28 des Exp $
+# $FreeBSD: src/tools/tools/tinderbox/tbmaster.pl,v 1.35 2003/09/19 09:15:10 des Exp $
#
use 5.006_001;
@@ -358,11 +358,19 @@
die("Where is the tinderbox script?\n");
}
+ my $stopfile = expand('SANDBOX') . "/stop";
foreach my $branch (@{$CONFIG{'BRANCHES'}}) {
foreach my $platform (@{$CONFIG{'PLATFORMS'}}) {
+ if (-e $stopfile || -e "$stopfile.$config") {
+ die("stop file found, aborting\n");
+ }
my ($arch, $machine) = split('/', $platform, 2);
$machine = $arch
unless defined($machine);
+ if (-e "$stopfile.$arch" || -e "$stopfile.$arch.$machine") {
+ warn("stop file for $arch/$machine found, skipping\n");
+ next;
+ }
tinderbox($branch, $arch, $machine);
}
}
==== //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tinderbox.pl#3 (text+ko) ====
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.20 2003/05/17 14:12:48 des Exp $
+# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.21 2003/09/19 09:12:32 des Exp $
#
use 5.006_001;
@@ -480,7 +480,7 @@
$ENV{$key} = $userenv{$key};
}
}
- if ($verbose > 1) {
+ if ($verbose && $verbose > 1) {
foreach my $key (sort(keys(%ENV))) {
message("$key=$ENV{$key}\n");
}
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list