From 7db199851c6457f6ec8aeec24a8500d28f32fd81 Mon Sep 17 00:00:00 2001 From: sobomax Date: Tue, 19 Sep 2000 18:01:03 +0000 Subject: [PATCH] Add thread-safe wrapper for fpathconf(2) syscall. Reviewed by: jlemon --- lib/libc_r/uthread/Makefile.inc | 1 + lib/libc_r/uthread/pthread_private.h | 1 + lib/libc_r/uthread/uthread_fpathconf.c | 46 ++++++++++++++++++++++++++ lib/libkse/thread/Makefile.inc | 1 + lib/libkse/thread/thr_private.h | 1 + lib/libpthread/thread/Makefile.inc | 1 + lib/libpthread/thread/thr_private.h | 1 + 7 files changed, 52 insertions(+) create mode 100644 lib/libc_r/uthread/uthread_fpathconf.c diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc index 36c0834d596..fe19b0e081d 100644 --- a/lib/libc_r/uthread/Makefile.inc +++ b/lib/libc_r/uthread/Makefile.inc @@ -49,6 +49,7 @@ SRCS+= \ uthread_find_thread.c \ uthread_flock.c \ uthread_fork.c \ + uthread_fpathconf.c \ uthread_fstat.c \ uthread_fstatfs.c \ uthread_fsync.c \ diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index 80584697658..9d76747ff76 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -1204,6 +1204,7 @@ int _thread_sys_ftruncate(int, off_t); int _thread_sys_pause(void); int _thread_sys_pipe(int *); int _thread_sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); +long _thread_sys_fpathconf(int, int); off_t _thread_sys_lseek(int, off_t, int); pid_t _thread_sys_fork(void); pid_t _thread_sys_tcgetpgrp(int); diff --git a/lib/libc_r/uthread/uthread_fpathconf.c b/lib/libc_r/uthread/uthread_fpathconf.c new file mode 100644 index 00000000000..04fae27f123 --- /dev/null +++ b/lib/libc_r/uthread/uthread_fpathconf.c @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2000 Maxim Sobolev + * 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$ + */ +#include +#ifdef _THREAD_SAFE +#include +#include "pthread_private.h" + +long +_fpathconf(int fd, int name) +{ + long ret; + + if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) { + ret = _thread_sys_fpathconf(fd, name); + _FD_UNLOCK(fd, FD_READ); + } + return ret; +} + +__strong_reference(_fpathconf, fpathconf); +#endif diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index 36c0834d596..fe19b0e081d 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -49,6 +49,7 @@ SRCS+= \ uthread_find_thread.c \ uthread_flock.c \ uthread_fork.c \ + uthread_fpathconf.c \ uthread_fstat.c \ uthread_fstatfs.c \ uthread_fsync.c \ diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 80584697658..9d76747ff76 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -1204,6 +1204,7 @@ int _thread_sys_ftruncate(int, off_t); int _thread_sys_pause(void); int _thread_sys_pipe(int *); int _thread_sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); +long _thread_sys_fpathconf(int, int); off_t _thread_sys_lseek(int, off_t, int); pid_t _thread_sys_fork(void); pid_t _thread_sys_tcgetpgrp(int); diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index 36c0834d596..fe19b0e081d 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -49,6 +49,7 @@ SRCS+= \ uthread_find_thread.c \ uthread_flock.c \ uthread_fork.c \ + uthread_fpathconf.c \ uthread_fstat.c \ uthread_fstatfs.c \ uthread_fsync.c \ diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index 80584697658..9d76747ff76 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -1204,6 +1204,7 @@ int _thread_sys_ftruncate(int, off_t); int _thread_sys_pause(void); int _thread_sys_pipe(int *); int _thread_sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); +long _thread_sys_fpathconf(int, int); off_t _thread_sys_lseek(int, off_t, int); pid_t _thread_sys_fork(void); pid_t _thread_sys_tcgetpgrp(int); -- 2.45.2