Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib Add librt, which provides POSIX 1003.1b Real-time extens...



details:   https://anonhg.NetBSD.org/src/rev/2a0fea0adfcc
branches:  trunk
changeset: 542233:2a0fea0adfcc
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jan 24 01:52:42 2003 +0000

description:
Add librt, which provides POSIX 1003.1b Real-time extensions not
present in libc.  Currently includes 1003.1b semaphores.

diffstat:

 lib/Makefile             |    4 +-
 lib/librt/Makefile       |   16 ++
 lib/librt/sem.c          |  321 +++++++++++++++++++++++++++++++++++++++++++++++
 lib/librt/sem_destroy.3  |   82 ++++++++++++
 lib/librt/sem_getvalue.3 |   75 ++++++++++
 lib/librt/sem_init.3     |   99 ++++++++++++++
 lib/librt/sem_open.3     |   82 ++++++++++++
 lib/librt/sem_post.3     |   71 ++++++++++
 lib/librt/sem_wait.3     |   87 ++++++++++++
 lib/librt/shlib_version  |    5 +
 10 files changed, 840 insertions(+), 2 deletions(-)

diffs (truncated from 892 to 300 lines):

diff -r 932a9a2c4c40 -r 2a0fea0adfcc lib/Makefile
--- a/lib/Makefile      Fri Jan 24 01:51:09 2003 +0000
+++ b/lib/Makefile      Fri Jan 24 01:52:42 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.81 2003/01/19 16:05:46 christos Exp $
+#      $NetBSD: Makefile,v 1.82 2003/01/24 01:52:42 thorpej Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -6,7 +6,7 @@
 SUBDIR=        csu libc .WAIT libarch libbz2 libcdk libcompat libcrypt libcurses \
        libedit libform libintl libkvm libl libm libmenu libossaudio libpcap \
        libpci libpmc libposix libpthread libpthread_dbg libresolv librmt \
-       librpcsvc libterm libusbhid libutil libwrap liby libz
+       librpcsvc librt libterm libusbhid libutil libwrap liby libz
 
 .if (${MKSKEY} != "no")
 SUBDIR+= libskey
