svn commit: r224221 - in head/sys: kern sys
Attilio Rao
attilio at FreeBSD.org
Tue Jul 19 16:50:56 UTC 2011
Author: attilio
Date: Tue Jul 19 16:50:55 2011
New Revision: 224221
URL: http://svn.freebsd.org/changeset/base/224221
Log:
Remove explicit MAXCPU usage from sys/pcpu.h avoiding a namespace
pollution. That is a step further in the direction of building correct
policies for userland and modules on how to deal with the number of
maxcpus at runtime.
Reported by: jhb
Reviewed and tested by: pluknet
Approved by: re (kib)
Modified:
head/sys/kern/sched_ule.c
head/sys/sys/pcpu.h
Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c Tue Jul 19 15:24:44 2011 (r224220)
+++ head/sys/kern/sched_ule.c Tue Jul 19 16:50:55 2011 (r224221)
@@ -84,7 +84,7 @@ dtrace_vtime_switch_func_t dtrace_vtime_
#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX)))
#define TDQ_NAME_LEN (sizeof("sched lock ") + sizeof(__XSTRING(MAXCPU)))
-#define TDQ_LOADNAME_LEN (PCPU_NAME_LEN + sizeof(" load"))
+#define TDQ_LOADNAME_LEN (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU)) - 1 + sizeof(" load"))
/*
* Thread scheduler specific section. All fields are protected
Modified: head/sys/sys/pcpu.h
==============================================================================
--- head/sys/sys/pcpu.h Tue Jul 19 15:24:44 2011 (r224220)
+++ head/sys/sys/pcpu.h Tue Jul 19 16:50:55 2011 (r224221)
@@ -146,8 +146,6 @@ struct rm_queue {
struct rm_queue* volatile rmq_prev;
};
-#define PCPU_NAME_LEN (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU)) - 1)
-
/*
* This structure maps out the global data that needs to be kept on a
* per-cpu basis. The members are accessed via the PCPU_GET/SET/PTR
@@ -200,7 +198,7 @@ struct pcpu {
STAILQ_HEAD(cpuhead, pcpu);
extern struct cpuhead cpuhead;
-extern struct pcpu *cpuid_to_pcpu[MAXCPU];
+extern struct pcpu *cpuid_to_pcpu[];
#define curcpu PCPU_GET(cpuid)
#define curproc (curthread->td_proc)
More information about the svn-src-head
mailing list