Author: jeff
Date: Sun Jan 25 07:35:10 2009
New Revision: 187679
URL: http://svn.freebsd.org/changeset/base/187679
Log:
- Use __XSTRING where I want the define to be expanded. This resulted in
sizeof("MAXCPU") being used to calculate a string length rather than
something more reasonable such as sizeof("32"). This shouldn't have
caused any ill effect until we run on machines with 1000000 or more
cpus.
Modified:
head/sys/kern/sched_4bsd.c
head/sys/kern/sched_ule.c
head/sys/sys/pcpu.h
Modified: head/sys/kern/sched_4bsd.c
==============================================================================
--- head/sys/kern/sched_4bsd.c Sun Jan 25 07:31:51 2009 (r187678)
+++ head/sys/kern/sched_4bsd.c Sun Jan 25 07:35:10 2009 (r187679)
@@ -82,7 +82,7 @@ dtrace_vtime_switch_func_t dtrace_vtime_
#endif
#define NICE_WEIGHT 1 /* Priorities per nice level. */
-#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") +
sizeof(__STRING(UINT_MAX)))
+#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") +
sizeof(__XSTRING(UINT_MAX)))
/*
* The schedulable entity that runs a context.
Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c Sun Jan 25 07:31:51 2009 (r187678)
+++ head/sys/kern/sched_ule.c Sun Jan 25 07:35:10 2009 (r187679)
@@ -86,8 +86,8 @@ dtrace_vtime_switch_func_t dtrace_vtime_
#define KTR_ULE 0
-#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") +
sizeof(__STRING(UINT_MAX)))
-#define TDQ_NAME_LEN (sizeof("sched lock ") +
sizeof(__STRING(MAXCPU)))
+#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"))
/*
Modified: head/sys/sys/pcpu.h
==============================================================================
--- head/sys/sys/pcpu.h Sun Jan 25 07:31:51 2009 (r187678)
+++ head/sys/sys/pcpu.h Sun Jan 25 07:35:10 2009 (r187679)
@@ -54,7 +54,7 @@ struct rm_queue {
struct rm_queue* volatile rmq_prev;
};
-#define PCPU_NAME_LEN (sizeof("CPU ") + sizeof(__STRING(MAXCPU) + 1))
+#define PCPU_NAME_LEN (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU) + 1))
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
