From owner-svn-src-all@FreeBSD.ORG  Sat Jul  6 03:39:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5AAB775A;
 Sat,  6 Jul 2013 03:39:41 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4D1CE133A;
 Sat,  6 Jul 2013 03:39:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r663dfqh098341;
 Sat, 6 Jul 2013 03:39:41 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r663dfkM098340;
 Sat, 6 Jul 2013 03:39:41 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201307060339.r663dfkM098340@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sat, 6 Jul 2013 03:39:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252860 - stable/9/sys/cddl/dev/dtmalloc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jul 2013 03:39:41 -0000

Author: markj
Date: Sat Jul  6 03:39:40 2013
New Revision: 252860
URL: http://svnweb.freebsd.org/changeset/base/252860

Log:
  MFC r252325:
  The dtmalloc provider uses the short description of a malloc type as the
  function name of its corresponding DTrace probes. These descriptions may
  contain whitespace, but probe names cannot, so just replace any whitespace
  with underscores when creating probes.

Modified:
  stable/9/sys/cddl/dev/dtmalloc/dtmalloc.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cddl/dev/dtmalloc/dtmalloc.c
==============================================================================
--- stable/9/sys/cddl/dev/dtmalloc/dtmalloc.c	Sat Jul  6 02:50:22 2013	(r252859)
+++ stable/9/sys/cddl/dev/dtmalloc/dtmalloc.c	Sat Jul  6 03:39:40 2013	(r252860)
@@ -28,6 +28,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/ctype.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -111,8 +112,17 @@ dtmalloc_type_cb(struct malloc_type *mtp
 {
 	char name[DTRACE_FUNCNAMELEN];
 	struct malloc_type_internal *mtip = mtp->ks_handle;
+	int i;
 
+	/*
+	 * malloc_type descriptions are allowed to contain whitespace, but
+	 * DTrace probe identifiers are not, so replace the whitespace with
+	 * underscores.
+	 */
 	strlcpy(name, mtp->ks_shortdesc, sizeof(name));
+	for (i = 0; name[i] != 0; i++)
+		if (isspace(name[i]))
+			name[i] = '_';
 
 	if (dtrace_probe_lookup(dtmalloc_id, NULL, name, "malloc") != 0)
 		return;