From owner-svn-src-all@FreeBSD.ORG Tue Jan 5 06:40:27 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 730331065679; Tue, 5 Jan 2010 06:40:27 +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 61A898FC0C; Tue, 5 Jan 2010 06:40:27 +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 o056eRgw015620; Tue, 5 Jan 2010 06:40:27 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o056eRjE015617; Tue, 5 Jan 2010 06:40:27 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201001050640.o056eRjE015617@svn.freebsd.org> From: David Xu Date: Tue, 5 Jan 2010 06:40:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201561 - head/lib/libc/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2010 06:40:27 -0000 Author: davidxu Date: Tue Jan 5 06:40:27 2010 New Revision: 201561 URL: http://svn.freebsd.org/changeset/base/201561 Log: More cleanup, remove _libc prefix because libthr no longer has stubs referencing them. Modified: head/lib/libc/gen/Symbol.map head/lib/libc/gen/sem_new.c Modified: head/lib/libc/gen/Symbol.map ============================================================================== --- head/lib/libc/gen/Symbol.map Tue Jan 5 06:34:20 2010 (r201560) +++ head/lib/libc/gen/Symbol.map Tue Jan 5 06:40:27 2010 (r201561) @@ -475,14 +475,6 @@ FBSDprivate_1.0 { __waitpid; _waitpid; - _libc_sem_destroy; - _libc_sem_init; - _libc_sem_getvalue; - _libc_sem_trywait; - _libc_sem_wait; - _libc_sem_timedwait; - _libc_sem_post; - _libc_sem_init_compat; _libc_sem_destroy_compat; _libc_sem_open_compat; Modified: head/lib/libc/gen/sem_new.c ============================================================================== --- head/lib/libc/gen/sem_new.c Tue Jan 5 06:34:20 2010 (r201560) +++ head/lib/libc/gen/sem_new.c Tue Jan 5 06:40:27 2010 (r201561) @@ -48,26 +48,16 @@ #include #include "un-namespace.h" -__weak_reference(_libc_sem_close, sem_close); -__weak_reference(_libc_sem_close, _sem_close); -__weak_reference(_libc_sem_destroy, sem_destroy); -__weak_reference(_libc_sem_destroy, _sem_destroy); -__weak_reference(_libc_sem_getvalue, sem_getvalue); -__weak_reference(_libc_sem_getvalue, _sem_getvalue); -__weak_reference(_libc_sem_init, sem_init); -__weak_reference(_libc_sem_init, _sem_init); -__weak_reference(_libc_sem_open, sem_open); -__weak_reference(_libc_sem_open, _sem_open); -__weak_reference(_libc_sem_post, sem_post); -__weak_reference(_libc_sem_post, _sem_post); -__weak_reference(_libc_sem_timedwait, sem_timedwait); -__weak_reference(_libc_sem_timedwait, _sem_timedwait); -__weak_reference(_libc_sem_trywait, sem_trywait); -__weak_reference(_libc_sem_trywait, _sem_trywait); -__weak_reference(_libc_sem_unlink, sem_unlink); -__weak_reference(_libc_sem_unlink, _sem_unlink); -__weak_reference(_libc_sem_wait, sem_wait); -__weak_reference(_libc_sem_wait, _sem_wait); +__weak_reference(_sem_close, sem_close); +__weak_reference(_sem_destroy, sem_destroy); +__weak_reference(_sem_getvalue, sem_getvalue); +__weak_reference(_sem_init, sem_init); +__weak_reference(_sem_open, sem_open); +__weak_reference(_sem_post, sem_post); +__weak_reference(_sem_timedwait, sem_timedwait); +__weak_reference(_sem_trywait, sem_trywait); +__weak_reference(_sem_unlink, sem_unlink); +__weak_reference(_sem_wait, sem_wait); #define SEM_PREFIX "/tmp/SEMD" #define SEM_MAGIC ((u_int32_t)0x73656d31) @@ -127,7 +117,7 @@ sem_check_validity(sem_t *sem) } int -_libc_sem_init(sem_t *sem, int pshared, unsigned int value) +_sem_init(sem_t *sem, int pshared, unsigned int value) { if (value > SEM_VALUE_MAX) { @@ -144,7 +134,7 @@ _libc_sem_init(sem_t *sem, int pshared, } sem_t * -_libc_sem_open(const char *name, int flags, ...) +_sem_open(const char *name, int flags, ...) { char path[PATH_MAX]; @@ -251,7 +241,7 @@ error: } int -_libc_sem_close(sem_t *sem) +_sem_close(sem_t *sem) { struct sem_nameinfo *ni; @@ -287,7 +277,7 @@ _libc_sem_close(sem_t *sem) } int -_libc_sem_unlink(const char *name) +_sem_unlink(const char *name) { char path[PATH_MAX]; @@ -306,7 +296,7 @@ _libc_sem_unlink(const char *name) } int -_libc_sem_destroy(sem_t *sem) +_sem_destroy(sem_t *sem) { if (sem_check_validity(sem) != 0) @@ -321,7 +311,7 @@ _libc_sem_destroy(sem_t *sem) } int -_libc_sem_getvalue(sem_t * __restrict sem, int * __restrict sval) +_sem_getvalue(sem_t * __restrict sem, int * __restrict sval) { if (sem_check_validity(sem) != 0) @@ -352,7 +342,7 @@ usem_wait(struct _usem *sem, const struc } int -_libc_sem_trywait(sem_t *sem) +_sem_trywait(sem_t *sem) { int val; @@ -403,7 +393,7 @@ restore_async_cancel(int val) } int -_libc_sem_timedwait(sem_t * __restrict sem, +_sem_timedwait(sem_t * __restrict sem, const struct timespec * __restrict abstime) { struct timespec ts, ts2; @@ -444,9 +434,9 @@ _libc_sem_timedwait(sem_t * __restrict s } int -_libc_sem_wait(sem_t *sem) +_sem_wait(sem_t *sem) { - return _libc_sem_timedwait(sem, NULL); + return _sem_timedwait(sem, NULL); } /* @@ -456,7 +446,7 @@ _libc_sem_wait(sem_t *sem) * The implementation does not use lock, so it should be safe. */ int -_libc_sem_post(sem_t *sem) +_sem_post(sem_t *sem) { if (sem_check_validity(sem) != 0)