From owner-svn-src-projects@FreeBSD.ORG Fri May 29 22:28:28 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AA031065673; Fri, 29 May 2009 22:28:28 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2EC048FC0C; Fri, 29 May 2009 22:28:28 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TMSRTx088763; Fri, 29 May 2009 22:28:27 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TMSRUG088762; Fri, 29 May 2009 22:28:27 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200905292228.n4TMSRUG088762@svn.freebsd.org> From: Robert Watson Date: Fri, 29 May 2009 22:28:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193071 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 29 May 2009 22:28:28 -0000 Author: rwatson Date: Fri May 29 22:28:27 2009 New Revision: 193071 URL: http://svn.freebsd.org/changeset/base/193071 Log: Trim hybrid cross-cpu counter, related tweaks. Modified: projects/pnet/sys/net/netisr2.c Modified: projects/pnet/sys/net/netisr2.c ============================================================================== --- projects/pnet/sys/net/netisr2.c Fri May 29 22:19:45 2009 (r193070) +++ projects/pnet/sys/net/netisr2.c Fri May 29 22:28:27 2009 (r193071) @@ -179,7 +179,7 @@ struct netisr_proto { const char *np_name; /* Character string protocol name. */ netisr_t *np_handler; /* Protocol handler. */ netisr_m2flow_t *np_m2flow; /* Query flow for untagged packet. */ - netisr_m2cpuid_t *np_m2cpuid; /* Query CPU to process packet on. */ + netisr_m2cpuid_t *np_m2cpuid; /* Query CPU to process packet on. */ u_int np_qlimit; /* Maximum per-CPU queue depth. */ u_int np_policy; /* Work placement policy. */ }; @@ -214,7 +214,6 @@ struct netisr_work { */ u_int64_t nw_dispatched; /* Number of direct dispatches. */ u_int64_t nw_hybrid_dispatched; /* "" hybrid dispatches. */ - u_int64_t nw_hybrid_xcpudispatched; /* "" cross-CPU hybrid. */ u_int64_t nw_qdrops; /* "" drops. */ u_int64_t nw_queued; /* "" enqueues. */ u_int64_t nw_handled; /* "" handled in worker. */ @@ -930,10 +929,7 @@ netisr2_dispatch_src(u_int proto, uintpt NWS_LOCK(nwsp); nwsp->nws_flags &= ~NWS_DISPATCHING; npwp->nw_handled++; - if (curcpu == cpuid) - npwp->nw_hybrid_dispatched++; - else - npwp->nw_hybrid_xcpudispatched++; + npwp->nw_hybrid_dispatched++; /* * If other work was enqueued by another thread while we were direct @@ -1088,9 +1084,8 @@ DB_SHOW_COMMAND(netisr2, db_show_netisr2 struct netisr_work *nwp; int cpu, first, proto; - db_printf("%3s %6s %5s %5s %5s %8s %8s %8s %8s %8s\n", "CPU", - "Proto", "Len", "WMark", "Max", "Disp", "HDisp", "XHDisp", - "Drop", "Queue"); + db_printf("%3s %6s %5s %5s %5s %8s %8s %8s %8s\n", "CPU", "Proto", + "Len", "WMark", "Max", "Disp", "HDisp", "Drop", "Queue"); for (cpu = 0; cpu < MAXCPU; cpu++) { nwsp = &nws[cpu]; if (nwsp->nws_intr_event == NULL) @@ -1106,12 +1101,11 @@ DB_SHOW_COMMAND(netisr2, db_show_netisr2 } else db_printf("%3s ", ""); db_printf( - "%6s %5d %5d %5d %8ju %8ju %8ju %8ju %8ju\n", + "%6s %5d %5d %5d %8ju %8ju %8ju %8ju\n", np[proto].np_name, nwp->nw_len, nwp->nw_watermark, nwp->nw_qlimit, nwp->nw_dispatched, nwp->nw_hybrid_dispatched, - nwp->nw_hybrid_xcpudispatched, nwp->nw_qdrops, - nwp->nw_queued); + nwp->nw_qdrops, nwp->nw_queued); } } }