From: Eric Wong <e@80x24.org>
To: mwrap-public@80x24.org
Subject: [PATCH 14/19] fixes for FreeBSD 11.1...
Date: Mon, 16 Jul 2018 21:19:28 +0000 [thread overview]
Message-ID: <20180716211933.5835-15-e@80x24.org> (raw)
In-Reply-To: <20180716211933.5835-1-e@80x24.org>
PTHREAD_MUTEX_INITIALIZER is incomplete, in that it does lazy
initialization when pthread_mutex_init is called. So we call
pthread_mutex_init explicitly, as well as calling rcu_read_lock
during the constructor to initialize mutexes used by urcu-bp.
---
ext/mwrap/mwrap.c | 78 ++++++++++++++++++++++++++++++++--------------
test/test_mwrap.rb | 5 +--
2 files changed, 57 insertions(+), 26 deletions(-)
diff --git a/ext/mwrap/mwrap.c b/ext/mwrap/mwrap.c
index 2b946b1..421c086 100644
--- a/ext/mwrap/mwrap.c
+++ b/ext/mwrap/mwrap.c
@@ -41,13 +41,13 @@ int __attribute__((weak)) ruby_thread_has_gvl_p(void)
#ifdef __FreeBSD__
void *__malloc(size_t);
void __free(void *);
-static void *(*real_malloc)(size_t) = __malloc;
-static void (*real_free)(void *) = __free;
+# define real_malloc __malloc
+# define real_free __free
#else
static void *(*real_malloc)(size_t);
static void (*real_free)(void *);
-#endif /* !FreeBSD */
static int resolving_malloc;
+#endif /* !FreeBSD */
/*
* we need to fake an OOM condition while dlsym is running,
@@ -92,7 +92,26 @@ __attribute__((constructor)) static void resolve_malloc(void)
{
int err;
-#ifndef __FreeBSD__
+#ifdef __FreeBSD__
+ /*
+ * PTHREAD_MUTEX_INITIALIZER on FreeBSD means lazy initialization,
+ * which happens at pthread_mutex_lock, and that calls calloc
+ */
+ {
+ size_t i;
+
+ for (i = 0; i < MUTEX_NR; i++) {
+ err = pthread_mutex_init(&mutexes[i].mtx, 0);
+ if (err) {
+ fprintf(stderr, "error: %s\n", strerror(err));
+ _exit(1);
+ }
+ }
+ /* initialize mutexes used by urcu-bp */
+ rcu_read_lock();
+ rcu_read_unlock();
+ }
+#else /* !FreeBSD (tested on GNU/Linux) */
if (!real_malloc) {
resolving_malloc = 1;
real_malloc = dlsym(RTLD_NEXT, "malloc");
@@ -103,7 +122,7 @@ __attribute__((constructor)) static void resolve_malloc(void)
"\t%p %p\n", real_malloc, real_free);
_exit(1);
}
-#endif
+#endif /* !FreeBSD */
totals = lfht_new();
if (!totals)
fprintf(stderr, "failed to allocate totals table\n");
@@ -285,16 +304,21 @@ out_unlock:
return l;
}
-static struct src_loc *update_stats_rcu(size_t size, uintptr_t caller)
+static void update_stats_rcu_unlock(const struct src_loc *l)
+{
+ if (caa_likely(l)) rcu_read_unlock();
+}
+
+static struct src_loc *update_stats_rcu_lock(size_t size, uintptr_t caller)
{
struct src_loc *k, *ret = 0;
static const size_t xlen = sizeof(caller);
char *dst;
- assert(rcu_read_ongoing());
-
+ if (caa_unlikely(!totals)) return 0;
if (locating++) goto out; /* do not recurse into another *alloc */
+ rcu_read_lock();
if (has_ec_p()) {
int line;
const char *ptr = rb_source_location_cstr(&line);
@@ -379,7 +403,6 @@ static void
alloc_insert_rcu(struct src_loc *l, struct alloc_hdr *h, size_t size, void *real)
{
/* we need src_loc to remain alive for the duration of this call */
- assert(rcu_read_ongoing());
if (!h) return;
h->size = size;
h->real = real;
@@ -437,8 +460,7 @@ internal_memalign(void **pp, size_t alignment, size_t size, uintptr_t caller)
return ENOMEM;
/* assert(asize == (alignment + size + sizeof(struct alloc_hdr))); */
- rcu_read_lock();
- l = update_stats_rcu(size, caller);
+ l = update_stats_rcu_lock(size, caller);
real = real_malloc(asize);
if (real) {
void *p = hdr2ptr(real);
@@ -448,7 +470,7 @@ internal_memalign(void **pp, size_t alignment, size_t size, uintptr_t caller)
alloc_insert_rcu(l, h, size, real);
*pp = p;
}
- rcu_read_unlock();
+ update_stats_rcu_unlock(l);
return real ? 0 : ENOMEM;
}
@@ -524,20 +546,20 @@ void *malloc(size_t size)
* Needed for C++ global declarations using "new",
* which happens before our constructor
*/
+#ifndef __FreeBSD__
if (!real_malloc) {
if (resolving_malloc) goto enomem;
resolving_malloc = 1;
real_malloc = dlsym(RTLD_NEXT, "malloc");
}
-
- rcu_read_lock();
- l = update_stats_rcu(size, RETURN_ADDRESS(0));
+#endif
+ l = update_stats_rcu_lock(size, RETURN_ADDRESS(0));
p = h = real_malloc(asize);
if (h) {
alloc_insert_rcu(l, h, size, h);
p = hdr2ptr(h);
}
- rcu_read_unlock();
+ update_stats_rcu_unlock(l);
if (caa_unlikely(!p)) errno = ENOMEM;
return p;
enomem:
@@ -561,15 +583,14 @@ void *calloc(size_t nmemb, size_t size)
return 0;
}
RETURN_IF_NOT_READY();
- rcu_read_lock();
- l = update_stats_rcu(size, RETURN_ADDRESS(0));
+ l = update_stats_rcu_lock(size, RETURN_ADDRESS(0));
p = h = real_malloc(asize);
if (p) {
alloc_insert_rcu(l, h, size, h);
p = hdr2ptr(h);
memset(p, 0, size);
}
- rcu_read_unlock();
+ update_stats_rcu_unlock(l);
if (caa_unlikely(!p)) errno = ENOMEM;
return p;
}
@@ -591,14 +612,13 @@ void *realloc(void *ptr, size_t size)
}
RETURN_IF_NOT_READY();
- rcu_read_lock();
- l = update_stats_rcu(size, RETURN_ADDRESS(0));
+ l = update_stats_rcu_lock(size, RETURN_ADDRESS(0));
p = h = real_malloc(asize);
if (p) {
alloc_insert_rcu(l, h, size, h);
p = hdr2ptr(h);
}
- rcu_read_unlock();
+ update_stats_rcu_unlock(l);
if (ptr && p) {
struct alloc_hdr *old = ptr2hdr(ptr);
@@ -814,6 +834,17 @@ static const rb_data_type_t src_loc_type = {
static VALUE cSrcLoc;
+static int
+extract_addr(const char *str, size_t len, void **p)
+{
+ const char *c;
+#if defined(__GLIBC__)
+ return ((c = memchr(str, '[', len)) && sscanf(c, "[%p]", p));
+#else /* tested FreeBSD */
+ return ((c = strstr(str, "0x")) && sscanf(c, "%p", p));
+#endif
+}
+
/*
* call-seq:
* Mwrap[location] -> Mwrap::SourceLocation
@@ -834,9 +865,8 @@ static VALUE mwrap_aref(VALUE mod, VALUE loc)
struct cds_lfht *t;
struct src_loc *l;
VALUE val = Qnil;
- const char *c;
- if ((c = memchr(str, '[', len)) && sscanf(c, "[%p]", (void **)&p)) {
+ if (extract_addr(str, len, (void **)&p)) {
k = (void *)kbuf;
memcpy(k->k, &p, sizeof(p));
k->capa = 0;
diff --git a/test/test_mwrap.rb b/test/test_mwrap.rb
index 2234f7d..bc8694e 100644
--- a/test/test_mwrap.rb
+++ b/test/test_mwrap.rb
@@ -183,6 +183,7 @@ class TestMwrap < Test::Unit::TestCase
-e locs=""
-e Mwrap.each(1){|loc,tot,calls|locs<<loc}
-e m=locs.match(/(\[0x[a-f0-9]+\])/i)
+ -e m||=locs.match(/\b(0x[a-f0-9]+)\b/i)
-e p(loc=Mwrap["bobloblaw\t#{m[1]}"])
-e loc.each{|size,gen|p([size,gen,count])}
)
@@ -240,12 +241,12 @@ class TestMwrap < Test::Unit::TestCase
addr = false
Mwrap.each do |a,|
- if a =~ /\[0x[a-f0-9]+\]/
+ if a =~ /0x[a-f0-9]+/
addr = a
break
end
end
- addr.frozen? or abort 'Mwrap.each returned unfrozen address'
+ addr && addr.frozen? or abort 'Mwrap.each returned unfrozen address'
loc = Mwrap[addr] or abort "Mwrap[#{addr}] broken"
addr == loc.name or abort 'SourceLocation#name works on address'
loc.name.frozen? or abort 'SourceLocation#name not frozen'
--
EW
next prev parent reply other threads:[~2018-07-16 21:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 21:19 [PATCH 0/19] the heavy version of mwrap Eric Wong
2018-07-16 21:19 ` [PATCH 01/19] support per-allocation headers for per-alloc tracking Eric Wong
2018-07-16 21:19 ` [PATCH 02/19] mwrap: use malloc to do our own memalign Eric Wong
2018-07-16 21:19 ` [PATCH 03/19] hold RCU read lock to insert each allocation Eric Wong
2018-07-16 21:19 ` [PATCH 04/19] realloc: do not copy if allocation failed Eric Wong
2018-07-16 21:19 ` [PATCH 05/19] internal_memalign: do not assume real_malloc succeeds Eric Wong
2018-07-16 21:19 ` [PATCH 06/19] ensure ENOMEM is preserved in errno when appropriate Eric Wong
2018-07-16 21:19 ` [PATCH 07/19] memalign: check alignment on all public functions Eric Wong
2018-07-16 21:19 ` [PATCH 08/19] reduce stack usage from file names Eric Wong
2018-07-16 21:19 ` [PATCH 09/19] resolve real_malloc earlier for C++ programs Eric Wong
2018-07-16 21:19 ` [PATCH 10/19] allow analyzing live allocations via Mwrap[location] Eric Wong
2018-07-16 21:19 ` [PATCH 11/19] alias Mwrap.clear to Mwrap.reset Eric Wong
2018-07-16 21:19 ` [PATCH 12/19] implement accessors for SourceLocation Eric Wong
2018-07-16 21:19 ` [PATCH 13/19] mwrap_aref: quiet -Wshorten-64-to-32 warning Eric Wong
2018-07-16 21:19 ` Eric Wong [this message]
2018-07-16 21:19 ` [PATCH 15/19] use memrchr to extract address under glibc Eric Wong
2018-07-16 21:19 ` [PATCH 16/19] do not track allocations for constructor and Init_ Eric Wong
2018-07-16 21:19 ` [PATCH 17/19] disable memalign tracking by default Eric Wong
2018-07-16 21:19 ` [PATCH 18/19] support Mwrap.quiet to temporarily disable allocation tracking Eric Wong
2018-07-16 21:19 ` [PATCH 19/19] mwrap_rack: Rack app to track live allocations 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://80x24.org/mwrap/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180716211933.5835-15-e@80x24.org \
--to=e@80x24.org \
--cc=mwrap-public@80x24.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://80x24.org/mwrap.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).