From owner-svn-src-all@freebsd.org  Tue Sep 29 12:02:23 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1CDCA0B7F5;
 Tue, 29 Sep 2015 12:02:23 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E020B131F;
 Tue, 29 Sep 2015 12:02:23 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TC2Nk2056327;
 Tue, 29 Sep 2015 12:02:23 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TC2NpG056326;
 Tue, 29 Sep 2015 12:02:23 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201509291202.t8TC2NpG056326@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 29 Sep 2015 12:02:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288363 - head/sys/cddl/dev/sdt
X-SVN-Group: head
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.20
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2015 12:02:24 -0000

Author: avg
Date: Tue Sep 29 12:02:23 2015
New Revision: 288363
URL: https://svnweb.freebsd.org/changeset/base/288363

Log:
  std: it is important that func name is never an empty string
  
  otherwise DTRACE_ANCHORED() returns false and that makes stack()
  insert a bogus frame at the top.
  For example:
  dtrace -n 'test:dtrace_test::sdttest { stack(); }
  
  This change is not really a solution, but just a work-around.
  The real solution is to record the probe's call site and to use
  that for resolving a function name.
  
  PR:		195222
  MFC after:	22 days

Modified:
  head/sys/cddl/dev/sdt/sdt.c

Modified: head/sys/cddl/dev/sdt/sdt.c
==============================================================================
--- head/sys/cddl/dev/sdt/sdt.c	Tue Sep 29 11:58:21 2015	(r288362)
+++ head/sys/cddl/dev/sdt/sdt.c	Tue Sep 29 12:02:23 2015	(r288363)
@@ -168,6 +168,8 @@ sdt_create_probe(struct sdt_probe *probe
 	 * in the C compiler, so we have to respect const vs non-const.
 	 */
 	strlcpy(func, probe->func, sizeof(func));
+	if (func[0] == '\0')
+		strcpy(func, "none");
 
 	from = probe->name;
 	to = name;