From owner-p4-projects@FreeBSD.ORG Tue Dec 11 13:53:48 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DCAFA8AF for ; Tue, 11 Dec 2012 13:53:48 +0000 (UTC) (envelope-from aanna652@gmail.com) Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 9413A8FC1A for ; Tue, 11 Dec 2012 13:53:48 +0000 (UTC) Received: by mail-qc0-f182.google.com with SMTP id k19so2689525qcs.13 for ; Tue, 11 Dec 2012 05:53:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=oOudOTmrc/VtlTQtTa20GyAN2UjXz7Vt5JMBsz4nrUU=; b=A9WyAz4e41nOe/N4vDAf33dWyqa3QSv5jDDGM41kd1e2KlRpiU1qOnKiJR/rAsF5vA YKoEZJXJziHjWVS6iQYF0EIlA2Chwj1mrmGdNU5ydfs200KFyx03YDDt5+5/jcyFUxkY v2q3U1G/F7XLze734L1Huv2kkejDed59//l6mA9Wfof/DTeaX4UEaEtLyhbfGLdrsq+Z +6JZlQZTw3Zp3lBqz2Yz5Rt6OaAqbj19LlO3p6OkrOlsrWKt+uhUX1mCCBL0iCIqXleW yNNUa8VFqa+x0ySDPQU6Ft6JiTw6VN8CdHNOh/zgBk0ZopYBsF6KOZcsoyfnQIyOnPTi 9hEg== MIME-Version: 1.0 Received: by 10.49.103.162 with SMTP id fx2mr40168753qeb.1.1355234027518; Tue, 11 Dec 2012 05:53:47 -0800 (PST) Received: by 10.49.133.162 with HTTP; Tue, 11 Dec 2012 05:53:47 -0800 (PST) Date: Tue, 11 Dec 2012 14:53:47 +0100 Message-ID: Subject: From: Anna anna To: p4-projects@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2012 13:53:48 -0000 Hi, I'm a master student, my work is about protocol TMAC and I use "BridgeTest" on castalia .. I want to get the energy's graph of TMAC when I varied the value of TA { 5,10,15,20}... please can you help me .. any help will be dearly appreciated .. Thanks in advance. From owner-p4-projects@FreeBSD.ORG Wed Dec 12 17:54:24 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2C32471; Wed, 12 Dec 2012 17:54:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 57EDE46F for ; Wed, 12 Dec 2012 17:54:24 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3D36D8FC17 for ; Wed, 12 Dec 2012 17:54:24 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCHsONK096577 for ; Wed, 12 Dec 2012 17:54:24 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBCHsOso096574 for perforce@freebsd.org; Wed, 12 Dec 2012 17:54:24 GMT (envelope-from brooks@freebsd.org) Date: Wed, 12 Dec 2012 17:54:24 GMT Message-Id: <201212121754.qBCHsOso096574@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219898 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2012 17:54:25 -0000 http://p4web.freebsd.org/@@219898?ac=10 Change 219898 by brooks@brooks_zenith on 2012/12/12 17:53:37 Add a sysarch MIPS_GET_COUNT to access the cycle counter. Ideally we should use rdhwr to read it directly by BERI/CHERI doesn't have that yet. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/sysarch.h#2 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/sys_machdep.c#3 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/sysarch.h#2 (text+ko) ==== @@ -37,6 +37,7 @@ #define MIPS_SET_TLS 1 #define MIPS_GET_TLS 2 +#define MIPS_GET_COUNT 3 #ifndef _KERNEL #include ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/sys_machdep.c#3 (text+ko) ==== @@ -56,6 +56,7 @@ sysarch(struct thread *td, struct sysarch_args *uap) { int error; + uint32_t count; void *tlsbase; switch (uap->op) { @@ -66,6 +67,10 @@ tlsbase = td->td_md.md_tls; error = copyout(&tlsbase, uap->parms, sizeof(tlsbase)); return (error); + case MIPS_GET_COUNT: + count = mips_rd_count(); + error = copyout(&count, uap->parms, sizeof(count)); + return (error); default: break; } From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:16:54 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48353D02; Wed, 12 Dec 2012 21:16:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 088F3D00 for ; Wed, 12 Dec 2012 21:16:54 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E0D468FC15 for ; Wed, 12 Dec 2012 21:16:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCLGrxG005451 for ; Wed, 12 Dec 2012 21:16:53 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBCLGrPp005448 for perforce@freebsd.org; Wed, 12 Dec 2012 21:16:53 GMT (envelope-from brooks@freebsd.org) Date: Wed, 12 Dec 2012 21:16:53 GMT Message-Id: <201212122116.qBCLGrPp005448@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219899 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2012 21:16:54 -0000 http://p4web.freebsd.org/@@219899?ac=10 Change 219899 by brooks@brooks_zenith on 2012/12/12 21:16:50 We can't currently copyout to sandboxes due to the use of the wrong CP0 by the kernel so alter the code to return the counter directly. The caller needs to know that the return is actually unsigned. Fortunatly, this can't fail so not having an error indicator is fine. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/sys_machdep.c#4 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/sys_machdep.c#4 (text+ko) ==== @@ -56,7 +56,6 @@ sysarch(struct thread *td, struct sysarch_args *uap) { int error; - uint32_t count; void *tlsbase; switch (uap->op) { @@ -68,9 +67,8 @@ error = copyout(&tlsbase, uap->parms, sizeof(tlsbase)); return (error); case MIPS_GET_COUNT: - count = mips_rd_count(); - error = copyout(&count, uap->parms, sizeof(count)); - return (error); + td->td_retval[0] = mips_rd_count(); + return (0); default: break; } From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:18:57 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD282EDF; Wed, 12 Dec 2012 21:18:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 85660EDD for ; Wed, 12 Dec 2012 21:18:56 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 507EA8FC12 for ; Wed, 12 Dec 2012 21:18:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCLIuJR005498 for ; Wed, 12 Dec 2012 21:18:56 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBCLIuGD005495 for perforce@freebsd.org; Wed, 12 Dec 2012 21:18:56 GMT (envelope-from brooks@freebsd.org) Date: Wed, 12 Dec 2012 21:18:56 GMT Message-Id: <201212122118.qBCLIuGD005495@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219900 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2012 21:18:57 -0000 http://p4web.freebsd.org/@@219900?ac=10 Change 219900 by brooks@brooks_zenith on 2012/12/12 21:18:14 Unconditionally allow the MIPS_GET_COUNT sysarch(). Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/kern/subr_syscall.c#7 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#12 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#17 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/kern/subr_syscall.c#7 (text+ko) ==== @@ -114,7 +114,8 @@ * Constrain code that can originate system calls if * userspace sandboxing is available. */ - error = cheri_syscall_authorize(td); + error = cheri_syscall_authorize(td, sa->code, + sa->narg, sa->args); if (error) goto retval; #endif ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#12 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -41,6 +42,7 @@ #include #include #include +#include /* * Beginnings of a programming interface for explicitly managing capability @@ -345,15 +347,21 @@ } /* - * Only allow system calls from sandboxes that hold ambient authority in + * Only allow most system calls from sandboxes that hold ambient authority in * userspace. */ int -cheri_syscall_authorize(struct thread *td) +cheri_syscall_authorize(struct thread *td, u_int code, int nargs, + register_t *args) { struct chericap c; /* + * Allow the cycle counter to be read via sysarch. + */ + if (code == SYS_sysarch && args[0] == MIPS_GET_COUNT) + return (0); + /* * Check whether userspace holds the rights defined in * cheri_capability_set_user() in $C0. Note that object type is * We might also consider checking $PCC here. ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#17 (text+ko) ==== @@ -340,7 +340,8 @@ struct cheri_frame *cf_srcp); void cheri_exec_setregs(struct thread *td); void cheri_log_exception(struct trapframe *frame, int trap_type); -int cheri_syscall_authorize(struct thread *td); +int cheri_syscall_authorize(struct thread *td, u_int code, + int nargs, register_t *args); #endif #endif /* _MIPS_INCLUDE_CHERI_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Dec 13 16:39:10 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CAB53FA; Thu, 13 Dec 2012 16:39:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC5E03F8 for ; Thu, 13 Dec 2012 16:39:09 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D1B748FC0A for ; Thu, 13 Dec 2012 16:39:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDGd9qP052425 for ; Thu, 13 Dec 2012 16:39:09 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBDGd9oZ052422 for perforce@freebsd.org; Thu, 13 Dec 2012 16:39:09 GMT (envelope-from brooks@freebsd.org) Date: Thu, 13 Dec 2012 16:39:09 GMT Message-Id: <201212131639.qBDGd9oZ052422@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219901 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 16:39:10 -0000 http://p4web.freebsd.org/@@219901?ac=10 Change 219901 by brooks@brooks_zenith on 2012/12/13 16:38:36 Prefault the stack and heap by zeroing them. This signficantly reduces the runtime of the first invocation of libmagic sandboxes. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/lib/libcheri/sandbox.c#3 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/lib/libcheri/sandbox.c#3 (text+ko) ==== @@ -174,6 +174,7 @@ warn("%s: mmap heap", __func__); goto error; } + memset(base, 0, sb->sb_heaplen); base += sb->sb_heaplen; length -= sb->sb_heaplen; @@ -192,6 +193,7 @@ warn("%s: mmap stack", __func__); goto error; } + memset(base, 0, length); base += STACK_SIZE; length -= STACK_SIZE; From owner-p4-projects@FreeBSD.ORG Thu Dec 13 21:25:06 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AF583E5; Thu, 13 Dec 2012 21:25:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3BEC33E3 for ; Thu, 13 Dec 2012 21:25:06 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 056728FC08 for ; Thu, 13 Dec 2012 21:25:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDLP5ri063197 for ; Thu, 13 Dec 2012 21:25:05 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBDLP5ve063194 for perforce@freebsd.org; Thu, 13 Dec 2012 21:25:05 GMT (envelope-from brooks@freebsd.org) Date: Thu, 13 Dec 2012 21:25:05 GMT Message-Id: <201212132125.qBDLP5ve063194@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219902 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 21:25:06 -0000 http://p4web.freebsd.org/@@219902?ac=10 Change 219902 by brooks@brooks_zenith on 2012/12/13 21:24:16 Add an offset to support buffer or capability based read functions. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/iboxpriv.h#5 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/iboxpriv.h#5 (text+ko) ==== @@ -34,6 +34,7 @@ struct ibox_decode_state { int fd; + size_t offset; struct iboxstate *is; uint32_t *buffer; }; From owner-p4-projects@FreeBSD.ORG Thu Dec 13 21:26:08 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9C6B4E7; Thu, 13 Dec 2012 21:26:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 79E084E5 for ; Thu, 13 Dec 2012 21:26:07 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5E1C98FC13 for ; Thu, 13 Dec 2012 21:26:07 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDLQ7jW063236 for ; Thu, 13 Dec 2012 21:26:07 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBDLQ7tk063233 for perforce@freebsd.org; Thu, 13 Dec 2012 21:26:07 GMT (envelope-from brooks@freebsd.org) Date: Thu, 13 Dec 2012 21:26:07 GMT Message-Id: <201212132126.qBDLQ7tk063233@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219903 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 21:26:08 -0000 http://p4web.freebsd.org/@@219903?ac=10 Change 219903 by brooks@brooks_zenith on 2012/12/13 21:25:16 Use a per-instance offset rather than a bogus global one. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#6 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#6 (text+ko) ==== @@ -46,13 +46,14 @@ int pngwidth; -int offset = 0; static void cheri_read_data(png_structp png_ptr __unused, png_bytep data, png_size_t length) { - - memcpy_fromcap(data, 2, offset, length); - offset += length; + struct ibox_decode_state *ids; + + ids = png_get_io_ptr(png_ptr); + memcpy_fromcap(data, 2, ids->offset, length); + ids->offset += length; } static void @@ -92,6 +93,7 @@ is.sb = SB_CHERI; ids.fd = -1; + ids.offset = 0; /* * in principle we could update this via a capabilty, * but in practice we can reconstruct it on exit From owner-p4-projects@FreeBSD.ORG Thu Dec 13 21:26:09 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EA1F5C4; Thu, 13 Dec 2012 21:26:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C40C55BE for ; Thu, 13 Dec 2012 21:26:07 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A4BC68FC14 for ; Thu, 13 Dec 2012 21:26:07 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDLQ7I6063242 for ; Thu, 13 Dec 2012 21:26:07 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBDLQ7a0063239 for perforce@freebsd.org; Thu, 13 Dec 2012 21:26:07 GMT (envelope-from pjd@freebsd.org) Date: Thu, 13 Dec 2012 21:26:07 GMT Message-Id: <201212132126.qBDLQ7a0063239@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek Subject: PERFORCE change 219904 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 21:26:09 -0000 http://p4web.freebsd.org/@@219904?ac=10 Change 219904 by pjd@pjd_anger on 2012/12/13 21:25:41 Fix AUTHORS section. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.conf.5#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.conf.5#4 (text+ko) ==== @@ -355,7 +355,7 @@ .Xr auditdistd 8 . .Sh AUTHORS The -.Nm -was written by +.Nm auditdistd +was developed by .An Pawel Jakub Dawidek Aq pawel@dawidek.net under sponsorship of the FreeBSD Foundation. From owner-p4-projects@FreeBSD.ORG Thu Dec 13 21:27:09 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63F856E0; Thu, 13 Dec 2012 21:27:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1FC166DE for ; Thu, 13 Dec 2012 21:27:09 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 03E778FC0A for ; Thu, 13 Dec 2012 21:27:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDLR8Do063269 for ; Thu, 13 Dec 2012 21:27:08 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBDLR8xu063266 for perforce@freebsd.org; Thu, 13 Dec 2012 21:27:08 GMT (envelope-from brooks@freebsd.org) Date: Thu, 13 Dec 2012 21:27:08 GMT Message-Id: <201212132127.qBDLR8xu063266@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219905 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 21:27:09 -0000 http://p4web.freebsd.org/@@219905?ac=10 Change 219905 by brooks@brooks_zenith on 2012/12/13 21:26:30 Reuse the CHERI sandbox rather than invoking a new one each time. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#9 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#9 (text+ko) ==== @@ -225,7 +225,7 @@ cheri_png_read_start(char *pngbuffer, size_t pnglen, uint32_t width, uint32_t height, enum sbtype sb) { - struct sandbox *sandbox; + static struct sandbox *sandbox = NULL; struct iboxstate *is = NULL; register_t v; @@ -244,17 +244,11 @@ if (ibox_verbose) sb_verbose = ibox_verbose; - if (sandbox_setup("/usr/libexec/readpng-cheri.bin", 4*1024*1024, - &sandbox) < 0) - goto error; + if (sandbox == NULL) + if (sandbox_setup("/usr/libexec/readpng-cheri.bin", 4*1024*1024, + &sandbox) < 0) + goto error; -#if 0 - CHERI_CINCBASE(10, 0, is); - CHERI_CSETLEN(10, 10, sizeof(*is)); - CHERI_CANDPERM(10, 10, CHERI_PERM_LOAD|CHERI_PERM_STORE); - CHERI_CSC(10, 0, &c1, 0); -#endif - CHERI_CINCBASE(10, 0, is->buffer); CHERI_CSETLEN(10, 10, is->width * is->height * sizeof(uint32_t)); CHERI_CANDPERM(10, 10, CHERI_PERM_STORE); @@ -269,7 +263,6 @@ &c1, &c2, NULL, NULL, NULL, NULL, NULL); if (ibox_verbose) printf("%s: sandbox returned %ju\n", __func__, (uintmax_t)v); - sandbox_destroy(sandbox); is->valid_rows = height; is->passes_remaining = 0; return (is); From owner-p4-projects@FreeBSD.ORG Fri Dec 14 00:20:08 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC526A; Fri, 14 Dec 2012 00:20:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 47EF21000 for ; Fri, 14 Dec 2012 00:20:08 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2BC388FC14 for ; Fri, 14 Dec 2012 00:20:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBE0K87r069237 for ; Fri, 14 Dec 2012 00:20:08 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBE0K7dH069234 for perforce@freebsd.org; Fri, 14 Dec 2012 00:20:07 GMT (envelope-from brooks@freebsd.org) Date: Fri, 14 Dec 2012 00:20:07 GMT Message-Id: <201212140020.qBE0K7dH069234@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219906 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 00:20:08 -0000 http://p4web.freebsd.org/@@219906?ac=10 Change 219906 by brooks@brooks_zenith on 2012/12/14 00:19:39 Snapshot the cycle counter at four points in the png decoding process: - As the sandbox specific function is entered. - As the core decoding function is entered and exited. - As late as possible without waiting for a call to read_png_finish() which may take an indefinite amout of time. Add a pair of accessor functions to retrieve the total runtime and the decoding time. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#6 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/imagebox.h#5 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#10 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/Makefile#3 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#7 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/sysarch.S#1 add .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/readpng.c#5 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#6 (text+ko) ==== @@ -30,6 +30,8 @@ #include +#include + #include #include #include @@ -53,6 +55,8 @@ png_infop end_info = NULL; png_bytep *rows = NULL; + ids->is->times[1] = sysarch(MIPS_GET_COUNT, 0); + if ((png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) == NULL) { ids->is->error = 1; @@ -125,6 +129,7 @@ error: png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); close(ids->fd); + ids->is->times[2] = sysarch(MIPS_GET_COUNT, 0); free(rows); } ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/imagebox.h#5 (text+ko) ==== @@ -45,6 +45,7 @@ volatile uint32_t passes_remaining; volatile uint32_t error; volatile uint32_t *buffer; + volatile uint32_t times[4]; void *private; }; @@ -53,6 +54,9 @@ void iboxstate_free(struct iboxstate *ps); +uint32_t iboxstate_get_dtime(struct iboxstate *is); +uint32_t iboxstate_get_ttime(struct iboxstate *is); + struct iboxstate* png_read_start(int pfd, uint32_t maxw, uint32_t maxh, enum sbtype); int png_read_finish(struct iboxstate *ps); ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#10 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -70,6 +71,8 @@ decode_png(ids, NULL, NULL); + ids->is->times[3] = sysarch(MIPS_GET_COUNT, NULL); + free(ids); pthread_exit(NULL); @@ -89,6 +92,7 @@ is->width = width; is->height = height; is->passes_remaining = UINT32_MAX; + is->times[0] = sysarch(MIPS_GET_COUNT, NULL); if ((pdp = malloc(sizeof(*pdp))) == NULL) goto error; @@ -145,6 +149,7 @@ is->width = width; is->height = height; is->passes_remaining = UINT32_MAX; + is->times[0] = sysarch(MIPS_GET_COUNT, NULL); if ((bfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR)) == -1) @@ -219,7 +224,7 @@ /* * XXX: rwatson reports that capabilities end up misaligned on the stack. */ -static struct chericap c1, c2; +static struct chericap c1, c2, c3; static struct iboxstate* cheri_png_read_start(char *pngbuffer, size_t pnglen, @@ -236,6 +241,7 @@ is->width = width; is->height = height; is->passes_remaining = UINT32_MAX; + is->times[0] = sysarch(MIPS_GET_COUNT, NULL); if ((is->buffer = malloc(is->width * is->height * sizeof(*is->buffer))) == NULL) @@ -259,12 +265,18 @@ CHERI_CANDPERM(10, 10, CHERI_PERM_LOAD); CHERI_CSC(10, 0, &c2, 0); + CHERI_CINCBASE(10, 0, is->times + 1); + CHERI_CSETLEN(10, 10, sizeof(uint32_t) * 2); + CHERI_CANDPERM(10, 10, CHERI_PERM_STORE); + CHERI_CSC(10, 0, &c3, 0); + v = sandbox_invoke(sandbox, width, height, pnglen, 0, - &c1, &c2, NULL, NULL, NULL, NULL, NULL); + &c1, &c2, &c3, NULL, NULL, NULL, NULL); if (ibox_verbose) printf("%s: sandbox returned %ju\n", __func__, (uintmax_t)v); is->valid_rows = height; is->passes_remaining = 0; + is->times[3] = sysarch(MIPS_GET_COUNT, NULL); return (is); error: munmap(pngbuffer, pnglen); @@ -403,3 +415,25 @@ break; } } + +static uint32_t +counter_diff(uint32_t first, uint32_t second) +{ + + if (first < second) + return (second - first); + else + return (second + (UINT32_MAX - first)); +} + +uint32_t +iboxstate_get_ttime(struct iboxstate *is) { + + return (counter_diff(is->times[0], is->times[3])); +} + +uint32_t +iboxstate_get_dtime(struct iboxstate *is) { + + return (counter_diff(is->times[1], is->times[2])); +} ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/Makefile#3 (text+ko) ==== @@ -14,6 +14,7 @@ setjmp.S \ strcpy.c \ execve.S \ + sysarch.S \ cerror.S .PATH: ${.CURDIR}/../../../ctsrd-lib/libimagebox ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#7 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -108,5 +109,7 @@ if (is.error == 0) memcpy_tocap(1, ids.buffer, 0, sizeof(uint32_t) * a0 * a1); + memcpy_tocap(3, is.times + 1, 0, sizeof(uint32_t) * 2); + return (is.error); } ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/readpng.c#5 (text+ko) ==== @@ -32,6 +32,8 @@ #include #include +#include + #include #include #include @@ -63,5 +65,6 @@ err(1, "mmap buffer"); decode_png(&ids, NULL, NULL); + ids.is->times[3] = sysarch(MIPS_GET_COUNT, NULL); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Dec 14 00:22:11 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16C4E193; Fri, 14 Dec 2012 00:22:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA44B18F for ; Fri, 14 Dec 2012 00:22:10 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 946208FC12 for ; Fri, 14 Dec 2012 00:22:10 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBE0MAn4069291 for ; Fri, 14 Dec 2012 00:22:10 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBE0MADn069288 for perforce@freebsd.org; Fri, 14 Dec 2012 00:22:10 GMT (envelope-from brooks@freebsd.org) Date: Fri, 14 Dec 2012 00:22:10 GMT Message-Id: <201212140022.qBE0MADn069288@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219907 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 00:22:11 -0000 http://p4web.freebsd.org/@@219907?ac=10 Change 219907 by brooks@brooks_zenith on 2012/12/14 00:21:24 Total up the time take to render a composite slide and print it out in the verbose case. Remove an extra variable name left from a previous code flow. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#20 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#20 (text+ko) ==== @@ -450,9 +450,11 @@ char sntext[8]; uint32_t *snimage; uint32_t r; - struct iboxstate *is, *hdris; + uint64_t decode, total; + struct iboxstate *is; error = 0; + decode = total = 0; busy(1); @@ -473,6 +475,8 @@ warnx("png_read_finish() failed for %s", slide); return (-1); } + decode += iboxstate_get_dtime(is); + total += iboxstate_get_ttime(is); fb_fill_region(white, 0, 0, fb_width, fb_height); busy(0); /* @@ -558,6 +562,8 @@ warnx("png_read_finish() failed for sri.png"); return (-1); } + decode += iboxstate_get_dtime(is); + total += iboxstate_get_ttime(is); fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), slide_fcol, fb_height - is->height, is->width, is->height); if (sb_vis && sb != SB_NONE) @@ -578,6 +584,8 @@ warnx("png_read_finish() failed for ucam.png"); return (-1); } + decode += iboxstate_get_dtime(is); + total += iboxstate_get_ttime(is); fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), slide_fcol + slide_width - is->width, fb_height - is->height, is->width, is->height); @@ -613,28 +621,33 @@ warn("Failed to open header.png"); return (-1); } - if ((hdris = png_read_start(pfd, slide_width, fb_height, sb)) == NULL) { + if ((is = png_read_start(pfd, slide_width, fb_height, sb)) == NULL) { warn("Failed to start PNG decode for header.png"); return (-1); } - if (png_read_finish(hdris) != 0) { + if (png_read_finish(is) != 0) { warnx("png_read_finish() failed for header.png"); return (-1); } + decode += iboxstate_get_dtime(is); + total += iboxstate_get_ttime(is); /* Fill in the header's background. */ - for (r = 0; r < hdris->height; r++) - fb_fill_region(hdris->buffer[r * hdris->width], 0, r, + for (r = 0; r < is->height; r++) + fb_fill_region(is->buffer[r * is->width], 0, r, fb_width, 1); - fb_post_region(__DEVOLATILE(uint32_t *, hdris->buffer), - slide_fcol + slide_width - hdris->width, 0, hdris->width, - hdris->height); + fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), + slide_fcol + slide_width - is->width, 0, is->width, is->height); if (sb_vis && sb != SB_NONE) - fb_rectangle(red, 2, slide_fcol + slide_width - hdris->width, - 0, hdris->width, hdris->height); - iboxstate_free(hdris); + fb_rectangle(red, 2, slide_fcol + slide_width - is->width, + 0, is->width, is->height); + iboxstate_free(is); unbusy(); + if (verbose) + printf("total: %ju decode: %ju overhead: %.1f%%\n", total, + decode, 100.0 * (((float)total - decode) / total)); + return (error); } From owner-p4-projects@FreeBSD.ORG Fri Dec 14 21:31:40 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A6D0DA9 for ; Fri, 14 Dec 2012 21:31:40 +0000 (UTC) (envelope-from aanna652@gmail.com) Received: from mail-qa0-f54.google.com (mail-qa0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id D20318FC0A for ; Fri, 14 Dec 2012 21:31:39 +0000 (UTC) Received: by mail-qa0-f54.google.com with SMTP id j15so1135422qaq.13 for ; Fri, 14 Dec 2012 13:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=jHDw7rDvsxRtwUnpxwj9Uu+ZuI+W1THZmhQki89jmok=; b=iwEdw5RRcpej/TdqVzPFv+JNM7/WBw7/TYFflHh7oqfhItHEv+UDd0FurqhRkIVAb9 UChgTBK7ZJhkv7YAtZVpvvxkjTNcvpVbcyznl6fGm2wtb7oAw6/JFZY9DdnL4wlgSAbP QSmcYQ3fVdX2YteZpH7DK0rtJPdgnLX/DKaQYUdo5YUiEHhOLfzAcX0/iUBNzlLD3Ux/ a0CFBYONNpS5/nuhezp6cIjGAcj7ZQlvyUTIHPrJLUTn0/LioL467obusADKi7AgKumv E/mkpGbsLqF8nLUKa4i38c7goIloBJhEbKjRNLaL+TzCi+KgoZCExXAL1sHD5GlmhVu5 FoKw== MIME-Version: 1.0 Received: by 10.49.16.9 with SMTP id b9mr3564884qed.16.1355520693073; Fri, 14 Dec 2012 13:31:33 -0800 (PST) Received: by 10.49.116.193 with HTTP; Fri, 14 Dec 2012 13:31:33 -0800 (PST) In-Reply-To: References: Date: Fri, 14 Dec 2012 22:31:33 +0100 Message-ID: Subject: Re: From: Anna anna To: p4-projects@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 21:31:40 -0000 please, I really need your help ! 2012/12/11 Anna anna > Hi, > > I'm a master student, my work is about protocol TMAC and I use > "BridgeTest" on castalia .. I want to get the energy's graph of TMAC when I > varied the value of TA { 5,10,15,20}... please can you help me .. any > help will be dearly appreciated .. Thanks in advance. > From owner-p4-projects@FreeBSD.ORG Sat Dec 15 00:38:37 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D281696; Sat, 15 Dec 2012 00:38:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EEA68694 for ; Sat, 15 Dec 2012 00:38:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D196B8FC13 for ; Sat, 15 Dec 2012 00:38:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBF0caHQ021504 for ; Sat, 15 Dec 2012 00:38:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBF0caV8021501 for perforce@freebsd.org; Sat, 15 Dec 2012 00:38:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Dec 2012 00:38:36 GMT Message-Id: <201212150038.qBF0caV8021501@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219908 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 00:38:37 -0000 http://p4web.freebsd.org/@@219908?ac=10 Change 219908 by rwatson@rwatson_cinnamon on 2012/12/15 00:37:55 Do a slightly cosmetic renaming so that variations on OpenBSM version numbers are formatted slightly more consistently. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#30 edit .. //depot/projects/trustedbsd/openbsm/configure#69 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#66 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#30 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_2alpha3 +OPENBSM_1_2_alpha3 ==== //depot/projects/trustedbsd/openbsm/configure#69 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#64 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha3. +# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.2alpha3' -PACKAGE_STRING='OpenBSM 1.2alpha3' +PACKAGE_VERSION='1.2-alpha3' +PACKAGE_STRING='OpenBSM 1.2-alpha3' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.2alpha3 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.2alpha3:";; + short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.2alpha3 +OpenBSM configure 1.2-alpha3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1991,7 +1991,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.2alpha3, which was +It was created by OpenBSM $as_me 1.2-alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11552,7 +11552,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.2alpha3 + VERSION=1.2-alpha3 cat >>confdefs.h <<_ACEOF @@ -14174,7 +14174,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.2alpha3, which was +This file was extended by OpenBSM $as_me 1.2-alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14240,7 +14240,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenBSM config.status 1.2alpha3 +OpenBSM config.status 1.2-alpha3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#66 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.2alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 $]) +AC_INIT([OpenBSM], [1.2-alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) From owner-p4-projects@FreeBSD.ORG Sat Dec 15 00:49:49 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E996830; Sat, 15 Dec 2012 00:49:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E0E4082E for ; Sat, 15 Dec 2012 00:49:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BDEED8FC13 for ; Sat, 15 Dec 2012 00:49:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBF0nm7a021735 for ; Sat, 15 Dec 2012 00:49:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBF0nmNs021732 for perforce@freebsd.org; Sat, 15 Dec 2012 00:49:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Dec 2012 00:49:48 GMT Message-Id: <201212150049.qBF0nmNs021732@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219909 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 00:49:49 -0000 http://p4web.freebsd.org/@@219909?ac=10 Change 219909 by rwatson@rwatson_fledge on 2012/12/15 00:49:43 Release OpenBSM 1.2-alpha3. Affected files ... .. //depot/projects/trustedbsd/www/news.page#28 edit .. //depot/projects/trustedbsd/www/openbsm.page#45 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#28 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#27 $ + $P4: //depot/projects/trustedbsd/www/news.page#28 $ @@ -50,6 +50,13 @@
+
December 16, 2012 OpenBSM 1.2 alpha 3 released
+

