зеркало из https://github.com/github/ruby.git
objspace_dump.c: refine output
* ext/objspace/objspace_dump.c (dump_output): allow IO object as output, and use Tempfile.create and return open file instead of mkstemp() and path name for :file output. [ruby-core:58266] [Bug #9102] * test/objspace/test_objspace.rb (TestObjSpace#dump_my_heap_please): remove temporary output file. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
6cbe261626
Коммит
91aa8da578
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
Fri Nov 15 01:06:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ext/objspace/objspace_dump.c (dump_output): allow IO object as
|
||||
output, and use Tempfile.create and return open file instead of
|
||||
mkstemp() and path name for :file output.
|
||||
[ruby-core:58266] [Bug #9102]
|
||||
|
||||
* test/objspace/test_objspace.rb (TestObjSpace#dump_my_heap_please):
|
||||
remove temporary output file.
|
||||
|
||||
Thu Nov 14 23:39:00 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
|
||||
|
||||
* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] remove example of
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
|
||||
have_func("mkstemp")
|
||||
create_makefile('objspace')
|
||||
|
|
|
@ -276,12 +276,11 @@ root_obj_i(const char *category, VALUE obj, void *data)
|
|||
dc->roots++;
|
||||
}
|
||||
|
||||
#ifndef HAVE_MKSTEMP
|
||||
#define dump_output(dc, opts, output, filename) dump_output(dc, opts, output)
|
||||
#endif
|
||||
static VALUE
|
||||
dump_output(struct dump_config *dc, VALUE opts, VALUE output, char *filename)
|
||||
dump_output(struct dump_config *dc, VALUE opts, VALUE output, const char *filename)
|
||||
{
|
||||
VALUE tmp;
|
||||
|
||||
if (RTEST(opts))
|
||||
output = rb_hash_aref(opts, sym_output);
|
||||
|
||||
|
@ -290,18 +289,23 @@ dump_output(struct dump_config *dc, VALUE opts, VALUE output, char *filename)
|
|||
dc->string = Qnil;
|
||||
}
|
||||
else if (output == sym_file) {
|
||||
#ifdef HAVE_MKSTEMP
|
||||
int fd = mkstemp(filename);
|
||||
dc->string = rb_filesystem_str_new_cstr(filename);
|
||||
if (fd == -1) rb_sys_fail_path(dc->string);
|
||||
dc->stream = fdopen(fd, "w");
|
||||
#else
|
||||
rb_raise(rb_eArgError, "output to temprary file is not supported");
|
||||
#endif
|
||||
rb_io_t *fptr;
|
||||
rb_require("tempfile");
|
||||
tmp = rb_assoc_new(rb_str_new_cstr(filename), rb_str_new_cstr(".json"));
|
||||
tmp = rb_funcallv(rb_path2class("Tempfile"), rb_intern("create"), 1, &tmp);
|
||||
io:
|
||||
dc->string = rb_io_get_write_io(tmp);
|
||||
rb_io_flush(dc->string);
|
||||
GetOpenFile(dc->string, fptr);
|
||||
dc->stream = rb_io_stdio_file(fptr);
|
||||
}
|
||||
else if (output == sym_string) {
|
||||
dc->string = rb_str_new_cstr("");
|
||||
}
|
||||
else if (!NIL_P(tmp = rb_io_check_io(output))) {
|
||||
output = sym_file;
|
||||
goto io;
|
||||
}
|
||||
else {
|
||||
rb_raise(rb_eArgError, "wrong output option: %"PRIsVALUE, output);
|
||||
}
|
||||
|
@ -315,7 +319,7 @@ dump_result(struct dump_config *dc, VALUE output)
|
|||
return dc->string;
|
||||
}
|
||||
else if (output == sym_file) {
|
||||
fclose(dc->stream);
|
||||
rb_io_flush(dc->string);
|
||||
return dc->string;
|
||||
}
|
||||
else {
|
||||
|
@ -340,9 +344,7 @@ dump_result(struct dump_config *dc, VALUE output)
|
|||
static VALUE
|
||||
objspace_dump(int argc, VALUE *argv, VALUE os)
|
||||
{
|
||||
#ifdef HAVE_MKSTEMP
|
||||
char filename[] = "/tmp/rubyobjXXXXXX";
|
||||
#endif
|
||||
static const char filename[] = "rubyobj";
|
||||
VALUE obj = Qnil, opts = Qnil, output;
|
||||
struct dump_config dc = {0,};
|
||||
|
||||
|
@ -372,9 +374,7 @@ objspace_dump(int argc, VALUE *argv, VALUE os)
|
|||
static VALUE
|
||||
objspace_dump_all(int argc, VALUE *argv, VALUE os)
|
||||
{
|
||||
#ifdef HAVE_MKSTEMP
|
||||
char filename[] = "/tmp/rubyheapXXXXXX";
|
||||
#endif
|
||||
static const char filename[] = "rubyheap";
|
||||
VALUE opts = Qnil, output;
|
||||
struct dump_config dc = {0,};
|
||||
|
||||
|
|
|
@ -204,17 +204,38 @@ class TestObjSpace < Test::Unit::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_dump
|
||||
def test_dump_to_default
|
||||
line = nil
|
||||
info = nil
|
||||
ObjectSpace.trace_object_allocations do
|
||||
line = __LINE__ + 1
|
||||
str = "hello world"
|
||||
info = ObjectSpace.dump(str)
|
||||
end
|
||||
assert_dump_object(info, line)
|
||||
end
|
||||
|
||||
def test_dump_to_io
|
||||
line = nil
|
||||
info = IO.pipe do |r, w|
|
||||
th = Thread.start {r.read}
|
||||
ObjectSpace.trace_object_allocations do
|
||||
line = __LINE__ + 1
|
||||
str = "hello world"
|
||||
ObjectSpace.dump(str, output: w)
|
||||
end
|
||||
w.close
|
||||
th.value
|
||||
end
|
||||
assert_dump_object(info, line)
|
||||
end
|
||||
|
||||
def assert_dump_object(info, line)
|
||||
loc = caller_locations(1, 1)[0]
|
||||
assert_match /"type":"STRING"/, info
|
||||
assert_match /"embedded":true, "bytesize":11, "value":"hello world", "encoding":"UTF-8"/, info
|
||||
assert_match /"file":"#{Regexp.escape __FILE__}", "line":#{__LINE__-6}/, info
|
||||
assert_match /"method":"test_dump"/, info
|
||||
assert_match /"file":"#{Regexp.escape __FILE__}", "line":#{line}/, info
|
||||
assert_match /"method":"#{loc.base_label}"/, info
|
||||
end
|
||||
|
||||
def test_dump_all
|
||||
|
@ -235,13 +256,14 @@ class TestObjSpace < Test::Unit::TestCase
|
|||
ObjectSpace.trace_object_allocations_start
|
||||
GC.start
|
||||
"TEST STRING".force_encoding("UTF-8")
|
||||
ObjectSpace.dump_all()
|
||||
ObjectSpace.dump_all().path
|
||||
end
|
||||
|
||||
puts dump_my_heap_please
|
||||
end;
|
||||
skip if /is not supported/ =~ error
|
||||
assert_match(entry, File.read(output))
|
||||
File.unlink(output)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче