From patchwork Thu Feb 2 06:40:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 139088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id F32A7104785 for ; Thu, 2 Feb 2012 17:40:36 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1328769637; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Subject:Date:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=770bwY10LIZP+qIuIvtR/LZLOi8=; b=PvOPhPCqA9GXdnf Z1sQCOCBk8EET3Mm26Y1TAf5KEGqg0z46X4hRFF7FdVl+BsemFp7FiCeDQuqvO5K aQuizG9zKwWEmP26y1WREfnUtLtPjDvr+qmJ3XcEl8pVB2f8SlL44bJw9n+JW5Qw GOptoRS+sm8fsILvU1k99g7Lqdvw= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=BfMTpzD4P/Iqw5yyDii4iqTuZCuGLdxXqSlcAQiv71J5qLHmrmB+LvbJZloJEs qDY9AwK3EoB18UR9YReLUlHiN5xWIJX61SmqYObizJy1kzqHUFUAl/VmiVGbbb59 TIL3MOj0bN6cbZuTDDrrs1s8EdnuqYvEyZP47vOUnrKcs=; Received: (qmail 10672 invoked by alias); 2 Feb 2012 06:40:31 -0000 Received: (qmail 10621 invoked by uid 22791); 2 Feb 2012 06:40:30 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-pw0-f47.google.com (HELO mail-pw0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 02 Feb 2012 06:40:17 +0000 Received: by pbbb4 with SMTP id b4so1741276pbb.20 for ; Wed, 01 Feb 2012 22:40:16 -0800 (PST) Received: by 10.68.240.164 with SMTP id wb4mr5151520pbc.57.1328164816900; Wed, 01 Feb 2012 22:40:16 -0800 (PST) Received: by 10.68.240.164 with SMTP id wb4mr5151504pbc.57.1328164816805; Wed, 01 Feb 2012 22:40:16 -0800 (PST) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id p9sm3621947pbb.9.2012.02.01.22.40.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Feb 2012 22:40:16 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Add syscall.Times Date: Wed, 01 Feb 2012 22:40:14 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch to libgo adds the syscall.Times function, which corresponds to the POSIX function times. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 492a0c57d461 libgo/go/syscall/libcall_posix.go --- a/libgo/go/syscall/libcall_posix.go Wed Feb 01 22:22:41 2012 -0800 +++ b/libgo/go/syscall/libcall_posix.go Wed Feb 01 22:38:30 2012 -0800 @@ -133,15 +133,15 @@ } func FDSet(fd int, set *FdSet) { - set.Bits[fd / nfdbits] |= (1 << (uint)(fd % nfdbits)) + set.Bits[fd/nfdbits] |= (1 << (uint)(fd%nfdbits)) } func FDClr(fd int, set *FdSet) { - set.Bits[fd / nfdbits] &^= (1 << (uint)(fd % nfdbits)) + set.Bits[fd/nfdbits] &^= (1 << (uint)(fd%nfdbits)) } func FDIsSet(fd int, set *FdSet) bool { - if set.Bits[fd / nfdbits] & (1 << (uint)(fd % nfdbits)) != 0 { + if set.Bits[fd/nfdbits]&(1<<(uint)(fd%nfdbits)) != 0 { return true } else { return false @@ -323,9 +323,8 @@ // //sysnb Time(t *Time_t) (tt Time_t, err error) // //time(t *Time_t) Time_t -// FIXME: mksysinfo Tms -// //sysnb Times(tms *Tms) (ticks uintptr, err error) -// //times(tms *Tms) _clock_t +//sysnb Times(tms *Tms) (ticks uintptr, err error) +//times(tms *Tms) _clock_t //sysnb Umask(mask int) (oldmask int) //umask(mask Mode_t) Mode_t diff -r 492a0c57d461 libgo/mksysinfo.sh --- a/libgo/mksysinfo.sh Wed Feb 01 22:22:41 2012 -0800 +++ b/libgo/mksysinfo.sh Wed Feb 01 22:38:30 2012 -0800 @@ -66,6 +66,7 @@ #include #include #include +#include #include #include #if defined(HAVE_SYS_USER_H) @@ -368,6 +369,15 @@ -e 's/tv_nsec *[a-zA-Z0-9_]*/Nsec Timestruc_nsec_t/' >> ${OUT} fi +# The tms struct. +grep '^type _tms ' gen-sysinfo.go | \ + sed -e 's/type _tms/type Tms/' \ + -e 's/tms_utime/Utime/' \ + -e 's/tms_stime/Stime/' \ + -e 's/tms_cutime/Cutime/' \ + -e 's/tms_cstime/Cstime/' \ + >> ${OUT} + # The stat type. # Prefer largefile variant if available. stat=`grep '^type _stat64 ' gen-sysinfo.go || true`