OpenBSM 1.2 alpha 3 has been released; this is a test release + of OpenBSM, and includes a variety of bug fixes and refinements for + the new auditdistd distributed audit daemon feature. See the OpenBSM web page for more + information.

+
November 23, 2012 OpenBSM 1.2 alpha 2 released

OpenBSM 1.2 alpha 2 has been released; this is a test release of OpenBSM, and includes a new audit trail distribution daemon, ==== //depot/projects/trustedbsd/www/openbsm.page#45 (text+ko) ==== @@ -30,7 +30,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#44 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#45 $ @@ -245,14 +245,47 @@ Description + 1.2 alpha3 + openbsm-1.2-alpha3.tgz + 736K + 2012-12-15 + +

OpenBSM 1.2-alpha3 is the third test release of the OpenBSM 1.2 + release stream. + In this revision, a number of (largely minor) refinements are + made to auditdistd; perhaps most importantly, header files and + build elements are cleaned up to support better integration into + the FreeBSD 10-CURRENT source tree.

+ + + + + + + +
+ Historical Development Snapshots + + +

This is an archive of past OpenBSM test snapshots; use of these + versions is not recommended. + These snapshots are from the development of OpenBSM 1.1:

+ + + + + + + + + + - + -
VersionDownloadSizeDateDescription
1.2 alpha2 openbsm-1.2-alpha2.tgz704K736K 2012-11-23 -

OpenBSM 1.2a2 is the second test release of the OpenBSM 1.2 - release stream. - In this revision, OpenBSM grows a new daemon, auditdistd, which +

In this revision, OpenBSM grows a new daemon, auditdistd, which provides secure audit trail distribution over the network. Implemented by Pawel Jakub Dawidek and sponsored by the FreeBSD Foundation, auditdistd provides a client to run on hosts @@ -269,9 +302,7 @@

640K 2012-07-22 -

OpenBSM 1.2a1 is the first test release of the OpenBSM 1.2 - release stream. - In this revision, OpenBSM grows suport for Capsicum system calls +

In this revision, OpenBSM grows suport for Capsicum system calls and events, has various fixes to address warnings from the Clang static analyser, fixes trail expiration when the host parameter is used, adds support for privilege tokens, fixes a directory @@ -280,27 +311,6 @@ rendering of BSM, and improved the documentation.

- - -
- -
- Historical Development Snapshots - - -

This is an archive of past OpenBSM test snapshots; use of these - versions is not recommended. - These snapshots are from the development of OpenBSM 1.1:

- - - - - - - - -
VersionDownloadSizeDateDescription
1.1 beta 1 openbsm-1.1-beta1.tgz