Merge git.joyent.com:illumos-joyent20120517

1 files changed, 15 insertions, 0 deletions

diff --git a/usr/src/cmd/svc/startd/startd.c b/usr/src/cmd/svc/startd/startd.c
index f0c57d37eb..14180c5f54 100644
--- a/usr/src/cmd/svc/startd/startd.c
+++ b/usr/src/cmd/svc/startd/startd.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
 
 /*
@@ -143,6 +144,7 @@ static uint8_t prop_reconfig = 0;
 
 pthread_mutexattr_t mutex_attrs;
 
+#ifdef DEBUG
 const char *
 _umem_debug_init(void)
 {
@@ -154,6 +156,19 @@ _umem_logging_init(void)
 {
 	return ("fail,contents");	/* UMEM_LOGGING setting */
 }
+#endif
+
+const char *
+_umem_options_init(void)
+{
+	/*
+	 * To reduce our memory footprint, we set our UMEM_OPTIONS to indicate
+	 * that we do not wish to have per-CPU magazines -- if svc.startd is so
+	 * hot on CPU such that this becomes a scalability problem, there are
+	 * likely deeper things amiss...
+	 */
+	return ("nomagazines");		/* UMEM_OPTIONS setting */
+}
 
 /*
  * startd_alloc_retry()