Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mq_timedsend/mq_timedreceive: timeout value is absolute, not relative. 

While here, drop unecessary (since fdesc API changes) lwp_t arguments.

Bug reported by Stathis Kamperis, thanks!
This commit is contained in:
rmind 2009-10-05 23:49:46 +00:00
parent ae2795775d
commit c9a5a18df3
3 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/compat/common/kern_time_50.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_time_50.c,v 1.8 2009/07/19 02:41:27 rmind Exp $ */
/* $NetBSD: kern_time_50.c,v 1.9 2009/10/05 23:49:47 rmind Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.8 2009/07/19 02:41:27 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.9 2009/10/05 23:49:47 rmind Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@ -538,10 +538,9 @@ compat_50_sys_mq_timedsend(struct lwp *l,
syscallarg(const struct timespec50 *) abs_timeout;
} */
#ifdef MQUEUE
int t;
int error;
struct timespec50 ts50;
struct timespec ts;
struct timespec ts, *tsp;
int error;
/* Get and convert time value */
if (SCARG(uap, abs_timeout)) {
@ -549,14 +548,13 @@ compat_50_sys_mq_timedsend(struct lwp *l,
if (error)
return error;
timespec50_to_timespec(&ts50, &ts);
error = abstimeout2timo(&ts, &t);
if (error)
return error;
} else
t = 0;
tsp = &ts;
} else {
tsp = NULL;
}
return mq_send1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), t);
return mq_send1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), tsp);
#else
return ENOSYS;
#endif
@ -574,10 +572,10 @@ compat_50_sys_mq_timedreceive(struct lwp *l,
syscallarg(const struct timespec50 *) abs_timeout;
} */
#ifdef MQUEUE
int error, t;
ssize_t mlen;
struct timespec ts;
struct timespec ts, *tsp;
struct timespec50 ts50;
ssize_t mlen;
int error;
/* Get and convert time value */
if (SCARG(uap, abs_timeout)) {
@ -586,14 +584,13 @@ compat_50_sys_mq_timedreceive(struct lwp *l,
return error;
timespec50_to_timespec(&ts50, &ts);
error = abstimeout2timo(&ts, &t);
if (error)
return error;
} else
t = 0;
tsp = &ts;
} else {
tsp = NULL;
}
error = mq_receive1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), t, &mlen);
error = mq_recv1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), tsp, &mlen);
if (error == 0)
*retval = mlen;

