PERFORCE change 140103 for review
John Birrell
jb at FreeBSD.org
Wed Apr 16 07:27:18 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140103
Change 140103 by jb at jb_freebsd1 on 2008/04/16 07:26:18
IF6
Affected files ...
.. //depot/projects/dtrace6/src/ObsoleteFiles.inc#3 integrate
.. //depot/projects/dtrace6/src/contrib/bsnmp/snmpd/main.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/pf/pfctl/pfctl_altq.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/top/display.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/top/layout.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/top/machine.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/top/top.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/top/top.h#2 integrate
.. //depot/projects/dtrace6/src/etc/defaults/rc.conf#5 integrate
.. //depot/projects/dtrace6/src/etc/freebsd-update.conf#4 integrate
.. //depot/projects/dtrace6/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/dtrace6/src/etc/rc.d/ppp#3 integrate
.. //depot/projects/dtrace6/src/etc/rc.d/rfcomm_pppd_server#1 branch
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt.c#4 integrate
.. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate
.. //depot/projects/dtrace6/src/sbin/dhclient/dhclient-script#5 integrate
.. //depot/projects/dtrace6/src/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/dtrace6/src/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/dtrace6/src/share/man/man4/arcmsr.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/ed.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/ng_pptpgre.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/ubsa.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/dtrace6/src/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/dtrace6/src/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/dtrace6/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/dtrace6/src/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/dtrace6/src/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/dtrace6/src/sys/dev/iir/iir.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/usb/ubsa.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/dtrace6/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/dtrace6/src/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netgraph/ng_pptpgre.h#2 integrate
.. //depot/projects/dtrace6/src/sys/pci/if_dc.c#2 integrate
.. //depot/projects/dtrace6/src/sys/pci/if_dcreg.h#2 integrate
.. //depot/projects/dtrace6/src/sys/pci/if_de.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/include/tlb.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/cache.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/cheetah.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/spitfire.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/tlb.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/pcpu.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/resource.h#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/chat/chat.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/tar/COPYING#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/top/machine.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/vmstat/Makefile#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/vmstat/vmstat.8#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/vmstat/vmstat.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/Makefile#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/add/add.h#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/add/extract.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/add/main.c#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/add/perform.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/add/pkg_add.1#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/create/create.h#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/create/main.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/create/perform.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/create/pkg_create.1#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/create/pl.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/delete/main.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/delete/perform.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/info.h#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/main.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/perform.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/show.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/deps.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/exec.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/global.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/lib.h#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/match.c#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/plist.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/url.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/Makefile#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/README#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/check.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/common.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/extern.h#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/gzip.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/gzip.h#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/main.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/pgp.h#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/pgp_check.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/sha1.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/sign.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/stand.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/stand.h#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/sign/x509.c#2 delete
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/updating/Makefile#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/updating/main.c#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/updating/pathnames.h#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/version/main.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/version/perform.c#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/version/version.h#2 integrate
Differences ...
==== //depot/projects/dtrace6/src/ObsoleteFiles.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.25.2.21 2007/12/19 17:08:34 obrien Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.25.2.23 2008/04/11 10:14:19 remko Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080407: pkg_sign has been removed
+OLD_FILES+=usr/sbin/pkg_check
+OLD_FILES+=usr/sbin/pkg_sign
+OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
# 20070711: bzip2 1.0.4
OLD_FILES+=usr/share/info/bzip2.info.gz
# 20070710: Removal of the PROTO.localhost* files
@@ -256,6 +261,9 @@
OLD_FILES+=usr/sbin/ntptimeset
OLD_FILES+=usr/share/man/man8/kernbb.8.gz
OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
# 200406XX
OLD_FILES+=usr/bin/gasp
OLD_FILES+=usr/bin/gdbreplay
==== //depot/projects/dtrace6/src/contrib/bsnmp/snmpd/main.c#2 (text+ko) ====
@@ -2246,6 +2246,8 @@
return (m);
err:
+ if ((m->flags & LM_ONSTARTLIST) != 0)
+ TAILQ_REMOVE(&modules_start, m, start);
if (m->handle)
dlclose(m->handle);
free(m->path);
==== //depot/projects/dtrace6/src/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ====
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.7.2.1 2006/12/03 18:32:51 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.7.2.2 2008/04/12 19:52:13 mlaier Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -169,6 +169,10 @@
return;
}
+#ifdef __FreeBSD__
+ if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
+ printf("INACTIVE ");
+#endif
printf("altq on %s ", a->ifname);
switch (a->scheduler) {
@@ -203,6 +207,10 @@
{
unsigned i;
+#ifdef __FreeBSD__
+ if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
+ printf("INACTIVE ");
+#endif
printf("queue ");
for (i = 0; i < level; ++i)
printf(" ");
@@ -1164,7 +1172,11 @@
sizeof(ifr.ifr_name))
errx(1, "getifmtu: strlcpy");
if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == -1)
+#ifdef __FreeBSD__
+ ifr.ifr_mtu = 1500;
+#else
err(1, "SIOCGIFMTU");
+#endif
if (shutdown(s, SHUT_RDWR) == -1)
err(1, "shutdown");
if (close(s))
==== //depot/projects/dtrace6/src/contrib/pf/pfctl/pfctl_qstats.c#2 (text+ko) ====
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6 2005/05/03 16:55:20 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6.2.1 2008/04/12 19:52:13 mlaier Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -118,6 +118,10 @@
for (node = root; node != NULL; node = node->next) {
if (iface != NULL && strcmp(node->altq.ifname, iface))
continue;
+#ifdef __FreeBSD__
+ if (node->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
+ continue;
+#endif
pfctl_print_altq_node(dev, node, 0, opts);
}
}
@@ -157,7 +161,12 @@
warn("DIOCGETALTQ");
return (-1);
}
+#ifdef __FreeBSD__
+ if (pa.altq.qid > 0 &&
+ !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
+#else
if (pa.altq.qid > 0) {
+#endif
pq.nr = nr;
pq.ticket = pa.ticket;
pq.buf = &qstats.data;
@@ -175,6 +184,19 @@
pfctl_insert_altq_node(root, pa.altq, qstats);
}
}
+#ifdef __FreeBSD__
+ else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) {
+ memset(&qstats.data, 0, sizeof(qstats.data));
+ if ((node = pfctl_find_altq_node(*root, pa.altq.qname,
+ pa.altq.ifname)) != NULL) {
+ memcpy(&node->qstats.data, &qstats.data,
+ sizeof(qstats.data));
+ update_avg(node);
+ } else {
+ pfctl_insert_altq_node(root, pa.altq, qstats);
+ }
+ }
+#endif
}
return (mnr);
}
@@ -280,6 +302,10 @@
{
if (a->altq.qid == 0)
return;
+#ifdef __FreeBSD__
+ if (a->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
+ return;
+#endif
switch (a->altq.scheduler) {
case ALTQT_CBQ:
==== //depot/projects/dtrace6/src/contrib/top/display.c#2 (text+ko) ====
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $
+ * $FreeBSD: src/contrib/top/display.c,v 1.9.2.1 2008/04/09 19:48:06 peter Exp $
*/
/*
@@ -78,8 +78,10 @@
static int *lmemory;
static int *lswap;
+static int num_cpus;
static int *cpustate_columns;
static int cpustate_total_length;
+static int cpustates_column;
static enum { OFF, ON, ERASE } header_status = ON;
@@ -87,6 +89,29 @@
static void summary_format();
static void line_update();
+int x_lastpid = 10;
+int y_lastpid = 0;
+int x_loadave = 33;
+int x_loadave_nompid = 15;
+int y_loadave = 0;
+int x_procstate = 0;
+int y_procstate = 1;
+int x_brkdn = 15;
+int y_brkdn = 1;
+int x_mem = 5;
+int y_mem = 3;
+int x_swap = 6;
+int y_swap = 4;
+int y_message = 5;
+int x_header = 0;
+int y_header = 6;
+int x_idlecursor = 0;
+int y_idlecursor = 5;
+int y_procs = 7;
+
+int y_cpustates = 2;
+int Header_lines = 7;
+
int display_resize()
{
@@ -138,6 +163,12 @@
/* call resize to do the dirty work */
lines = display_resize();
+ num_cpus = statics->ncpus;
+ cpustates_column = 5; /* CPU: */
+ if (num_cpus != 1)
+ cpustates_column += 2; /* CPU 0: */
+ for (i = num_cpus; i > 9; i /= 10)
+ cpustates_column++;
/* only do the rest if we need to */
if (lines > -1)
@@ -153,7 +184,7 @@
num_swap = string_count(swap_names);
lswap = (int *)malloc(num_swap * sizeof(int));
num_cpustates = string_count(cpustate_names);
- lcpustates = (int *)malloc(num_cpustates * sizeof(int));
+ lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus);
cpustate_columns = (int *)malloc(num_cpustates * sizeof(int));
memory_names = statics->memory_names;
@@ -365,14 +396,13 @@
}
}
+#ifdef no_more
/*
* *_cpustates(states, names) - print the cpu state percentages
*
* Assumptions: cursor is on the PREVIOUS line
*/
-static int cpustates_column;
-
/* cpustates_tag() calculates the correct tag to use to label the line */
char *cpustates_tag()
@@ -398,6 +428,7 @@
cpustates_column = strlen(use);
return(use);
}
+#endif
i_cpustates(states)
@@ -406,11 +437,18 @@
{
register int i = 0;
register int value;
- register char **names = cpustate_names;
+ register char **names;
register char *thisname;
+ int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+ names = cpustate_names;
/* print tag and bump lastline */
- printf("\n%s", cpustates_tag());
+ if (num_cpus == 1)
+ printf("\nCPU: ");
+ else
+ printf("\nCPU %d: ", cpu);
lastline++;
/* now walk thru the names and print the line */
@@ -423,14 +461,15 @@
/* if percentage is >= 1000, print it as 100% */
printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"),
- i++ == 0 ? "" : ", ",
+ (i++ % num_cpustates) == 0 ? "" : ", ",
((float)value)/10.,
thisname);
}
}
+}
/* copy over values into "last" array */
- memcpy(lcpustates, states, num_cpustates * sizeof(int));
+ memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus);
}
u_cpustates(states)
@@ -439,14 +478,18 @@
{
register int value;
- register char **names = cpustate_names;
+ register char **names;
register char *thisname;
register int *lp;
register int *colp;
+ int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+ names = cpustate_names;
- Move_to(cpustates_column, y_cpustates);
- lastline = y_cpustates;
- lp = lcpustates;
+ Move_to(cpustates_column, y_cpustates + cpu);
+ lastline = y_cpustates + cpu;
+ lp = lcpustates + (cpu * num_cpustates);
colp = cpustate_columns;
/* we could be much more optimal about this */
@@ -458,8 +501,8 @@
if (*lp != *states)
{
/* yes, move and change */
- Move_to(cpustates_column + *colp, y_cpustates);
- lastline = y_cpustates;
+ Move_to(cpustates_column + *colp, y_cpustates + cpu);
+ lastline = y_cpustates + cpu;
/* retrieve value and remember it */
value = *states;
@@ -479,30 +522,39 @@
colp++;
}
}
+}
z_cpustates()
{
register int i = 0;
- register char **names = cpustate_names;
+ register char **names;
register char *thisname;
register int *lp;
+ int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+ names = cpustate_names;
/* show tag and bump lastline */
- printf("\n%s", cpustates_tag());
+ if (num_cpus == 1)
+ printf("\nCPU: ");
+ else
+ printf("\nCPU %d: ", cpu);
lastline++;
while ((thisname = *names++) != NULL)
{
if (*thisname != '\0')
{
- printf("%s %% %s", i++ == 0 ? "" : ", ", thisname);
+ printf("%s %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname);
}
}
+}
/* fill the "last" array with all -1s, to insure correct updating */
lp = lcpustates;
- i = num_cpustates;
+ i = num_cpustates * num_cpus;
while (--i >= 0)
{
*lp++ = -1;
==== //depot/projects/dtrace6/src/contrib/top/layout.h#2 (text+ko) ====
@@ -4,26 +4,28 @@
* This file defines the locations on tne screen for various parts of the
* display. These definitions are used by the routines in "display.c" for
* cursor addressing.
+ *
+ * $FreeBSD: src/contrib/top/layout.h,v 1.2.40.1 2008/04/09 19:48:06 peter Exp $
*/
-#define x_lastpid 10
-#define y_lastpid 0
-#define x_loadave 33
-#define x_loadave_nompid 15
-#define y_loadave 0
-#define x_procstate 0
-#define y_procstate 1
-#define x_brkdn 15
-#define y_brkdn 1
-#define x_mem 5
-#define y_mem 3
-#define x_swap 6
-#define y_swap 4
-#define y_message 5
-#define x_header 0
-#define y_header 6
-#define x_idlecursor 0
-#define y_idlecursor 5
-#define y_procs 7
+extern int x_lastpid; /* 10 */
+extern int y_lastpid; /* 0 */
+extern int x_loadave; /* 33 */
+extern int x_loadave_nompid; /* 15 */
+extern int y_loadave; /* 0 */
+extern int x_procstate; /* 0 */
+extern int y_procstate; /* 1 */
+extern int x_brkdn; /* 15 */
+extern int y_brkdn; /* 1 */
+extern int x_mem; /* 5 */
+extern int y_mem; /* 3 */
+extern int x_swap; /* 6 */
+extern int y_swap; /* 4 */
+extern int y_message; /* 5 */
+extern int x_header; /* 0 */
+extern int y_header; /* 6 */
+extern int x_idlecursor; /* 0 */
+extern int y_idlecursor; /* 5 */
+extern int y_procs; /* 7 */
-#define y_cpustates 2
+extern int y_cpustates; /* 2 */
==== //depot/projects/dtrace6/src/contrib/top/machine.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/contrib/top/machine.h,v 1.7.2.2 2007/05/04 15:45:13 rafan Exp $
+ * $FreeBSD: src/contrib/top/machine.h,v 1.7.2.3 2008/04/09 19:48:06 peter Exp $
*/
/*
@@ -20,6 +20,7 @@
#ifdef ORDER
char **order_names;
#endif
+ int ncpus;
};
/*
@@ -43,6 +44,8 @@
int *memory;
int *swap;
struct timeval boottime;
+ unsigned long cpumask; /* bitfield of cpu states represented */
+ int ncpus;
};
/* cpu_states is an array of percentages * 10. For example,
==== //depot/projects/dtrace6/src/contrib/top/top.c#2 (text+ko) ====
@@ -1,3 +1,5 @@
+
+
char *copyright =
"Copyright (c) 1984 through 1996, William LeFebvre";
@@ -13,7 +15,7 @@
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD: src/contrib/top/top.c,v 1.17.2.3 2007/05/04 15:45:13 rafan Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.17.2.4 2008/04/09 19:48:06 peter Exp $
*/
/*
@@ -65,6 +67,8 @@
/* imported from screen.c */
extern int overstrike;
+int pcpu_stats = No;
+
/* signal handling routines */
sigret_t leave();
sigret_t onalrm();
@@ -279,7 +283,7 @@
optind = 1;
}
- while ((i = getopt(ac, av, "CSIHbijnquvs:d:U:m:o:t")) != EOF)
+ while ((i = getopt(ac, av, "CSIHPbijnpquvs:d:U:m:o:t")) != EOF)
{
switch(i)
{
@@ -400,6 +404,14 @@
ps.jail = !ps.jail;
break;
+ case 'P':
+ pcpu_stats = Yes;
+ break;
+
+ case 'p':
+ pcpu_stats = No;
+ break;
+
default:
fprintf(stderr,
"Top version %s\n"
==== //depot/projects/dtrace6/src/contrib/top/top.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/contrib/top/top.h,v 1.3 2004/07/01 09:12:38 alfred Exp $
+ * $FreeBSD: src/contrib/top/top.h,v 1.3.8.1 2008/04/09 19:48:06 peter Exp $
*/
/*
* Top - a top users display for Berkeley Unix
@@ -11,7 +11,7 @@
#define VERSION 3
/* Number of lines of header information on the standard screen */
-#define Header_lines 7
+extern int Header_lines; /* 7 */
/* Maximum number of columns allowed for display */
#define MAX_COLS 128
@@ -40,3 +40,5 @@
enum displaymodes { DISP_CPU = 0, DISP_IO, DISP_MAX };
extern enum displaymodes displaymode;
+
+extern int pcpu_stats;
==== //depot/projects/dtrace6/src/etc/defaults/rc.conf#5 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.43 2008/02/26 10:30:18 maxim Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.44 2008/04/15 20:31:14 emax Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -355,6 +355,19 @@
bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file
bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file
+rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO)
+rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf
+#
+#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one'
+rfcomm_pppd_server_one_channel="1" # Override local channel for 'one'
+#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register
+#rfcomm_pppd_server_one_register_dun="NO" # for 'one'
+#
+#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two'
+rfcomm_pppd_server_two_channel="3" # Override local channel for 'two'
+#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register
+#rfcomm_pppd_server_two_register_dun="NO" # for 'two'
+
### Miscellaneous network options: ###
icmp_bmcastecho="NO" # respond to broadcast ping packets
==== //depot/projects/dtrace6/src/etc/freebsd-update.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/freebsd-update.conf,v 1.1.2.3 2007/12/04 22:50:38 cperciva Exp $
+# $FreeBSD: src/etc/freebsd-update.conf,v 1.1.2.4 2008/04/04 23:25:08 cperciva Exp $
# Trusted keyprint. Changing this is a Bad Idea unless you've received
# a PGP-signed email from <security-officer at FreeBSD.org> telling you to
@@ -28,7 +28,7 @@
# When upgrading to a new FreeBSD release, files which match MergeChanges
# will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/
+MergeChanges /etc/ /var/named/etc/ /boot/device.hints
### Default configuration options:
==== //depot/projects/dtrace6/src/etc/rc.d/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.53.2.20 2008/01/30 08:13:57 mtm Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.53.2.21 2008/04/15 20:31:14 emax Exp $
FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
@@ -27,7 +27,7 @@
pccard pcvt pf pflog pfsync \
powerd power_profile ppp pppoed pwcheck \
quota \
- ramdisk ramdisk-own random rarpd resolv root \
+ ramdisk ramdisk-own random rarpd resolv rfcomm_pppd_server root \
route6d routed routing rpcbind rtadvd rwho \
savecore sdpd securelevel sendmail \
serial sppp statd swap1 \
==== //depot/projects/dtrace6/src/etc/rc.d/ppp#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ppp,v 1.11.2.4 2007/10/31 18:53:07 emax Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.11.2.5 2008/04/15 22:37:43 brooks Exp $
#
# PROVIDE: ppp
@@ -18,20 +18,26 @@
ppp_start_profile()
{
- local _ppp_profile _ppp_mode _ppp_nat
+ local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
+ local _ppp_profile_cleaned _punct _punct_c
_ppp_profile=$1
+ _ppp_profile_cleaned=$1
+ _punct=". - / +"
+ for _punct_c in $_punct; do
+ _ppp_profile_cleaned=`ltr ${_ppp_profile_cleaned} ${_punct_c} '_'`
+ done
# Check for ppp profile mode override.
#
- eval _ppp_mode=\$ppp_${_ppp_profile}_mode
+ eval _ppp_mode=\$ppp_${_ppp_profile_cleaned}_mode
if [ -z "$_ppp_mode" ]; then
_ppp_mode=$ppp_mode
fi
# Check for ppp profile nat override.
#
- eval _ppp_nat=\$ppp_${_ppp_profile}_nat
+ eval _ppp_nat=\$ppp_${_ppp_profile_cleaned}_nat
if [ -z "$_ppp_nat" ]; then
_ppp_nat=$ppp_nat
fi
@@ -54,6 +60,13 @@
;;
esac
+ # Check for hard wired unit
+ eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
+ if [ -n "${_ppp_unit}" ]; then
+ _ppp_unit="-unit${_ppp_unit}"
+ fi
+ rc_flags="$rc_flags $_ppp_unit"
+
# Run!
#
su -m $ppp_user -c "$command ${rc_flags} ${_ppp_profile}"
==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kld.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6.4.1 2008/02/25 22:20:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6.4.2 2008/04/03 18:47:05 jhb Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -331,6 +331,7 @@
char *path;
int error;
+ head = NULL;
prev = &head;
/*
==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/main.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.7.2.5 2008/02/25 22:20:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.7.2.6 2008/04/03 18:47:05 jhb Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -59,6 +59,7 @@
#include <top.h>
#include <bfd.h>
#include <gdbcore.h>
+#include <wrapper.h>
extern void (*init_ui_hook)(char *);
@@ -188,13 +189,15 @@
char *s;
CORE_ADDR n;
- s = strdup(exp);
- old_chain = make_cleanup(free_current_contents, &expr);
- expr = parse_expression(s);
- val = (expr != NULL) ? evaluate_expression(expr) : NULL;
- n = (val != NULL) ? value_as_address(val) : 0;
+ n = 0;
+ s = xstrdup(exp);
+ old_chain = make_cleanup(xfree, s);
+ if (gdb_parse_exp_1(&s, NULL, 0, &expr) && *s == '\0') {
+ make_cleanup(free_current_contents, &expr);
+ if (gdb_evaluate_expression(expr, &val))
+ n = value_as_address(val);
+ }
do_cleanups(old_chain);
- free(s);
return (n);
}
==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.2.2.4 2008/02/25 22:20:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.2.2.5 2008/04/03 18:49:05 jhb Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -174,6 +174,32 @@
kgdb_switch_to_thread(thr);
}
+static void
+kgdb_set_tid_cmd (char *arg, int from_tty)
+{
+ CORE_ADDR addr;
+ struct kthr *thr;
+
+ if (!arg)
+ error_no_arg ("TID or thread address for the new context");
+
+ if (kvm == NULL)
+ error ("no kernel core file");
+
+ addr = (CORE_ADDR) parse_and_eval_address (arg);
+
+ if (!INKERNEL (addr)) {
+ thr = kgdb_thr_lookup_tid((int)addr);
+ if (thr == NULL)
+ error ("invalid TID");
+ } else {
+ thr = kgdb_thr_lookup_taddr(addr);
+ if (thr == NULL)
+ error("invalid thread address");
+ }
+ kgdb_switch_to_thread(thr);
+}
+
void
kgdb_target(void)
{
@@ -215,5 +241,7 @@
inferior_ptid = ptid_build(curkthr->pid, 0, curkthr->tid);
add_com ("proc", class_obscure, kgdb_set_proc_cmd,
"Set current process context");
+ add_com ("tid", class_obscure, kgdb_set_tid_cmd,
+ "Set current thread context");
kgdb_kld_init();
}
==== //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.883.2.90 2008/02/16 16:08:04 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.883.2.91 2008/04/06 05:34:14 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -131,9 +131,12 @@
<sect3 id="boot">
<title>Boot Loader Changes</title>
- <para></para>
+ <!-- Above this line, order boot loader changes by keyword-->
- <!-- Above this line, order boot loader changes by keyword-->
+ <para arch="i386,amd64">The BTX kernel used by the boot
+ loader has been changed to invoke BIOS routines from real
+ mode. This change makes it possible to boot &os; from USB
+ devices.</para>
</sect3>
@@ -196,7 +199,9 @@
<sect2 id="contrib">
<title>Contributed Software</title>
- <para></para>
+ <para>The timezone database has been updated from
+ the <application>tzdata2007k</application> release to
+ the <application>tzdata2008b</application> release.</para>
</sect2>
@@ -210,7 +215,11 @@
<sect2 id="releng">
<title>Release Engineering and Integration</title>
- <para></para>
+ <para>The supported version of
+ the <application>GNOME</application> desktop environment
+ (<filename role="package">x11/gnome2</filename>) has been
+ updated from 2.20.1 to 2.22.</para>
+
</sect2>
<sect2 id="doc">
==== //depot/projects/dtrace6/src/sbin/dhclient/dhclient-script#5 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $
-# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4.2.7 2008/03/12 17:29:42 brooks Exp $
+# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4.2.8 2008/04/11 00:18:37 brooks Exp $
#
# Copyright (c) 2003 Kenneth R Westerback <krw at openbsd.org>
#
@@ -20,10 +20,8 @@
#
ARP=/usr/sbin/arp
-AWK=/usr/bin/awk
HOSTNAME=/bin/hostname
IFCONFIG='/sbin/ifconfig -n'
-NETSTAT=/usr/bin/netstat
LOCALHOST=127.0.0.1
@@ -124,11 +122,12 @@
return 0;
fi
- for router in $old_routers; do
- if [ $if_defaultroute = x -o $if_defaultroute = $interface ]; then
- route delete default $route >/dev/null 2>&1
- fi
- done
+ # If we supported multiple default routes, we'd be removing each
+ # one here. We don't so just delete the default route if it's
+ # through our interface.
+ if is_default_interface; then
+ route delete default >/dev/null 2>&1
+ fi
if [ -n "$old_static_routes" ]; then
set $old_static_routes
@@ -169,10 +168,13 @@
fi
for router in $new_routers; do
- if [ "$new_ip_address" = "$router" ]; then
- route add default -iface $router >/dev/null 2>&1
- else
- route add default $router >/dev/null 2>&1
+ if is_default_interface; then
+
+ if [ "$new_ip_address" = "$router" ]; then
+ route add default -iface $router >/dev/null 2>&1
+ else
+ route add default $router >/dev/null 2>&1
+ fi
fi
# 2nd and subsequent default routers error out, so explicitly
# stop processing the list after the first one.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list