Support for select-like services.
cover Support for select-like services.
Hi,
here comes a third edition of the patchset adding support for select.
The core support now depends on a CONFIG_XENO_OPT_SELECT option, whereas the posix support depends on a CONFIG_XENO_OPT_POSIX_SELECT option.
The support for using rtdm_event_t and rtdm_sem_t objects is now built-in to these objects without creating new objects types (only if CONFIG_XENO_OPT_SELECT is enabled).
The rtdm_context_get modification, allowing to check that the caller of a service belongs to the same process as the file descriptor it uses, is now made in __rtdm_context_get while rtdm_context_get passes a NULL first argument to this new service.
When implementing these modifications, a few questions arise:
- RTDM support currently depends on the CONFIG_XENO_OPT_SELECT option, should we add an RTDM specific option ?
- in order to avoid numerous #ifdefs, and especially in drivers code, the new callback added to device operations for binding RTDM file descriptors to selector blocks is always there even if CONFIG_XENO_OPT_SELECT is disabled. Is it the right thing to do ?
Regards.
Signature · 1 line
Gilles Chanteperdrix.
PATCH 1/4 nucleus core support for select-like services.
stats:
include/nucleus/select.h | 124 ++++++++++++++ ksrc/nucleus/Kconfig | 3 ksrc/nucleus/Makefile | 3 ksrc/nucleus/select.c | 412 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 542 insertions(+)
Signature · 1 line
Gilles Chanteperdrix.
nucleus/select.h +124 -0
@@ -0,0 +1,124 @@ +/*!\file select.h +* \brief file descriptors events multiplexing header. +* \author Gilles Chanteperdrix +* +* Copyright (C) 2008 Efixo <[email protected]> +* +* Xenomai is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published +* by the Free Software Foundation; either version 2 of the License, +* or (at your option) any later version. +* +* Xenomai 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 +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with Xenomai; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +* 02111-1307, USA. +* +* \ingroup select +*/ + +#ifndef XNSELECT_H +#define XNSELECT_H + +/*! \addtogroup select +*@{*/ + +#include <nucleus/thread.h> + +#define XNSELECT_READ 0 +#define XNSELECT_WRITE 1 +#define XNSELECT_EXCEPT 2 +#define XNSELECT_MAX_TYPES 3 + +struct xnselector { +xnsynch_t synchbase; +struct fds { +fd_set expected; +fd_set pending; + } fds [XNSELECT_MAX_TYPES ]; +xnqueue_t bindings;/* only used by xnselector_destroy */ +}; + +#ifdef CONFIG_XENO_OPT_SELECT + +struct xnselect { +xnqueue_t bindings; +}; + +#define DECLARE_XNSELECT (name) struct xnselect name + +struct xnselect_binding { +struct xnselector *selector; +struct xnselect *fd; +unsigned type; +unsigned bit_index; +xnholder_t link;/* link in selected fds list. */ +xnholder_t slink;/* link in selector list */ +}; + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +void xnselect_init (struct xnselect *select_block); + +int xnselect_bind (struct xnselect *select_block, +struct xnselect_binding *binding, +struct xnselector *selector, +unsigned type, +unsigned bit_index, +unsigned state); + +int __xnselect_signal (struct xnselect *select_block,unsigned state); + +/** +* Signal a file descriptor state change. +* +* @param select_block pointer to an @a xnselect structure representing the file +* descriptor whose state changed; +* @param state new value of the state. +* +* @retval 1 if rescheduling is needed; +* @retval 0 otherwise. +*/ +static inline int +xnselect_signal (struct xnselect *select_block,unsigned state) +{ +if (!emptyq_p (&select_block->bindings)) +return __xnselect_signal (select_block, state); +return 0 ; +} + +void xnselect_destroy (struct xnselect *select_block); + +int xnselector_init (struct xnselector *selector); + +int xnselect (struct xnselector *selector, +fd_set *out_fds[XNSELECT_MAX_TYPES ], +fd_set *in_fds[XNSELECT_MAX_TYPES ], +int nfds, +xnticks_t timeout,xntmode_t timeout_mode); + +void xnselector_destroy (struct xnselector *selector); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#else /* !CONFIG_XENO_OPT_SELECT */ +struct xnselector ; +#define DECLARE_XNSELECT (name) +#define xnselect_init (block) +#define xnselect_bind (select_block,binding,selector,type,bit_index,state) -EBADF +#define xnselect_signal (block, state) ({ 0; }) +#define xnselect_destroy (block) +#endif /* !CONFIG_XENO_OPT_SELECT */ + +/*@}*/ + +#endif /* XNSELECT_H */
nucleus/Kconfig +3 -0
@@ -228,6 +228,9 @@ config XENO_OPT_SHIRQ are allowed to control dedicated hardware devices which are configured to share the same interrupt line. +config XENO_OPT_SELECT + bool + menu "Timing" config XENO_OPT_TIMING_PERIODIC
nucleus/select.c +412 -0
412 lines not on this page · raw message
nucleus/Makefile +3 -0
@@ -14,6 +14,8 @@ xeno_nucleus-$(CONFIG_XENO_OPT_MAP) += m xeno_nucleus-$(CONFIG_XENO_OPT_REGISTRY) += registry.o +xeno_nucleus-$(CONFIG_XENO_OPT_SELECT) += select.o + EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai else
@@ -33,6 +35,7 @@ opt_objs-$(CONFIG_XENO_OPT_PERVASIVE) += opt_objs-$(CONFIG_XENO_OPT_PIPE) += pipe.o opt_objs-$(CONFIG_XENO_OPT_MAP) += map.o opt_objs-$(CONFIG_XENO_OPT_REGISTRY) += registry.o +opt_objs-$(CONFIG_XENO_OPT_SELECT) += select.o xeno_nucleus-objs += $(opt_objs-y)
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
In reply to Gilles Chanteperdrixstats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)
Signature · 1 line
Gilles Chanteperdrix.
rtdm/rtdm_driver.h +29 -1
@@ -38,6 +38,7 @@#include <nucleus/heap.h> #include <nucleus/pod.h> #include <nucleus/synch.h> +#include <nucleus/select.h> #include <rtdm/rtdm.h> /* debug support */
@@ -262,6 +263,10 @@ typedef ssize_t (*rtdm_sendmsg_handler_ttypedef int (*rtdm_rt_handler_t )(struct rtdm_dev_context *context,rtdm_user_info_t *user_info,void *arg); +typedef int (*rtdm_select_bind_handler_t )(struct rtdm_dev_context *context, +struct xnselector *selector, +unsigned type, +unsigned index);/** * Device operations */
@@ -304,6 +309,8 @@ struct rtdm_operations {/** Transmit message handler for non-real-time context (optional) */ rtdm_sendmsg_handler_t sendmsg_nrt;/** @} Message-Oriented Device Operations */ + +rtdm_select_bind_handler_t select_bind; };struct rtdm_devctx_reserved {
@@ -453,7 +460,8 @@ int rtdm_dev_unregister(struct rtdm_devi#define rtdm_getpeername rt_dev_getpeername#define rtdm_shutdown rt_dev_shutdown -struct rtdm_dev_context *rtdm_context_get (int fd); +struct rtdm_dev_context *__rtdm_context_get (rtdm_user_info_t *user_info,int fd); +#define rtdm_context_get (fd) __rtdm_context_get(NULL, fd)#ifndef DOXYGEN_CPP /* Avoid static inline tags for RTDM in doxygen */ static inline void rtdm_context_lock (struct rtdm_dev_context *context)
@@ -1002,11 +1010,20 @@ void rtdm_toseq_init(rtdm_toseq_t *timeotypedef struct {xnsynch_t synch_base; +DECLARE_XNSELECT (select_block); }rtdm_event_t ;#define RTDM_EVENT_PENDING XNSYNCH_SPARE1void rtdm_event_init (rtdm_event_t *event,unsigned long pending); +#ifdef CONFIG_XENO_OPT_SELECT +int rtdm_event_select_bind (rtdm_event_t *event, +struct xnselector *selector, +unsigned type, +unsigned bit_index); +#else /* !CONFIG_XENO_OPT_SELECT */ +#define rtdm_event_select_bind (e, s, t, b) -EBADF +#endif /* !CONFIG_XENO_OPT_SELECT */ int rtdm_event_wait (rtdm_event_t *event);int rtdm_event_timedwait (rtdm_event_t *event,nanosecs_rel_t timeout,rtdm_toseq_t *timeout_seq);
@@ -1027,6 +1044,7 @@ static inline void rtdm_event_destroy(rt {trace_mark (xn_rtdm_event_destroy,"event %p" , event);__rtdm_synch_flush (&event->synch_base,XNRMID ); +xnselect_destroy (&event->select_block); }#endif /* !DOXYGEN_CPP */
@@ -1035,9 +1053,18 @@ static inline void rtdm_event_destroy(rttypedef struct {unsigned long value;xnsynch_t synch_base; +DECLARE_XNSELECT (select_block); }rtdm_sem_t ;void rtdm_sem_init (rtdm_sem_t *sem,unsigned long value); +#ifdef CONFIG_XENO_OPT_SELECT +int rtdm_sem_select_bind (rtdm_sem_t *sem, +struct xnselector *selector, +unsigned type, +unsigned bit_index); +#else /* !CONFIG_XENO_OPT_SELECT */ +#define rtdm_sem_select_bind (s, se, t, b) -EBADF +#endif /* !CONFIG_XENO_OPT_SELECT */ int rtdm_sem_down (rtdm_sem_t *sem);int rtdm_sem_timeddown (rtdm_sem_t *sem,nanosecs_rel_t timeout,rtdm_toseq_t *timeout_seq);
@@ -1048,6 +1075,7 @@ static inline void rtdm_sem_destroy(rtdm {trace_mark (xn_rtdm_sem_destroy,"sem %p" , sem);__rtdm_synch_flush (&sem->synch_base,XNRMID ); +xnselect_destroy (&sem->select_block); }#endif /* !DOXYGEN_CPP */
rtdm/rtdm.h +4 -0
@@ -247,6 +247,10 @@ ssize_t __rt_dev_recvmsg(rtdm_user_info_ struct msghdr *msg, int flags);ssize_t __rt_dev_sendmsg (rtdm_user_info_t *user_info,int fd,const struct msghdr *msg,int flags); +struct xnselector ; +int __rt_dev_select_bind (rtdm_user_info_t *user_info,int fd, +struct xnselector *selector, +unsigned type,unsigned index);#endif /* __KERNEL__ */ /* Define RTDM_NO_DEFAULT_USER_API to switch off the default rt_dev_xxx
skins/rtdm/device.c +10 -0
@@ -70,6 +70,14 @@ int rtdm_no_support(void)return -ENOSYS ; } +int rtdm_select_bind_no_support (struct rtdm_dev_context *context, +struct xnselector *selector, +unsigned type, +unsigned index) +{ +return -EBADF ; +} +static inline int get_name_hash (const char *str,int limit,int hashkey_mask) {int hash =0 ;
@@ -242,6 +250,8 @@ int rtdm_dev_register(struct rtdm_deviceSET_DEFAULT_OP_IF_NULL (device->ops, write);SET_DEFAULT_OP_IF_NULL (device->ops, recvmsg);SET_DEFAULT_OP_IF_NULL (device->ops, sendmsg); +if (!device->ops.select_bind) + device->ops.select_bind = rtdm_select_bind_no_support;atomic_set (&device->reserved.refcount,0 ); device->reserved.exclusive_context =NULL ;
skins/rtdm/drvlib.c +69 -7
145 lines not on this page · raw message
skins/rtdm/core.c +58 -26
126 lines not on this page · raw message
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)
/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {
Uuuh, this doesn't look equivalent (for --sem->value < 0).
Otherwise it's OK with me.
Jan
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 26 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {Uuuh, this doesn't look equivalent (for --sem->value < 0).
Quoted 1 line
Otherwise it's OK with me.
Yes, of course, what we need is:
if (sem->value > 0) {
if (!--sem->value)
xnselect_signal
} else ...
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
In reply to Jan KiszkaQuoted 11 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
I guess it depends on the mail client, but with my mail client, I get plain text attachments inlined in the mail body. I somehow assumed that it was the case for everyone else.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 11 lines · Gilles Chanteperdrix
Quoted 10 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)
Quoted 5 lines
Quoted 1 line
/me thinks that going for inline patches on this list is overdue...
I guess it depends on the mail client, but with my mail client, I get plain text attachments inlined in the mail body. I somehow assumed that it was the case for everyone else.
Mine (TB) shows the patches inlined, but refuses to let me comment on them. Maybe there is a knob deep inside its configs, but I heards such complaints from other (likely non-TB) users as well.
The reason for staying with attachments was that /someone/ (not you) had problems with grabbing them from his client without causing whitespace havoc... :)
Jan
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 14 lines · Jan Kiszka
Quoted 13 lines · Gilles Chanteperdrix
Quoted 11 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
Quoted 7 lines
Quoted 3 lines
I guess it depends on the mail client, but with my mail client, I get plain text attachments inlined in the mail body. I somehow assumed that it was the case for everyone else.
Mine (TB) shows the patches inlined, but refuses to let me comment on them. Maybe there is a knob deep inside its configs, but I heards such complaints from other (likely non-TB) users as well.
There are even things in thunderbird that can only be configured through its configuration files, not with its menus.
Quoted 3 lines
The reason for staying with attachments was that /someone/ (not you) had problems with grabbing them from his client without causing whitespace havoc... :)
Yes, I think I would have the same problem, my mail client (I feel ashamed to tell: XEmacs VM) splits the line at 72 characters. So, if I paste a patch, I must refrain from reformatting the mail, otherwise the patch could be broken.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
In reply to Jan KiszkaQuoted 26 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {Uuuh, this doesn't look equivalent (for --sem->value < 0).
Quoted 1 line
Otherwise it's OK with me.
Here is a repost (inlined this time) of the select patch for rtdm, with the discussed changes and a minor change in rtdm_sem_select_bind (since I did not understand that sem->value could be negative).
If everybody is OK, I'll commit the whole thing.
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/Kconfig | 8 ++++ ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 79 ++++++++++++++++++++++++++++++++++++++---- 6 files changed, 180 insertions(+), 35 deletions(-)
Signature · 447 lines
Gilles Chanteperdrix.
--- include/rtdm/rtdm_driver.h (revision 3460)
+++ include/rtdm/rtdm_driver.h (working copy)
@@ -38,6 +38,7 @@
#include <nucleus/heap.h>
#include <nucleus/pod.h>
#include <nucleus/synch.h>
+#include <nucleus/select.h>
#include <rtdm/rtdm.h>
/* debug support */
@@ -262,6 +263,10 @@ typedef ssize_t (*rtdm_sendmsg_handler_t
typedef int (*rtdm_rt_handler_t)(struct rtdm_dev_context *context,
rtdm_user_info_t *user_info, void *arg);
+typedef int (*rtdm_select_bind_handler_t)(struct rtdm_dev_context *context,
+ struct xnselector *selector,
+ unsigned type,
+ unsigned index);
/**
* Device operations
*/
@@ -304,6 +309,8 @@ struct rtdm_operations {
/** Transmit message handler for non-real-time context (optional) */
rtdm_sendmsg_handler_t sendmsg_nrt;
/** @} Message-Oriented Device Operations */
+
+ rtdm_select_bind_handler_t select_bind;
};
struct rtdm_devctx_reserved {
@@ -453,7 +460,8 @@ int rtdm_dev_unregister(struct rtdm_devi
#define rtdm_getpeername rt_dev_getpeername
#define rtdm_shutdown rt_dev_shutdown
-struct rtdm_dev_context *rtdm_context_get(int fd);
+struct rtdm_dev_context *__rtdm_context_get(rtdm_user_info_t *user_info, int fd);
+#define rtdm_context_get(fd) __rtdm_context_get(NULL, fd)
#ifndef DOXYGEN_CPP /* Avoid static inline tags for RTDM in doxygen */
static inline void rtdm_context_lock(struct rtdm_dev_context *context)
@@ -1002,11 +1010,20 @@ void rtdm_toseq_init(rtdm_toseq_t *timeo
typedef struct {
xnsynch_t synch_base;
+ DECLARE_XNSELECT(select_block);
} rtdm_event_t;
#define RTDM_EVENT_PENDING XNSYNCH_SPARE1
void rtdm_event_init(rtdm_event_t *event, unsigned long pending);
+#ifdef CONFIG_XENO_OPT_RTDM_SELECT
+int rtdm_event_select_bind(rtdm_event_t *event,
+ struct xnselector *selector,
+ unsigned type,
+ unsigned bit_index);
+#else /* !CONFIG_XENO_OPT_RTDM_SELECT */
+#define rtdm_event_select_bind(e, s, t, b) ({ -EBADF; })
+#endif /* !CONFIG_XENO_OPT_RTDM_SELECT */
int rtdm_event_wait(rtdm_event_t *event);
int rtdm_event_timedwait(rtdm_event_t *event, nanosecs_rel_t timeout,
rtdm_toseq_t *timeout_seq);
@@ -1027,6 +1044,7 @@ static inline void rtdm_event_destroy(rt
{
trace_mark(xn_rtdm_event_destroy, "event %p", event);
__rtdm_synch_flush(&event->synch_base, XNRMID);
+ xnselect_destroy(&event->select_block);
}
#endif /* !DOXYGEN_CPP */
@@ -1035,9 +1053,18 @@ static inline void rtdm_event_destroy(rt
typedef struct {
unsigned long value;
xnsynch_t synch_base;
+ DECLARE_XNSELECT(select_block);
} rtdm_sem_t;
void rtdm_sem_init(rtdm_sem_t *sem, unsigned long value);
+#ifdef CONFIG_XENO_OPT_RTDM_SELECT
+int rtdm_sem_select_bind(rtdm_sem_t *sem,
+ struct xnselector *selector,
+ unsigned type,
+ unsigned bit_index);
+#else /* !CONFIG_XENO_OPT_RTDM_SELECT */
+#define rtdm_sem_select_bind(s, se, t, b) ({ -EBADF; })
+#endif /* !CONFIG_XENO_OPT_RTDM_SELECT */
int rtdm_sem_down(rtdm_sem_t *sem);
int rtdm_sem_timeddown(rtdm_sem_t *sem, nanosecs_rel_t timeout,
rtdm_toseq_t *timeout_seq);
@@ -1048,6 +1075,7 @@ static inline void rtdm_sem_destroy(rtdm
{
trace_mark(xn_rtdm_sem_destroy, "sem %p", sem);
__rtdm_synch_flush(&sem->synch_base, XNRMID);
+ xnselect_destroy(&sem->select_block);
}
#endif /* !DOXYGEN_CPP */
--- include/rtdm/rtdm.h (revision 3460)
+++ include/rtdm/rtdm.h (working copy)
@@ -247,6 +247,10 @@ ssize_t __rt_dev_recvmsg(rtdm_user_info_
struct msghdr *msg, int flags);
ssize_t __rt_dev_sendmsg(rtdm_user_info_t *user_info, int fd,
const struct msghdr *msg, int flags);
+struct xnselector;
+int __rt_dev_select_bind(rtdm_user_info_t *user_info, int fd,
+ struct xnselector *selector,
+ unsigned type, unsigned index);
#endif /* __KERNEL__ */
/* Define RTDM_NO_DEFAULT_USER_API to switch off the default rt_dev_xxx
--- ksrc/skins/rtdm/Kconfig (revision 3460)
+++ ksrc/skins/rtdm/Kconfig (working copy)
@@ -37,6 +37,14 @@ config XENO_OPT_RTDM_FILDES
a global resource all applications share, either via the RTDM skin
directly or via the embedded services of the POSIX skin.
+config XENO_OPT_RTDM_SELECT
+ bool "Select support for RTDM file descriptors"
+ select XENO_OPT_SELECT
+ help
+
+ This option allows RTDM-based file descriptors to be used with
+ select-like services.
+
config XENO_OPT_DEBUG_RTDM
bool "RTDM debugging support"
depends on XENO_OPT_DEBUG
--- ksrc/skins/rtdm/device.c (revision 3460)
+++ ksrc/skins/rtdm/device.c (working copy)
@@ -70,6 +70,14 @@ int rtdm_no_support(void)
return -ENOSYS;
}
+int rtdm_select_bind_no_support(struct rtdm_dev_context *context,
+ struct xnselector *selector,
+ unsigned type,
+ unsigned index)
+{
+ return -EBADF;
+}
+
static inline int get_name_hash(const char *str, int limit, int hashkey_mask)
{
int hash = 0;
@@ -242,6 +250,8 @@ int rtdm_dev_register(struct rtdm_device
SET_DEFAULT_OP_IF_NULL(device->ops, write);
SET_DEFAULT_OP_IF_NULL(device->ops, recvmsg);
SET_DEFAULT_OP_IF_NULL(device->ops, sendmsg);
+ if (!device->ops.select_bind)
+ device->ops.select_bind = rtdm_select_bind_no_support;
atomic_set(&device->reserved.refcount, 0);
device->reserved.exclusive_context = NULL;
--- ksrc/skins/rtdm/drvlib.c (revision 3460)
+++ ksrc/skins/rtdm/drvlib.c (working copy)
@@ -756,12 +756,39 @@ void rtdm_event_init(rtdm_event_t *event
xnsynch_init(&event->synch_base, XNSYNCH_PRIO);
if (pending)
xnsynch_set_flags(&event->synch_base, RTDM_EVENT_PENDING);
+ xnselect_init(&event->select_block);
xnlock_put_irqrestore(&nklock, s);
}
EXPORT_SYMBOL(rtdm_event_init);
+#ifdef CONFIG_XENO_OPT_RTDM_SELECT
+int rtdm_event_select_bind(rtdm_event_t *event,
+ struct xnselector *selector,
+ unsigned type,
+ unsigned bit_index)
+{
+ struct xnselect_binding *binding;
+ int err;
+ spl_t s;
+
+ binding = xnmalloc(sizeof(*binding));
+ if (!binding)
+ return -ENOMEM;
+
+ xnlock_get_irqsave(&nklock, s);
+ err = xnselect_bind(&event->select_block,
+ binding, selector, type,bit_index,
+ xnsynch_test_flags(&event->synch_base,
+ RTDM_EVENT_PENDING));
+ xnlock_put_irqrestore(&nklock, s);
+
+ return err;
+}
+EXPORT_SYMBOL(rtdm_event_select_bind);
+#endif /* CONFIG_XENO_OPT_RTDM_SELECT */
+
#ifdef DOXYGEN_CPP /* Only used for doxygen doc generation */
/**
* @brief Destroy an event
@@ -825,6 +852,7 @@ void rtdm_event_pulse(rtdm_event_t *even
*/
void rtdm_event_signal(rtdm_event_t *event)
{
+ int resched = 0;
spl_t s;
trace_mark(xn_rtdm_event_signal, "event %p", event);
@@ -833,6 +861,10 @@ void rtdm_event_signal(rtdm_event_t *eve
xnsynch_set_flags(&event->synch_base, RTDM_EVENT_PENDING);
if (xnsynch_flush(&event->synch_base, 0))
+ resched = 1;
+ if (xnselect_signal(&event->select_block, 1))
+ resched = 1;
+ if (resched)
xnpod_schedule();
xnlock_put_irqrestore(&nklock, s);
@@ -927,9 +959,10 @@ int rtdm_event_timedwait(rtdm_event_t *e
if (unlikely(testbits(event->synch_base.status, RTDM_SYNCH_DELETED)))
err = -EIDRM;
else if (likely(xnsynch_test_flags(&event->synch_base,
- RTDM_EVENT_PENDING)))
+ RTDM_EVENT_PENDING))) {
xnsynch_clear_flags(&event->synch_base, RTDM_EVENT_PENDING);
- else {
+ xnselect_signal(&event->select_block, 0);
+ } else {
/* non-blocking mode */
if (timeout < 0) {
err = -EWOULDBLOCK;
@@ -951,10 +984,11 @@ int rtdm_event_timedwait(rtdm_event_t *e
}
if (likely
- (!xnthread_test_info(thread, XNTIMEO | XNRMID | XNBREAK)))
+ (!xnthread_test_info(thread, XNTIMEO | XNRMID | XNBREAK))) {
xnsynch_clear_flags(&event->synch_base,
RTDM_EVENT_PENDING);
- else if (xnthread_test_info(thread, XNTIMEO))
+ xnselect_signal(&event->select_block, 0);
+ } else if (xnthread_test_info(thread, XNTIMEO))
err = -ETIMEDOUT;
else if (xnthread_test_info(thread, XNRMID))
err = -EIDRM;
@@ -995,6 +1029,7 @@ void rtdm_event_clear(rtdm_event_t *even
xnlock_get_irqsave(&nklock, s);
xnsynch_clear_flags(&event->synch_base, RTDM_EVENT_PENDING);
+ xnselect_signal(&event->select_block, 0);
xnlock_put_irqrestore(&nklock, s);
}
@@ -1034,12 +1069,37 @@ void rtdm_sem_init(rtdm_sem_t *sem, unsi
sem->value = value;
xnsynch_init(&sem->synch_base, XNSYNCH_PRIO);
+ xnselect_init(&sem->select_block);
xnlock_put_irqrestore(&nklock, s);
}
EXPORT_SYMBOL(rtdm_sem_init);
+#ifdef CONFIG_XENO_OPT_RTDM_SELECT
+int rtdm_sem_select_bind(rtdm_sem_t *sem,
+ struct xnselector *selector,
+ unsigned type,
+ unsigned bit_index)
+{
+ struct xnselect_binding *binding;
+ int err;
+ spl_t s;
+
+ binding = xnmalloc(sizeof(*binding));
+ if (!binding)
+ return -ENOMEM;
+
+ xnlock_get_irqsave(&nklock, s);
+ err = xnselect_bind(&sem->select_block,
+ binding, selector, type, bit_index, sem->value > 0);
+ xnlock_put_irqrestore(&nklock, s);
+
+ return err;
+}
+EXPORT_SYMBOL(rtdm_sem_select_bind);
+#endif /* CONFIG_XENO_OPT_RTDM_SELECT */
+
#ifdef DOXYGEN_CPP /* Only used for doxygen doc generation */
/**
* @brief Destroy a semaphore
@@ -1148,9 +1208,10 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,
if (testbits(sem->synch_base.status, RTDM_SYNCH_DELETED))
err = -EIDRM;
- else if (sem->value > 0)
- sem->value--;
- else if (timeout < 0) /* non-blocking mode */
+ else if (sem->value > 0) {
+ if(!--sem->value)
+ xnselect_signal(&sem->select_block, 0);
+ } else if (timeout < 0) /* non-blocking mode */
err = -EWOULDBLOCK;
else {
thread = xnpod_current_thread();
@@ -1214,7 +1275,9 @@ void rtdm_sem_up(rtdm_sem_t *sem)
if (xnsynch_wakeup_one_sleeper(&sem->synch_base))
xnpod_schedule();
else
- sem->value++;
+ if (sem->value++ == 0
+ && xnselect_signal(&sem->select_block, 1))
+ xnpod_schedule();
xnlock_put_irqrestore(&nklock, s);
}
--- ksrc/skins/rtdm/core.c (revision 3460)
+++ ksrc/skins/rtdm/core.c (working copy)
@@ -49,28 +49,7 @@ EXPORT_SYMBOL(rtdm_tbase);
DEFINE_XNLOCK(rt_fildes_lock);
-/**
- * @brief Resolve file descriptor to device context
- *
- * @param[in] fd File descriptor
- *
- * @return Pointer to associated device context, or NULL on error
- *
- * @note The device context has to be unlocked using rtdm_context_unlock()
- * when it is no longer referenced.
- *
- * Environments:
- *
- * This service can be called from:
- *
- * - Kernel module initialization/cleanup code
- * - Interrupt service routine
- * - Kernel-based task
- * - User-space task (RT, non-RT)
- *
- * Rescheduling: never.
- */
-struct rtdm_dev_context *rtdm_context_get(int fd)
+struct rtdm_dev_context *__rtdm_context_get(rtdm_user_info_t *user_info, int fd)
{
struct rtdm_dev_context *context;
spl_t s;
@@ -82,7 +61,9 @@ struct rtdm_dev_context *rtdm_context_ge
context = fildes_table[fd].context;
if (unlikely(!context ||
- test_bit(RTDM_CLOSING, &context->context_flags))) {
+ test_bit(RTDM_CLOSING, &context->context_flags) ||
+ context->reserved.owner != (user_info
+ ? user_info->mm : NULL))) {
xnlock_put_irqrestore(&rt_fildes_lock, s);
return NULL;
}
@@ -94,7 +75,7 @@ struct rtdm_dev_context *rtdm_context_ge
return context;
}
-EXPORT_SYMBOL(rtdm_context_get);
+EXPORT_SYMBOL(__rtdm_context_get);
static int create_instance(struct rtdm_device *device,
struct rtdm_dev_context **context_ptr,
@@ -294,6 +275,34 @@ err_out:
EXPORT_SYMBOL(__rt_dev_socket);
+int __rt_dev_select_bind(rtdm_user_info_t *info, int fd,
+ struct xnselector *selector,
+ unsigned type, unsigned index)
+{
+ struct rtdm_dev_context *context;
+ struct rtdm_operations *ops;
+ int ret;
+
+ context = __rtdm_context_get(info, fd);
+
+ ret = -EBADF;
+ if (unlikely(!context))
+ goto err_out;
+
+ ops = context->ops;
+
+ ret = ops->select_bind(context, selector, type, index);
+
+ XENO_ASSERT(RTDM, !rthal_local_irq_test(), rthal_local_irq_enable(););
+
+ rtdm_context_unlock(context);
+
+ err_out:
+ return ret;
+}
+
+EXPORT_SYMBOL(__rt_dev_select_bind);
+
int __rt_dev_close(rtdm_user_info_t *user_info, int fd)
{
struct rtdm_dev_context *context;
@@ -312,7 +321,8 @@ again:
context = fildes_table[fd].context;
- if (unlikely(!context)) {
+ if (unlikely(!context ||
+ (user_info && context->reserved.owner != user_info->mm))) {
xnlock_put_irqrestore(&rt_fildes_lock, s);
goto err_out; /* -EBADF */
}
@@ -408,7 +418,7 @@ do { \
struct rtdm_operations *ops; \
int ret; \
\
- context = rtdm_context_get(fd); \
+ context = __rtdm_context_get(user_info, fd); \
ret = -EBADF; \
if (unlikely(!context)) \
goto err_out; \
@@ -517,6 +527,28 @@ ssize_t __rt_dev_sendmsg(rtdm_user_info_
EXPORT_SYMBOL(__rt_dev_sendmsg);
#ifdef DOXYGEN_CPP /* Only used for doxygen doc generation */
+/**
+ * @brief Resolve file descriptor to device context
+ *
+ * @param[in] fd File descriptor
+ *
+ * @return Pointer to associated device context, or NULL on error
+ *
+ * @note The device context has to be unlocked using rtdm_context_unlock()
+ * when it is no longer referenced.
+ *
+ * Environments:
+ *
+ * This service can be called from:
+ *
+ * - Kernel module initialization/cleanup code
+ * - Interrupt service routine
+ * - Kernel-based task
+ * - User-space task (RT, non-RT)
+ *
+ * Rescheduling: never.
+ */
+struct rtdm_dev_context *rtdm_context_get(int fd);
/**
* @brief Increment context reference counterRe: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
In reply to Jan KiszkaQuoted 26 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {Uuuh, this doesn't look equivalent (for --sem->value < 0).
Quoted 1 line
Otherwise it's OK with me.
After testing, it appears that the "owner" of a file descriptor changed from current->mm
tocontainer_of(xnshadow_ppd_get(__rtdm_muxid), struct rtdm_process, ppd)
So, I now need a ppd hash lookup in __rtdm_context_get.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 27 lines · Gilles Chanteperdrix
Quoted 26 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {Uuuh, this doesn't look equivalent (for --sem->value < 0).
Quoted 6 lines
Quoted 1 line
Otherwise it's OK with me.
After testing, it appears that the "owner" of a file descriptor changed from
current->mm
tocontainer_of(xnshadow_ppd_get(__rtdm_muxid), struct rtdm_process, ppd)
Yes, indeed, forgot about it. We have a full-blown owner structure now to track comm and pid.
Quoted 3 lines
So, I now need a ppd hash lookup in
__rtdm_context_get.
You could add mm to rtdm_process. This means another indirection and makes things worse (more cache misses in the worst case...). Could you live without the check until we have per-process fd tabled, or was it essential for the select thing?
Jan
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 39 lines · Jan Kiszka
Quoted 27 lines · Gilles Chanteperdrix
Quoted 26 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {Uuuh, this doesn't look equivalent (for --sem->value < 0).
Quoted 6 lines
Quoted 1 line
Otherwise it's OK with me.
After testing, it appears that the "owner" of a file descriptor changed from
current->mm
tocontainer_of(xnshadow_ppd_get(__rtdm_muxid), struct rtdm_process, ppd)Yes, indeed, forgot about it. We have a full-blown owner structure now to track comm and pid.
Quoted 1 line
Quoted 5 lines
Quoted 2 lines
So, I now need a ppd hash lookup in
__rtdm_context_get.You could add mm to
rtdm_process. This means another indirection and makes things worse (more cache misses in the worst case...).
Would not it be simpler to put a pointer to the task_struct ? After all, it already has a pid, comm and mm, and a file descriptor will not survive a task_struct thanks to automatic closing of file descriptors.
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 43 lines · Gilles Chanteperdrix
Quoted 42 lines · Jan Kiszka
Quoted 27 lines · Gilles Chanteperdrix
Quoted 26 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {Uuuh, this doesn't look equivalent (for --sem->value < 0).
Quoted 6 lines
Quoted 1 line
Otherwise it's OK with me.
After testing, it appears that the "owner" of a file descriptor changed from
current->mm
tocontainer_of(xnshadow_ppd_get(__rtdm_muxid), struct rtdm_process, ppd)Yes, indeed, forgot about it. We have a full-blown owner structure now to track comm and pid.
Quoted 3 lines
So, I now need a ppd hash lookup in
__rtdm_context_get.
Quoted 6 lines
Quoted 2 lines
You could add mm to
rtdm_process. This means another indirection and makes things worse (more cache misses in the worst case...).Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.
Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Quoted 9 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
So, will you change rtdm_process too? Thanks.
Jan
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 58 lines · Jan Kiszka
Quoted 43 lines · Gilles Chanteperdrix
Quoted 42 lines · Jan Kiszka
Quoted 27 lines · Gilles Chanteperdrix
Quoted 26 lines · Jan Kiszka
Quoted 8 lines · Gilles Chanteperdrix
stats:
include/rtdm/rtdm.h | 4 ++ include/rtdm/rtdm_driver.h | 30 +++++++++++++++- ksrc/skins/rtdm/core.c | 84 +++++++++++++++++++++++++++++++-------------- ksrc/skins/rtdm/device.c | 10 +++++ ksrc/skins/rtdm/drvlib.c | 76 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 34 deletions(-)/me thinks that going for inline patches on this list is overdue...
skins/rtdm/drvlib.c int rtdm_sem_timeddown(rtdm_sem_t *sem, · line 1215
Quoted 11 lines
skins/rtdm/drvlib.c +2
-2@@ -1148,8 +1208,8 @@ int rtdm_sem_timeddown(rtdm_sem_t *sem,if (testbits (sem->synch_base.status,RTDM_SYNCH_DELETED )) err = -EIDRM ; -else if (sem->value >0 ) - sem->value--; +else if (sem->value >0 && !--sem->value) +xnselect_signal (&sem->select_block,0 );else if (timeout <0 )/* non-blocking mode */ err = -EWOULDBLOCK ;else {Uuuh, this doesn't look equivalent (for --sem->value < 0).
Quoted 6 lines
Quoted 1 line
Otherwise it's OK with me.
After testing, it appears that the "owner" of a file descriptor changed from
current->mm
tocontainer_of(xnshadow_ppd_get(__rtdm_muxid), struct rtdm_process, ppd)Yes, indeed, forgot about it. We have a full-blown owner structure now to track comm and pid.
Quoted 3 lines
So, I now need a ppd hash lookup in
__rtdm_context_get.Quoted 6 lines
Quoted 2 lines
You could add mm to
rtdm_process. This means another indirection and makes things worse (more cache misses in the worst case...).Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Quoted 5 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
Quoted 8 lines
Quoted 4 lines
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
So, will you change
rtdm_processtoo? Thanks.
Ok, but I will send the new patch tomorrow.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
In reply to Jan KiszkaQuoted 6 lines · Jan Kiszka
Quoted 3 lines · Gilles Chanteperdrix
Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Actually no, we can not do that because a task_struct may well disappear and the rtdm_process continue to exist as long as another thread uses the same mm.
Quoted 6 lines
Quoted 6 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
Quoted 8 lines
Quoted 4 lines
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
So, will you change
rtdm_processtoo? Thanks.
I commited the select support, without any change to rtdm_context_get or rtdm_process. So, now, how do you prefer this to be fixed, by adding an mm struct to the rtdm_process struct ? By the way, after thinking about it I can live without this fix: I just have to stop the loop closing file descriptors at 768, so that it will not try to close RTDM file descriptors.
While commiting the support for select, I also had a dependency problem in Kconfig: when support for posix select is enabled the posix module uses a function defined in the RTDM module. So, there is one invalid
configuration: posix built-in with support for select and rtdm built as a module. I could not find a way to express this condition in the Kconfig language, so I just made a comment depend on this condition, but would be happy if anyone found a better solution.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 11 lines · Gilles Chanteperdrix
Quoted 6 lines · Jan Kiszka
Quoted 3 lines · Gilles Chanteperdrix
Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Actually no, we can not do that because a
task_structmay well disappear and thertdm_processcontinue to exist as long as another thread uses the same mm.
Because we cleanup on mm exit, not task exit, right? OK, looks like I originally spent a few more thoughts than this time :-/.
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
Quoted 8 lines
Quoted 1 line
So, will you change
rtdm_processtoo? Thanks.I commited the select support, without any change to
rtdm_context_getorrtdm_process. So, now, how do you prefer this to be fixed, by adding an mm struct to thertdm_processstruct ? By the way, after thinking about it I can live without this fix: I just have to stop the loop closing file descriptors at 768, so that it will not try to close RTDM file descriptors.
If you can live with it, I would vote for fixing it by the intended redesign via per-process fds.
Quoted 8 lines
While commiting the support for select, I also had a dependency problem in
Kconfig: when support for posix select is enabled the posix module uses a function defined in the RTDM module. So, there is one invalid
configuration: posix built-in with support for select and rtdm built as a module. I could not find a way to express this condition in theKconfiglanguage, so I just made a comment depend on this condition, but would be happy if anyone found a better solution.
I would say:
config POSIX
select RTDM if OPT_SELECT
Jan
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 39 lines · Jan Kiszka
Quoted 11 lines · Gilles Chanteperdrix
Quoted 6 lines · Jan Kiszka
Quoted 3 lines · Gilles Chanteperdrix
Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Actually no, we can not do that because a
task_structmay well disappear and thertdm_processcontinue to exist as long as another thread uses the same mm.Because we cleanup on mm exit, not task exit, right? OK, looks like I originally spent a few more thoughts than this time :-/.
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
Quoted 8 lines
Quoted 1 line
So, will you change
rtdm_processtoo? Thanks.I commited the select support, without any change to
rtdm_context_getorrtdm_process. So, now, how do you prefer this to be fixed, by adding an mm struct to thertdm_processstruct ? By the way, after thinking about it I can live without this fix: I just have to stop the loop closing file descriptors at 768, so that it will not try to close RTDM file descriptors.
Quoted 2 lines
If you can live with it, I would vote for fixing it by the intended redesign via per-process fds.
Ok.
Quoted 10 lines
Quoted 9 lines
While commiting the support for select, I also had a dependency problem in
Kconfig: when support for posix select is enabled the posix module uses a function defined in the RTDM module. So, there is one invalid
configuration: posix built-in with support for select and rtdm built as a module. I could not find a way to express this condition in theKconfiglanguage, so I just made a comment depend on this condition, but would be happy if anyone found a better solution.
Quoted 4 lines
I would say:
config POSIX
select RTDM ifOPT_SELECT
But in this case, I can not have posix with select and without rtdm.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 55 lines · Gilles Chanteperdrix
Quoted 39 lines · Jan Kiszka
Quoted 11 lines · Gilles Chanteperdrix
Quoted 6 lines · Jan Kiszka
Quoted 3 lines · Gilles Chanteperdrix
Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Actually no, we can not do that because a
task_structmay well disappear and thertdm_processcontinue to exist as long as another thread uses the same mm.Because we cleanup on mm exit, not task exit, right? OK, looks like I originally spent a few more thoughts than this time :-/.
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
Quoted 8 lines
Quoted 1 line
So, will you change
rtdm_processtoo? Thanks.I commited the select support, without any change to
rtdm_context_getorrtdm_process. So, now, how do you prefer this to be fixed, by adding an mm struct to thertdm_processstruct ? By the way, after thinking about it I can live without this fix: I just have to stop the loop closing file descriptors at 768, so that it will not try to close RTDM file descriptors.Quoted 2 lines
If you can live with it, I would vote for fixing it by the intended redesign via per-process fds.
Ok.
Quoted 10 lines
Quoted 9 lines
While commiting the support for select, I also had a dependency problem in
Kconfig: when support for posix select is enabled the posix module uses a function defined in the RTDM module. So, there is one invalid
configuration: posix built-in with support for select and rtdm built as a module. I could not find a way to express this condition in theKconfiglanguage, so I just made a comment depend on this condition, but would be happy if anyone found a better solution.
Quoted 6 lines
Quoted 4 lines
I would say:
config POSIX
select RTDM ifOPT_SELECTBut in this case, I can not have posix with select and without rtdm.
Then you need to isolate those services that POSIX needs from RTDM. The above just expresses the dependency you described. In the end this just shows that we have to define the common fd-ground for both skins in the core.
Jan
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 58 lines · Jan Kiszka
Quoted 57 lines · Gilles Chanteperdrix
Quoted 39 lines · Jan Kiszka
Quoted 11 lines · Gilles Chanteperdrix
Quoted 6 lines · Jan Kiszka
Quoted 3 lines · Gilles Chanteperdrix
Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Actually no, we can not do that because a
task_structmay well disappear and thertdm_processcontinue to exist as long as another thread uses the same mm.Because we cleanup on mm exit, not task exit, right? OK, looks like I originally spent a few more thoughts than this time :-/.
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
Quoted 8 lines
Quoted 1 line
So, will you change
rtdm_processtoo? Thanks.I commited the select support, without any change to
rtdm_context_getorrtdm_process. So, now, how do you prefer this to be fixed, by adding an mm struct to thertdm_processstruct ? By the way, after thinking about it I can live without this fix: I just have to stop the loop closing file descriptors at 768, so that it will not try to close RTDM file descriptors.Quoted 2 lines
If you can live with it, I would vote for fixing it by the intended redesign via per-process fds.
Ok.
Quoted 12 lines
Quoted 9 lines
While commiting the support for select, I also had a dependency problem in
Kconfig: when support for posix select is enabled the posix module uses a function defined in the RTDM module. So, there is one invalid
configuration: posix built-in with support for select and rtdm built as a module. I could not find a way to express this condition in theKconfiglanguage, so I just made a comment depend on this condition, but would be happy if anyone found a better solution.I would say:
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
config POSIX
select RTDM ifOPT_SELECTBut in this case, I can not have posix with select and without rtdm.
Then you need to isolate those services that POSIX needs from RTDM. The above just expresses the dependency you described.
Then I was wrong in what I described: the problem is that if posix is built-in and RTDM is enabled, then RTDM must be built-in.
In the end this just
Quoted 2 lines
shows that we have to define the common fd-ground for both skins in the core.
I also have the choice of defining the service needed (rt_dev_select_bind) as a callback in the posix module, the RTDM module setting this callback when loaded (like what the rtcap module does with rtnet). But I wanted something simple, so I aimed at Kconfig stuff.
Signature · 1 line
Gilles Chanteperdrix.
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 62 lines · Gilles Chanteperdrix
Quoted 61 lines · Jan Kiszka
Quoted 60 lines · Gilles Chanteperdrix
Quoted 39 lines · Jan Kiszka
Quoted 11 lines · Gilles Chanteperdrix
Quoted 6 lines · Jan Kiszka
Quoted 3 lines · Gilles Chanteperdrix
Would not it be simpler to put a pointer to the
task_struct? After all, it already has a pid, comm and mm, and a file descriptor will not survive atask_structthanks to automatic closing of file descriptors.Hmm, hmm, hmmmm... Sounds reasonable, should be safe.
Actually no, we can not do that because a
task_structmay well disappear and thertdm_processcontinue to exist as long as another thread uses the same mm.Because we cleanup on mm exit, not task exit, right? OK, looks like I originally spent a few more thoughts than this time :-/.
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Could you
Quoted 2 lines
live without the check until we have per-process fd tabled, or was it essential for the select thing?
An application which I ported to Xenomai (and which uses the select call) closes all file descriptors in a for loop. The purpose of this loop is, I guess, to avoid leaving a file descriptor opened that was passed through exec.
OK.
Quoted 8 lines
Quoted 1 line
So, will you change
rtdm_processtoo? Thanks.I commited the select support, without any change to
rtdm_context_getorrtdm_process. So, now, how do you prefer this to be fixed, by adding an mm struct to thertdm_processstruct ? By the way, after thinking about it I can live without this fix: I just have to stop the loop closing file descriptors at 768, so that it will not try to close RTDM file descriptors.Quoted 2 lines
If you can live with it, I would vote for fixing it by the intended redesign via per-process fds.
Ok.
Quoted 14 lines
Quoted 9 lines
While commiting the support for select, I also had a dependency problem in
Kconfig: when support for posix select is enabled the posix module uses a function defined in the RTDM module. So, there is one invalid
configuration: posix built-in with support for select and rtdm built as a module. I could not find a way to express this condition in theKconfiglanguage, so I just made a comment depend on this condition, but would be happy if anyone found a better solution.I would say:
config POSIX
select RTDM ifOPT_SELECT
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
But in this case, I can not have posix with select and without rtdm.
Then you need to isolate those services that POSIX needs from RTDM. The above just expresses the dependency you described.
Then I was wrong in what I described: the problem is that if posix is built-in and RTDM is enabled, then RTDM must be built-in.
That should be covered by the kconfig rule automatically.
Quoted 10 lines
In the end this just
Quoted 2 lines
shows that we have to define the common fd-ground for both skins in the core.
I also have the choice of defining the service needed (
rt_dev_select_bind) as a callback in the posix module, the RTDM module setting this callback when loaded (like what the rtcap module does with rtnet). But I wanted something simple, so I aimed atKconfigstuff.
If you can live with the callback being NULL, you could also perfectly wrap some ifdef CONFIG_...RTDM[_MODULE] around the current invocations. Then you don't need the dependency above. I think I have to look at the code...
Jan
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 7 lines · Jan Kiszka
Quoted 5 lines · Gilles Chanteperdrix
I also have the choice of defining the service needed (
rt_dev_select_bind) as a callback in the posix module, the RTDM module setting this callback when loaded (like what the rtcap module does with rtnet). But I wanted something simple, so I aimed atKconfigstuff.
Quoted 5 lines
If you can live with the callback being NULL, you could also perfectly wrap some ifdef CONFIG_...RTDM[_MODULE] around the current invocations. Then you don't need the dependency above. I think I have to look at the code...
I understood the core of your problem meanwhile. Here is a better suggestion:
skins/posix/Kconfig +6 -7
@@ -47,9 +47,15 @@ config XENO_OPT_POSIX_INTR RTDM skin is the preferred way of implementing drivers), leave this option unselected. +if XENO_SKIN_RTDM = m && XENO_SKIN_RTDM != XENO_SKIN_POSIX + comment "Note: Select support only available if the POSIX skin is built" + comment "as module or the RTDM skin is built into the kernel as well." +endif + config XENO_OPT_POSIX_SELECT bool "Select syscall" select XENO_OPT_SELECT + depends on XENO_SKIN_RTDM != m || XENO_SKIN_RTDM = XENO_SKIN_POSIX help This option allows applications using the Xenomai POSIX skin in
@@ -65,10 +71,3 @@ config XENO_OPT_DEBUG_POSIX cleaned up POSIX objects it detects on process termination. endif - -if XENO_OPT_POSIX_SELECT && XENO_SKIN_POSIX = y && XENO_SKIN_RTDM = m - comment "This configuration will not work ! If you enable the POSIX" - comment "select syscall while the POSIX skin is built-in the kernel," - comment "you have to compile the POSIX skin as a module or the RTDM" - comment "skin built-in the kernel." -endif
Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux
Re: [Xenomai-core] [patch 2/4] RTDM support for select-like service.
Quoted 41 lines · Jan Kiszka
Quoted 8 lines · Jan Kiszka
Quoted 5 lines · Gilles Chanteperdrix
I also have the choice of defining the service needed (
rt_dev_select_bind) as a callback in the posix module, the RTDM module setting this callback when loaded (like what the rtcap module does with rtnet). But I wanted something simple, so I aimed atKconfigstuff.Quoted 5 lines
If you can live with the callback being NULL, you could also perfectly wrap some ifdef CONFIG_...RTDM[_MODULE] around the current invocations. Then you don't need the dependency above. I think I have to look at the code...
I understood the core of your problem meanwhile. Here is a better suggestion:
Index: ksrc/skins/posix/Kconfig
===================================================================
--- ksrc/skins/posix/Kconfig (Revision 3499)
+++ ksrc/skins/posix/Kconfig (Arbeitskopie)
@@ -47,9 +47,15 @@ configXENO_OPT_POSIX_INTR
RTDM skin is the preferred way of implementing drivers), leave this option unselected.+if
XENO_SKIN_RTDM= m &&XENO_SKIN_RTDM!=XENO_SKIN_POSIX
+ comment "Note: Select support only available if the POSIX skin is built"
+ comment "as module or the RTDM skin is built into the kernel as well."
+endif
+
configXENO_OPT_POSIX_SELECT
bool "Select syscall"
selectXENO_OPT_SELECT
+ depends onXENO_SKIN_RTDM!= m ||XENO_SKIN_RTDM=XENO_SKIN_POSIX
helpThis option allows applications using the Xenomai POSIX skin in
@@ -65,10 +71,3 @@ configXENO_OPT_DEBUG_POSIX
cleaned up POSIX objects it detects on process termination.
Quoted 8 lines
endif
-
-ifXENO_OPT_POSIX_SELECT&&XENO_SKIN_POSIX= y &&XENO_SKIN_RTDM= m- comment "This configuration will not work ! If you enable the POSIX" - comment "select syscall while the POSIX skin is built-in the kernel," - comment "you have to compile the POSIX skin as a module or the RTDM" - comment "skin built-in the kernel."-endif
This looks much better, thanks, I will use that approach.
Signature · 1 line
Gilles Chanteperdrix
PATCH 3/4 posix skin kernel-space support for select.
In reply to Gilles Chanteperdrixstats:
include/posix/syscall.h | 1 ksrc/skins/posix/Kconfig | 9 ++ ksrc/skins/posix/internal.h | 26 ++++++ ksrc/skins/posix/mq.c | 79 ++++++++++++++++++- ksrc/skins/posix/syscall.c | 181 ++++++++++++++++++++++++++++++++++++++++++++ ksrc/skins/posix/thread.c | 7 + ksrc/skins/posix/thread.h | 4 7 files changed, 305 insertions(+), 2 deletions(-)
Signature · 1 line
Gilles Chanteperdrix.
posix/syscall.h +1 -0
@@ -100,6 +100,7 @@#define __pse51_condattr_setpshared 74#define __pse51_thread_getschedparam 75#define __pse51_thread_kill 76 +#define __pse51_select 77#ifdef __KERNEL__
skins/posix/Kconfig +9 -0
@@ -47,6 +47,15 @@ config XENO_OPT_POSIX_INTR RTDM skin is the preferred way of implementing drivers), leave this option unselected. +config XENO_OPT_POSIX_SELECT + bool "Select syscall" + select XENO_OPT_SELECT + help + + This option allows applications using the Xenomai POSIX skin in + user-space to use the "select" syscall with Xenomai POSIXK skin file + descriptors. + config XENO_OPT_DEBUG_POSIX bool "Debugging support" default y
skins/posix/syscall.c +181 -0
199 lines not on this page · raw message
skins/posix/mq.c +78 -1
139 lines not on this page · raw message
skins/posix/thread.c +7 -0
@@ -84,6 +84,12 @@ static void thread_delete_hook(xnthread_pse51_mark_deleted (thread);pse51_signal_cleanup_thread (thread);pse51_timer_cleanup_thread (thread); +#ifdef CONFIG_XENO_OPT_POSIX_SELECT +if (thread->selector) { +xnselector_destroy (thread->selector); + thread->selector =NULL ; + } +#endif /* CONFIG_XENO_OPT_POSIX_SELECT */ switch (thread_getdetachstate (thread)) {case PTHREAD_CREATE_DETACHED :
@@ -216,6 +222,7 @@ int pthread_create(pthread_t *tid,pse51_signal_init_thread (thread, cur);pse51_tsd_init_thread (thread);pse51_timer_init_thread (thread); + thread->selector =NULL ;if (thread->attr.policy ==SCHED_RR ) {xnthread_time_slice (&thread->threadbase) = pse51_time_slice;
skins/posix/thread.h +4 -0
@@ -21,6 +21,7 @@#define _POSIX_THREAD_H#include <posix/internal.h> +#include <nucleus/select.h> typedef unsigned long long pse51_sigset_t ;
@@ -90,6 +91,9 @@ struct pse51_thread {/* For timers. */ xnqueue_t timersq; +/* For select. */ +struct xnselector *selector; +#ifdef CONFIG_XENO_OPT_PERVASIVE struct pse51_hkey hkey;#endif /* CONFIG_XENO_OPT_PERVASIVE */
skins/posix/internal.h +25 -1
@@ -22,6 +22,7 @@#include <nucleus/xenomai.h> #include <nucleus/core.h> #include <nucleus/ppd.h> +#include <nucleus/select.h> #include <posix/posix.h> #include <posix/registry.h>
@@ -152,12 +153,32 @@ static inline xnticks_t ts2ticks_ceil(coreturn rem ? ticks+1 : ticks; } +static inline xnticks_t tv2ticks_ceil (const struct timeval *tv) +{ +xntime_t nsecs = tv->tv_usec *1000 ; +unsigned long rem; +xnticks_t ticks; +if (tv->tv_sec) + nsecs += (xntime_t ) tv->tv_sec *ONE_BILLION ; + ticks =xnarch_ulldiv (nsecs,xntbase_get_tickval (pse51_tbase), &rem); +return rem ? ticks+1 : ticks; +} + +static inline void ticks2tv (struct timeval *tv,xnticks_t ticks) +{ +unsigned long nsecs; + tv->tv_sec =xnarch_uldivrem (xntbase_ticks2ns (pse51_tbase, ticks), +ONE_BILLION , + &nsecs); + tv->tv_usec = nsecs /1000 ; +} +static inline xnticks_t clock_get_ticks (clockid_t clock_id) {if (clock_id ==CLOCK_REALTIME )return xntbase_get_time (pse51_tbase);else -return xntbase_ns2ticks (pse51_tbase,xnpod_get_cpu_time ()); +return xntbase_get_jiffies (pse51_tbase); }static inline int clock_flag (int flag,clockid_t clock_id)
@@ -178,4 +199,7 @@ static inline int clock_flag(int flag, c return -EINVAL; } +int pse51_mq_select_bind (mqd_t fd,struct xnselector *selector, +unsigned type,unsigned index); +#endif /* !_POSIX_INTERNAL_H */
PATCH 4/4 posix skin user-space support for select.
In reply to Gilles Chanteperdrixstats:
include/posix/sys/select.h | 23 +++++++++++++++++++++++ src/skins/posix/Makefile.am | 1 + src/skins/posix/posix.wrappers | 1 + src/skins/posix/select.c | 26 ++++++++++++++++++++++++++ src/skins/posix/wrappers.c | 9 +++++++++ 5 files changed, 60 insertions(+)
Signature · 1 line
Gilles Chanteperdrix.
posix/sys/select.h +23 -0
@@ -0,0 +1,23 @@ +#ifndef _XENO_POSIX_SELECT_H +#define _XENO_POSIX_SELECT_H + +#if !(defined(__KERNEL__) || defined(__XENO_SIM__)) + +#include_next <sys/select.h> + +#ifdef __cplusplus +extern "C" { +#endif + +extern int __real_select (int __nfds,fd_set *__restrict __readfds, +fd_set *__restrict __writefds, +fd_set *__restrict __exceptfds, +struct timeval *__restrict __timeout); + +#ifdef __cplusplus +} +#endif + +#endif /* !(__KERNEL__ || __XENO_SIM__) */ + +#endif /* _XENO_POSIX_SELECT_H */
skins/posix/wrappers.c +9 -0
@@ -30,6 +30,7 @@#include <unistd.h> #include <sys/ioctl.h> #include <sys/mman.h> +#include <sys/select.h> /* sched */ int __real_pthread_setschedparam(pthread_t thread,
@@ -235,3 +236,11 @@ int __real_munmap(void *addr, size_t len {return munmap (addr, len); } + +int __real_select (int __nfds,fd_set *__restrict __readfds, +fd_set *__restrict __writefds, +fd_set *__restrict __exceptfds, +struct timeval *__restrict __timeout) +{ +return select (__nfds, __readfds, __writefds, __exceptfds, __timeout); +}
skins/posix/select.c +26 -0
@@ -0,0 +1,26 @@ +#include <errno.h> +#include <posix/syscall.h> +#include <sys/select.h> + +extern int __pse51_muxid; + +int __wrap_select (int __nfds,fd_set *__restrict __readfds, +fd_set *__restrict __writefds, +fd_set *__restrict __exceptfds, +struct timeval *__restrict __timeout) +{ +int err; + + err =XENOMAI_SKINCALL5 (__pse51_muxid, __pse51_select, __nfds, + __readfds, __writefds, __exceptfds, __timeout); + +if (err == -EBADF || err == -EPERM || err == -ENOSYS ) +return __real_select (__nfds, __readfds, + __writefds, __exceptfds, __timeout); + +if (err >0 ) +return err; + + errno = -err; +return -1 ; +}
skins/posix/posix.wrappers +1 -0
@@ -87,3 +87,4 @@ --wrap shm_unlink --wrap mmap --wrap munmap +--wrap select
skins/posix/Makefile.am +1 -0
@@ -15,6 +15,7 @@ libpthread_rt_la_SOURCES = \ mutex.c \ shm.c \ interrupt.c \ + select.c \ rtdm.c \ wrappers.c
Quoted 11 lines · Gilles Chanteperdrix
Hi,
here comes a third edition of the patchset adding support for select.
The core support now depends on a
CONFIG_XENO_OPT_SELECToption, whereas the posix support depends on aCONFIG_XENO_OPT_POSIX_SELECToption.The support for using
rtdm_event_tandrtdm_sem_tobjects is now built-in to these objects without creating new objects types (only ifCONFIG_XENO_OPT_SELECTis enabled).
Quoted 8 lines
The
rtdm_context_getmodification, allowing to check that the caller of a service belongs to the same process as the file descriptor it uses, is now made in__rtdm_context_getwhilertdm_context_getpasses a NULL first argument to this new service.When implementing these modifications, a few questions arise:
- RTDM support currently depends on theCONFIG_XENO_OPT_SELECToption, should we add an RTDM specific option ?
IIRC, the policy is so far that the skin selects the nucleus features it wants/needs, so we may better add the visible switch to RTDM as well.
Quoted 4 lines
- in order to avoid numerous #ifdefs, and especially in drivers code, the new callback added to device operations for binding RTDM file descriptors to selector blocks is always there even if
CONFIG_XENO_OPT_SELECTis disabled. Is it the right thing to do ?
That's ok, otherwise ifdef'ery would crawl into the drivers as well. Given the conversion you posted for RTnet, we don't add noticeable bloat this way.
Jan
Gilles,
Quoted 4 lines · Gilles Chanteperdrix
Hi,
here comes a third edition of the patchset adding support for select.
Could you tell me against which version this patch is tested? Would it work with 2.4.1, or do I need the latest version from SVN?
Kind regards,
Johan Borkhuis
Signature · 4 lines
Johan Borkhuis Dutch Space BV email: [email protected] Newtonweg 1 phone: 071-5245788 Leiden fax: 071-5245499 The Netherlands
Quoted 10 lines · Johan Borkhuis
Gilles,
Quoted 4 lines · Gilles Chanteperdrix
Hi,
here comes a third edition of the patchset adding support for select.
Could you tell me against which version this patch is tested? Would it work with 2.4.1, or do I need the latest version from SVN?
The patch is against trunk. We would need to rework it a bit to adapt it to 2.4.1, but since it adds a new syscall, I do not know if it will be backported, though adding a syscall does not really break the ABI.
Signature · 1 line
Gilles Chanteperdrix
Quoted 10 lines · Johan Borkhuis
Gilles,
Quoted 4 lines · Gilles Chanteperdrix
Hi,
here comes a third edition of the patchset adding support for select.
Could you tell me against which version this patch is tested? Would it work with 2.4.1, or do I need the latest version from SVN?
Hi Johan,
I am getting back to this issue, how much would you need the select service ? It is a posix only service for now, is it ok for you ?
Regards.
Signature · 1 line
Gilles Chanteperdrix