From owner-svn-src-all@FreeBSD.ORG Thu May 30 11:09:42 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3D05BBE8; Thu, 30 May 2013 11:09:42 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BC1C35EE; Thu, 30 May 2013 11:09:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4UB9fU5045232; Thu, 30 May 2013 11:09:41 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4UB9ftS045231; Thu, 30 May 2013 11:09:41 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201305301109.r4UB9ftS045231@svn.freebsd.org> From: Luigi Rizzo Date: Thu, 30 May 2013 11:09:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251131 - head/tools/tools/netmap 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.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 May 2013 11:09:42 -0000 Author: luigi Date: Thu May 30 11:09:41 2013 New Revision: 251131 URL: http://svnweb.freebsd.org/changeset/base/251131 Log: add a compile-time option to copy packets instead of doing the buffer swapping. Modified: head/tools/tools/netmap/bridge.c Modified: head/tools/tools/netmap/bridge.c ============================================================================== --- head/tools/tools/netmap/bridge.c Thu May 30 11:08:16 2013 (r251130) +++ head/tools/tools/netmap/bridge.c Thu May 30 11:09:41 2013 (r251131) @@ -14,7 +14,7 @@ int verbose = 0; -char *version = "$Id: bridge.c 12016 2013-01-23 17:24:22Z luigi $"; +char *version = "$Id$"; static int do_abort = 0; @@ -50,7 +50,12 @@ process_rings(struct netmap_ring *rxring while (limit-- > 0) { struct netmap_slot *rs = &rxring->slot[j]; struct netmap_slot *ts = &txring->slot[k]; +#ifdef NO_SWAP + char *rxbuf = NETMAP_BUF(rxring, rs->buf_idx); + char *txbuf = NETMAP_BUF(txring, ts->buf_idx); +#else uint32_t pkt; +#endif /* swap packets */ if (ts->buf_idx < 2 || rs->buf_idx < 2) { @@ -58,20 +63,24 @@ process_rings(struct netmap_ring *rxring j, rs->buf_idx, k, ts->buf_idx); sleep(2); } +#ifndef NO_SWAP pkt = ts->buf_idx; ts->buf_idx = rs->buf_idx; rs->buf_idx = pkt; - +#endif /* copy the packet length. */ if (rs->len < 14 || rs->len > 2048) D("wrong len %d rx[%d] -> tx[%d]", rs->len, j, k); else if (verbose > 1) D("%s send len %d rx[%d] -> tx[%d]", msg, rs->len, j, k); ts->len = rs->len; - +#ifdef NO_SWAP + pkt_copy(rxbuf, txbuf, ts->len); +#else /* report the buffer change. */ ts->flags |= NS_BUF_CHANGED; rs->flags |= NS_BUF_CHANGED; +#endif /* NO_SWAP */ j = NETMAP_RING_NEXT(rxring, j); k = NETMAP_RING_NEXT(txring, k); }