90
sys/kern/sys_mqueue.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_mqueue.c,v 1.24 2009/07/19 02:50:44 rmind Exp $ */
/* $NetBSD: sys_mqueue.c,v 1.25 2009/10/05 23:49:46 rmind Exp $ */
/*
* Copyright (c) 2007-2009 Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.24 2009/07/19 02:50:44 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.25 2009/10/05 23:49:46 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@ -295,20 +295,26 @@ mqueue_linear_insert(struct mqueue *mq, struct mq_msg *msg)
}
/*
* Converter from struct timespec to the ticks.
* Calculate delta and convert from struct timespec to the ticks.
* Used by mq_timedreceive(), mq_timedsend().
*/
int
abstimeout2timo(struct timespec *ts, int *timo)
{
struct timespec tsd;
int error;
/*
* According to POSIX, validation check is needed only in case of
* blocking. Thus, set the invalid value right now, and fail latter.
*/
error = itimespecfix(ts);
*timo = (error == 0) ? tstohz(ts) : -1;
getnanotime(&tsd);
timespecsub(ts, &tsd, &tsd);
if (tsd.tv_sec < 0 || (tsd.tv_sec == 0 && tsd.tv_nsec <= 0)) {
return ETIMEDOUT;
}
error = itimespecfix(&tsd);
if (error) {
return error;
}
*timo = tstohz(&tsd);
KASSERT(*timo != 0);
return 0;
}
@ -609,11 +615,11 @@ sys_mq_close(struct lwp *l, const struct sys_mq_close_args *uap,
}
/*
* Primary mq_receive1() function.
* Primary mq_recv1() function.
*/
int
mq_receive1(lwp_t *l, mqd_t mqdes, void *msg_ptr, size_t msg_len,
unsigned *msg_prio, int t, ssize_t *mlen)
mq_recv1(mqd_t mqdes, void *msg_ptr, size_t msg_len, u_int *msg_prio,
struct timespec *ts, ssize_t *mlen)
{
file_t *fp = NULL;
struct mqueue *mq;
@ -643,12 +649,14 @@ mq_receive1(lwp_t *l, mqd_t mqdes, void *msg_ptr, size_t msg_len,
/* Check if queue is empty */
while (mqattr->mq_curmsgs == 0) {
int t;
if (mqattr->mq_flags & O_NONBLOCK) {
error = EAGAIN;
goto error;
}
if (t < 0) {
error = EINVAL;
error = abstimeout2timo(ts, &t);
if (error) {
goto error;
}
/*
@ -720,11 +728,11 @@ sys_mq_receive(struct lwp *l, const struct sys_mq_receive_args *uap,
syscallarg(size_t) msg_len;
syscallarg(unsigned *) msg_prio;
} */
int error;
ssize_t mlen;
int error;
error = mq_receive1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), 0, &mlen);
error = mq_recv1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), NULL, &mlen);
if (error == 0)
*retval = mlen;
@ -742,24 +750,22 @@ sys___mq_timedreceive50(struct lwp *l,
syscallarg(unsigned *) msg_prio;
syscallarg(const struct timespec *) abs_timeout;
} */
int error, t;
struct timespec ts, *tsp;
ssize_t mlen;
struct timespec ts;
int error;
/* Get and convert time value */
if (SCARG(uap, abs_timeout)) {
error = copyin(SCARG(uap, abs_timeout), &ts, sizeof(ts));
if (error)
return error;
tsp = &ts;
} else {
tsp = NULL;
}
error = abstimeout2timo(&ts, &t);
if (error)
return error;
} else
t = 0;
error = mq_receive1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), t, &mlen);
error = mq_recv1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), tsp, &mlen);
if (error == 0)
*retval = mlen;
@ -770,8 +776,8 @@ sys___mq_timedreceive50(struct lwp *l,
* Primary mq_send1() function.
*/
int
mq_send1(lwp_t *l, mqd_t mqdes, const char *msg_ptr, size_t msg_len,
unsigned msg_prio, int t)
mq_send1(mqd_t mqdes, const char *msg_ptr, size_t msg_len, u_int msg_prio,
struct timespec *ts)
{
file_t *fp = NULL;
struct mqueue *mq;
@ -828,12 +834,14 @@ mq_send1(lwp_t *l, mqd_t mqdes, const char *msg_ptr, size_t msg_len,
/* Check if queue is full */
while (mqattr->mq_curmsgs >= mqattr->mq_maxmsg) {
int t;
if (mqattr->mq_flags & O_NONBLOCK) {
error = EAGAIN;
goto error;
}
if (t < 0) {
error = EINVAL;
error = abstimeout2timo(ts, &t);
if (error) {
goto error;
}
/* Block until queue becomes available */
@ -904,8 +912,8 @@ sys_mq_send(struct lwp *l, const struct sys_mq_send_args *uap,
syscallarg(unsigned) msg_prio;
} */
return mq_send1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), 0);
return mq_send1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), NULL);
}
int
@ -919,8 +927,7 @@ sys___mq_timedsend50(struct lwp *l, const struct sys___mq_timedsend50_args *uap,
syscallarg(unsigned) msg_prio;
syscallarg(const struct timespec *) abs_timeout;
} */
int t;
struct timespec ts;
struct timespec ts, *tsp;
int error;
/* Get and convert time value */
@ -928,14 +935,13 @@ sys___mq_timedsend50(struct lwp *l, const struct sys___mq_timedsend50_args *uap,
error = copyin(SCARG(uap, abs_timeout), &ts, sizeof(ts));
if (error)
return error;
error = abstimeout2timo(&ts, &t);
if (error)
return error;
} else
t = 0;
tsp = &ts;
} else {
tsp = NULL;
}
return mq_send1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), t);
return mq_send1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
SCARG(uap, msg_len), SCARG(uap, msg_prio), tsp);
}
int

6
sys/sys/mqueue.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mqueue.h,v 1.10 2009/07/19 02:50:44 rmind Exp $ */
/* $NetBSD: mqueue.h,v 1.11 2009/10/05 23:49:46 rmind Exp $ */
/*
* Copyright (c) 2007-2009 Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -110,8 +110,8 @@ struct mq_msg {
/* Prototypes */
void mqueue_print_list(void (*pr)(const char *, ...));
int abstimeout2timo(struct timespec *, int *);
int mq_send1(lwp_t *, mqd_t, const char *, size_t, unsigned, int);
int mq_receive1(lwp_t *, mqd_t, void *, size_t, unsigned *, int, ssize_t *);
int mq_send1(mqd_t, const char *, size_t, u_int, struct timespec *);
int mq_recv1(mqd_t, void *, size_t, u_int *, struct timespec *, ssize_t *);
#endif /* _KERNEL */