diff options
| author | Alan Wu <[email protected]> | 2021-07-14 19:44:26 -0400 |
|---|---|---|
| committer | Koichi Sasada <[email protected]> | 2022-06-10 10:10:27 +0900 |
| commit | e75cb61d4645b9833b14a0cc4190cceffc9b6551 () | |
| tree | 65c861cbc1d9a511a1fdf58676177edb714ad25c | |
| parent | cedc36ec577530b23497a9ace74fc3a8e0c66bdf (diff) | |
Fix nested bmethod TracePoint and memory
df317151a5b4e0c5a30fcc321a9dc6abad63f7ed removed the code to free rb_hook_list_t, so repeated targeting of the same bmethod started to the hook list. You can observe how the maximum memory use scales with input size in the following script with `/usr/bin/time -v`. ```ruby o = Object.new o.define_singleton_method(:foo) {} trace = TracePoint.new(:return) {} bmethod = o.method(:foo) ARGV.first.to_i.times { trace.enable(target:bmethod){} } 4.times {GC.start} ``` After this change the maximum doesn't grow as quickly. To plug the , check whether the hook list is already allocated when enabling the targeting TracePoint for the bmethod. This fix also allows multiple TracePoints to target the same bmethod, similar to other valid TracePoint targets. Finally, free the rb_hook_list_t struct when freeing the method definition it lives on. Freeing in the GC is a good way to avoid lifetime problems similar to the one fixed in df31715. [Bug #18031]
Notes: Merged: https://.com/ruby/ruby/pull/4651
| -rw-r--r-- | test/ruby/test_settracefunc.rb | 22 | ||||
| -rw-r--r-- | vm_method.c | 4 | ||||
| -rw-r--r-- | vm_trace.c | 4 |
3 files changed, 28 insertions, 2 deletions
@@ -2364,6 +2364,28 @@ CODE assert_equal [:tp1, 1, 2, :tp2, 3], events end def test_script_compiled events = [] tp = TracePoint.new(:script_compiled){|tp| @@ -405,7 +405,9 @@ rb_method_definition_release(rb_method_definition_t *def, int complemented) if (alias_count + complemented_count == 0) { if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d,%d (remove)\n", (void *)def, rb_id2name(def->original_id), alias_count, complemented_count); - VM_ASSERT(def->type == VM_METHOD_TYPE_BMETHOD ? def->body.bmethod.hooks == NULL : TRUE); xfree(def); } else { @@ -1226,7 +1226,9 @@ rb_tracepoint_enable_for_target(VALUE tpval, VALUE target, VALUE target_line) rb_method_definition_t *def = (rb_method_definition_t *)rb_method_def(target); if (def->type == VM_METHOD_TYPE_BMETHOD && (tp->events & (RUBY_EVENT_CALL | RUBY_EVENT_RETURN))) { - def->body.bmethod.hooks = ZALLOC(rb_hook_list_t); rb_hook_list_connect_tracepoint(target, def->body.bmethod.hooks, tpval, 0); rb_hash_aset(tp->local_target_set, target, Qfalse); target_bmethod = true; |