From 1b82c6c77d566ce3977c83b7ca47f09aac31e525 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 13 Apr 2004 02:15:43 +0000 Subject: Update. 2004-04-08 Ulrich Drepper * rt/tst-mqueue3.c: New file. * rt/Makefile (tests): Add tst-mqueue3. 2004-04-08 Jakub Jelinek * rt/tst-mqueue1.c: New file. * rt/tst-mqueue2.c: New file. * rt/tst-mqueue4.c: New file. * rt/Makefile (tests): Add tst-mqueue1, tst-mqueue2, tst-mqueue4. * rt/Versions (librt): Add mq_*@@GLIBC_2.3.4. * rt/Makefile (headers): Add mqueue.h and bits/mqueue.h. (mq-routines): Set. (librt-routines): Use it. * rt/mqueue.h: New file. * include/mqueue.h: New file. * sysdeps/generic/bits/mqueue.h: New file. * sysdeps/generic/mq_setattr.c: New file. * sysdeps/generic/mq_getattr.c: New file. * sysdeps/generic/mq_notify.c: New file. * sysdeps/generic/mq_close.c: New file. * sysdeps/generic/mq_send.c: New file. * sysdeps/generic/mq_unlink.c: New file. * sysdeps/generic/mq_receive.c: New file. * sysdeps/generic/mq_timedreceive.c: New file. * sysdeps/generic/mq_timedsend.c: New file. * sysdeps/generic/mq_open.c: New file. * sysdeps/unix/sysv/linux/bits/local_lim.h (MQ_PRIO_MAX): Define. * sysdeps/unix/sysv/linux/bits/mqueue.h: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add mq_timedsend, mq_timedreceive and mq_setattr. * sysdeps/unix/sysv/linux/mq_getattr.c: New file. * sysdeps/unix/sysv/linux/mq_notify.c: New file. * sysdeps/unix/sysv/linux/mq_close.c: New file. * sysdeps/unix/sysv/linux/mq_send.c: New file. * sysdeps/unix/sysv/linux/mq_unlink.c: New file. * sysdeps/unix/sysv/linux/mq_receive.c: New file. * sysdeps/unix/sysv/linux/mq_open.c: New file. 2004-04-09 Thorsten Kukuk * sysdeps/s390/ffs.c: Don't add ffsl weak alias on s390x. 2004-04-09 Steven Munroe * sysdeps/unix/sysv/linux/powerpc/powerpc64/umount.c: New file. --- sysdeps/unix/sysv/linux/bits/local_lim.h | 3 ++ sysdeps/unix/sysv/linux/bits/mqueue.h | 32 +++++++++++++++++ sysdeps/unix/sysv/linux/mq_close.c | 35 +++++++++++++++++++ sysdeps/unix/sysv/linux/mq_getattr.c | 34 ++++++++++++++++++ sysdeps/unix/sysv/linux/mq_notify.c | 43 +++++++++++++++++++++++ sysdeps/unix/sysv/linux/mq_open.c | 59 ++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/mq_receive.c | 36 +++++++++++++++++++ sysdeps/unix/sysv/linux/mq_send.c | 35 +++++++++++++++++++ sysdeps/unix/sysv/linux/mq_unlink.c | 39 +++++++++++++++++++++ sysdeps/unix/sysv/linux/syscalls.list | 4 +++ 10 files changed, 320 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/bits/mqueue.h create mode 100644 sysdeps/unix/sysv/linux/mq_close.c create mode 100644 sysdeps/unix/sysv/linux/mq_getattr.c create mode 100644 sysdeps/unix/sysv/linux/mq_notify.c create mode 100644 sysdeps/unix/sysv/linux/mq_open.c create mode 100644 sysdeps/unix/sysv/linux/mq_receive.c create mode 100644 sysdeps/unix/sysv/linux/mq_send.c create mode 100644 sysdeps/unix/sysv/linux/mq_unlink.c (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/bits/local_lim.h b/sysdeps/unix/sysv/linux/bits/local_lim.h index 169a5f1474..54a51ee766 100644 --- a/sysdeps/unix/sysv/linux/bits/local_lim.h +++ b/sysdeps/unix/sysv/linux/bits/local_lim.h @@ -63,3 +63,6 @@ /* Maximum host name length. */ #define HOST_NAME_MAX 64 + +/* Maximum message queue priority level. */ +#define MQ_PRIO_MAX 32768 diff --git a/sysdeps/unix/sysv/linux/bits/mqueue.h b/sysdeps/unix/sysv/linux/bits/mqueue.h new file mode 100644 index 0000000000..df528f876a --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/mqueue.h @@ -0,0 +1,32 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _MQUEUE_H +# error "Never use directly; include instead." +#endif + +typedef int mqd_t; + +struct mq_attr +{ + long int mq_flags; /* Message queue flags. */ + long int mq_maxmsg; /* Maximum number of messages. */ + long int mq_msgsize; /* Maximum message size. */ + long int mq_curmsgs; /* Number of messages currently queued. */ + long int __pad[4]; +}; diff --git a/sysdeps/unix/sysv/linux/mq_close.c b/sysdeps/unix/sysv/linux/mq_close.c new file mode 100644 index 0000000000..65522d5adc --- /dev/null +++ b/sysdeps/unix/sysv/linux/mq_close.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef __NR_mq_open + +/* Removes the association between message queue descriptor MQDES and its + message queue. */ +int +mq_close (mqd_t mqdes) +{ + return INLINE_SYSCALL (close, 1, mqdes); +} + +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/mq_getattr.c b/sysdeps/unix/sysv/linux/mq_getattr.c new file mode 100644 index 0000000000..94c1df57a3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mq_getattr.c @@ -0,0 +1,34 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef __NR_mq_getsetattr + +/* Query status and attributes of message queue MQDES. */ +int +mq_getattr (mqd_t mqdes, struct mq_attr *mqstat) +{ + return mq_setattr (mqdes, NULL, mqstat); +} + +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c new file mode 100644 index 0000000000..6ebe8efe5a --- /dev/null +++ b/sysdeps/unix/sysv/linux/mq_notify.c @@ -0,0 +1,43 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef __NR_mq_notify + +/* Register notification upon message arrival to an empty message queue + MQDES. */ +int +mq_notify (mqd_t mqdes, const struct sigevent *notification) +{ + /* mq_notify which handles SIGEV_THREAD is included in the thread + add-on. */ + if (notification != NULL + && notification->sigev_notify == SIGEV_THREAD) + { + __set_errno (ENOSYS); + return -1; + } + return INLINE_SYSCALL (mq_notify, 2, mqdes, notification); +} + +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/mq_open.c b/sysdeps/unix/sysv/linux/mq_open.c new file mode 100644 index 0000000000..ce5f5e9959 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mq_open.c @@ -0,0 +1,59 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include +#include + +#ifdef __NR_mq_open + +/* Establish connection between a process and a message queue NAME and + return message queue descriptor or (mqd_t) -1 on error. OFLAG determines + the type of access used. If O_CREAT is on OFLAG, the third argument is + taken as a `mode_t', the mode of the created message queue, and the fourth + argument is taken as `struct mq_attr *', pointer to message queue + attributes. If the fourth argument is NULL, default attributes are + used. */ +mqd_t +mq_open (const char *name, int oflag, ...) +{ + if (name[0] != '/') + { + __set_errno (EINVAL); + return -1; + } + + mode_t mode = 0; + struct mq_attr *attr = NULL; + if (oflag & O_CREAT) + { + va_list ap; + + va_start (ap, oflag); + mode = va_arg (ap, mode_t); + attr = va_arg (ap, struct mq_attr *); + va_end (ap); + } + + return INLINE_SYSCALL (mq_open, 4, name + 1, oflag, mode, attr); +} + +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/mq_receive.c b/sysdeps/unix/sysv/linux/mq_receive.c new file mode 100644 index 0000000000..b24ba4b688 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mq_receive.c @@ -0,0 +1,36 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef __NR_mq_timedreceive + +/* Receive the oldest from highest priority messages in message queue + MQDES. */ +ssize_t +mq_receive (mqd_t mqdes, char *msg_ptr, size_t msg_len, + unsigned int *msg_prio) +{ + return mq_timedreceive (mqdes, msg_ptr, msg_len, msg_prio, NULL); +} + +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/mq_send.c b/sysdeps/unix/sysv/linux/mq_send.c new file mode 100644 index 0000000000..06d367b566 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mq_send.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef __NR_mq_timedsend + +/* Add message pointed by MSG_PTR to message queue MQDES. */ +int +mq_send (mqd_t mqdes, const char *msg_ptr, size_t msg_len, + unsigned int msg_prio) +{ + return mq_timedsend (mqdes, msg_ptr, msg_len, msg_prio, NULL); +} + +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/mq_unlink.c b/sysdeps/unix/sysv/linux/mq_unlink.c new file mode 100644 index 0000000000..8da70ea42b --- /dev/null +++ b/sysdeps/unix/sysv/linux/mq_unlink.c @@ -0,0 +1,39 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef __NR_mq_unlink + +/* Remove message queue named NAME. */ +int +mq_unlink (const char *name) +{ + if (name[0] != '/') + { + __set_errno (EINVAL); + return -1; + } + return INLINE_SYSCALL (mq_unlink, 1, name + 1); +} + +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 9ec085da40..860094be50 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -86,3 +86,7 @@ flistxattr - flistxattr i:isi flistxattr removexattr - removexattr i:ss removexattr lremovexattr - lremovexattr i:ss lremovexattr fremovexattr - fremovexattr i:is fremovexattr + +mq_timedsend - mq_timedsend Ci:ipiip __GI_mq_timedsend mq_timedsend +mq_timedreceive - mq_timedreceive Ci:ipipp __GI_mq_timedreceive mq_timedreceive +mq_setattr - mq_getsetattr i:ipp __GI_mq_setattr mq_setattr -- cgit v1.2.3