From owner-svn-src-user@FreeBSD.ORG Wed Nov 10 04:35:37 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2987106564A; Wed, 10 Nov 2010 04:35:37 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7B348FC14; Wed, 10 Nov 2010 04:35:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAA4ZbXZ081888; Wed, 10 Nov 2010 04:35:37 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAA4ZbWO081886; Wed, 10 Nov 2010 04:35:37 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201011100435.oAA4ZbWO081886@svn.freebsd.org> From: David Xu Date: Wed, 10 Nov 2010 04:35:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215075 - user/davidxu/libthr/lib/libthr/thread X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2010 04:35:38 -0000 Author: davidxu Date: Wed Nov 10 04:35:37 2010 New Revision: 215075 URL: http://svn.freebsd.org/changeset/base/215075 Log: Add missing functions and copyright. Modified: user/davidxu/libthr/lib/libthr/thread/thr_rwlock.c Modified: user/davidxu/libthr/lib/libthr/thread/thr_rwlock.c ============================================================================== --- user/davidxu/libthr/lib/libthr/thread/thr_rwlock.c Wed Nov 10 03:18:14 2010 (r215074) +++ user/davidxu/libthr/lib/libthr/thread/thr_rwlock.c Wed Nov 10 04:35:37 2010 (r215075) @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2010 David Xu * Copyright (c) 1998 Alex Nash * All rights reserved. * @@ -53,9 +54,12 @@ int _pthread_rwlock_init_1_0(pthread_rwl const pthread_rwlockattr_t *); int _pthread_rwlock_timedrdlock_1_0(pthread_rwlock_old_t *, const struct timespec *); +int _pthread_rwlock_timedwrlock_1_0(pthread_rwlock_old_t *, + const struct timespec *); int _pthread_rwlock_tryrdlock_1_0(pthread_rwlock_old_t *); int _pthread_rwlock_trywrlock_1_0(pthread_rwlock_old_t *); -int _pthread_rwlock_rdlock_1_0(pthread_rwlock_old_t *, const struct timespec *); +int _pthread_rwlock_rdlock_1_0(pthread_rwlock_old_t *); +int _pthread_rwlock_wrlock_1_0(pthread_rwlock_old_t *); int _pthread_rwlock_unlock_1_0(pthread_rwlock_old_t *); #define RWL_PSHARED(rwp) ((rwp->__flags & USYNC_PROCESS_SHARED) != 0) @@ -408,6 +412,17 @@ _pthread_rwlock_timedrdlock_1_0(pthread_ } int +_pthread_rwlock_timedwrlock_1_0(pthread_rwlock_old_t *rwlpp, + const struct timespec *abstime) +{ + struct pthread_rwlock *rwlp; + + CHECK_AND_INIT_RWLOCK + + return (rwlock_wrlock_common(rwlp, abstime)); +} + +int _pthread_rwlock_tryrdlock_1_0(pthread_rwlock_old_t *rwlpp) { struct pthread_rwlock *rwlp; @@ -428,13 +443,23 @@ _pthread_rwlock_trywrlock_1_0(pthread_rw } int -_pthread_rwlock_rdlock_1_0(pthread_rwlock_old_t *rwlpp, const struct timespec *abstime) +_pthread_rwlock_rdlock_1_0(pthread_rwlock_old_t *rwlpp) { struct pthread_rwlock *rwlp; CHECK_AND_INIT_RWLOCK - return rwlock_rdlock_common(rwlp, abstime); + return rwlock_rdlock_common(rwlp, NULL); +} + +int +_pthread_rwlock_wrlock_1_0(pthread_rwlock_old_t *rwlpp) +{ + struct pthread_rwlock *rwlp; + + CHECK_AND_INIT_RWLOCK + + return (rwlock_wrlock_common(rwlp, NULL)); } int