mwrap user+dev discussion/patches/pulls/bugs/help
 help / color / Atom feed
From: Eric Wong <e@80x24.org>
To: mwrap-public@80x24.org
Subject: [SQUASH] 32-bit fixes
Date: Fri, 10 Aug 2018 06:57:28 +0000
Message-ID: <20180810065728.GA17003@dcvr> (raw)
In-Reply-To: <20180810064943.24287-1-e@80x24.org>

---
 ext/mwrap/mwrap.c  | 4 +---
 test/test_mwrap.rb | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ext/mwrap/mwrap.c b/ext/mwrap/mwrap.c
index b2d169f..29cfc11 100644
--- a/ext/mwrap/mwrap.c
+++ b/ext/mwrap/mwrap.c
@@ -1208,9 +1208,7 @@ static VALUE hpb_each_yield(VALUE ignore)
 		VALUE v[2]; /* [ generation, address ] */
 		void *addr = hdr2ptr(h);
 		assert(ptr_is_aligned(addr, HEAP_PAGE_ALIGN));
-		v[0] = sizeof(void *) == sizeof(long) ?
-				LONG2NUM((long)addr) :
-				LL2NUM((LONG_LONG)addr);
+		v[0] = LONG2NUM((long)addr);
 		v[1] = SIZET2NUM(h->as.live.gen);
 		rb_yield_values2(2, v);
 	}
diff --git a/test/test_mwrap.rb b/test/test_mwrap.rb
index 6c66460..9c6141d 100644
--- a/test/test_mwrap.rb
+++ b/test/test_mwrap.rb
@@ -298,14 +298,14 @@ class TestMwrap < Test::Unit::TestCase
         (0 == (addr & 16383)) or abort "addr not aligned: #{'%x' % addr}"
       end
       nr == ap or abort 'HeapPageBody.each missed page'
-      5.times { (1..20000).to_a.map(&:to_s) }
+      10.times { (1..20000).to_a.map(&:to_s) }
       3.times { GC.start }
       Mwrap::HeapPageBody.stat(h)
       Integer === h[:lifespan_max] or abort 'lifespan_max not recorded'
       Integer === h[:lifespan_min] or abort 'lifespan_min not recorded'
       Float === h[:lifespan_mean] or abort 'lifespan_mean not recorded'
       3.times { GC.start }
-      5.times { (1..20000).to_a.map(&:to_s) }
+      10.times { (1..20000).to_a.map(&:to_s) }
       Mwrap::HeapPageBody.stat(h)
       h[:deathspan_min] <= h[:deathspan_max] or
         abort 'wrong min/max deathtime'
-- 
EW

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-10  6:49 [PATCH] keep stats for memalign-ed heap_page_body in Ruby Eric Wong
2018-08-10  6:57 ` Eric Wong [this message]

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=20180810065728.GA17003@dcvr \
    --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

mwrap user+dev discussion/patches/pulls/bugs/help

Archives are clonable:
	git clone --mirror https://80x24.org/mwrap-public/0 mwrap-public/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 mwrap-public mwrap-public/ https://80x24.org/mwrap-public \
		mwrap-public@80x24.org
	public-inbox-index mwrap-public

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.lang.ruby.mwrap
	nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.mwrap

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git