PERFORCE change 43370 for review
Peter Wemm
peter at FreeBSD.org
Wed Dec 3 09:13:27 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=43370
Change 43370 by peter at peter_overcee on 2003/12/03 09:12:26
IFC @43369
Affected files ...
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#6 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#6 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#8 integrate
.. //depot/projects/hammer/sbin/sconfig/Makefile#1 branch
.. //depot/projects/hammer/sbin/sconfig/sconfig.8#1 branch
.. //depot/projects/hammer/sbin/sconfig/sconfig.c#1 branch
.. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#10 integrate
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#48 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#10 integrate
.. //depot/projects/hammer/sys/conf/files#41 integrate
.. //depot/projects/hammer/sys/conf/ldscript.i386#5 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_cam.c#6 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-isa.c#6 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#6 integrate
.. //depot/projects/hammer/sys/dev/cx/cronyxfw.h#1 branch
.. //depot/projects/hammer/sys/dev/cx/csigma.c#1 branch
.. //depot/projects/hammer/sys/dev/cx/csigmafw.h#1 branch
.. //depot/projects/hammer/sys/dev/cx/cxddk.c#1 branch
.. //depot/projects/hammer/sys/dev/cx/cxddk.h#1 branch
.. //depot/projects/hammer/sys/dev/cx/cxreg.h#1 branch
.. //depot/projects/hammer/sys/dev/cx/if_cx.c#1 branch
.. //depot/projects/hammer/sys/dev/cx/machdep.h#1 branch
.. //depot/projects/hammer/sys/dev/cx/ng_cx.h#1 branch
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#24 integrate
.. //depot/projects/hammer/sys/i386/include/cserial.h#1 branch
.. //depot/projects/hammer/sys/kern/sched_ule.c#21 integrate
.. //depot/projects/hammer/sys/kern/subr_smp.c#12 integrate
.. //depot/projects/hammer/sys/modules/cx/Makefile#1 branch
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#11 integrate
.. //depot/projects/hammer/sys/sys/smp.h#5 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#20 integrate
.. //depot/projects/hammer/usr.sbin/kernbb/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/kernbb/kernbb.c#5 integrate
Differences ...
==== //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#6 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.37 2003/01/06 00:56:23 marcel Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.38 2003/12/03 06:54:40 peter Exp $
*/
#include <errno.h>
#include <stdlib.h>
==== //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#6 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.45 2003/01/11 00:43:20 deischen Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.46 2003/12/03 06:54:40 peter Exp $
*/
/* Allocate space for global thread variables here: */
==== //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#8 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.45 2003/03/05 04:28:08 marcel Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.46 2003/12/03 06:54:40 peter Exp $
*/
#include <sys/param.h>
#include <sys/types.h>
==== //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.50 2003/11/30 22:08:24 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $");
#include "opt_kstack_pages.h"
==== //depot/projects/hammer/sys/amd64/acpica/madt.c#22 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.8 2003/12/03 06:58:48 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#48 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.229 2003/11/30 22:20:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.230 2003/12/03 14:57:25 jhb Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#10 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.6 2003/11/08 07:43:44 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $");
#include "opt_compat.h"
==== //depot/projects/hammer/sys/conf/files#41 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.854 2003/11/20 20:07:37 andre Exp $
+# $FreeBSD: src/sys/conf/files,v 1.855 2003/12/03 14:55:30 jhb Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/hammer/sys/conf/ldscript.i386#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.8 2003/10/01 23:46:07 peter Exp $ */
+/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.9 2003/12/03 07:40:03 phk Exp $ */
OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd")
OUTPUT_ARCH(i386)
ENTRY(btext)
@@ -65,6 +65,7 @@
CONSTRUCTORS
}
.data1 : { *(.data1) }
+ . = ALIGN(32 / 8);
_start_ctors = .;
PROVIDE (start_ctors = .);
.ctors :
==== //depot/projects/hammer/sys/dev/aac/aac_cam.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.13 2003/08/24 17:48:01 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.14 2003/12/03 15:42:12 scottl Exp $");
/*
* CAM front-end for communicating with non-DASD devices
@@ -116,11 +116,15 @@
camsc = (struct aac_cam *)device_get_softc(dev);
+ mtx_lock(&Giant);
+
xpt_async(AC_LOST_DEVICE, camsc->path, NULL);
xpt_free_path(camsc->path);
xpt_bus_deregister(cam_sim_path(camsc->sim));
cam_sim_free(camsc->sim, /*free_devq*/TRUE);
-
+
+ mtx_unlock(&Giant);
+
return (0);
}
@@ -491,7 +495,11 @@
aac_release_command(cm);
+ AAC_LOCK_RELEASE(&sc->aac_io_lock);
+ mtx_lock(&Giant);
xpt_done(ccb);
+ mtx_unlock(&Giant);
+ AAC_LOCK_ACQUIRE(&sc->aac_io_lock);
return;
}
==== //depot/projects/hammer/sys/dev/ata/ata-isa.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.17 2003/08/25 09:01:49 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.18 2003/12/03 13:40:26 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -64,7 +64,7 @@
static void
ata_isa_setmode(struct ata_device *atadev, int mode)
{
- atadev->mode = min(mode, ATA_PIO_MAX);
+ atadev->mode = ata_limit_mode(atadev, mode, ATA_PIO_MAX);
}
static int
==== //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.23 2003/11/02 22:04:53 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.24 2003/12/03 15:32:53 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -575,7 +575,7 @@
}
}
}
- if (stat1 & ATA_S_BUSY) {
+ if (!((mask == 0x03) && (stat0 & ATA_S_BUSY)) && (stat1 & ATA_S_BUSY)) {
ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE);
DELAY(10);
err = ATA_IDX_INB(ch, ATA_ERROR);
==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#24 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.226 2003/11/21 22:23:25 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.227 2003/12/03 14:57:25 jhb Exp $");
#include "opt_apic.h"
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/kern/sched_ule.c#21 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.83 2003/11/17 08:27:11 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.84 2003/12/03 14:57:25 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/kern/subr_smp.c#12 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.179 2003/11/21 22:23:26 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.180 2003/12/03 14:55:31 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#11 (text+ko) ====
@@ -52,7 +52,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.24 2003/11/21 22:23:26 jhb Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.25 2003/12/03 14:57:25 jhb Exp $
*/
#include "opt_ddb.h"
==== //depot/projects/hammer/sys/sys/smp.h#5 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/sys/smp.h,v 1.74 2003/11/21 22:23:26 jhb Exp $
+ * $FreeBSD: src/sys/sys/smp.h,v 1.76 2003/12/03 14:57:25 jhb Exp $
*/
#ifndef _SYS_SMP_H_
==== //depot/projects/hammer/sys/vm/uma_core.c#20 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.88 2003/11/30 22:18:14 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.89 2003/12/03 14:57:26 jhb Exp $");
/* I should really use ktr.. */
/*
==== //depot/projects/hammer/usr.sbin/kernbb/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.9 2003/01/06 07:46:26 phk Exp $
+# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.10 2003/12/03 07:43:03 phk Exp $
PROG= kernbb
MAN= kernbb.8
@@ -6,6 +6,8 @@
DPADD= ${LIBKVM}
LDADD= -lkvm
+CFLAGS+= -I${.CURDIR}/../../contrib/gcc
+
WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/hammer/usr.sbin/kernbb/kernbb.c#5 (text+ko) ====
@@ -9,7 +9,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.15 2003/05/03 21:06:37 obrien Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.16 2003/12/03 07:43:03 phk Exp $");
#include <err.h>
#include <fcntl.h>
@@ -19,18 +19,28 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/endian.h>
+typedef long long gcov_type;
+
+#define PARAMS(foo) foo
+#define ATTRIBUTE_UNUSED __unused
+#include "gcov-io.h"
+
+struct bbf {
+ long checksum;
+ long arc_count;
+ u_long name;
+};
+
struct bb {
u_long zero_one;
u_long filename;
u_long counts;
u_long ncounts;
u_long next;
- u_long addr;
- u_long nwords;
- u_long func;
- u_long lineno;
- u_long file;
+ u_long sizeof_bb;
+ u_long funcs;
};
struct nlist namelist[] = {
@@ -43,10 +53,13 @@
int
main(int argc __unused, char **argv __unused)
{
- int i;
+ int i, funcs;
u_long l1,l2,l4;
struct bb bb;
+ struct bbf bbf;
char buf[BUFSIZ], *p;
+ gcov_type *q, *qr;
+
FILE *f;
kv = kvm_open(NULL,NULL,NULL,O_RDWR,"dnc");
@@ -61,7 +74,22 @@
while(l2) {
l1 += sizeof l1;
kvm_read(kv,l2,&bb,sizeof bb);
+#if 0
+printf("%lx\n%lx\n%lx\n%lx\n%lx\n%lx\n%lx\n",
+ bb.zero_one, bb.filename, bb.counts, bb.ncounts, bb.next,
+ bb.sizeof_bb, bb.funcs);
+#endif
+
+ funcs = 0;
+ for (l4 = bb.funcs; ; l4 += sizeof (bbf)) {
+ kvm_read(kv, l4, &bbf, sizeof(bbf));
+ if (bbf.arc_count == -1)
+ break;
+ funcs++;
+ }
+
l2 = bb.next;
+
kvm_read(kv, bb.filename, buf, sizeof(buf));
p = buf;
f = fopen(p, "w");
@@ -78,14 +106,40 @@
}
if (f == NULL)
err(1,"%s", p);
- fwrite(&bb.ncounts, 4, 1, f);
- l4 = 0;
- fwrite(&l4, 4, 1, f);
- p = malloc(bb.ncounts * 8);
- kvm_read(kv, bb.counts, p, bb.ncounts * 8);
- fwrite(p, 8, bb.ncounts, f);
+ __write_long(-123, f, 4);
+
+ __write_long(funcs, f, 4);
+
+ __write_long(4 + 8 + 8 + 4 + 8 + 8, f, 4);
+
+ __write_long(bb.ncounts, f, 4);
+ __write_long(0, f, 8);
+ __write_long(0, f, 8);
+
+ __write_long(bb.ncounts, f, 4);
+ __write_long(0, f, 8);
+ __write_long(0, f, 8);
+
+ qr = malloc(bb.ncounts * 8);
+ kvm_read(kv, bb.counts, qr, bb.ncounts * 8);
+ q = qr;
+ for (l4 = bb.funcs; ; l4 += sizeof (bbf)) {
+ kvm_read(kv, l4, &bbf, sizeof(bbf));
+ if (bbf.arc_count == -1)
+ break;
+ kvm_read(kv, bbf.name, buf, sizeof(buf));
+
+ __write_gcov_string(buf, strlen(buf), f, -1);
+
+ __write_long(bbf.checksum, f, 4);
+ __write_long(bbf.arc_count, f, 4);
+ for (i = 0; i < bbf.arc_count; i++) {
+ __write_gcov_type(*q, f, 8);
+ q++;
+ }
+ }
fclose(f);
- free(p);
+ free(qr);
}
return 0;
}
More information about the p4-projects
mailing list