summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS2
-rw-r--r--ext/objspace/objspace_dump.c6
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 37ac2046b2..79c977e689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 26 06:42:50 2013 Aman Gupta <ruby@tmm1.net>
+
+ * NEWS: Add ObjectSpace.after_gc_{start,end}_hook=
+ * ext/objspace/objspace_dump.c: [DOC] catch up dump/dump_all to r43679
+
Tue Nov 26 04:12:10 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems master 612f85a. Notable changes:
diff --git a/NEWS b/NEWS
index 75c2ff84c5..d93a8ff346 100644
--- a/NEWS
+++ b/NEWS
@@ -185,6 +185,8 @@ with all sufficient information, see the ChangeLog file.
* ObjectSpace.allocation_method_id
* ObjectSpace.allocation_generation
* ObjectSpace.reachable_objects_from_root
+ * ObjectSpace.after_gc_start_hook=
+ * ObjectSpace.after_gc_end_hook=
* ObjectSpace.dump
* ObjectSpace.dump_all
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index 1b68d9ab8b..7b0992c4ff 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -330,8 +330,8 @@ dump_result(struct dump_config *dc, VALUE output)
/*
* call-seq:
* ObjectSpace.dump(obj[, output: :string]) # => "{ ... }"
- * ObjectSpace.dump(obj, output: :file) # => "/tmp/rubyobj000000"
- * ObjectSpace.dump(obj, output: :stdout) # => nil
+ * ObjectSpace.dump(obj, output: :file) # => #<File:/tmp/rubyobj20131125-88733-1xkfmpv.json>
+ * ObjectSpace.dump(obj, output: :stdout) # => nil
*
* Dump the contents of a ruby object as JSON.
*
@@ -359,7 +359,7 @@ objspace_dump(int argc, VALUE *argv, VALUE os)
/*
* call-seq:
- * ObjectSpace.dump_all([output: :file]) # => "/tmp/rubyheap000000"
+ * ObjectSpace.dump_all([output: :file]) # => #<File:/tmp/rubyheap20131125-88469-laoj3v.json>
* ObjectSpace.dump_all(output: :stdout) # => nil
* ObjectSpace.dump_all(output: :string) # => "{...}\n{...}\n..."
*