From owner-svn-src-projects@FreeBSD.ORG Sun Jan 11 23:19:18 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 2EF4A10656F2; Sun, 11 Jan 2009 23:19:18 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1E4968FC16; Sun, 11 Jan 2009 23:19:18 +0000 (UTC) (envelope-from sam@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 n0BNJH78041375; Sun, 11 Jan 2009 23:19:17 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0BNJHxN041374; Sun, 11 Jan 2009 23:19:17 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901112319.n0BNJHxN041374@svn.freebsd.org> From: Sam Leffler Date: Sun, 11 Jan 2009 23:19:17 +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: r187068 - projects/vap7/usr.sbin 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: Sun, 11 Jan 2009 23:19:18 -0000 Author: sam Date: Sun Jan 11 23:19:17 2009 New Revision: 187068 URL: http://svn.freebsd.org/changeset/base/187068 Log: fix mismerge; looks like part of usr.bin/Makefile got integrated Modified: projects/vap7/usr.sbin/Makefile Modified: projects/vap7/usr.sbin/Makefile ============================================================================== --- projects/vap7/usr.sbin/Makefile Sun Jan 11 22:36:45 2009 (r187067) +++ projects/vap7/usr.sbin/Makefile Sun Jan 11 23:19:17 2009 (r187068) @@ -393,23 +393,8 @@ _sysinstall= sysinstall .endif .if ${MK_TOOLCHAIN} != "no" -_ar= ar -_c89= c89 -_c99= c99 -_compile_et= compile_et -_ctags= ctags -_file2c= file2c -_gprof= gprof -_indent= indent -_lex= lex -_mkstr= mkstr -_rpcgen= rpcgen -_unifdef= unifdef -_xlint= xlint -_xstr= xstr -# XXX maybe under textproc? -_vgrind= vgrind -_yacc= yacc +_config= config +_crunch= crunch .endif .if ${MK_USB} != "no" From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 01:19:39 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 2B1E7106566B; Mon, 12 Jan 2009 01:19:39 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F38CD8FC19; Mon, 12 Jan 2009 01:19:38 +0000 (UTC) (envelope-from sam@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 n0C1JcpK044073; Mon, 12 Jan 2009 01:19:38 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0C1Jc3N044072; Mon, 12 Jan 2009 01:19:38 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901120119.n0C1Jc3N044072@svn.freebsd.org> From: Sam Leffler Date: Mon, 12 Jan 2009 01:19:38 +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: r187070 - projects/vap7/usr.sbin 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: Mon, 12 Jan 2009 01:19:39 -0000 Author: sam Date: Mon Jan 12 01:19:38 2009 New Revision: 187070 URL: http://svn.freebsd.org/changeset/base/187070 Log: fix merge botch Modified: projects/vap7/usr.sbin/Makefile Modified: projects/vap7/usr.sbin/Makefile ============================================================================== --- projects/vap7/usr.sbin/Makefile Mon Jan 12 00:39:22 2009 (r187069) +++ projects/vap7/usr.sbin/Makefile Mon Jan 12 01:19:38 2009 (r187070) @@ -157,7 +157,7 @@ SUBDIR= ${_ac} \ ${_rtsold} \ ${_rwhod} \ ${_sa} \ - sade \ + ${_sade} \ ${_sendmail} \ setfib \ setfmac \ From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 11:47:25 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 600B11065674; Mon, 12 Jan 2009 11:47:25 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 335878FC37; Mon, 12 Jan 2009 11:47:25 +0000 (UTC) (envelope-from lulf@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 n0CBlOeR065179; Mon, 12 Jan 2009 11:47:24 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CBlOSQ065176; Mon, 12 Jan 2009 11:47:24 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200901121147.n0CBlOSQ065176@svn.freebsd.org> From: Ulf Lilleengen Date: Mon, 12 Jan 2009 11:47:24 +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: r187095 - projects/gvinum/sys/geom/vinum 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: Mon, 12 Jan 2009 11:47:25 -0000 Author: lulf Date: Mon Jan 12 11:47:24 2009 New Revision: 187095 URL: http://svn.freebsd.org/changeset/base/187095 Log: - Add version checks to the code to allow it to be more easily tested on older FreeBSD versions. - Add missing locking of hostname_mtx that was added to HEAD. Modified: projects/gvinum/sys/geom/vinum/geom_vinum.c projects/gvinum/sys/geom/vinum/geom_vinum_create.c projects/gvinum/sys/geom/vinum/geom_vinum_drive.c Modified: projects/gvinum/sys/geom/vinum/geom_vinum.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum.c Mon Jan 12 11:24:32 2009 (r187094) +++ projects/gvinum/sys/geom/vinum/geom_vinum.c Mon Jan 12 11:47:24 2009 (r187095) @@ -177,7 +177,11 @@ gv_init(struct g_class *mp) TAILQ_INIT(&sc->equeue); mtx_init(&sc->config_mtx, "gv_config", NULL, MTX_DEF); mtx_init(&sc->queue_mtx, "gv_queue", NULL, MTX_DEF); +#if __FreeBSD_version >= 800002 kproc_create(gv_worker, sc, NULL, 0, 0, "gv_worker"); +#else + kthread_create(gv_worker, sc, NULL, 0, 0, "gv_worker"); +#endif } static int @@ -961,7 +965,11 @@ gv_worker(void *arg) mtx_destroy(&sc->queue_mtx); g_free(sc->bqueue); g_free(sc); +#if __FreeBSD_version >= 800002 kproc_exit(ENXIO); +#else + kthread_exit(ENXIO); +#endif break; /* not reached */ default: Modified: projects/gvinum/sys/geom/vinum/geom_vinum_create.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum_create.c Mon Jan 12 11:24:32 2009 (r187094) +++ projects/gvinum/sys/geom/vinum/geom_vinum_create.c Mon Jan 12 11:47:24 2009 (r187095) @@ -32,6 +32,9 @@ #include #include #include +#if __FreeBSD_version >= 800044 +#include +#endif #include #include @@ -152,7 +155,13 @@ gv_create_drive(struct gv_softc *sc, str hdr = g_malloc(sizeof(*hdr), M_WAITOK | M_ZERO); hdr->magic = GV_MAGIC; hdr->config_length = GV_CFG_LEN; +#if __FreeBSD_version >= 800044 + mtx_lock(&hostname_mtx); + bcopy(G_hostname, hdr->label.sysname, GV_HOSTNAME_LEN); + mtx_unlock(&hostname_mtx); +#else bcopy(hostname, hdr->label.sysname, GV_HOSTNAME_LEN); +#endif strlcpy(hdr->label.name, d->name, sizeof(hdr->label.name)); microtime(&hdr->label.date_of_birth); d->hdr = hdr; Modified: projects/gvinum/sys/geom/vinum/geom_vinum_drive.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum_drive.c Mon Jan 12 11:24:32 2009 (r187094) +++ projects/gvinum/sys/geom/vinum/geom_vinum_drive.c Mon Jan 12 11:47:24 2009 (r187095) @@ -30,7 +30,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#if __FreeBSD_version >= 800044 #include +#endif #include #include From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 11:51:19 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 C01CA106566C; Mon, 12 Jan 2009 11:51:18 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE3798FC19; Mon, 12 Jan 2009 11:51:18 +0000 (UTC) (envelope-from lulf@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 n0CBpIB4065283; Mon, 12 Jan 2009 11:51:18 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CBpIPN065282; Mon, 12 Jan 2009 11:51:18 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200901121151.n0CBpIPN065282@svn.freebsd.org> From: Ulf Lilleengen Date: Mon, 12 Jan 2009 11:51:18 +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: r187096 - projects/gvinum/sys/geom/vinum 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: Mon, 12 Jan 2009 11:51:19 -0000 Author: lulf Date: Mon Jan 12 11:51:18 2009 New Revision: 187096 URL: http://svn.freebsd.org/changeset/base/187096 Log: - Save configuration automatically after a initialization, rebuild, resync or growing. Modified: projects/gvinum/sys/geom/vinum/geom_vinum_plex.c Modified: projects/gvinum/sys/geom/vinum/geom_vinum_plex.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum_plex.c Mon Jan 12 11:47:24 2009 (r187095) +++ projects/gvinum/sys/geom/vinum/geom_vinum_plex.c Mon Jan 12 11:51:18 2009 (r187096) @@ -636,6 +636,7 @@ gv_sync_complete(struct gv_plex *to, str gv_set_sd_state(s, GV_SD_UP, 0); to->flags &= ~GV_PLEX_SYNCING; to->synced = 0; + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); } else { offset = bp->bio_offset + bp->bio_length; err = gv_sync_request(from, to, offset, @@ -711,12 +712,16 @@ gv_grow_request(struct gv_plex *p, off_t void gv_grow_complete(struct gv_plex *p, struct bio *bp) { + struct gv_softc *sc; struct gv_sd *s; struct gv_volume *v; off_t origsize, offset; int sdcount, err; v = p->vol_sc; + KASSERT(v != NULL, ("gv_grow_complete: NULL v")); + sc = v->vinumconf; + KASSERT(sc != NULL, ("gv_grow_complete: NULL sc")); err = 0; /* If it was a read, write it. */ @@ -748,6 +753,7 @@ gv_grow_complete(struct gv_plex *p, stru gv_access(v->provider, -1, -1, 0); g_topology_unlock(); p->synced = 0; + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); /* Issue delayed requests. */ gv_plex_flush(p); } else { @@ -819,6 +825,7 @@ gv_init_request(struct gv_sd *s, off_t s void gv_init_complete(struct gv_plex *p, struct bio *bp) { + struct gv_softc *sc; struct gv_drive *d; struct g_consumer *cp; struct gv_sd *s; @@ -837,6 +844,8 @@ gv_init_complete(struct gv_plex *p, stru KASSERT(d != NULL, ("gv_init_complete: NULL d")); cp = d->consumer; KASSERT(cp != NULL, ("gv_init_complete: NULL cp")); + sc = p->vinumconf; + KASSERT(sc != NULL, ("gv_init_complete: NULL sc")); g_destroy_bio(bp); @@ -859,6 +868,7 @@ gv_init_complete(struct gv_plex *p, stru } else { gv_set_sd_state(s, GV_SD_UP, GV_SETSTATE_CONFIG); s->initialized = 0; + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); G_VINUM_DEBUG(1, "subdisk '%s' init: finished " "successfully", s->name); } @@ -920,12 +930,16 @@ gv_parity_request(struct gv_plex *p, int void gv_parity_complete(struct gv_plex *p, struct bio *bp) { + struct gv_softc *sc; int error, flags; error = bp->bio_error; flags = bp->bio_cflags; flags &= ~GV_BIO_MALLOC; + sc = p->vinumconf; + KASSERT(sc != NULL, ("gv_parity_complete: NULL sc")); + /* Clean up what we allocated. */ if (bp->bio_cflags & GV_BIO_MALLOC) g_free(bp->bio_data); @@ -960,6 +974,7 @@ gv_parity_complete(struct gv_plex *p, st /* We're finished. */ G_VINUM_DEBUG(1, "parity operation on %s finished", p->name); p->synced = 0; + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); return; } @@ -973,6 +988,7 @@ gv_parity_complete(struct gv_plex *p, st void gv_rebuild_complete(struct gv_plex *p, struct bio *bp) { + struct gv_softc *sc; struct gv_sd *s; int error, flags; off_t offset; @@ -981,6 +997,8 @@ gv_rebuild_complete(struct gv_plex *p, s flags = bp->bio_cflags; offset = bp->bio_offset; flags &= ~GV_BIO_MALLOC; + sc = p->vinumconf; + KASSERT(sc != NULL, ("gv_rebuild_complete: NULL sc")); /* Clean up what we allocated. */ if (bp->bio_cflags & GV_BIO_MALLOC) @@ -1016,6 +1034,7 @@ gv_rebuild_complete(struct gv_plex *p, s /* Try to up all subdisks. */ LIST_FOREACH(s, &p->subdisks, in_plex) gv_update_sd_state(s); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); gv_plex_flush(p); /* Flush out remaining rebuild BIOs. */ return; } From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 11:53:38 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 61F7410656C4; Mon, 12 Jan 2009 11:53:38 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 50DB88FC22; Mon, 12 Jan 2009 11:53:38 +0000 (UTC) (envelope-from lulf@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 n0CBrco4065369; Mon, 12 Jan 2009 11:53:38 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CBrcLc065368; Mon, 12 Jan 2009 11:53:38 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200901121153.n0CBrcLc065368@svn.freebsd.org> From: Ulf Lilleengen Date: Mon, 12 Jan 2009 11:53:38 +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: r187097 - projects/gvinum/sys/geom/vinum 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: Mon, 12 Jan 2009 11:53:40 -0000 Author: lulf Date: Mon Jan 12 11:53:38 2009 New Revision: 187097 URL: http://svn.freebsd.org/changeset/base/187097 Log: - When doing write-only to a volume, add to read counts as well since it might be a RAID5 volume. Modified: projects/gvinum/sys/geom/vinum/geom_vinum.c Modified: projects/gvinum/sys/geom/vinum/geom_vinum.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum.c Mon Jan 12 11:51:18 2009 (r187096) +++ projects/gvinum/sys/geom/vinum/geom_vinum.c Mon Jan 12 11:53:38 2009 (r187097) @@ -134,6 +134,10 @@ gv_access(struct g_provider *pp, int dr, error = ENXIO; gp = pp->geom; sc = gp->softc; + if (dw > 0 && dr == 0) + dr = 1; + else if (dw < 0 && dr == 0) + dr = -1; LIST_FOREACH(d, &sc->drives, drive) { if (d->consumer == NULL) continue; From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 19:19:52 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 E51E2106564A; Mon, 12 Jan 2009 19:19:51 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D2DE88FC0A; Mon, 12 Jan 2009 19:19:51 +0000 (UTC) (envelope-from sam@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 n0CJJpY1074183; Mon, 12 Jan 2009 19:19:51 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CJJp50074173; Mon, 12 Jan 2009 19:19:51 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901121919.n0CJJp50074173@svn.freebsd.org> From: Sam Leffler Date: Mon, 12 Jan 2009 19:19:51 +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: r187111 - in projects/vap7/sys: . arm/conf conf contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/at... 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: Mon, 12 Jan 2009 19:19:52 -0000 Author: sam Date: Mon Jan 12 19:19:51 2009 New Revision: 187111 URL: http://svn.freebsd.org/changeset/base/187111 Log: merge r187108 Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/arm/conf/AVILA projects/vap7/sys/arm/conf/BWCT projects/vap7/sys/arm/conf/CRB projects/vap7/sys/arm/conf/EP80219 projects/vap7/sys/arm/conf/HL200 projects/vap7/sys/arm/conf/IQ31244 projects/vap7/sys/arm/conf/KB920X projects/vap7/sys/arm/conf/SIMICS projects/vap7/sys/arm/conf/SKYEYE projects/vap7/sys/conf/Makefile.arm projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/net80211/ (props changed) Modified: projects/vap7/sys/arm/conf/AVILA ============================================================================== --- projects/vap7/sys/arm/conf/AVILA Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/AVILA Mon Jan 12 19:19:51 2009 (r187111) @@ -31,6 +31,7 @@ options STARTUP_PAGETABLE_ADDR=0x1000000 include "../xscale/ixp425/std.avila" #To statically compile in device wiring instead of /boot/device.hints hints "AVILA.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale Modified: projects/vap7/sys/arm/conf/BWCT ============================================================================== --- projects/vap7/sys/arm/conf/BWCT Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/BWCT Mon Jan 12 19:19:51 2009 (r187111) @@ -28,6 +28,7 @@ include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "hints.at91rm9200" hints "BWCT.hints" +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB Modified: projects/vap7/sys/arm/conf/CRB ============================================================================== --- projects/vap7/sys/arm/conf/CRB Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/CRB Mon Jan 12 19:19:51 2009 (r187111) @@ -29,6 +29,7 @@ options STARTUP_PAGETABLE_ADDR=0x0000000 include "../xscale/i8134x/std.crb" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale Modified: projects/vap7/sys/arm/conf/EP80219 ============================================================================== --- projects/vap7/sys/arm/conf/EP80219 Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/EP80219 Mon Jan 12 19:19:51 2009 (r187111) @@ -29,6 +29,7 @@ options STARTUP_PAGETABLE_ADDR=0xa00000 include "../xscale/i80321/std.ep80219" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale Modified: projects/vap7/sys/arm/conf/HL200 ============================================================================== --- projects/vap7/sys/arm/conf/HL200 Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/HL200 Mon Jan 12 19:19:51 2009 (r187111) @@ -33,6 +33,7 @@ options KERNVIRTADDR=0xc0100000 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. hints "KB920X.hints" +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB Modified: projects/vap7/sys/arm/conf/IQ31244 ============================================================================== --- projects/vap7/sys/arm/conf/IQ31244 Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/IQ31244 Mon Jan 12 19:19:51 2009 (r187111) @@ -30,6 +30,7 @@ options STARTUP_PAGETABLE_ADDR=0xa000000 include "../xscale/i80321/std.iq31244" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale Modified: projects/vap7/sys/arm/conf/KB920X ============================================================================== --- projects/vap7/sys/arm/conf/KB920X Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/KB920X Mon Jan 12 19:19:51 2009 (r187111) @@ -25,6 +25,7 @@ include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. hints "KB920X.hints" +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB Modified: projects/vap7/sys/arm/conf/SIMICS ============================================================================== --- projects/vap7/sys/arm/conf/SIMICS Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/SIMICS Mon Jan 12 19:19:51 2009 (r187111) @@ -26,6 +26,7 @@ options PHYSADDR=0xc0000000 include "../sa11x0/std.sa11x0" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=strongarm Modified: projects/vap7/sys/arm/conf/SKYEYE ============================================================================== --- projects/vap7/sys/arm/conf/SKYEYE Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/arm/conf/SKYEYE Mon Jan 12 19:19:51 2009 (r187111) @@ -27,6 +27,7 @@ options PHYSADDR=0xc0000000 include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=arm9 Modified: projects/vap7/sys/conf/Makefile.arm ============================================================================== --- projects/vap7/sys/conf/Makefile.arm Mon Jan 12 19:17:43 2009 (r187110) +++ projects/vap7/sys/conf/Makefile.arm Mon Jan 12 19:19:51 2009 (r187111) @@ -19,9 +19,6 @@ # Which version of config(8) is required. %VERSREQ= 600004 -# Temporary stuff while we're still embryonic -NO_MODULES= - STD8X16FONT?= iso .if !defined(S) @@ -109,6 +106,8 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$ rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \ inflate-tramp.o tmphack.S +MKMODULESENV+= MACHINE=${MACHINE} + %BEFORE_DEPEND %OBJS From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 21:04:23 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 797E9106564A; Mon, 12 Jan 2009 21:04:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 50F248FC08; Mon, 12 Jan 2009 21:04:23 +0000 (UTC) (envelope-from gonzo@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 n0CL4MCW076227; Mon, 12 Jan 2009 21:04:22 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CL4Mjb076226; Mon, 12 Jan 2009 21:04:22 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200901122104.n0CL4Mjb076226@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Mon, 12 Jan 2009 21:04:22 +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: r187114 - projects/mips 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: Mon, 12 Jan 2009 21:04:23 -0000 Author: gonzo Date: Mon Jan 12 21:04:22 2009 New Revision: 187114 URL: http://svn.freebsd.org/changeset/base/187114 Log: Create projects/ area for FreeBSD/MIPS development/experiments. It's supposed to substitute perforce mips2 branch. Added: projects/mips/ (props changed) - copied from r187113, head/ From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 21:30:23 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 D27B01065672; Mon, 12 Jan 2009 21:30:23 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AD4D88FC0C; Mon, 12 Jan 2009 21:30:23 +0000 (UTC) (envelope-from sam@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 n0CLUNkj076860; Mon, 12 Jan 2009 21:30:23 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CLUNes076857; Mon, 12 Jan 2009 21:30:23 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901122130.n0CLUNes076857@svn.freebsd.org> From: Sam Leffler Date: Mon, 12 Jan 2009 21:30:23 +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: r187115 - in projects/vap7: etc gnu gnu/usr.bin/cc gnu/usr.bin/cvs gnu/usr.bin/gdb/kgdb gnu/usr.bin/groff/tmac gnu/usr.bin/sort lib lib/bind lib/csu lib/libarchive lib/libbluetooth lib/... 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: Mon, 12 Jan 2009 21:30:27 -0000 Author: sam Date: Mon Jan 12 21:30:22 2009 New Revision: 187115 URL: http://svn.freebsd.org/changeset/base/187115 Log: re-merge build infrastructure sync w/ HEAD from r187106; fixes some stuff I missed the first time Modified: projects/vap7/etc/ (props changed) projects/vap7/gnu/ (props changed) projects/vap7/gnu/usr.bin/cc/ (props changed) projects/vap7/gnu/usr.bin/cvs/ (props changed) projects/vap7/gnu/usr.bin/gdb/kgdb/ (props changed) projects/vap7/gnu/usr.bin/groff/tmac/mdoc.local (props changed) projects/vap7/gnu/usr.bin/sort/ (props changed) projects/vap7/lib/ (props changed) projects/vap7/lib/Makefile projects/vap7/lib/bind/ (props changed) projects/vap7/lib/csu/ (props changed) projects/vap7/lib/libarchive/ (props changed) projects/vap7/lib/libbluetooth/ (props changed) projects/vap7/lib/libc/ (props changed) projects/vap7/lib/libc/string/ffsll.c (props changed) projects/vap7/lib/libc/string/flsll.c (props changed) projects/vap7/lib/libc_r/ (props changed) projects/vap7/lib/libcam/ (props changed) projects/vap7/lib/libdisk/ (props changed) projects/vap7/lib/libfetch/ (props changed) projects/vap7/lib/libftpio/ (props changed) projects/vap7/lib/libgeom/ (props changed) projects/vap7/lib/libgssapi/ (props changed) projects/vap7/lib/libkse/ (props changed) projects/vap7/lib/libkvm/ (props changed) projects/vap7/lib/libmagic/ (props changed) projects/vap7/lib/libthr/ (props changed) projects/vap7/lib/libutil/ (props changed) projects/vap7/libexec/ (props changed) projects/vap7/libexec/Makefile projects/vap7/libexec/rpc.rstatd/ (props changed) projects/vap7/libexec/rtld-elf/ (props changed) projects/vap7/sbin/ (props changed) projects/vap7/sbin/atacontrol/ (props changed) projects/vap7/sbin/ddb/ (props changed) projects/vap7/sbin/devfs/ (props changed) projects/vap7/sbin/dhclient/ (props changed) projects/vap7/sbin/fdisk/ (props changed) projects/vap7/sbin/fsck_ffs/ (props changed) projects/vap7/sbin/geom/ (props changed) projects/vap7/sbin/geom/class/part/ (props changed) projects/vap7/sbin/geom/misc/ (props changed) projects/vap7/sbin/ifconfig/ (props changed) projects/vap7/sbin/init/ (props changed) projects/vap7/sbin/ipfw/ (props changed) projects/vap7/sbin/md5/ (props changed) projects/vap7/sbin/mdconfig/ (props changed) projects/vap7/sbin/mksnap_ffs/ (props changed) projects/vap7/sbin/mount/ (props changed) projects/vap7/sbin/natd/ (props changed) projects/vap7/sbin/ping6/ (props changed) projects/vap7/sbin/sconfig/ (props changed) projects/vap7/share/ (props changed) projects/vap7/share/colldef/ (props changed) projects/vap7/share/examples/ (props changed) projects/vap7/share/man/man3/ (props changed) projects/vap7/share/man/man4/ (props changed) projects/vap7/share/man/man4/igb.4 (props changed) projects/vap7/share/man/man5/ (props changed) projects/vap7/share/man/man7/ (props changed) projects/vap7/share/man/man9/ (props changed) projects/vap7/share/mk/ (props changed) projects/vap7/share/sendmail/ (props changed) projects/vap7/share/syscons/ (props changed) projects/vap7/share/syscons/keymaps/ (props changed) projects/vap7/share/timedef/ (props changed) projects/vap7/share/zoneinfo/ (props changed) projects/vap7/usr.bin/ (props changed) projects/vap7/usr.bin/calendar/ (props changed) projects/vap7/usr.bin/cksum/ (props changed) projects/vap7/usr.bin/comm/ (props changed) projects/vap7/usr.bin/cpuset/ (props changed) projects/vap7/usr.bin/fetch/ (props changed) projects/vap7/usr.bin/file/ (props changed) projects/vap7/usr.bin/gzip/ (props changed) projects/vap7/usr.bin/ipcrm/ (props changed) projects/vap7/usr.bin/ipcs/ (props changed) projects/vap7/usr.bin/kdump/ (props changed) projects/vap7/usr.bin/ktrace/ (props changed) projects/vap7/usr.bin/ldd/ (props changed) projects/vap7/usr.bin/lockf/ (props changed) projects/vap7/usr.bin/logger/ (props changed) projects/vap7/usr.bin/make/ (props changed) projects/vap7/usr.bin/netstat/ (props changed) projects/vap7/usr.bin/procstat/ (props changed) projects/vap7/usr.bin/sed/ (props changed) projects/vap7/usr.bin/shar/ (props changed) projects/vap7/usr.bin/su/ (props changed) projects/vap7/usr.bin/tar/ (props changed) projects/vap7/usr.bin/top/ (props changed) projects/vap7/usr.bin/truncate/ (props changed) projects/vap7/usr.bin/truss/ (props changed) projects/vap7/usr.bin/units/ (props changed) projects/vap7/usr.bin/vmstat/ (props changed) projects/vap7/usr.bin/whereis/ (props changed) projects/vap7/usr.bin/window/ (props changed) projects/vap7/usr.bin/xargs/ (props changed) projects/vap7/usr.sbin/ (props changed) projects/vap7/usr.sbin/Makefile projects/vap7/usr.sbin/adduser/ (props changed) projects/vap7/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed) projects/vap7/usr.sbin/cdcontrol/ (props changed) projects/vap7/usr.sbin/config/ (props changed) projects/vap7/usr.sbin/cron/ (props changed) projects/vap7/usr.sbin/cron/cron/ (props changed) projects/vap7/usr.sbin/extattr/ (props changed) projects/vap7/usr.sbin/freebsd-update/ (props changed) projects/vap7/usr.sbin/fwcontrol/ (props changed) projects/vap7/usr.sbin/iostat/ (props changed) projects/vap7/usr.sbin/mountd/ (props changed) projects/vap7/usr.sbin/mtree/ (props changed) projects/vap7/usr.sbin/ndiscvt/ (props changed) projects/vap7/usr.sbin/newsyslog/newsyslog.conf.5 (props changed) projects/vap7/usr.sbin/nscd/ (props changed) projects/vap7/usr.sbin/ntp/ (props changed) projects/vap7/usr.sbin/pkg_install/ (props changed) projects/vap7/usr.sbin/pmcstat/ (props changed) projects/vap7/usr.sbin/portsnap/ (props changed) projects/vap7/usr.sbin/powerd/ (props changed) projects/vap7/usr.sbin/pw/ (props changed) projects/vap7/usr.sbin/rpc.lockd/ (props changed) projects/vap7/usr.sbin/rpc.statd/ (props changed) projects/vap7/usr.sbin/rpc.yppasswdd/ (props changed) projects/vap7/usr.sbin/setfib/ (props changed) projects/vap7/usr.sbin/sysinstall/ (props changed) projects/vap7/usr.sbin/syslogd/ (props changed) projects/vap7/usr.sbin/traceroute/ (props changed) projects/vap7/usr.sbin/tzsetup/ (props changed) projects/vap7/usr.sbin/wlandebug/ (props changed) projects/vap7/usr.sbin/wpa/ (props changed) projects/vap7/usr.sbin/wpa/wpa_supplicant/ (props changed) Modified: projects/vap7/lib/Makefile ============================================================================== --- projects/vap7/lib/Makefile Mon Jan 12 21:04:22 2009 (r187114) +++ projects/vap7/lib/Makefile Mon Jan 12 21:30:22 2009 (r187115) @@ -124,7 +124,6 @@ _libmp= libmp .if ${MK_PMC} != "no" _libpmc= libpmc -_libusb20= libusb20 .endif .if ${MK_SENDMAIL} != "no" @@ -140,6 +139,7 @@ _libtelnet= libtelnet .if ${MK_USB} != "no" _libusbhid= libusbhid +_libusb20= libusb20 .endif .include Modified: projects/vap7/libexec/Makefile ============================================================================== --- projects/vap7/libexec/Makefile Mon Jan 12 21:04:22 2009 (r187114) +++ projects/vap7/libexec/Makefile Mon Jan 12 21:30:22 2009 (r187115) @@ -3,9 +3,9 @@ .include -SUBDIR= atrun \ +SUBDIR= ${_atrun} \ bootpd \ - comsat \ + ${_comsat} \ fingerd \ ftpd \ getty \ @@ -13,7 +13,7 @@ SUBDIR= atrun \ ${_mail.local} \ makekey \ ${_mknetid} \ - pppoed \ + ${_pppoed} \ pt_chown \ rbootd \ revnetgroup \ @@ -29,16 +29,28 @@ SUBDIR= atrun \ ${_smrsh} \ talkd \ tcpd \ - telnetd \ + ${_telnetd} \ tftpd \ ${_tftp-proxy} \ ${_ypxfr} +.if ${MK_AT} != "no" +_atrun= atrun +.endif + +.if ${MK_MAIL} != "no" +_comsat= comsat +.endif + .if ${MK_NIS} != "no" _mknetid= mknetid _ypxfr= ypxfr .endif +.if ${MK_NETGRAPH} != "no" +_pppoed= pppoed +.endif + .if ${MK_PF} != "no" _tftp-proxy= tftp-proxy .endif @@ -54,7 +66,11 @@ _rshd= rshd .if ${MK_SENDMAIL} != "no" _mail.local= mail.local -_smrsh= smrsh +_smrsh= smrsh +.endif + +.if ${MK_TELNET} != "no" +_telnetd= telnetd .endif .include Modified: projects/vap7/usr.sbin/Makefile ============================================================================== --- projects/vap7/usr.sbin/Makefile Mon Jan 12 21:04:22 2009 (r187114) +++ projects/vap7/usr.sbin/Makefile Mon Jan 12 21:30:22 2009 (r187115) @@ -425,7 +425,6 @@ _btxld= btxld .if ${MK_I4B} != "no" _i4b= i4b .endif -_cpucontrol= cpucontrol _kgmon= kgmon _kgzip= kgzip _lptcontrol= lptcontrol @@ -467,7 +466,6 @@ _boot0cfg= boot0cfg .if ${MK_TOOLCHAIN} != "no" _btxld= btxld .endif -_cpucontrol= cpucontrol _kgmon= kgmon _lptcontrol= lptcontrol .if ${MK_NCP} != "no" From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 22:53:27 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 63CCB106566B; Mon, 12 Jan 2009 22:53:27 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 53CE28FC16; Mon, 12 Jan 2009 22:53:27 +0000 (UTC) (envelope-from sam@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 n0CMrRaL078731; Mon, 12 Jan 2009 22:53:27 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CMrRdx078730; Mon, 12 Jan 2009 22:53:27 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901122253.n0CMrRdx078730@svn.freebsd.org> From: Sam Leffler Date: Mon, 12 Jan 2009 22:53: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: r187121 - in projects/vap7/tools/tools/net80211: . wlantxtime 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: Mon, 12 Jan 2009 22:53:27 -0000 Author: sam Date: Mon Jan 12 22:53:26 2009 New Revision: 187121 URL: http://svn.freebsd.org/changeset/base/187121 Log: merge wlantxtime Added: projects/vap7/tools/tools/net80211/wlantxtime/ - copied from r187120, head/tools/tools/net80211/wlantxtime/ Modified: projects/vap7/tools/tools/net80211/ (props changed) projects/vap7/tools/tools/net80211/Makefile Modified: projects/vap7/tools/tools/net80211/Makefile ============================================================================== --- projects/vap7/tools/tools/net80211/Makefile Mon Jan 12 22:50:55 2009 (r187120) +++ projects/vap7/tools/tools/net80211/Makefile Mon Jan 12 22:53:26 2009 (r187121) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= stumbler w00t wesside wlaninject wlanstats wlanwatch wlanwds +SUBDIR= stumbler w00t wesside wlaninject wlanstats wlantxtime wlanwatch wlanwds .include From owner-svn-src-projects@FreeBSD.ORG Tue Jan 13 04:57:26 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 017281065676; Tue, 13 Jan 2009 04:57:26 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D96EB8FC16; Tue, 13 Jan 2009 04:57:25 +0000 (UTC) (envelope-from sam@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 n0D4vPYt090372; Tue, 13 Jan 2009 04:57:25 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0D4vPHO090370; Tue, 13 Jan 2009 04:57:25 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901130457.n0D4vPHO090370@svn.freebsd.org> From: Sam Leffler Date: Tue, 13 Jan 2009 04:57:25 +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: r187127 - in projects/vap7/sys: . arm/arm conf contrib/pf dev dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal... 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: Tue, 13 Jan 2009 04:57:26 -0000 Author: sam Date: Tue Jan 13 04:57:25 2009 New Revision: 187127 URL: http://svn.freebsd.org/changeset/base/187127 Log: mfc the bits needed to make trampoline builds work Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/arm/arm/elf_trampoline.c projects/vap7/sys/conf/Makefile.arm projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) Modified: projects/vap7/sys/arm/arm/elf_trampoline.c ============================================================================== --- projects/vap7/sys/arm/arm/elf_trampoline.c Tue Jan 13 04:56:41 2009 (r187126) +++ projects/vap7/sys/arm/arm/elf_trampoline.c Tue Jan 13 04:57:25 2009 (r187127) @@ -33,8 +33,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - /* * Since we are compiled outside of the normal kernel build process, we * need to include opt_global.h manually. @@ -47,6 +45,7 @@ extern char kernel_end[]; extern void *_end; +void _start(void); void __start(void); void __startC(void); Modified: projects/vap7/sys/conf/Makefile.arm ============================================================================== --- projects/vap7/sys/conf/Makefile.arm Tue Jan 13 04:56:41 2009 (r187126) +++ projects/vap7/sys/conf/Makefile.arm Tue Jan 13 04:57:25 2009 (r187127) @@ -37,6 +37,10 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscri CC += -mbig-endian SYSTEM_LD += -EB LD += -EB +.else +CC += -mlittle-endian +SYSTEM_LD += -EL +LD += -EL .endif @@ -65,6 +69,8 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_ar $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S +KERNEL_EXTRA=trampoline +KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h @@ -78,10 +84,11 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$ -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp eval $$(stat -s ${KERNEL_KO}.tmp) && \ echo "#define KERNSIZE $$st_size" >>opt_kernname.h - ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp \ + ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker ldscript.$M.tramp \ tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp - ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ + ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker \ + ldscript.$M.tramp.noheader \ tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ @@ -94,11 +101,12 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$ gzip -9 ${KERNEL_KO}.tmp eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \ echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h - ${CC} -O2 -DKZIP -I. -c $S/kern/inflate.c -o inflate-tramp.o - ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp \ + ${CC} -O2 -DKZIP -I. -I$S -c $S/kern/inflate.c -o inflate-tramp.o + ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker ldscript.$M.tramp \ -DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \ $S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.gz.tramp - ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ + ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker \ + ldscript.$M.tramp.noheader \ -DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \ $S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ From owner-svn-src-projects@FreeBSD.ORG Tue Jan 13 09:21:11 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 C83F81065673; Tue, 13 Jan 2009 09:21:11 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B86C98FC1D; Tue, 13 Jan 2009 09:21:11 +0000 (UTC) (envelope-from lulf@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 n0D9LBes095503; Tue, 13 Jan 2009 09:21:11 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0D9LBdF095502; Tue, 13 Jan 2009 09:21:11 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200901130921.n0D9LBdF095502@svn.freebsd.org> From: Ulf Lilleengen Date: Tue, 13 Jan 2009 09:21:11 +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: r187135 - projects/gvinum/sys/geom/vinum 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: Tue, 13 Jan 2009 09:21:12 -0000 Author: lulf Date: Tue Jan 13 09:21:11 2009 New Revision: 187135 URL: http://svn.freebsd.org/changeset/base/187135 Log: - Don't assume that a plex always have subdisks, which would panic with a divide by zero. Modified: projects/gvinum/sys/geom/vinum/geom_vinum_list.c Modified: projects/gvinum/sys/geom/vinum/geom_vinum_list.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum_list.c Tue Jan 13 07:58:57 2009 (r187134) +++ projects/gvinum/sys/geom/vinum/geom_vinum_list.c Tue Jan 13 09:21:11 2009 (r187135) @@ -308,7 +308,8 @@ gv_lpi(struct gv_plex *p, struct sbuf *s sbuf_printf(sb, "\t\tSynced: "); sbuf_printf(sb, "%16jd bytes (%d%%)\n", (intmax_t)p->synced, - (int)((p->synced * 100) / p->size)); + (p->size > 0) ? (int)((p->synced * 100) / p->size) : + 0); } sbuf_printf(sb, "\t\tOrganization: %s", gv_plexorg(p->org)); if (gv_is_striped(p)) { From owner-svn-src-projects@FreeBSD.ORG Tue Jan 13 11:24:15 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 4621C1065672; Tue, 13 Jan 2009 11:24:15 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3555D8FC0A; Tue, 13 Jan 2009 11:24:15 +0000 (UTC) (envelope-from lulf@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 n0DBOFFq002166; Tue, 13 Jan 2009 11:24:15 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DBOFwU002165; Tue, 13 Jan 2009 11:24:15 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200901131124.n0DBOFwU002165@svn.freebsd.org> From: Ulf Lilleengen Date: Tue, 13 Jan 2009 11:24:15 +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: r187140 - projects/gvinum/sys/geom/vinum 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: Tue, 13 Jan 2009 11:24:15 -0000 Author: lulf Date: Tue Jan 13 11:24:14 2009 New Revision: 187140 URL: http://svn.freebsd.org/changeset/base/187140 Log: - In the case of a volume in the up state but all plexes down (the state must have been forced by the user), avoid looping infinately while trying out all plexes, which are down. Modified: projects/gvinum/sys/geom/vinum/geom_vinum_volume.c Modified: projects/gvinum/sys/geom/vinum/geom_vinum_volume.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum_volume.c Tue Jan 13 10:59:54 2009 (r187139) +++ projects/gvinum/sys/geom/vinum/geom_vinum_volume.c Tue Jan 13 11:24:14 2009 (r187140) @@ -43,6 +43,7 @@ gv_volume_start(struct gv_softc *sc, str struct g_geom *gp; struct gv_volume *v; struct gv_plex *p, *lp; + int numwrites; gp = sc->geom; v = bp->bio_to->private; @@ -69,8 +70,10 @@ gv_volume_start(struct gv_softc *sc, str lp = LIST_FIRST(&v->plexes); p = LIST_NEXT(lp, in_volume); do { - if (p == NULL) - p = LIST_FIRST(&v->plexes); + if (p == NULL) { + p = lp; + break; + } if ((p->state > GV_PLEX_DEGRADED) || (p->state >= GV_PLEX_DEGRADED && p->org == GV_PLEX_RAID5)) @@ -100,12 +103,16 @@ gv_volume_start(struct gv_softc *sc, str } } + numwrites = 0; /* Give the BIO to each plex of this volume. */ LIST_FOREACH(p, &v->plexes, in_volume) { if (p->state < GV_PLEX_DEGRADED) continue; gv_plex_start(p, bp); + numwrites++; } + if (numwrites == 0) + g_io_deliver(bp, ENXIO); break; } } From owner-svn-src-projects@FreeBSD.ORG Tue Jan 13 11:51:33 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 392911065680; Tue, 13 Jan 2009 11:51:33 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 282C88FC2A; Tue, 13 Jan 2009 11:51:33 +0000 (UTC) (envelope-from lulf@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 n0DBpXWb002654; Tue, 13 Jan 2009 11:51:33 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DBpXuW002653; Tue, 13 Jan 2009 11:51:33 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200901131151.n0DBpXuW002653@svn.freebsd.org> From: Ulf Lilleengen Date: Tue, 13 Jan 2009 11:51:33 +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: r187141 - projects/gvinum/sys/geom/vinum 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: Tue, 13 Jan 2009 11:51:33 -0000 Author: lulf Date: Tue Jan 13 11:51:32 2009 New Revision: 187141 URL: http://svn.freebsd.org/changeset/base/187141 Log: - Make sure the plex state goes to up if it was incorrectly down after the sync. Modified: projects/gvinum/sys/geom/vinum/geom_vinum_plex.c Modified: projects/gvinum/sys/geom/vinum/geom_vinum_plex.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum_plex.c Tue Jan 13 11:24:14 2009 (r187140) +++ projects/gvinum/sys/geom/vinum/geom_vinum_plex.c Tue Jan 13 11:51:32 2009 (r187141) @@ -634,6 +634,7 @@ gv_sync_complete(struct gv_plex *to, str /* Update our state. */ LIST_FOREACH(s, &to->subdisks, in_plex) gv_set_sd_state(s, GV_SD_UP, 0); + gv_update_plex_state(to); to->flags &= ~GV_PLEX_SYNCING; to->synced = 0; gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); From owner-svn-src-projects@FreeBSD.ORG Tue Jan 13 18:17:41 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 26C8D1065673; Tue, 13 Jan 2009 18:17:41 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED08B8FC0C; Tue, 13 Jan 2009 18:17:40 +0000 (UTC) (envelope-from sam@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 n0DIHeeJ010921; Tue, 13 Jan 2009 18:17:40 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DIHeJe010920; Tue, 13 Jan 2009 18:17:40 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901131817.n0DIHeJe010920@svn.freebsd.org> From: Sam Leffler Date: Tue, 13 Jan 2009 18:17:40 +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: r187158 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54... 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: Tue, 13 Jan 2009 18:17:41 -0000 Author: sam Date: Tue Jan 13 18:17:40 2009 New Revision: 187158 URL: http://svn.freebsd.org/changeset/base/187158 Log: MFC r187129: don't touch bb registers if the phy is powered down Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) Modified: projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c Tue Jan 13 16:48:01 2009 (r187157) +++ projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c Tue Jan 13 18:17:40 2009 (r187158) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5212_rfgain.c,v 1.2 2008/11/19 21:23:01 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -280,7 +280,8 @@ ar5212GetRfgain(struct ath_hal *ah) GAIN_VALUES *gv = &ahp->ah_gainValues; uint32_t rddata, probeType; - if (!gv->active) + /* NB: beware of touching the BB when PHY is powered down */ + if (!gv->active || !ahp->ah_phyPowerOn) return HAL_RFGAIN_INACTIVE; if (ahp->ah_rfgainState == HAL_RFGAIN_READ_REQUESTED) { From owner-svn-src-projects@FreeBSD.ORG Tue Jan 13 19:17:12 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 EBA7D1065939; Tue, 13 Jan 2009 19:17:11 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CAA0A8FC13; Tue, 13 Jan 2009 19:17:11 +0000 (UTC) (envelope-from lulf@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 n0DJHBfv013367; Tue, 13 Jan 2009 19:17:11 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DJHBM6013365; Tue, 13 Jan 2009 19:17:11 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200901131917.n0DJHBM6013365@svn.freebsd.org> From: Ulf Lilleengen Date: Tue, 13 Jan 2009 19:17:11 +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: r187187 - in projects/gvinum: sbin/gvinum sys/geom/vinum 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: Tue, 13 Jan 2009 19:17:14 -0000 Author: lulf Date: Tue Jan 13 19:17:11 2009 New Revision: 187187 URL: http://svn.freebsd.org/changeset/base/187187 Log: - Add the -f option to the rm command, which allows the removal to be forced. Submitted by: Rick C. Petty Modified: projects/gvinum/sbin/gvinum/gvinum.c projects/gvinum/sys/geom/vinum/geom_vinum_rm.c Modified: projects/gvinum/sbin/gvinum/gvinum.c ============================================================================== --- projects/gvinum/sbin/gvinum/gvinum.c Tue Jan 13 19:14:51 2009 (r187186) +++ projects/gvinum/sbin/gvinum/gvinum.c Tue Jan 13 19:17:11 2009 (r187187) @@ -709,7 +709,7 @@ gvinum_help(void) " Rebuild the parity blocks of a RAID-5 plex.\n" "resetconfig\n" " Reset the complete gvinum configuration\n" - "rm [-r] volume | plex | subdisk | drive\n" + "rm [-r] [-f] volume | plex | subdisk | drive\n" " Remove an object.\n" "saveconfig\n" " Save vinum configuration to disk after configuration" @@ -1052,8 +1052,11 @@ gvinum_rm(int argc, char **argv) flags = 0; optreset = 1; optind = 1; - while ((j = getopt(argc, argv, "r")) != -1) { + while ((j = getopt(argc, argv, "rf")) != -1) { switch (j) { + case 'f': + flags |= GV_FLAG_F; + break; case 'r': flags |= GV_FLAG_R; break; Modified: projects/gvinum/sys/geom/vinum/geom_vinum_rm.c ============================================================================== --- projects/gvinum/sys/geom/vinum/geom_vinum_rm.c Tue Jan 13 19:14:51 2009 (r187186) +++ projects/gvinum/sys/geom/vinum/geom_vinum_rm.c Tue Jan 13 19:17:11 2009 (r187187) @@ -130,7 +130,8 @@ gv_remove(struct g_geom *gp, struct gctl case GV_TYPE_DRIVE: d = gv_find_drive(sc, argv); /* We don't allow to remove open drives. */ - if (gv_consumer_is_open(d->consumer)) { + if (gv_consumer_is_open(d->consumer) && + !(*flags & GV_FLAG_F)) { gctl_error(req, "drive '%s' is open", d->name); return; } From owner-svn-src-projects@FreeBSD.ORG Wed Jan 14 16:03:12 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 31D9D1065BF9; Wed, 14 Jan 2009 16:03:12 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 150A38FC1C; Wed, 14 Jan 2009 16:03:12 +0000 (UTC) (envelope-from pho@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 n0EG3CLh047482; Wed, 14 Jan 2009 16:03:12 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0EG3BP0047461; Wed, 14 Jan 2009 16:03:11 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200901141603.n0EG3BP0047461@svn.freebsd.org> From: Peter Holm Date: Wed, 14 Jan 2009 16:03:11 +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: r187224 - in projects/stress2: . doc include lib misc testcases testcases/badcode testcases/creat testcases/fts testcases/link testcases/lockf testcases/lockf2 testcases/mkdir testcases... 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: Wed, 14 Jan 2009 16:03:14 -0000 Author: pho Date: Wed Jan 14 16:03:10 2009 New Revision: 187224 URL: http://svn.freebsd.org/changeset/base/187224 Log: The Kernel Stress Test Suite has been added to projects. Approved by: kib Added: projects/stress2/ projects/stress2/Makefile (contents, props changed) projects/stress2/Makefile.gnu (contents, props changed) projects/stress2/README (contents, props changed) projects/stress2/all.cfg (contents, props changed) projects/stress2/beaver1.sentex.ca (contents, props changed) projects/stress2/creat.cfg (contents, props changed) projects/stress2/default.cfg (contents, props changed) projects/stress2/df.cfg (contents, props changed) projects/stress2/disk.cfg (contents, props changed) projects/stress2/doc/ projects/stress2/doc/README (contents, props changed) projects/stress2/doc/linuxforum06.pdf (contents, props changed) projects/stress2/doc/stress.pdf (contents, props changed) projects/stress2/hydra1.netperf.freebsd.org (contents, props changed) projects/stress2/hydra2.netperf.freebsd.org (contents, props changed) projects/stress2/include/ projects/stress2/include/stress.h (contents, props changed) projects/stress2/io.cfg (contents, props changed) projects/stress2/jeff.cfg (contents, props changed) projects/stress2/lib/ projects/stress2/lib/Makefile (contents, props changed) projects/stress2/lib/main.c (contents, props changed) projects/stress2/lib/options.c (contents, props changed) projects/stress2/lib/random_int.c (contents, props changed) projects/stress2/lib/resources.c (contents, props changed) projects/stress2/link.cfg (contents, props changed) projects/stress2/load.cfg (contents, props changed) projects/stress2/lockf.cfg (contents, props changed) projects/stress2/misc/ projects/stress2/misc/README (contents, props changed) projects/stress2/misc/all.sh (contents, props changed) projects/stress2/misc/altbufferflushes.sh (contents, props changed) projects/stress2/misc/alternativeFlushPath.sh (contents, props changed) projects/stress2/misc/backingstore.sh (contents, props changed) projects/stress2/misc/cdevsw.sh (contents, props changed) projects/stress2/misc/cleanup.sh (contents, props changed) projects/stress2/misc/core.sh (contents, props changed) projects/stress2/misc/crossmp.sh (contents, props changed) projects/stress2/misc/crossmp2.sh (contents, props changed) projects/stress2/misc/devfs.sh (contents, props changed) projects/stress2/misc/devfs2.sh (contents, props changed) projects/stress2/misc/extattrctl.sh (contents, props changed) projects/stress2/misc/fdescfs.sh (contents, props changed) projects/stress2/misc/fpclone.sh (contents, props changed) projects/stress2/misc/fpclone2.sh (contents, props changed) projects/stress2/misc/fs.sh (contents, props changed) projects/stress2/misc/fullpath.sh (contents, props changed) projects/stress2/misc/fuzz.sh (contents, props changed) projects/stress2/misc/inversion.sh (contents, props changed) projects/stress2/misc/isofs.sh (contents, props changed) projects/stress2/misc/jail.sh (contents, props changed) projects/stress2/misc/kevent.sh (contents, props changed) projects/stress2/misc/kevent2.sh (contents, props changed) projects/stress2/misc/kevent3.sh (contents, props changed) projects/stress2/misc/kevent4.sh (contents, props changed) projects/stress2/misc/kevent5.sh (contents, props changed) projects/stress2/misc/kinfo.sh (contents, props changed) projects/stress2/misc/kinfo2.sh (contents, props changed) projects/stress2/misc/kinfo3.sh (contents, props changed) projects/stress2/misc/libMicro.sh (contents, props changed) projects/stress2/misc/lockf.sh (contents, props changed) projects/stress2/misc/lookup_shared.sh (contents, props changed) projects/stress2/misc/mac.sh (contents, props changed) projects/stress2/misc/mac_chkexec.sh (contents, props changed) projects/stress2/misc/md.sh (contents, props changed) projects/stress2/misc/md2.sh (contents, props changed) projects/stress2/misc/mmap.sh (contents, props changed) projects/stress2/misc/mount.sh (contents, props changed) projects/stress2/misc/mount2.sh (contents, props changed) projects/stress2/misc/mountro.sh (contents, props changed) projects/stress2/misc/mountro2.sh (contents, props changed) projects/stress2/misc/mountro3.sh (contents, props changed) projects/stress2/misc/msdos.sh (contents, props changed) projects/stress2/misc/newfs.sh (contents, props changed) projects/stress2/misc/newfs2.sh (contents, props changed) projects/stress2/misc/newfs3.sh (contents, props changed) projects/stress2/misc/newfs4.sh (contents, props changed) projects/stress2/misc/nfs.sh (contents, props changed) projects/stress2/misc/nfs2.sh (contents, props changed) projects/stress2/misc/nfs3.sh (contents, props changed) projects/stress2/misc/nfs4.sh (contents, props changed) projects/stress2/misc/nfs5.sh (contents, props changed) projects/stress2/misc/nfs6.sh (contents, props changed) projects/stress2/misc/nfsrename.sh (contents, props changed) projects/stress2/misc/nullfs.sh (contents, props changed) projects/stress2/misc/procfs.sh (contents, props changed) projects/stress2/misc/pthread.sh (contents, props changed) projects/stress2/misc/quota1.sh (contents, props changed) projects/stress2/misc/quota10.sh (contents, props changed) projects/stress2/misc/quota2.sh (contents, props changed) projects/stress2/misc/quota3.sh (contents, props changed) projects/stress2/misc/quota4.sh (contents, props changed) projects/stress2/misc/quota5.sh (contents, props changed) projects/stress2/misc/quota6.sh (contents, props changed) projects/stress2/misc/quota7.sh (contents, props changed) projects/stress2/misc/quota8.sh (contents, props changed) projects/stress2/misc/quota9.sh (contents, props changed) projects/stress2/misc/recursiveflushes.sh (contents, props changed) projects/stress2/misc/revoke.sh (contents, props changed) projects/stress2/misc/sem.sh (contents, props changed) projects/stress2/misc/snap.sh (contents, props changed) projects/stress2/misc/snap2-1.sh (contents, props changed) projects/stress2/misc/snap2.sh (contents, props changed) projects/stress2/misc/snap3.sh (contents, props changed) projects/stress2/misc/snap4.sh (contents, props changed) projects/stress2/misc/snap5-1.sh (contents, props changed) projects/stress2/misc/snap5.sh (contents, props changed) projects/stress2/misc/snap6.sh (contents, props changed) projects/stress2/misc/snap7.sh (contents, props changed) projects/stress2/misc/snapbackup.sh (contents, props changed) projects/stress2/misc/softupdate.sh (contents, props changed) projects/stress2/misc/statfs.sh (contents, props changed) projects/stress2/misc/symlink.sh (contents, props changed) projects/stress2/misc/symlink2.sh (contents, props changed) projects/stress2/misc/syscall.sh (contents, props changed) projects/stress2/misc/syscall2.sh (contents, props changed) projects/stress2/misc/ucom.sh (contents, props changed) projects/stress2/misc/umount.sh (contents, props changed) projects/stress2/misc/umountf.sh (contents, props changed) projects/stress2/misc/umountf2.sh (contents, props changed) projects/stress2/misc/umountf3.sh (contents, props changed) projects/stress2/misc/umountf4.sh (contents, props changed) projects/stress2/misc/unionfs.sh (contents, props changed) projects/stress2/misc/unionfs2.sh (contents, props changed) projects/stress2/misc/unionfs3.sh (contents, props changed) projects/stress2/mkdir.cfg (contents, props changed) projects/stress2/mkfifo.cfg (contents, props changed) projects/stress2/norw.cfg (contents, props changed) projects/stress2/noswap.cfg (contents, props changed) projects/stress2/orangutan.netperf.freebsd.org (contents, props changed) projects/stress2/pty.cfg (contents, props changed) projects/stress2/run.sh (contents, props changed) projects/stress2/rw.cfg (contents, props changed) projects/stress2/syscall.cfg (contents, props changed) projects/stress2/sysctl.cfg (contents, props changed) projects/stress2/testcases/ projects/stress2/testcases/Makefile (contents, props changed) projects/stress2/testcases/Makefile.inc (contents, props changed) projects/stress2/testcases/README (contents, props changed) projects/stress2/testcases/badcode/ projects/stress2/testcases/badcode/Makefile (contents, props changed) projects/stress2/testcases/badcode/badcode.c (contents, props changed) projects/stress2/testcases/creat/ projects/stress2/testcases/creat/Makefile (contents, props changed) projects/stress2/testcases/creat/creat.c (contents, props changed) projects/stress2/testcases/fts/ projects/stress2/testcases/fts/Makefile (contents, props changed) projects/stress2/testcases/fts/fts.c (contents, props changed) projects/stress2/testcases/link/ projects/stress2/testcases/link/Makefile (contents, props changed) projects/stress2/testcases/link/link.c (contents, props changed) projects/stress2/testcases/lockf/ projects/stress2/testcases/lockf/Makefile (contents, props changed) projects/stress2/testcases/lockf/lockf.c (contents, props changed) projects/stress2/testcases/lockf2/ projects/stress2/testcases/lockf2/Makefile (contents, props changed) projects/stress2/testcases/lockf2/lockf2.c (contents, props changed) projects/stress2/testcases/mkdir/ projects/stress2/testcases/mkdir/Makefile (contents, props changed) projects/stress2/testcases/mkdir/mkdir.c (contents, props changed) projects/stress2/testcases/mkfifo/ projects/stress2/testcases/mkfifo/Makefile (contents, props changed) projects/stress2/testcases/mkfifo/mkfifo.c (contents, props changed) projects/stress2/testcases/mmap/ projects/stress2/testcases/mmap/Makefile (contents, props changed) projects/stress2/testcases/mmap/mmap.c (contents, props changed) projects/stress2/testcases/openat/ projects/stress2/testcases/openat/Makefile (contents, props changed) projects/stress2/testcases/openat/doat.c (contents, props changed) projects/stress2/testcases/openat/openat.c (contents, props changed) projects/stress2/testcases/pty/ projects/stress2/testcases/pty/Makefile (contents, props changed) projects/stress2/testcases/pty/pty.c (contents, props changed) projects/stress2/testcases/rename/ projects/stress2/testcases/rename/Makefile (contents, props changed) projects/stress2/testcases/rename/rename.c (contents, props changed) projects/stress2/testcases/run/ projects/stress2/testcases/run/Makefile (contents, props changed) projects/stress2/testcases/run/run.c (contents, props changed) projects/stress2/testcases/rw/ projects/stress2/testcases/rw/Makefile (contents, props changed) projects/stress2/testcases/rw/rw.c (contents, props changed) projects/stress2/testcases/shm/ projects/stress2/testcases/shm/Makefile (contents, props changed) projects/stress2/testcases/shm/shm.c (contents, props changed) projects/stress2/testcases/socket/ projects/stress2/testcases/socket/Makefile (contents, props changed) projects/stress2/testcases/socket/socket.c (contents, props changed) projects/stress2/testcases/swap/ projects/stress2/testcases/swap/Makefile (contents, props changed) projects/stress2/testcases/swap/swap.c (contents, props changed) projects/stress2/testcases/symlink/ projects/stress2/testcases/symlink/Makefile (contents, props changed) projects/stress2/testcases/symlink/symlink.c (contents, props changed) projects/stress2/testcases/syscall/ projects/stress2/testcases/syscall/Makefile (contents, props changed) projects/stress2/testcases/syscall/syscall.c (contents, props changed) projects/stress2/testcases/sysctl/ projects/stress2/testcases/sysctl/Makefile (contents, props changed) projects/stress2/testcases/sysctl/sysctl.c (contents, props changed) projects/stress2/testcases/tcp/ projects/stress2/testcases/tcp/Makefile (contents, props changed) projects/stress2/testcases/tcp/tcp.c (contents, props changed) projects/stress2/testcases/thr1/ projects/stress2/testcases/thr1/Makefile (contents, props changed) projects/stress2/testcases/thr1/thr1.c (contents, props changed) projects/stress2/testcases/thr2/ projects/stress2/testcases/thr2/Makefile (contents, props changed) projects/stress2/testcases/thr2/thr2.c (contents, props changed) projects/stress2/testcases/udp/ projects/stress2/testcases/udp/Makefile (contents, props changed) projects/stress2/testcases/udp/udp.c (contents, props changed) projects/stress2/tools/ projects/stress2/tools/df.sh (contents, props changed) projects/stress2/tools/freeze.sh (contents, props changed) projects/stress2/tools/freeze2.sh (contents, props changed) projects/stress2/tools/fstool.c (contents, props changed) projects/stress2/tools/iwatch.sh (contents, props changed) projects/stress2/tools/l3.sh (contents, props changed) projects/stress2/tools/leaks.sh (contents, props changed) projects/stress2/tools/leaks2.sh (contents, props changed) projects/stress2/tools/module/ projects/stress2/tools/module/Makefile (contents, props changed) projects/stress2/tools/module/ptest.c (contents, props changed) projects/stress2/tools/monitor.sh (contents, props changed) projects/stress2/tools/ptsleak.sh (contents, props changed) projects/stress2/tools/ptyleak.sh (contents, props changed) projects/stress2/tools/rwatch.sh (contents, props changed) projects/stress2/udp.cfg (contents, props changed) projects/stress2/vfs.cfg (contents, props changed) Added: projects/stress2/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/Makefile Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= lib testcases + +.include Added: projects/stress2/Makefile.gnu ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/Makefile.gnu Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,28 @@ +#MAKE=gmake + +# Gnu Makefile by "Brad Knotwell" + +LIBOBJS=$(subst .c,.o,$(wildcard lib/*.c)) +TESTDIRS=run swap mkdir creat thr1 syscall rw sysctl tcp udp +EXES=$(foreach dir,$(TESTDIRS),testcases/$(dir)/$(dir).test) +OBJS=$(subst .test,.o,$(EXES)) +SRCS=$(subst .o,.c,$(OBJS)) +LIBS=./lib/libstress.a +CFLAGS=-g -Wall -I./include + +all: $(EXES) + +lib/libstress.a: lib/libstress.a($(LIBOBJS)) + ranlib lib/libstress.a + +lib/libstress.a(*.o): $(LIBOBJS) + +$(OBJS): %.o: %.c + +$(EXES): %.test: %.o lib/libstress.a + +%.test: %.o + $(CC) $(CFLAGS) $(LIBS) $< -o $@ + +clean: + rm -fr $(LIBOBJS) lib/libstress.a $(EXES) $(OBJS) Added: projects/stress2/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/README Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,39 @@ +$FreeBSD$ + +This is the FreeBSD kernel stress test suite. The purpose is to crash the +computer, by stressing selected parts of the kernel, thus exposing inadequate +error handling. + +Do not run the syscall test as root. + +To build and use: + +make +sh ./run.sh + +The "run.sh" script accepts an optional configuration file in order to test specific areas. +For example: + +./run.sh vfs.sh + + +To run all of the different test scenarios type: + +./run.sh -a + +You may have to tune the stress test to make sure that your test box run low +on resources. For example: + +INCARNATIONS=125 ./run.sh + +The following sub-directories exists: + +./doc Documentation +./include Include file for building the test programs in ./testcases +./lib Common support files for the test programs +./misc Various test scenarios. Mostly regression tests +./testcases Test programs +./tools Supplementary tools used in stress testing + +The name stress2 indicates that this is the second generation of the Kernel Stress Test Suite. +The first version (stress) was based mostly on scripts. Added: projects/stress2/all.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/all.cfg Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +# Stress Test Suite Configuration: run all test programs + +# Default values +. ./default.cfg + +export TESTPROGS="" Added: projects/stress2/beaver1.sentex.ca ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/beaver1.sentex.ca Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +# Configuration needed for the beaver1 test box + +export RUNDIR=/usr/tmp/stressX +TZ=Europe/Copenhagen; export TZ + +###export BLASTHOST=192.168.5.105 # orangutan +export BLASTHOST=127.0.0.1 # + +export DISKIMAGE=/usr/tmp/diskimage # Location of 1G disk image +export MNTPOINT=/mnt # Disk image mount point +export TESTUSER=test # Name of non root test user +###export MDSTART=5 # Start of free md units +###INCARNATIONS=125 Added: projects/stress2/creat.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/creat.cfg Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +# Stress Test Suite Configuration + +# Default values +. ./default.cfg + +export TESTPROGS="testcases/creat/creat" +export creatNODELAY=1 +export creatLOAD=100 Added: projects/stress2/default.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/default.cfg Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,76 @@ +# $FreeBSD$ + +# Stress Test Suite Configuration + +# Default values +export RUNDIR=${RUNDIR:-/tmp/stressX} +export RUNTIME=${RUNTIME:-2m} +export VERBOSE=${VERBOSE:-1} +export LOAD=20 + +# The INCARNATIONS variable should be set to match the number of CPUs and +# the amount of RAM in the test box. +# 10 for a 1,8 GHz Celeron with 256 Mb of RAM +# 100 for a dual Xeon 1,8 GHz with 1024 Gb of RAM + +export INCARNATIONS=${INCARNATIONS:-20} + +# Change hostname! +#export BLASTHOST=192.168.1.2 # host with udp disacard enabled in inetd.conf +export BLASTHOST=192.168.1.3 # host with udp disacard enabled in inetd.conf + + +# Run all test cases: +export runRUNTIME=${runRUNTIME:-3d} # Run tests for three days +export runINCARNATIONS=1 +export runLOAD=100 + +export swapINCARNATIONS=$((2 * INCARNATIONS)) +export swapLOAD=80 + +export syscallKILL=1 + +export rwLOAD=70 +export mkdirLOAD=80 +export creatLOAD=80 + +export symlinkLOAD=20 + +export tcpKILL=1 +#export shmKILL=1 +export shmINCARNATIONS=5 + +export TESTPROGS=" +testcases/rw/rw +testcases/swap/swap +testcases/creat/creat +testcases/mkdir/mkdir +testcases/thr1/thr1 +testcases/udp/udp +testcases/tcp/tcp +" + +[ -r default.cfg ] && ulimit -t 200 # Do not run this for the misc sub directory + +# +# Defaults for ./misc tests +# + +diskimage=/var/tmp/diskimage # Location of 1G disk image +mntpoint=/mnt # Disk image mount point +testuser=pho # Name of non root test user +mdstart=5 # Start of free md units +part=a # partitition to use on a md FS + +# Wrapper for dd +dede () { # file, blocksize, count + local log=/tmp/$0.$$ + dd if=/dev/zero of=$1 bs=$2 count=$3 > $log 2>&1 + local status=$? + egrep -v "records in|records out|bytes transferred" $log + rm -f $log + return $status +} + +[ -r "./`hostname`" ] && . "./`hostname`" # source in local configuration +[ -r "../`hostname`" ] && . "../`hostname`" # source in local configuration Added: projects/stress2/df.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/df.cfg Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +# Stress Test Suite Configuration + +# Default values +. ./default.cfg +###export creatVERBOSE=3 # Remove comments for test +###export rwVERBOSE=3 # Remove comments for test + +# Only run these two test programs for VFS tests + +export TESTPROGS="testcases/creat/creat testcases/rw/rw" Added: projects/stress2/disk.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/disk.cfg Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +# Stress Test Suite Configuration + +# Default values +. ./default.cfg + +export TESTPROGS="testcases/rw/rw testcases/creat/creat testcases/mkdir/mkdir" +export rwNODELAY=1 +export rwLOAD=100 Added: projects/stress2/doc/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/doc/README Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,5 @@ +$FreeBSD$ + +stress.pdf An old (and out of date) document escribing the first + generation of the test suite. +linuxforum06.pdf The slides from a presentation at Linux Forum 2006 Added: projects/stress2/doc/linuxforum06.pdf ============================================================================== Binary file. No diff available. Added: projects/stress2/doc/stress.pdf ============================================================================== Binary file. No diff available. Added: projects/stress2/hydra1.netperf.freebsd.org ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/hydra1.netperf.freebsd.org Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +# Configuration needed for the hydra1 test box + +export RUNDIR=/var/tmp/stressX + +export BLASTHOST=192.168.5.105 # orangutan + +export DISKIMAGE=/var/tmp/diskimage # Location of 1G disk image +export MNTPOINT=/mnt # Disk image mount point +export TESTUSER=test # Name of non root test user +export MDSTART=5 # Start of free md units +INCARNATIONS=150 Added: projects/stress2/hydra2.netperf.freebsd.org ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/hydra2.netperf.freebsd.org Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +# Configuration needed for the hydra1 test box + +export RUNDIR=/m2/stressX + +export BLASTHOST=192.168.5.105 # orangutan + +export DISKIMAGE=/m2/tmp/diskimage # Location of 1G disk image +export MNTPOINT=/mnt # Disk image mount point +export TESTUSER=test # Name of non root test user +export MDSTART=5 # Start of free md units +INCARNATIONS=125 Added: projects/stress2/include/stress.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/include/stress.h Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,65 @@ +/*- + * Copyright (c) 2008 Peter Holm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _STRESS_H_ +#define _STRESS_H_ +extern int setup(int); +extern int test(void); +extern void cleanup(void); +extern void options(int, char **); +extern int random_int(int, int); +/*extern void limits(void);*/ + +typedef struct { + int argc; + char **argv; + int run_time; + int load; + char *wd; + char *cd; + int verbose; + int incarnations; + int hog; + int nodelay; + int kill; + int kblocks; + int inodes; +} opt_t; + +extern opt_t *op; + +extern volatile int done_testing; +extern char *home; +extern void rmval(void); +extern void putval(unsigned long); +extern unsigned long getval(void); +extern void getdf(int64_t *, int64_t *); +extern void reservedf(int64_t, int64_t); +extern int64_t swap(void); +extern unsigned long usermem(void); +#endif Added: projects/stress2/io.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/io.cfg Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +# Stress Test Suite Configuration + +# Default values +. ./default.cfg + +# Only run these three test programs for VFS tests + +export TESTPROGS="testcases/swap/swap testcases/creat/creat testcases/mkdir/mkdir testcases/rw/rw" +export swapLOAD=10 Added: projects/stress2/jeff.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/jeff.cfg Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +# Stress Test Suite Configuration + +# Default values +. ./default.cfg + +# Only run these two test programs for VFS tests + +export TESTPROGS="testcases/creat/creat testcases/mkdir/mkdir" Added: projects/stress2/lib/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/lib/Makefile Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +LIB=stress +SRCS=main.c options.c random_int.c resources.c + +.include "../testcases/Makefile.inc" + +.include Added: projects/stress2/lib/main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/lib/main.c Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,206 @@ +/*- + * Copyright (c) 2008 Peter Holm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +/* Main program for all test programs */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "stress.h" + +static char const rcsid[] = "$Name: $ $FreeBSD$"; + +volatile int done_testing; +static int cleanupcalled = 0; +char *home; + +static pid_t *r; + +void +handler(int i) +{ + int j; + + done_testing = 1; + for (j = 0; j < op->incarnations; j++) { + if (op->verbose > 2) + printf("handler: kill -HUP %d\n", r[j]); + if (r[j] != 0 && kill(r[j], SIGHUP) == -1) + if (errno != ESRCH) + warn("kill(%d, SIGHUP), %s:%d", r[j], __FILE__, __LINE__); + } + if (op->kill == 1) { + sleep(5); + /* test programs may have blocked for the SIGHUP, so try harder */ + for (j = 0; j < op->incarnations; j++) { + if (op->verbose > 2) + printf("handler: kill -KILL %d\n", r[j]); + if (r[j] != 0) + (void) kill(r[j], SIGKILL); + } + } +} + +void +run_test_handler(int i) +{ + + done_testing = 1; +} + +void +exit_handler(int i) +{ + + exit(1); +} + +void +callcleanup(void) +{ + if (cleanupcalled == 0) + cleanup(); + cleanupcalled = 1; +} + +static void +run_tests(int i) +{ + time_t start; + + signal(SIGHUP, run_test_handler); + signal(SIGINT, exit_handler); + atexit(callcleanup); + arc4random_stir(); + if ((strcmp(getprogname(), "run") != 0) && (op->nodelay == 0)) + sleep(random_int(1,10)); + setup(i); + start = time(NULL); + while (done_testing == 0 && + (time(NULL) - start) < op->run_time) { + test(); + } + callcleanup(); + exit(EXIT_SUCCESS); +} + +static void +run_incarnations(void) +{ + int i; + int s; + + signal(SIGHUP, handler); + for (i = 0; i < op->incarnations && done_testing == 0; i++) { + if ((r[i] = fork()) == 0) { + run_tests(i); + } + if (r[i] < 0) { + warn("fork(), %s:%d", __FILE__, __LINE__); + r[i] = 0; + break; + } + } + for (i = 0; i < op->incarnations; i++) + if (r[i] != 0 && waitpid(r[i], &s, 0) == -1) + warn("waitpid(%d), %s:%d", r[i], __FILE__, __LINE__); + + exit(EXIT_SUCCESS); +} + +static int +run_test(void) +{ + pid_t p; + time_t start; + int status = 0; + + if (random_int(1,100) > op->load) + return (status); + + start = time(NULL); + done_testing = 0; + fflush(stdout); + rmval(); + p = fork(); + if (p == 0) + run_incarnations(); + if (p < 0) + err(1, "fork() in %s:%d", __FILE__, __LINE__); + while (done_testing != 1 && + (time(NULL) - start) < op->run_time) + sleep(1); + if (kill(p, SIGHUP) == -1) + warn("kill(%d, SIGHUP), %s:%d", p, __FILE__, __LINE__); + + if (waitpid(p, &status, 0) == -1) + err(1, "waitpid(%d), %s:%d", p, __FILE__, __LINE__); + + return (status); +} + +int +main(int argc, char **argv) +{ + struct stat sb; + int status = 0; + + options(argc, argv); + + umask(0); + if (stat(op->wd, &sb) == -1) { + if (mkdir(op->wd, 0770) == -1) + if (errno != EEXIST) + err(1, "mkdir(%s) %s:%d", op->wd, __FILE__, __LINE__); + } + if (stat(op->cd, &sb) == -1) { + if (mkdir(op->cd, 0770) == -1) + if (errno != EEXIST) + err(1, "mkdir(%s) %s:%d", op->cd, __FILE__, __LINE__); + } + if ((home = getcwd(NULL, 0)) == NULL) + err(1, "getcwd(), %s:%d", __FILE__, __LINE__); + if (chdir(op->wd) == -1) + err(1, "chdir(%s) %s:%d", op->wd, __FILE__, __LINE__); + + r = (pid_t *)calloc(1, op->incarnations * sizeof(pid_t)); + + status = run_test(); + + return (status); +} Added: projects/stress2/lib/options.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/lib/options.c Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,261 @@ +/*- + * Copyright (c) 2008 Peter Holm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include "stress.h" + +opt_t opt; +opt_t *op; + +static char path[64]; + +static void +usage(char *where) +{ + char *help; + + if (where != NULL) + printf("Error in \"%s\"\n", where); + fprintf(stderr, "Usage: %s [-t | -l | -i | -d | -h | -k | -v]\n", getprogname()); + help = " t : time to run test\n" + " l : load factor 0 - 100%\n" + " i : max # of parallel incarnations\n" + " d : working directory\n" + " h : hog resources\n" + " k : terminate with SIGHUP + SIGKILL\n" + " n : no startup delay\n" + " v : verbose\n"; + printf(help); + exit(EX_USAGE); +} + +static int +time2sec(const char *string) +{ + int r, s = 0; + char modifier; + r = sscanf(string, "%d%c", &s, &modifier); + if (r == 2) + switch(modifier) { + case 's': break; + case 'm': s = s * 60; break; + case 'h': s = s * 60 * 60; break; + case 'd': s = s * 60 * 60 * 24; break; + default: + usage("-t"); + } + else + usage("-t"); + return (s); +} + +static char *gete(char *name) +{ + char *cp; + char help[128]; + + snprintf(help, sizeof(help), "%s%s", getprogname(), name); + cp = getenv(help); + if (cp == NULL) + cp = getenv(name); + return (cp); +} + +static void +environment(void) +{ + char *cp; + + if ((cp = gete("INCARNATIONS")) != NULL) { + if (sscanf(cp, "%d", &op->incarnations) != 1) + usage("INCARNATIONS"); + } + if ((cp = gete("LOAD")) != NULL) { + if (sscanf(cp, "%d", &op->load) != 1) + usage("LOAD"); + } + if ((cp = gete("RUNTIME")) != NULL) { + op->run_time = time2sec(cp); + } + if ((cp = gete("RUNDIR")) != NULL) { + op->wd = cp; + } + if ((cp = gete("CTRLDIR")) != NULL) { + op->cd = cp; + } + if ((cp = gete("HOG")) != NULL) { + op->hog = 1; + } + if ((cp = gete("KILL")) != NULL) { + op->kill = 1; + } + if ((cp = gete("NODELAY")) != NULL) { + op->nodelay = 1; + } + if ((cp = gete("VERBOSE")) != NULL) { + if (sscanf(cp, "%d", &op->verbose) != 1) + usage("VERBOSE"); + } + if ((cp = gete("KBLOCKS")) != NULL) { + if (sscanf(cp, "%d", &op->kblocks) != 1) + usage("KBLOCKS"); + } + if ((cp = gete("INODES")) != NULL) { + if (sscanf(cp, "%d", &op->inodes) != 1) + usage("INODES"); + } +} + +void +options(int argc, char **argv) +{ + int ch; + int days; + time_t t; + char buf[80]; + + op = &opt; + + op->run_time = 60; + op->load = 100; + op->wd = "/tmp/stressX"; + op->cd = "/tmp/stressX.control"; + op->incarnations = 1; + op->hog = 0; + op->kill = 0; + op->nodelay = 0; + op->verbose = 0; + op->kblocks = 0; + op->inodes = 0; + + environment(); + + while ((ch = getopt(argc, argv, "t:l:i:d:hknv")) != -1) + switch(ch) { + case 't': /* run time */ + op->run_time = time2sec(optarg); + break; + case 'l': /* load factor in pct */ + if (sscanf(optarg, "%d", &op->load) != 1) + usage("-l"); + break; + case 'i': /* max incarnations */ + if (sscanf(optarg, "%d", &op->incarnations) != 1) + usage("-i"); + break; + case 'd': /* working directory */ + op->wd = strdup(optarg); + break; + case 'h': /* hog flag */ + op->hog += 1; + break; + case 'k': /* kill flag */ + op->kill = 1; + break; + case 'n': /* no delay flag */ + op->nodelay = 1; + break; + case 'v': /* verbose flag */ + op->verbose += 1; + break; + default: + usage(NULL); + } + op->argc = argc -= optind; + op->argv = argv += optind; + + if (op->incarnations < 1) + op->incarnations = 1; + if (op->hog == 0) + op->incarnations = random_int(1, op->incarnations); + if (op->run_time < 15) + op->run_time = 15; + if (op->load < 0 || op->load > 100) + op->load = 100; + + if (op->verbose > 0) { + t = op->run_time; + days = t / (60 * 60 * 24); + t = t % (60 * 60 * 24); + strftime(buf, sizeof(buf), "%T", gmtime(&t)); + printf("%8s: run time %2d+%s, incarnations %3d, load %3d, verbose %d\n", + getprogname(), days, buf, op->incarnations, op->load, + op->verbose); + } +} + + +void +rmval(void) +{ + if (snprintf(path, sizeof(path), "%s/%s.conf", op->cd, getprogname()) < 0) + err(1, "snprintf path"); + (void) unlink(path); +} + +void +putval(unsigned long v) +{ + char buf[64]; + + rmval(); + snprintf(buf, sizeof(buf), "%lu", v); + if (symlink(buf, path) < 0) + err(1, "symlink(%s, %s)", path, buf); +} + +unsigned long +getval(void) +{ + int i, n; + unsigned long val; + char buf[64]; + + if ((n = readlink(path, buf, sizeof(buf) -1)) < 0) { + for (i = 0; i < 60; i++) { + sleep(1); + if ((n = readlink(path, buf, sizeof(buf) -1)) > 0) + break; + } + if (n < 0) + err(1, "readlink(%s). %s:%d", path, __FILE__, __LINE__); + } + buf[n] = '\0'; + if (sscanf(buf, "%ld", &val) != 1) + err(1, "sscanf(%s)", buf); + return val; +} Added: projects/stress2/lib/random_int.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/lib/random_int.c Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,57 @@ +/*- + * Copyright (c) 2008 Peter Holm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +int +random_int(int mi, int ma) +{ + return (arc4random() % (ma - mi + 1) + mi); +} + +#ifdef TEST +#include +int +main() +{ + int i, j, min, max, r; + min = 100; + max = 1; + for (i = 0; i < 10000; i++) { + j += (r = random_int(1,100)); + if (max < r) + max = r; + if (min > r) + min = r; + } + printf("Average is %d, min = %d, max = %d\n", j / 10000, min, max); + return (0); +} +#endif Added: projects/stress2/lib/resources.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/lib/resources.c Wed Jan 14 16:03:10 2009 (r187224) @@ -0,0 +1,297 @@ +/*- + * Copyright (c) 2008 Peter Holm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +/* Get various resource limits for the tests */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "stress.h" + +static int lockfd; +static int dffd; +static int flags; +static char lockpath[128]; +static char dfpath[128]; + +static int64_t +inodes(void) +{ + char path[MAXPATHLEN+1]; + struct statfs buf; + + if (op->inodes != 0) + return (op->inodes); + if (getcwd(path, sizeof(path)) == NULL) + err(1, "getcwd()"); + + if (statfs(path, &buf) < 0) + err(1, "statfs(%s)", path); + if (!strcmp(buf.f_fstypename, "msdosfs")) + buf.f_ffree = 9999; + flags = buf.f_flags & MNT_VISFLAGMASK; + if (op->verbose > 2) + printf("Free inodes on %s (%s): %jd\n", path, buf.f_mntonname, buf.f_ffree); + return (buf.f_ffree); +} + +static int64_t +df(void) +{ + char path[MAXPATHLEN+1]; + struct statfs buf; + + if (op->kblocks != 0) + return (op->kblocks * (uint64_t)1024); + + if (getcwd(path, sizeof(path)) == NULL) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Jan 14 22:56:59 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 7F4F21065714; Wed, 14 Jan 2009 22:56:59 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E4228FC0A; Wed, 14 Jan 2009 22:56:59 +0000 (UTC) (envelope-from sam@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 n0EMuxxW056440; Wed, 14 Jan 2009 22:56:59 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0EMuxWq056439; Wed, 14 Jan 2009 22:56:59 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901142256.n0EMuxWq056439@svn.freebsd.org> From: Sam Leffler Date: Wed, 14 Jan 2009 22:56:59 +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: r187254 - projects/vap7/sbin/ifconfig 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: Wed, 14 Jan 2009 22:57:00 -0000 Author: sam Date: Wed Jan 14 22:56:59 2009 New Revision: 187254 URL: http://svn.freebsd.org/changeset/base/187254 Log: mfc r187253: use correct interface name when setting flags Modified: projects/vap7/sbin/ifconfig/ (props changed) projects/vap7/sbin/ifconfig/ifconfig.c Modified: projects/vap7/sbin/ifconfig/ifconfig.c ============================================================================== --- projects/vap7/sbin/ifconfig/ifconfig.c Wed Jan 14 22:55:49 2009 (r187253) +++ projects/vap7/sbin/ifconfig/ifconfig.c Wed Jan 14 22:56:59 2009 (r187254) @@ -697,13 +697,13 @@ setifflags(const char *vname, int value, struct ifreq my_ifr; int flags; - bcopy((char *)&ifr, (char *)&my_ifr, sizeof(struct ifreq)); + memset(&my_ifr, 0, sizeof(my_ifr)); + (void) strlcpy(my_ifr.ifr_name, name, sizeof(my_ifr.ifr_name)); if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&my_ifr) < 0) { Perror("ioctl (SIOCGIFFLAGS)"); exit(1); } - strncpy(my_ifr.ifr_name, name, sizeof (my_ifr.ifr_name)); flags = (my_ifr.ifr_flags & 0xffff) | (my_ifr.ifr_flagshigh << 16); if (value < 0) { From owner-svn-src-projects@FreeBSD.ORG Thu Jan 15 23:11:03 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 1489E1065676; Thu, 15 Jan 2009 23:11:03 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF8248FC20; Thu, 15 Jan 2009 23:11:02 +0000 (UTC) (envelope-from kmacy@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 n0FNB2RI090067; Thu, 15 Jan 2009 23:11:02 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0FNB2ie090066; Thu, 15 Jan 2009 23:11:02 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200901152311.n0FNB2ie090066@svn.freebsd.org> From: Kip Macy Date: Thu, 15 Jan 2009 23:11:02 +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: r187320 - projects/release_6_3_xen/sys/dev/xen/netfront 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: Thu, 15 Jan 2009 23:11:03 -0000 Author: kmacy Date: Thu Jan 15 23:11:02 2009 New Revision: 187320 URL: http://svn.freebsd.org/changeset/base/187320 Log: handle mbuf overrun Modified: projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c Modified: projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c ============================================================================== --- projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c Thu Jan 15 23:03:27 2009 (r187319) +++ projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c Thu Jan 15 23:11:02 2009 (r187320) @@ -1237,7 +1237,9 @@ next: m->m_len = rx->status; m->m_data += rx->offset; m0->m_pkthdr.len += rx->status; - } + } else + break; + if (!(rx->flags & NETRXF_more_data)) break; From owner-svn-src-projects@FreeBSD.ORG Thu Jan 15 23:40:02 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 D3C86106564A; Thu, 15 Jan 2009 23:40:02 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C249B8FC1C; Thu, 15 Jan 2009 23:40:02 +0000 (UTC) (envelope-from sam@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 n0FNe2Wh090708; Thu, 15 Jan 2009 23:40:02 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0FNe2sm090706; Thu, 15 Jan 2009 23:40:02 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901152340.n0FNe2sm090706@svn.freebsd.org> From: Sam Leffler Date: Thu, 15 Jan 2009 23:40:02 +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: r187323 - in projects/vap7/tools/tools/ath: . athrd 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: Thu, 15 Jan 2009 23:40:03 -0000 Author: sam Date: Thu Jan 15 23:40:02 2009 New Revision: 187323 URL: http://svn.freebsd.org/changeset/base/187323 Log: merge athrd Added: projects/vap7/tools/tools/ath/athrd/ - copied from r187322, head/tools/tools/ath/athrd/ Modified: projects/vap7/tools/tools/ath/ (props changed) projects/vap7/tools/tools/ath/Makefile projects/vap7/tools/tools/ath/Makefile.inc Modified: projects/vap7/tools/tools/ath/Makefile ============================================================================== --- projects/vap7/tools/tools/ath/Makefile Thu Jan 15 23:38:21 2009 (r187322) +++ projects/vap7/tools/tools/ath/Makefile Thu Jan 15 23:40:02 2009 (r187323) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= athdebug athkey athprom athregs athstats +SUBDIR= athdebug athkey athprom athrd athregs athstats .include Modified: projects/vap7/tools/tools/ath/Makefile.inc ============================================================================== --- projects/vap7/tools/tools/ath/Makefile.inc Thu Jan 15 23:38:21 2009 (r187322) +++ projects/vap7/tools/tools/ath/Makefile.inc Thu Jan 15 23:40:02 2009 (r187323) @@ -6,6 +6,7 @@ NO_MAN= ATH_DEFAULT= ath0 CFLAGS+=-DATH_DEFAULT='"${ATH_DEFAULT}"' -CFLAGS+=-I../common -CFLAGS+=-I../../../../sys/dev/ath -CFLAGS+=-I../../../../sys/dev/ath/ath_hal +CFLAGS+=-I${.CURDIR} +CFLAGS+=-I${.CURDIR}/../common +CFLAGS+=-I${.CURDIR}/../../../../sys/dev/ath +CFLAGS+=-I${.CURDIR}/../../../../sys/dev/ath/ath_hal From owner-svn-src-projects@FreeBSD.ORG Fri Jan 16 20:51:04 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 77E72106566B; Fri, 16 Jan 2009 20:51:04 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B2B28FC08; Fri, 16 Jan 2009 20:51:04 +0000 (UTC) (envelope-from sam@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 n0GKp4uv018335; Fri, 16 Jan 2009 20:51:04 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0GKp4Zf018332; Fri, 16 Jan 2009 20:51:04 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901162051.n0GKp4Zf018332@svn.freebsd.org> From: Sam Leffler Date: Fri, 16 Jan 2009 20:51:04 +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: r187346 - in projects/vap7: etc sbin/ifconfig sys sys/contrib/pf sys/dev sys/dev/ath sys/dev/ath/ath_hal sys/dev/ath/ath_hal/ar5210 sys/dev/ath/ath_hal/ar5211 sys/dev/ath/ath_hal/ar5212... 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, 16 Jan 2009 20:51:04 -0000 Author: sam Date: Fri Jan 16 20:51:03 2009 New Revision: 187346 URL: http://svn.freebsd.org/changeset/base/187346 Log: merge bits necessary to get the Public Safety Band Modified: projects/vap7/etc/ (props changed) projects/vap7/etc/regdomain.xml projects/vap7/sbin/ifconfig/ (props changed) projects/vap7/sbin/ifconfig/ifieee80211.c projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) Modified: projects/vap7/etc/regdomain.xml ============================================================================== --- projects/vap7/etc/regdomain.xml Fri Jan 16 20:44:45 2009 (r187345) +++ projects/vap7/etc/regdomain.xml Fri Jan 16 20:51:03 2009 (r187346) @@ -190,6 +190,55 @@ + + + + FCC4 + 0x12 + + + + 30 + IEEE80211_CHAN_B + + + + + + 30 + IEEE80211_CHAN_G + + + + + + 23 + + + + 27 + + + + 30 + + + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + + JAPAN 0x40 @@ -1515,6 +1564,23 @@ NB: keep sorted by starting frequency, legacy before HT --> + + 4942 4987 + 5 5 + IEEE80211_CHAN_A + IEEE80211_CHAN_QUARTER + + + 4945 4985 + 10 5 + IEEE80211_CHAN_A + IEEE80211_CHAN_HALF + + + 4950 4980 + 20 5 + IEEE80211_CHAN_A + 5120 5240 20 20 Modified: projects/vap7/sbin/ifconfig/ifieee80211.c ============================================================================== --- projects/vap7/sbin/ifconfig/ifieee80211.c Fri Jan 16 20:44:45 2009 (r187345) +++ projects/vap7/sbin/ifconfig/ifieee80211.c Fri Jan 16 20:51:03 2009 (r187346) @@ -1806,7 +1806,7 @@ regdomain_addchans(struct ieee80211req_c continue; } if ((flags & IEEE80211_CHAN_QUARTER) && - ((chanFlags & IEEE80211_CHAN_HALF) == 0 && + ((chanFlags & IEEE80211_CHAN_QUARTER) == 0 && (flags & IEEE80211_CHAN_GSM) == 0)) { if (verbose) printf("%u: skip, device does not support quarter-rate channels\n", freq); @@ -1900,12 +1900,26 @@ regdomain_makechannels( if (!LIST_EMPTY(&rd->bands_11b)) regdomain_addchans(ci, &rd->bands_11b, reg, IEEE80211_CHAN_B, &dc->dc_chaninfo); - if (!LIST_EMPTY(&rd->bands_11g)) + if (!LIST_EMPTY(&rd->bands_11g)) { regdomain_addchans(ci, &rd->bands_11g, reg, IEEE80211_CHAN_G, &dc->dc_chaninfo); - if (!LIST_EMPTY(&rd->bands_11a)) + regdomain_addchans(ci, &rd->bands_11g, reg, + IEEE80211_CHAN_G | IEEE80211_CHAN_HALF, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11g, reg, + IEEE80211_CHAN_G | IEEE80211_CHAN_QUARTER, + &dc->dc_chaninfo); + } + if (!LIST_EMPTY(&rd->bands_11a)) { regdomain_addchans(ci, &rd->bands_11a, reg, IEEE80211_CHAN_A, &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11a, reg, + IEEE80211_CHAN_A | IEEE80211_CHAN_HALF, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11a, reg, + IEEE80211_CHAN_A | IEEE80211_CHAN_QUARTER, + &dc->dc_chaninfo); + } if (!LIST_EMPTY(&rd->bands_11na)) { regdomain_addchans(ci, &rd->bands_11na, reg, IEEE80211_CHAN_A | IEEE80211_CHAN_HT20, Modified: projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 20:44:45 2009 (r187345) +++ projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 20:51:03 2009 (r187346) @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_regdomain.c,v 1.24 2008/11/27 22:29:27 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -1231,9 +1231,18 @@ static REG_DOMAIN regDomains[] = { {.regDmnEnum = DEBUG_REG_DMN, .conformanceTestLimit = FCC, .dfsMask = DFS_FCC3, - .chan11a = BM3(F1_5120_5240, F1_5260_5700, F1_5745_5825), - .chan11a_half = BM3(F2_5120_5240, F2_5260_5700, F7_5745_5825), - .chan11a_quarter = BM3(F3_5120_5240, F3_5260_5700, F8_5745_5825), + .chan11a = BM4(F1_4950_4980, + F1_5120_5240, + F1_5260_5700, + F1_5745_5825), + .chan11a_half = BM4(F1_4945_4985, + F2_5120_5240, + F2_5260_5700, + F7_5745_5825), + .chan11a_quarter = BM4(F1_4942_4987, + F3_5120_5240, + F3_5260_5700, + F8_5745_5825), .chan11a_turbo = BM8(T1_5130_5210, T1_5250_5330, T1_5370_5490, From owner-svn-src-projects@FreeBSD.ORG Sat Jan 17 02:54: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 F40881065673; Sat, 17 Jan 2009 02:54:27 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E2B028FC16; Sat, 17 Jan 2009 02:54:27 +0000 (UTC) (envelope-from sam@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 n0H2sRkH025256; Sat, 17 Jan 2009 02:54:27 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0H2sRdJ025254; Sat, 17 Jan 2009 02:54:27 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901170254.n0H2sRdJ025254@svn.freebsd.org> From: Sam Leffler Date: Sat, 17 Jan 2009 02:54: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: r187353 - in projects/vap7/tools/tools/net80211: . scripts 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: Sat, 17 Jan 2009 02:54:28 -0000 Author: sam Date: Sat Jan 17 02:54:27 2009 New Revision: 187353 URL: http://svn.freebsd.org/changeset/base/187353 Log: merge r187255: simple scripts to demonstrate tdma setup Added: projects/vap7/tools/tools/net80211/scripts/setup.tdma-master - copied unchanged from r187255, head/tools/tools/net80211/scripts/setup.tdma-master projects/vap7/tools/tools/net80211/scripts/setup.tdma-slave - copied unchanged from r187255, head/tools/tools/net80211/scripts/setup.tdma-slave Modified: projects/vap7/tools/tools/net80211/ (props changed) Copied: projects/vap7/tools/tools/net80211/scripts/setup.tdma-master (from r187255, head/tools/tools/net80211/scripts/setup.tdma-master) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/vap7/tools/tools/net80211/scripts/setup.tdma-master Sat Jan 17 02:54:27 2009 (r187353, copy of r187255, head/tools/tools/net80211/scripts/setup.tdma-master) @@ -0,0 +1,20 @@ +#! /bin/sh +# +# Setup a TDMA master and bridge it to a wired NIC. +# +# $FreeBSD$ +# +PATH=.:$PATH +. config + +SSID='freebsd+tdma' + +WLAN=`ifconfig wlan create wlanmode tdma wlandev $WIRELESS` +ifconfig $WLAN ssid "$SSID" tdmaslot 0 channel $CHANNEL +wlandebug -i $WLAN state+scan+tdma + +BRIDGE=`ifconfig bridge create` +ifconfig $BRIDGE addm $WLAN addm $WIRED 192.168.2.1/24 + +ifconfig $WIRED up +ifconfig $WLAN up Copied: projects/vap7/tools/tools/net80211/scripts/setup.tdma-slave (from r187255, head/tools/tools/net80211/scripts/setup.tdma-slave) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/vap7/tools/tools/net80211/scripts/setup.tdma-slave Sat Jan 17 02:54:27 2009 (r187353, copy of r187255, head/tools/tools/net80211/scripts/setup.tdma-slave) @@ -0,0 +1,19 @@ +#! /bin/sh +# +# Setup a TDMA slave and hook it into a bridge. +# +# $FreeBSD$ +# +PATH=.:$PATH +. config + +SSID='freebsd+tdma' + +WLAN=`ifconfig wlan create wlanmode tdma wlandev $WIRELESS` +ifconfig $WLAN ssid "$SSID" 0 +wlandebug -i $WLAN state+scan+tdma + +BRIDGE=`ifconfig bridge create` +ifconfig $BRIDGE addm $WLAN 192.168.2.2/24 + +ifconfig $WLAN up