From owner-p4-projects@FreeBSD.ORG Thu Feb 1 15:52:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB0916A403; Thu, 1 Feb 2007 15:52:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7B1016A401 for ; Thu, 1 Feb 2007 15:52:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AA01A13C442 for ; Thu, 1 Feb 2007 15:52:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l11FqBne049574 for ; Thu, 1 Feb 2007 15:52:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l11FqBmg049570 for perforce@freebsd.org; Thu, 1 Feb 2007 15:52:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 1 Feb 2007 15:52:11 GMT Message-Id: <200702011552.l11FqBmg049570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 113841 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2007 15:52:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=113841 Change 113841 by rwatson@rwatson_cinnamon on 2007/02/01 15:51:33 Update zbuf_tap for shared header in buffers. Affected files ... .. //depot/projects/zcopybpf/utils/zbuf_tap/zbuf_tap.c#4 edit Differences ... ==== //depot/projects/zcopybpf/utils/zbuf_tap/zbuf_tap.c#4 (text+ko) ==== @@ -56,7 +56,9 @@ int main(int argc, char *argv[]) { - u_char *bufa, *bufb, *buf; + struct bpf_zbuf_header *bzh, *bzha, *bzhb; /* Buffer headers. */ + u_char *zbufa, *zbufb, *zbuf; /* Mapped pages. */ + u_char *buf; /* Buffers. */ u_int buflen, maxbuflen; struct pollfd pollfd; char name[PATH_MAX]; @@ -67,14 +69,18 @@ buflen = getpagesize() * 2; - bufa = mmap(NULL, buflen, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); - if (bufa == MAP_FAILED) + zbufa = mmap(NULL, buflen, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + if (zbufa == MAP_FAILED) err(-1, "mmap"); - bufb = mmap(NULL, buflen, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); - if (bufb == MAP_FAILED) + bzha = (struct bpf_zbuf_header *)zbufa; + + zbufb = mmap(NULL, buflen, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + if (zbufb == MAP_FAILED) err(-1, "mmap"); + bzhb = (struct bpf_zbuf_header *)zbufb; + tap_fd = tap_open(); if (tap_fd < 0) err(-1, "tap_open"); @@ -94,7 +100,7 @@ err(-1, "bpf_getzmax"); printf("zmax: %d\n", maxbuflen); - if (bpf_setzbuf(bpf_fd, bufa, bufb, buflen) < 0) + if (bpf_setzbuf(bpf_fd, zbufa, zbufb, buflen) < 0) err(-1, "bpf_setzbuf"); if (bpf_setimmediate(bpf_fd, 1) < 0) @@ -113,11 +119,25 @@ * Exercise various poll mechanisms to see which say * something is ready to read. */ - if (bpf_getznext(bpf_fd, (void **)&buf, &buflen) < 0) + if (bpf_getznext(bpf_fd, (void **)&zbuf, &buflen) < 0) err(-1, "bpf_getznext"); - printf("bpf_getznext returned (0x%x, %d)\n", (uintptr_t)buf, + printf("bpf_getznext returned (0x%x, %d)\n", (uintptr_t)zbuf, buflen); + if (zbuf != NULL) { + bzh = (struct bpf_zbuf_header *)zbuf; + if (bzh == bzha) + printf("Buffer A is next\n"); + else if (bzh == bzhb) + printf("Buffer B is next\n"); + else + errx(-1, "getznext unrecognized buffer"); + buf = (u_char *)(bzh + 1); + } else { + bzh = NULL; + buf = NULL; + } + if (ioctl(bpf_fd, FIONREAD, &i) < 0) err(-1, "ioctl(FIONREAD)"); printf("FIONREAD returned %d\n", i); @@ -146,8 +166,8 @@ else printf("select returned not readable\n"); - if (buf != NULL) { - if (bpf_ackzbuf(bpf_fd, buf, buflen) < 0) + if (zbuf != NULL) { + if (bpf_ackzbuf(bpf_fd, zbuf, buflen) < 0) err(-1, "bpf_ackzbuf(0x%x, %d)", (uintptr_t)buf, buflen); }