* [PATCH 0/4] minor modernizations and cleanups
@ 2023-06-11 21:33 7% Eric Wong
2023-06-11 21:33 5% ` [PATCH 1/4] avoid unnecessary #to_io calls Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-06-11 21:33 UTC (permalink / raw)
To: raindrops-public
alloca use was dangerous for architectures with >4K pages,
and we can avoid some Ruby #to_io dispatches in some places.
Eric Wong (4):
avoid unnecessary #to_io calls
my_fileno: use rb_io_check_closed for Ruby <3.1
linux_inet_diag: get rid of alloca usage
test_linux_reuseport_tcp_listen_stats: skip w/o unicorn
ext/raindrops/linux_inet_diag.c | 23 +++++++++++--------
ext/raindrops/my_fileno.h | 16 ++++---------
ext/raindrops/tcp_info.c | 2 +-
test/test_linux_reuseport_tcp_listen_stats.rb | 2 +-
4 files changed, 20 insertions(+), 23 deletions(-)
^ permalink raw reply [relevance 7%]
* [PATCH 1/4] avoid unnecessary #to_io calls
2023-06-11 21:33 7% [PATCH 0/4] minor modernizations and cleanups Eric Wong
@ 2023-06-11 21:33 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-06-11 21:33 UTC (permalink / raw)
To: raindrops-public
Calling `#to_io' is only necessary when we're handling an argument
from user code where the user could pass a non-IO object.
`#to_io' calls are a waste of time when we create the IO object
ourselves (in `Raindrops::InetDiagSock.new').
This allows us to define the `my_fileno' macro for Ruby 3.1+
users to call the new `rb_io_descriptor' function directly
without an extra C stack frame. This also allows us to get
rid of nesting CPP directives inside C functions which (IMHO)
improves readability.
Furthermore, any necessary #to_io calls using `rb_convert_type'
can be replaced with `rb_io_get_io' to decrease code size.
`rb_io_get_io' has been in ruby/io.h since Ruby 1.9.2 and
there's no expectation that it'd be deprecated since it only
deals with opaque `VALUE' types.
---
ext/raindrops/linux_inet_diag.c | 4 ++--
ext/raindrops/my_fileno.h | 13 ++++---------
ext/raindrops/tcp_info.c | 2 +-
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/ext/raindrops/linux_inet_diag.c b/ext/raindrops/linux_inet_diag.c
index 2a2360c..e1ae62a 100644
--- a/ext/raindrops/linux_inet_diag.c
+++ b/ext/raindrops/linux_inet_diag.c
@@ -627,8 +627,8 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
args.iov[2].iov_len = OPLEN;
args.iov[2].iov_base = alloca(page_size);
args.table = NULL;
- if (NIL_P(sock))
- sock = rb_funcall(cIDSock, id_new, 0);
+ sock = NIL_P(sock) ? rb_funcall(cIDSock, id_new, 0)
+ : rb_io_get_io(sock);
args.fd = my_fileno(sock);
switch (TYPE(addrs)) {
diff --git a/ext/raindrops/my_fileno.h b/ext/raindrops/my_fileno.h
index 00c5d29..646f31b 100644
--- a/ext/raindrops/my_fileno.h
+++ b/ext/raindrops/my_fileno.h
@@ -1,22 +1,17 @@
#include <ruby.h>
#include <ruby/io.h>
+#ifdef HAVE_RB_IO_DESCRIPTOR
+# define my_fileno(io) rb_io_descriptor(io)
+#else /* Ruby <3.1 */
static int my_fileno(VALUE io)
{
-#ifdef HAVE_RB_IO_DESCRIPTOR
- if (TYPE(io) != T_FILE)
- io = rb_convert_type(io, T_FILE, "IO", "to_io");
-
- return rb_io_descriptor(io);
-#else
rb_io_t *fptr;
- if (TYPE(io) != T_FILE)
- io = rb_convert_type(io, T_FILE, "IO", "to_io");
GetOpenFile(io, fptr);
if (fptr->fd < 0)
rb_raise(rb_eIOError, "closed stream");
return fptr->fd;
-#endif
}
+#endif /* Ruby <3.1 !HAVE_RB_IO_DESCRIPTOR */
diff --git a/ext/raindrops/tcp_info.c b/ext/raindrops/tcp_info.c
index b82f705..c0d34e0 100644
--- a/ext/raindrops/tcp_info.c
+++ b/ext/raindrops/tcp_info.c
@@ -76,7 +76,7 @@ static VALUE alloc(VALUE klass)
*/
static VALUE init(VALUE self, VALUE io)
{
- int fd = my_fileno(io);
+ int fd = my_fileno(rb_io_get_io(io));
struct tcp_info *info = DATA_PTR(self);
socklen_t len = (socklen_t)sizeof(struct tcp_info);
int rc = getsockopt(fd, IPPROTO_TCP, TCP_INFO, info, &len);
^ permalink raw reply related [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-06-11 21:33 7% [PATCH 0/4] minor modernizations and cleanups Eric Wong
2023-06-11 21:33 5% ` [PATCH 1/4] avoid unnecessary #to_io calls Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/raindrops.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).