From: Eric Wong <normalperson@yhbt.net>
To: ruby.posix.mq@librelist.org
Subject: [PATCH 2/5] ext: fix type inconsistencies for int vs mqd_t retvals
Date: Thu, 12 Jul 2012 12:45:38 -0700 [thread overview]
Message-ID: <1342122341-24646-3-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: 1342122341-24646-1-git-send-email-normalperson@yhbt.net
From: "ew@fbsd90-32.(none)" <ew@fbsd90-32.(none)>
Somehow I mixed up return values for mq_* functions that
return "int". This was noticed on FreeBSD where mqd_t
is NOT an integer.
---
ext/posix_mq/posix_mq.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/ext/posix_mq/posix_mq.c b/ext/posix_mq/posix_mq.c
index 66f3f99..7a3dc14 100644
--- a/ext/posix_mq/posix_mq.c
+++ b/ext/posix_mq/posix_mq.c
@@ -468,9 +468,9 @@ static VALUE init(int argc, VALUE *argv, VALUE self)
*/
static VALUE s_unlink(VALUE self, VALUE name)
{
- mqd_t rv = mq_unlink(StringValueCStr(name));
+ int rv = mq_unlink(StringValueCStr(name));
- if (rv == MQD_INVALID)
+ if (rv == -1)
rb_sys_fail("mq_unlink");
return INT2NUM(1);
@@ -489,12 +489,12 @@ static VALUE s_unlink(VALUE self, VALUE name)
static VALUE _unlink(VALUE self)
{
struct posix_mq *mq = get(self, 0);
- mqd_t rv;
+ int rv;
assert(TYPE(mq->name) == T_STRING && "mq->name is not a string");
rv = mq_unlink(RSTRING_PTR(mq->name));
- if (rv == MQD_INVALID)
+ if (rv == -1)
rb_sys_fail("mq_unlink");
return self;
@@ -532,7 +532,7 @@ static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self)
struct posix_mq *mq = get(self, 1);
struct rw_args x;
VALUE buffer, prio, timeout;
- mqd_t rv;
+ int rv;
struct timespec expire;
rb_scan_args(argc, argv, "12", &buffer, &prio, &timeout);
@@ -543,8 +543,8 @@ static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self)
x.msg_prio = NIL_P(prio) ? 0 : NUM2UINT(prio);
retry:
- rv = (mqd_t)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
- if (rv == MQD_INVALID) {
+ rv = (int)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
+ if (rv == -1) {
if (errno == EINTR)
goto retry;
if (errno == EAGAIN && (sflags & PMQ_TRY))
@@ -570,7 +570,7 @@ static VALUE send0(VALUE self, VALUE buffer)
{
struct posix_mq *mq = get(self, 1);
struct rw_args x;
- mqd_t rv;
+ int rv;
setup_send_buffer(&x, buffer);
x.des = mq->des;
@@ -578,8 +578,8 @@ static VALUE send0(VALUE self, VALUE buffer)
x.msg_prio = 0;
retry:
- rv = (mqd_t)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
- if (rv == MQD_INVALID) {
+ rv = (int)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
+ if (rv == -1) {
if (errno == EINTR)
goto retry;
rb_sys_fail("mq_send");
@@ -838,14 +838,14 @@ static void thread_notify_fd(union sigval sv)
static void my_mq_notify(mqd_t des, struct sigevent *not)
{
- mqd_t rv = mq_notify(des, not);
+ int rv = mq_notify(des, not);
- if (rv == MQD_INVALID) {
+ if (rv == -1) {
if (errno == ENOMEM) {
rb_gc();
rv = mq_notify(des, not);
}
- if (rv == MQD_INVALID)
+ if (rv == -1)
rb_sys_fail("mq_notify");
}
}
--
1.7.11.rc0.55.gb2478aa
next prev parent reply other threads:[~2012-07-12 19:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-12 19:45 [PATCH 0/5] some FreeBSD9 fixes pushed to master Eric Wong
2012-07-12 19:45 ` [PATCH 1/5] notify: set lower bound for notify stack size Eric Wong
2012-07-12 19:45 ` Eric Wong [this message]
2012-07-12 19:45 ` [PATCH 3/5] test: disable IO.select test if #to_io is missing Eric Wong
2012-07-12 19:45 ` [PATCH 4/5] extconf: fix __mq_oshandle() detection on FreeBSD Eric Wong
2012-07-12 19:45 ` [PATCH 5/5] test: relax test timings for timed* tests Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/ruby_posix_mq/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342122341-24646-3-git-send-email-normalperson@yhbt.net \
--to=normalperson@yhbt.net \
--cc=ruby.posix.mq@librelist.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/ruby_posix_mq.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).