aboutsummaryrefslogtreecommitdiff
path: root/librt
diff options
context:
space:
mode:
authorGravatar Peter S. Mazinger <ps.m@gmx.net>2011-02-27 00:25:56 +0100
committerGravatar Peter S. Mazinger <ps.m@gmx.net>2011-03-03 18:22:50 +0100
commit45dafbdb4e221f600895aa70a69e2e306093bd90 (patch)
tree64b4c9695592ae280287e681fa84052d2d4f0b42 /librt
parent5ecbf1730329be5e04229fb1ea23f4bc0bc3d2a3 (diff)
downloaduClibc-45dafbdb4e221f600895aa70a69e2e306093bd90.tar.gz
uClibc-45dafbdb4e221f600895aa70a69e2e306093bd90.tar.bz2
fix dependency on ADVANCED_REALTIME
Do not depend on ADVANCED REALTIME for mq_send/mq_receive Added stubs implementation based on libc's stubs.c Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Diffstat (limited to 'librt')
-rw-r--r--librt/mq_receive.c34
-rw-r--r--librt/mq_send.c35
-rw-r--r--librt/rt_stubs.c39
3 files changed, 75 insertions, 33 deletions
diff --git a/librt/mq_receive.c b/librt/mq_receive.c
index 40447dfb9..26fc45194 100644
--- a/librt/mq_receive.c
+++ b/librt/mq_receive.c
@@ -2,22 +2,23 @@
* mq_receive.c - functions for receiving from message queue.
*/
-#include <errno.h>
-#include <stddef.h>
#include <sys/syscall.h>
+
+#ifdef __NR_mq_timedreceive
+
+#include <stddef.h>
#include <mqueue.h>
-#warning FIXME: hard dependency on ADVANCED REALTIME feature
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
librt_hidden_proto(mq_timedreceive)
+#else
-#ifndef __UCLIBC_HAS_THREADS_NATIVE__
-#ifdef __NR_mq_timedreceive
-#define __NR___syscall_mq_timedreceive __NR_mq_timedreceive
-static __inline__ _syscall5(int, __syscall_mq_timedreceive, int, mqdes,
- char *, msg_ptr, size_t, msg_len, unsigned int *,
- msg_prio, const void *, abs_timeout);
-#endif
+# define __NR___syscall_mq_timedreceive __NR_mq_timedreceive
+static _syscall5(int, __syscall_mq_timedreceive, int, mqdes,
+ char *, msg_ptr, size_t, msg_len, unsigned int *,
+ msg_prio, const void *, abs_timeout);
+# ifdef __UCLIBC_HAS_ADVANCED_REALTIME__
/*
* Receive the oldest from highest priority messages.
* Stop waiting if abs_timeout expires.
@@ -26,21 +27,22 @@ ssize_t mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
unsigned int *msg_prio,
const struct timespec *abs_timeout)
{
-#ifdef __NR_mq_timedreceive
return __syscall_mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio,
abs_timeout);
-#else
- errno = ENOSYS;
- return -1;
-#endif
}
+# endif
-librt_hidden_def(mq_timedreceive)
#endif
/* Receive the oldest from highest priority messages */
ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
unsigned int *msg_prio)
{
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
return mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, NULL);
+#else
+ return __syscall_mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, NULL);
+#endif
}
+
+#endif
diff --git a/librt/mq_send.c b/librt/mq_send.c
index f0fcfa35a..78308d8d9 100644
--- a/librt/mq_send.c
+++ b/librt/mq_send.c
@@ -2,22 +2,23 @@
* mq_send.c - functions for sending to message queue.
*/
-#include <errno.h>
-#include <stddef.h>
#include <sys/syscall.h>
+
+#ifdef __NR_mq_timedsend
+
+#include <stddef.h>
#include <mqueue.h>
-#warning FIXME: hard dependency on ADVANCED REALTIME feature
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
librt_hidden_proto(mq_timedsend)
+#else
-#ifndef __UCLIBC_HAS_THREADS_NATIVE__
-#ifdef __NR_mq_timedsend
-#define __NR___syscall_mq_timedsend __NR_mq_timedsend
-static __inline__ _syscall5(int, __syscall_mq_timedsend, int, mqdes,
- const char *, msg_ptr, size_t, msg_len, unsigned int,
- msg_prio, const void *, abs_timeout);
-#endif
+# define __NR___syscall_mq_timedsend __NR_mq_timedsend
+static _syscall5(int, __syscall_mq_timedsend, int, mqdes,
+ const char *, msg_ptr, size_t, msg_len, unsigned int,
+ msg_prio, const void *, abs_timeout);
+# ifdef __UCLIBC_HAS_ADVANCED_REALTIME__
/*
* Add a message to queue. If O_NONBLOCK is set and queue is full, wait
* for sufficient room in the queue until abs_timeout expires.
@@ -25,21 +26,21 @@ static __inline__ _syscall5(int, __syscall_mq_timedsend, int, mqdes,
int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
unsigned int msg_prio, const struct timespec *abs_timeout)
{
-#ifdef __NR_mq_timedsend
return __syscall_mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio,
abs_timeout);
-#else
- errno = ENOSYS;
- return -1;
-#endif
}
-
-librt_hidden_def(mq_timedsend)
+# endif
#endif
/* Add a message to queue */
int mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
unsigned int msg_prio)
{
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
return mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio, NULL);
+#else
+ return __syscall_mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio, NULL);
+#endif
}
+
+#endif
diff --git a/librt/rt_stubs.c b/librt/rt_stubs.c
new file mode 100644
index 000000000..b2c09dea9
--- /dev/null
+++ b/librt/rt_stubs.c
@@ -0,0 +1,39 @@
+/*
+ * system call not available stub
+ * based on libc's stubs.c
+ *
+ * Copyright (C) 2009 Analog Devices Inc.
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#include <errno.h>
+#include <sys/syscall.h>
+
+#ifdef __UCLIBC_HAS_STUBS__
+
+static int rt_enosys_stub(void)
+{
+ __set_errno(ENOSYS);
+ return -1;
+}
+
+#define make_stub(stub) \
+ link_warning(stub, #stub ": this function is not implemented") \
+ strong_alias(rt_enosys_stub, stub)
+
+#ifndef __NR_mq_timedreceive
+make_stub(mq_receive)
+# ifdef __UCLIBC_HAS_ADVANCED_REALTIME__
+make_stub(mq_timedreceive)
+# endif
+#endif
+
+#ifndef __NR_mq_timedsend
+make_stub(mq_send)
+# ifdef __UCLIBC_HAS_ADVANCED_REALTIME__
+make_stub(mq_timedsend)
+# endif
+#endif
+
+#endif