diff -r 932a9a2c4c40 -r 2a0fea0adfcc lib/librt/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/librt/Makefile        Fri Jan 24 01:52:42 2003 +0000
@@ -0,0 +1,16 @@
+#      $NetBSD: Makefile,v 1.1 2003/01/24 01:52:43 thorpej Exp $
+#
+
+WARNS= 2
+
+LIB=   rt
+SRCS=  sem.c
+
+MAN+=  sem_destroy.3 sem_getvalue.3 sem_init.3 sem_open.3 sem_post.3 \
+       sem_wait.3
+
+MLINKS+=       sem_open.3 sem_close.3
+MLINKS+=       sem_open.3 sem_unlink.3
+MLINKS+=       sem_wait.3 sem_trywait.3
+
+.include <bsd.lib.mk>
diff -r 932a9a2c4c40 -r 2a0fea0adfcc lib/librt/sem.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/librt/sem.c   Fri Jan 24 01:52:42 2003 +0000
@@ -0,0 +1,321 @@
+/*     $NetBSD: sem.c,v 1.1 2003/01/24 01:52:44 thorpej Exp $  */
+
+/*-
+ * Copyright (c) 2003 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*
+ * Copyright (C) 2000 Jason Evans <jasone%freebsd.org@localhost>.
+ * 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(s), this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified other than the possible
+ *    addition of one or more copyright notices.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice(s), 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 COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
+ */
+
+/*
+ * If an application is linked against both librt and libpthread, the
+ * libpthread versions must be used.  Provide weak aliases to cause
+ * this behavior.
+ */
+#define        sem_init        _librt_sem_init
+#define        sem_destroy     _librt_sem_destroy
+#define        sem_open        _librt_sem_open
+#define        sem_close       _librt_sem_close
+#define        sem_unlink      _librt_sem_unlink
+#define        sem_wait        _librt_sem_wait
+#define        sem_trywait     _librt_sem_trywait
+#define        sem_post        _librt_sem_post
+#define        sem_getvalue    _librt_sem_getvalue
+
+#define        _LIBC           /* XXX to get semid_t type */
+
+#include <sys/types.h>
+#include <sys/ksem.h>
+#include <sys/queue.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <semaphore.h>
+#include <stdarg.h>
+
+struct _sem_st {
+       unsigned int    ksem_magic;
+#define        KSEM_MAGIC      0x90af0421U
+
+       LIST_ENTRY(_sem_st) ksem_list;
+       semid_t         ksem_semid;     /* 0 -> user (non-shared) */
+       sem_t           *ksem_identity;
+};
+
+static int sem_alloc(unsigned int value, semid_t semid, sem_t *semp);
+static void sem_free(sem_t sem);
+
+static LIST_HEAD(, _sem_st) named_sems = LIST_HEAD_INITIALIZER(&named_sems);
+
+__weak_alias(sem_init,_librt_sem_init)
+__weak_alias(sem_destroy,_librt_sem_destroy)
+__weak_alias(sem_open,_librt_sem_open)
+__weak_alias(sem_close,_librt_sem_close)
+__weak_alias(sem_unlink,_librt_sem_unlink)
+__weak_alias(sem_wait,_librt_sem_wait)
+__weak_alias(sem_trywait,_librt_sem_trywait)
+__weak_alias(sem_post,_librt_sem_post)
+__weak_alias(sem_getvalue,_librt_sem_getvalue)
+
+static void
+sem_free(sem_t sem)
+{
+
+       sem->ksem_magic = 0;
+       free(sem);
+}
+
+static int
+sem_alloc(unsigned int value, semid_t semid, sem_t *semp)
+{
+       sem_t sem;
+
+       if (value > SEM_VALUE_MAX)
+               return (EINVAL);
+
+       if ((sem = malloc(sizeof(struct _sem_st))) == NULL)
+               return (ENOSPC);
+
+       sem->ksem_magic = KSEM_MAGIC;
+       sem->ksem_semid = semid;
+ 
+       *semp = sem;
+       return (0);
+}
+
+/* ARGSUSED */
+int
+sem_init(sem_t *sem, int pshared, unsigned int value)
+{
+       semid_t semid;
+       int error;
+
+       if (_ksem_init(value, &semid) == -1)
+               return (-1);
+
+       if ((error = sem_alloc(value, semid, sem)) != 0) {
+               _ksem_destroy(semid);
+               errno = error;
+               return (-1);
+       }
+
+       return (0);
+}
+
+int
+sem_destroy(sem_t *sem)
+{
+
+#ifdef ERRORCHECK
+       if (sem == NULL || *sem == NULL || (*sem)->ksem_magic != KSEM_MAGIC) {
+               errno = EINVAL;
+               return (-1);
+       }
+#endif
+
+       if (_ksem_destroy((*sem)->ksem_semid) == -1)
+               return (-1);
+
+       sem_free(*sem);
+
+       return (0);
+}
+
+sem_t *
+sem_open(const char *name, int oflag, ...)
+{
+       sem_t *sem, s;
+       semid_t semid;
+       mode_t mode;
+       unsigned int value;
+       int error;
+       va_list ap;
+
+       mode = 0;
+       value = 0;
+
+       if (oflag & O_CREAT) {
+               va_start(ap, oflag);
+               mode = va_arg(ap, int);
+               value = va_arg(ap, unsigned int);
+               va_end(ap);
+       }
+
+       /*
+        * We can be lazy and let the kernel handle the oflag,
+        * we'll just merge duplicate IDs into our list.
+        */
+       if (_ksem_open(name, oflag, mode, value, &semid) == -1)
+               return (SEM_FAILED);
+
+       /*
+        * Search for a duplicate ID, we must return the same sem_t *
+        * if we locate one.
+        */
+       LIST_FOREACH(s, &named_sems, ksem_list) {
+               if (s->ksem_semid == semid)
+                       return (s->ksem_identity);
+       }
+
+       if ((sem = malloc(sizeof(*sem))) == NULL) {
+               error = ENOSPC;
+               goto bad;
+       }
+       if ((error = sem_alloc(value, semid, sem)) != 0)
+               goto bad;
+
+       LIST_INSERT_HEAD(&named_sems, *sem, ksem_list);
+       (*sem)->ksem_identity = sem;
+
+       return (sem);
+
+ bad:
+       _ksem_close(semid);
+       if (sem != NULL) {
+               if (*sem != NULL)
+                       sem_free(*sem);
+               free(sem);
+       }
+       errno = error;
+       return (SEM_FAILED);
+}
+
+int
+sem_close(sem_t *sem)
+{
+
+#ifdef ERRORCHECK
+       if (sem == NULL || *sem == NULL || (*sem)->ksem_magic != KSEM_MAGIC) {
+               errno = EINVAL;
+               return (-1);
+       }
+#endif
+
+       if (_ksem_close((*sem)->ksem_semid) == -1)
+               return (-1);
+
+       LIST_REMOVE((*sem), ksem_list);
+       sem_free(*sem);
+       free(sem);
+       return (0);



Home | Main Index | Thread Index | Old Index