From owner-p4-projects@FreeBSD.ORG  Tue Jul 19 11:01:51 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E44BB1065673; Tue, 19 Jul 2011 11:01:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6D24106566B
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 11:01:50 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 957348FC17
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 11:01:50 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6JB1oDQ065923
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 11:01:50 GMT
	(envelope-from syuu@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JB1oju065920
	for perforce@freebsd.org; Tue, 19 Jul 2011 11:01:50 GMT
	(envelope-from syuu@FreeBSD.org)
Date: Tue, 19 Jul 2011 11:01:50 GMT
Message-Id: <201107191101.p6JB1oju065920@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	syuu@FreeBSD.org using -f
From: Takuya ASADA <syuu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196391 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jul 2011 11:01:51 -0000

http://p4web.freebsd.org/@@196391?ac=10

Change 196391 by syuu@kikurage on 2011/07/19 11:01:24

	remove debug logging/dtrace probe

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#4 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#4 (text+ko) ====

@@ -41,7 +41,6 @@
 #include <sys/kernel.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
-#include <sys/sdt.h>
 
 #include <net/if.h>
 #include <net/netisr.h>
@@ -53,7 +52,6 @@
 #include <netinet/toeplitz.h>
 
 #ifdef SOFTRSS
-#include <sys/syslog.h>
 #include <net/ethernet.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
@@ -182,10 +180,6 @@
 static void softrss_set_flowid(struct mbuf *m);
 #endif
 
-SDT_PROVIDER_DECLARE(rss);
-SDT_PROVIDER_DEFINE(rss);
-SDT_PROBE_DEFINE2(rss, functions, rss_m2cpuid, entry, entry, "uint32_t", "uint32_t");
-
 static void
 rss_init(__unused void *arg)
 {
@@ -437,20 +431,16 @@
 	case M_HASHTYPE_RSS_TCP_IPV4:
 		*cpuid = rss_getcpu(rss_getbucket(m->m_pkthdr.flowid));
 #ifdef SOFTRSS
-		log(LOG_DEBUG, "%s SOFTRSS set rxqid:%d\n", __func__, *cpuid);
 		m->m_pkthdr.rxqid = *cpuid;
 		m->m_pkthdr.txqid = (uint32_t)-1;
-		SDT_PROBE2(rss, functions, rss_m2cpuid, entry, m->m_pkthdr.rxqid, m->m_pkthdr.txqid);
 #endif
 		return (m);
 
 	default:
 		*cpuid = NETISR_CPUID_NONE;
 #ifdef SOFTRSS
-		log(LOG_DEBUG, "%s SOFTRSS set rxqid:%d\n", __func__, *cpuid);
 		m->m_pkthdr.rxqid = curcpu;
 		m->m_pkthdr.txqid = (uint32_t)-1;
-		SDT_PROBE2(rss, functions, rss_m2cpuid, entry, m->m_pkthdr.rxqid, m->m_pkthdr.txqid);
 #endif
 		return (m);
 	}