From fe34c0b6695382afdfc5d92f11468a4f571cf0d0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 14 Jan 2015 00:09:00 +0000 Subject: linux_inet_diag: clarify *fprintf usage without GVL A reviewer may wonder why fprintf is chosen instead of rb_warn, so make it clear we're outside of the GVL when spewing the warning message and cannot use most rb_* functions. --- ext/raindrops/linux_inet_diag.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ext/raindrops/linux_inet_diag.c b/ext/raindrops/linux_inet_diag.c index fa8de03..5f21295 100644 --- a/ext/raindrops/linux_inet_diag.c +++ b/ext/raindrops/linux_inet_diag.c @@ -1,4 +1,5 @@ #include +#include #ifdef HAVE_RUBY_ST_H # include #else @@ -213,8 +214,14 @@ static const char *addr_any(sa_family_t family) return ipv6; } -static void bug_warn(void) +static void bug_warn_nogvl(const char *fmt, ...) { + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "Please report how you produced this at "\ "raindrops-public@bogomips.org\n"); fflush(stderr); @@ -263,8 +270,7 @@ static struct listen_stats *stats_for(st_table *table, struct inet_diag_msg *r) assert(0 && "unsupported address family, could that be IPv7?!"); } if (rc != 0) { - fprintf(stderr, "BUG: getnameinfo: %s\n", gai_strerror(rc)); - bug_warn(); + bug_warn_nogvl("BUG: getnameinfo: %s\n", gai_strerror(rc)); *key = 0; } @@ -296,8 +302,7 @@ static struct listen_stats *stats_for(st_table *table, struct inet_diag_msg *r) addr_any(sa.ss.ss_family), ntohs(r->id.idiag_sport)); if (n <= 0) { - fprintf(stderr, "BUG: snprintf: %d\n", n); - bug_warn(); + bug_warn_nogvl("BUG: snprintf: %d\n", n); } if (st_lookup(table, (st_data_t)key, (st_data_t *)&stats)) return stats; -- cgit v1.2.3-24-ge0c7