Date: Mon, 6 Jun 2016 14:24:01 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r301510 - projects/vnet/sys/net Message-ID: <201606061424.u56EO1Ol067054@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606061424.u56EO1Ol067054>