From owner-svn-src-projects@freebsd.org Mon Jun 6 14:24:03 2016 Return-Path: Delivered-To: svn-src-projects@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 04B72B6D4D1 for ; Mon, 6 Jun 2016 14:24:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C8BBB1086; Mon, 6 Jun 2016 14:24:02 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u56EO128067055; Mon, 6 Jun 2016 14:24:01 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u56EO1Ol067054; Mon, 6 Jun 2016 14:24:01 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201606061424.u56EO1Ol067054@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Mon, 6 Jun 2016 14:24:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r301510 - projects/vnet/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2016 14:24:03 -0000 Author: bz Date: Mon Jun 6 14:24:01 2016 New Revision: 301510 URL: https://svnweb.freebsd.org/changeset/base/301510 Log: Revert some local debugging which was not merged to HEAD. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/net/netisr.c Modified: projects/vnet/sys/net/netisr.c ============================================================================== --- projects/vnet/sys/net/netisr.c Mon Jun 6 14:05:54 2016 (r301509) +++ projects/vnet/sys/net/netisr.c Mon Jun 6 14:24:01 2016 (r301510) @@ -861,9 +861,6 @@ netisr_process_workstream_proto(struct n struct netisr_work local_npw, *npwp; u_int handled; struct mbuf *m; -#ifdef INVARIANTS - u_int b, f; -#endif NETISR_LOCK_ASSERT(); NWS_LOCK_ASSERT(nwsp); @@ -877,10 +874,6 @@ netisr_process_workstream_proto(struct n if (npwp->nw_len == 0) return (0); -#ifdef INVARIANTS - b = npwp->nw_len; - f = 0; -#endif /* * Move the global work queue to a thread-local work queue. * @@ -901,7 +894,6 @@ netisr_process_workstream_proto(struct n if (local_npw.nw_head == NULL) local_npw.nw_tail = NULL; local_npw.nw_len--; - f++; VNET_ASSERT(m->m_pkthdr.rcvif != NULL, ("%s:%d rcvif == NULL: m=%p", __func__, __LINE__, m)); CURVNET_SET(m->m_pkthdr.rcvif->if_vnet); @@ -909,8 +901,7 @@ netisr_process_workstream_proto(struct n CURVNET_RESTORE(); } KASSERT(local_npw.nw_len == 0, - ("%s(%u): len %u b %u f %u", __func__, proto, local_npw.nw_len, - b, f)); + ("%s(%u): len %u", __func__, proto, local_npw.nw_len)); if (netisr_proto[proto].np_drainedcpu) netisr_proto[proto].np_drainedcpu(nwsp->nws_cpu); NWS_LOCK(nwsp);