PERFORCE change 56055 for review
John Baldwin
jhb at FreeBSD.org
Mon Jun 28 21:05:30 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=56055
Change 56055 by jhb at jhb_slimer on 2004/06/29 04:04:41
IFC @56054.
Affected files ...
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#13 integrate
.. //depot/projects/smpng/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/smpng/sys/kern/subr_turnstile.c#12 integrate
Differences ...
==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#13 (text+ko) ====
@@ -100,7 +100,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.38 2004/06/21 22:46:35 darrenr Exp $";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.39 2004/06/29 03:39:06 darrenr Exp $";
#endif
#ifndef _KERNEL
@@ -2155,9 +2155,6 @@
ip_natsync(ifp);
ip_statesync(ifp);
}
-# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043)
- IFNET_RUNLOCK();
-# endif
ip_natsync((struct ifnet *)-1);
# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043)
IFNET_RUNLOCK();
==== //depot/projects/smpng/sys/kern/link_elf_obj.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.84 2004/06/15 23:57:02 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.85 2004/06/29 03:13:54 peter Exp $");
#include "opt_ddb.h"
#include "opt_mac.h"
@@ -562,7 +562,9 @@
if (ra != ef->nrela)
panic("lost rela");
if (mapbase != (vm_offset_t)ef->address + mapsize)
- panic("mapbase 0x%lx != address %p + mapsize 0x%lx (0x%lx)\n", mapbase, ef->address, mapsize, (vm_offset_t)ef->address + mapsize);
+ panic("mapbase 0x%lx != address %p + mapsize 0x%lx (0x%lx)\n",
+ mapbase, ef->address, mapsize,
+ (vm_offset_t)ef->address + mapsize);
/* Local intra-module relocations */
link_elf_reloc_local(lf);
==== //depot/projects/smpng/sys/kern/subr_turnstile.c#12 (text+ko) ====
@@ -59,7 +59,7 @@
#include "opt_turnstile_profiling.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.143 2004/06/29 02:30:12 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.144 2004/06/29 03:48:49 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,6 +142,9 @@
* Prototypes for non-exported routines.
*/
static void init_turnstile0(void *dummy);
+#ifdef TURNSTILE_PROFILING
+static void init_turnstile_profiling(void *arg);
+#endif
static void propagate_priority(struct thread *);
static void turnstile_setowner(struct turnstile *ts, struct thread *owner);
@@ -307,17 +310,26 @@
void
init_turnstiles(void)
{
-#ifdef TURNSTILE_PROFILING
- struct sysctl_oid *chain_oid;
- char chain_name[10];
-#endif
int i;
for (i = 0; i < TC_TABLESIZE; i++) {
LIST_INIT(&turnstile_chains[i].tc_turnstiles);
mtx_init(&turnstile_chains[i].tc_lock, "turnstile chain",
NULL, MTX_SPIN);
+ }
+ mtx_init(&td_contested_lock, "td_contested", NULL, MTX_SPIN);
+ thread0.td_turnstile = NULL;
+}
+
#ifdef TURNSTILE_PROFILING
+static void
+init_turnstile_profiling(void *arg)
+{
+ struct sysctl_oid *chain_oid;
+ char chain_name[10];
+ int i;
+
+ for (i = 0; i < TC_TABLESIZE; i++) {
snprintf(chain_name, sizeof(chain_name), "%d", i);
chain_oid = SYSCTL_ADD_NODE(NULL,
SYSCTL_STATIC_CHILDREN(_debug_turnstile_chains), OID_AUTO,
@@ -328,11 +340,11 @@
SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(chain_oid), OID_AUTO,
"max_depth", CTLFLAG_RD, &turnstile_chains[i].tc_max_depth,
0, NULL);
-#endif
}
- mtx_init(&td_contested_lock, "td_contested", NULL, MTX_SPIN);
- thread0.td_turnstile = NULL;
}
+SYSINIT(turnstile_profiling, SI_SUB_LOCK, SI_ORDER_ANY,
+ init_turnstile_profiling, NULL);
+#endif
static void
init_turnstile0(void *dummy)
More information about the p4-projects
mailing list