ruby-prof 1.4.2 → 1.4.4

data/ruby-prof.gemspec

@@ -36,7 +36,7 @@ EOF
   spec.files = Dir['CHANGES',
                    'LICENSE',
                    'Rakefile',
-                   'README.rdoc',
+                   'README.md',
                    'ruby-prof.gemspec',
                    'bin/ruby-prof',
                    'bin/ruby-prof-check-trace',
@@ -56,10 +56,9 @@ EOF
                    'test/*.rb']
 
   spec.test_files = Dir["test/test_*.rb"]
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.7.0'
   spec.date = Time.now.strftime('%Y-%m-%d')
   spec.homepage = 'https://github.com/ruby-prof/ruby-prof'
   spec.add_development_dependency('minitest')
   spec.add_development_dependency('rake-compiler')
-  spec.add_development_dependency('rdoc')
 end

data/test/alias_test.rb

@@ -20,107 +20,103 @@ class AliasTest < TestCase
     RubyProf::measure_mode = RubyProf::WALL_TIME
   end
 
-  # This test only correct works on Ruby 2.5 and higher because - see:
-  # https://bugs.ruby-lang.org/issues/12747
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
-    def test_alias
-      result = RubyProf.profile do
-        TestMe.new.some_method
-      end
-
-      methods = result.threads.first.methods
-      assert_equal(6, methods.count)
-
-      # Method 0
-      method = methods[0]
-      assert_equal('AliasTest#test_alias', method.full_name)
-      assert_equal(28, method.line)
-      refute(method.recursive?)
-
-      assert_equal(0, method.call_trees.callers.count)
-
-      assert_equal(2, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('Class#new', call_tree.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      call_tree = method.call_trees.callees[1]
-      assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      # Method 1
-      method = methods[1]
-      assert_equal('Class#new', method.full_name)
-      assert_equal(0, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      assert_equal(1, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('BasicObject#initialize', call_tree.target.full_name)
-      assert_equal(0, call_tree.line)
-
-      # Method 2
-      method = methods[2]
-      assert_equal('BasicObject#initialize', method.full_name)
-      assert_equal(0, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('Class#new', call_tree.parent.target.full_name)
-      assert_equal(0, call_tree.line)
-
-      assert_equal(0, method.call_trees.callees.count)
-
-      # Method 3
-      method = methods[3]
-      assert_equal('AliasTest::TestMe#some_method', method.full_name)
-      assert_equal(13, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      assert_equal(1, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('AliasTest::TestMe#some_method_original', call_tree.target.full_name)
-      assert_equal(14, call_tree.line)
-
-      # Method 4
-      method = methods[4]
-      assert_equal('AliasTest::TestMe#some_method_original', method.full_name)
-      assert_equal(8, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest::TestMe#some_method', call_tree.parent.target.full_name)
-      assert_equal(14, call_tree.line)
-
-      assert_equal(1, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('Kernel#sleep', call_tree.target.full_name)
-      assert_equal(9, call_tree.line)
-
-      # Method 5
-      method = methods[5]
-      assert_equal('Kernel#sleep', method.full_name)
-      assert_equal(0, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest::TestMe#some_method_original', call_tree.parent.target.full_name)
-      assert_equal(9, call_tree.line)
-
-      assert_equal(0, method.call_trees.callees.count)
+  def test_alias
+    result = RubyProf.profile do
+      TestMe.new.some_method
     end
+
+    methods = result.threads.first.methods
+    assert_equal(6, methods.count)
+
+    # Method 0
+    method = methods[0]
+    assert_equal('AliasTest#test_alias', method.full_name)
+    assert_equal(25, method.line)
+    refute(method.recursive?)
+
+    assert_equal(0, method.call_trees.callers.count)
+
+    assert_equal(2, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Class#new', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    # Method 1
+    method = methods[1]
+    assert_equal('Class#new', method.full_name)
+    assert_equal(0, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('BasicObject#initialize', call_tree.target.full_name)
+    assert_equal(0, call_tree.line)
+
+    # Method 2
+    method = methods[2]
+    assert_equal('BasicObject#initialize', method.full_name)
+    assert_equal(0, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Class#new', call_tree.parent.target.full_name)
+    assert_equal(0, call_tree.line)
+
+    assert_equal(0, method.call_trees.callees.count)
+
+    # Method 3
+    method = methods[3]
+    assert_equal('AliasTest::TestMe#some_method', method.full_name)
+    assert_equal(13, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('AliasTest::TestMe#some_method_original', call_tree.target.full_name)
+    assert_equal(14, call_tree.line)
+
+    # Method 4
+    method = methods[4]
+    assert_equal('AliasTest::TestMe#some_method_original', method.full_name)
+    assert_equal(8, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest::TestMe#some_method', call_tree.parent.target.full_name)
+    assert_equal(14, call_tree.line)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(9, call_tree.line)
+
+    # Method 5
+    method = methods[5]
+    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal(0, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest::TestMe#some_method_original', call_tree.parent.target.full_name)
+    assert_equal(9, call_tree.line)
+
+    assert_equal(0, method.call_trees.callees.count)
   end
 end

data/test/duplicate_names_test.rb

@@ -3,18 +3,18 @@
 
 require File.expand_path('../test_helper', __FILE__)
 
-class DuplicateNames < TestCase
+class DuplicateNamesTest < TestCase
   def test_names
     result = RubyProf::profile do
       str = %{module Foo; class Bar; def foo; end end end}
 
       eval str
       Foo::Bar.new.foo
-      DuplicateNames.class_eval {remove_const :Foo}
+      DuplicateNamesTest.class_eval {remove_const :Foo}
 
       eval str
       Foo::Bar.new.foo
-      DuplicateNames.class_eval {remove_const :Foo}
+      DuplicateNamesTest.class_eval {remove_const :Foo}
 
       eval str
       Foo::Bar.new.foo
@@ -24,7 +24,7 @@ class DuplicateNames < TestCase
     methods = result.threads.first.methods.sort.reverse
 
     methods = methods.select do |method|
-      method.full_name == 'DuplicateNames::Foo::Bar#foo'
+      method.full_name == 'DuplicateNamesTest::Foo::Bar#foo'
     end
 
     assert_equal(3, methods.length)

data/test/dynamic_method_test.rb

@@ -39,15 +39,29 @@ class DynamicMethodTest < TestCase
     end
 
     methods = result.threads.first.methods.sort.reverse
-    expected_method_names = %w(
-      DynamicMethodTest#test_dynamic_method
-      Kernel#sleep
-      DynamicMethodTest::FruitMedley#peach
-      DynamicMethodTest::FruitMedley#banana
-      DynamicMethodTest::FruitMedley#orange
-      DynamicMethodTest::FruitMedley#apple
-      Symbol#to_s
-    )
+
+    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1')
+      expected_method_names = %w(
+        DynamicMethodTest#test_dynamic_method
+        Kernel#sleep
+        DynamicMethodTest::FruitMedley#peach
+        DynamicMethodTest::FruitMedley#banana
+        DynamicMethodTest::FruitMedley#orange
+        DynamicMethodTest::FruitMedley#apple
+        Symbol#to_s
+      )
+    else
+      expected_method_names = %w(
+        DynamicMethodTest#test_dynamic_method
+        Kernel#sleep
+        DynamicMethodTest::FruitMedley#peach
+        DynamicMethodTest::FruitMedley#banana
+        DynamicMethodTest::FruitMedley#orange
+        DynamicMethodTest::FruitMedley#apple
+        Integer#==
+      )
+    end
+
     assert_equal expected_method_names.join("\n"), methods.map(&:full_name).join("\n")
   end
 end

data/test/gc_test.rb

@@ -29,6 +29,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     threads.each do |thread|
       refute_nil(thread.id)
     end
@@ -42,6 +44,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     methods.each do |method|
       refute_nil(method.method_name)
     end
@@ -55,6 +59,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     method_call_infos.each do |call_trees|
       refute_empty(call_trees.call_trees)
     end
@@ -63,11 +69,13 @@ class GcTest < TestCase
   def test_hold_onto_measurements
     measurements = 5.times.reduce(Array.new) do |array, i|
       profile = run_profile
-      measurements = profile.threads.map(&:methods).flatten.map(&:measurement)
-      array.concat(measurements)
+      measurements_2 = profile.threads.map(&:methods).flatten.map(&:measurement)
+      array.concat(measurements_2)
       array
     end
 
+    GC.start
+
     measurements.each do |measurement|
       error = assert_raises(RuntimeError) do
         measurement.total_time
@@ -83,6 +91,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     call_trees.each do |call_tree|
       refute_nil(call_tree.source_file)
     end

data/test/marshal_test.rb

@@ -5,6 +5,8 @@ require File.expand_path("../test_helper", __FILE__)
 class MarshalTest < TestCase
   def verify_profile(profile_1, profile_2)
     verify_threads(profile_1.threads, profile_2.threads)
+    assert_equal(profile_1.measure_mode, profile_2.measure_mode)
+    assert_equal(profile_1.track_allocations?, profile_2.track_allocations?)
   end
 
   def verify_threads(threads_1, threads_2)
@@ -35,7 +37,13 @@ class MarshalTest < TestCase
 
       assert_equal(method_1.recursive?, method_2.recursive?)
 
-      assert_equal(method_1.source_file, method_2.source_file)
+      if method_1.source_file
+        assert_equal(method_1.source_file, method_2.source_file)
+      else
+        assert_nil(method_1.source_file)
+        assert_nil(method_2.source_file)
+      end
+
       assert_equal(method_1.line, method_2.line)
 
       verify_measurement(method_1.measurement, method_2.measurement)
@@ -73,10 +81,23 @@ class MarshalTest < TestCase
 
   def verify_call_info(call_info_1, call_info_2)
     assert_equal(call_info_1.target, call_info_2.target)
-    assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
+
+    if call_info_1.parent&.target
+      assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
+    else
+      assert_nil(call_info_1.parent&.target)
+      assert_nil(call_info_2.parent&.target)
+    end
 
     assert_equal(call_info_1.depth, call_info_2.depth)
-    assert_equal(call_info_1.source_file, call_info_2.source_file)
+
+    if call_info_1.source_file
+      assert_equal(call_info_1.source_file, call_info_2.source_file) #
+    else
+      assert_nil(call_info_1.source_file)
+      assert_nil(call_info_2.source_file)
+    end
+
     assert_equal(call_info_1.line, call_info_2.line)
 
     verify_measurement(call_info_1.measurement, call_info_2.measurement)
@@ -89,8 +110,19 @@ class MarshalTest < TestCase
     assert_equal(measurement_1.called, measurement_2.called)
   end
 
-  def test_marshal
-    profile_1 = RubyProf.profile do
+  def test_marshal_1
+    profile_1 = RubyProf.profile(:measure_mode => RubyProf::WALL_TIME) do
+      1.times { RubyProf::C1.new.sleep_wait }
+    end
+
+    data = Marshal.dump(profile_1)
+    profile_2 = Marshal.load(data)
+
+    verify_profile(profile_1, profile_2)
+  end
+
+  def test_marshal_2
+    profile_1 = RubyProf.profile(:measure_mode => RubyProf::PROCESS_TIME, :track_allocations => true) do
       1.times { RubyProf::C1.new.sleep_wait }
     end
 

data/test/measure_allocations.rb

@@ -18,13 +18,9 @@ class Allocator
     String.new(b_string)
   end
 
-  def internal_run
+  def run
     make_arrays
     make_hashes
     make_strings
   end
-
-  def run
-    internal_run
-  end
 end

data/test/measure_allocations_test.rb

@@ -4,7 +4,7 @@
 require File.expand_path('../test_helper', __FILE__)
 require_relative './measure_allocations'
 
-class MeasureAllocationsTest < TestCase
+class MeasureAllocationsTraceTest < TestCase
   def setup
     RubyProf::measure_mode = RubyProf::ALLOCATIONS
   end
@@ -15,7 +15,7 @@ class MeasureAllocationsTest < TestCase
   end
 
   def test_allocations
-    result = RubyProf.profile do
+    result = RubyProf.profile(:track_allocations => true) do
       allocator = Allocator.new
       allocator.run
     end
@@ -24,11 +24,11 @@ class MeasureAllocationsTest < TestCase
     assert_in_delta(20, thread.total_time, 1)
 
     methods = result.threads.first.methods.sort.reverse
-    assert_equal(13, methods.length)
+    assert_equal(12, methods.length)
 
     # Method 0
     method = methods[0]
-    assert_equal('MeasureAllocationsTest#test_allocations',  method.full_name)
+    assert_equal('MeasureAllocationsTraceTest#test_allocations',  method.full_name)
     assert_in_delta(20, method.total_time, 1)
     assert_equal(0, method.wait_time)
     assert_equal(0, method.self_time)
@@ -61,31 +61,7 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(1, method.call_trees.callers.length)
     call_tree = method.call_trees.callers[0]
-    assert_equal('MeasureAllocationsTest#test_allocations', call_tree.parent.target.full_name)
-    assert_equal(19, call_tree.total_time)
-    assert_equal(0, call_tree.wait_time)
-    assert_equal(0, call_tree.self_time)
-    assert_equal(19, call_tree.children_time)
-
-    assert_equal(1, method.call_trees.callees.length)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('Allocator#internal_run', call_tree.target.full_name)
-    assert_equal(19, call_tree.total_time)
-    assert_equal(0, call_tree.wait_time)
-    assert_equal(0, call_tree.self_time)
-    assert_equal(19, call_tree.children_time)
-
-    # Method 2
-    method = methods[2]
-    assert_equal('Allocator#internal_run',  method.full_name)
-    assert_equal(19, method.total_time)
-    assert_equal(0, method.wait_time)
-    assert_equal(0, method.self_time)
-    assert_equal(19, method.children_time)
-
-    assert_equal(1, method.call_trees.callers.length)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('Allocator#run', call_tree.parent.target.full_name)
+    assert_equal('MeasureAllocationsTraceTest#test_allocations', call_tree.parent.target.full_name)
     assert_equal(19, call_tree.total_time)
     assert_equal(0, call_tree.wait_time)
     assert_equal(0, call_tree.self_time)
@@ -113,8 +89,8 @@ class MeasureAllocationsTest < TestCase
     assert_equal(1, call_tree.self_time)
     assert_equal(3, call_tree.children_time)
 
-    # Method 3
-    method = methods[3]
+    # Method 2
+    method = methods[2]
     assert_equal('Class#new', method.full_name)
     assert_equal(18, method.total_time)
     assert_equal(0, method.wait_time)
@@ -123,7 +99,7 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(4, method.call_trees.callers.length)
     call_tree = method.call_trees.callers[0]
-    assert_equal('MeasureAllocationsTest#test_allocations', call_tree.parent.target.full_name)
+    assert_equal('MeasureAllocationsTraceTest#test_allocations', call_tree.parent.target.full_name)
     assert_equal(1, call_tree.total_time)
     assert_equal(0, call_tree.wait_time)
     assert_equal(1, call_tree.self_time)
@@ -179,8 +155,8 @@ class MeasureAllocationsTest < TestCase
     assert_equal(1, call_tree.self_time)
     assert_equal(0, call_tree.children_time)
 
-    # Method 4
-    method = methods[4]
+    # Method 3
+    method = methods[3]
     assert_equal('Allocator#make_arrays', method.full_name)
     assert_equal(10, method.total_time)
     assert_equal(0, method.wait_time)
@@ -189,7 +165,7 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(1, method.call_trees.callers.length)
     call_tree = method.call_trees.callers[0]
-    assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+    assert_equal('Allocator#run', call_tree.parent.target.full_name)
     assert_equal(10, call_tree.total_time)
     assert_equal(0, call_tree.wait_time)
     assert_equal(0, call_tree.self_time)
@@ -203,8 +179,8 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, call_tree.self_time)
     assert_equal(10, call_tree.children_time)
 
-    # Method 5
-    method = methods[5]
+    # Method 4
+    method = methods[4]
     assert_equal('Integer#times', method.full_name)
     assert_equal(10, method.total_time)
     assert_equal(0, method.wait_time)
@@ -227,8 +203,8 @@ class MeasureAllocationsTest < TestCase
     assert_equal(10, call_tree.self_time)
     assert_equal(0, call_tree.children_time)
 
-    # Method 6
-    method = methods[6]
+    # Method 5
+    method = methods[5]
     assert_equal('Allocator#make_hashes', method.full_name)
     assert_equal(5, method.total_time)
     assert_equal(0, method.wait_time)
@@ -237,7 +213,7 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(1, method.call_trees.callers.length)
     call_tree = method.call_trees.callers[0]
-    assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+    assert_equal('Allocator#run', call_tree.parent.target.full_name)
     assert_equal(5, call_tree.total_time)
     assert_equal(0, call_tree.wait_time)
     assert_equal(0, call_tree.self_time)
@@ -251,8 +227,8 @@ class MeasureAllocationsTest < TestCase
     assert_equal(5, call_tree.self_time)
     assert_equal(0, call_tree.children_time)
 
-    # Method 7
-    method = methods[7]
+    # Method 6
+    method = methods[6]
     assert_equal('Allocator#make_strings', method.full_name)
     assert_equal(4, method.total_time)
     assert_equal(0, method.wait_time)
@@ -261,7 +237,7 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(1, method.call_trees.callers.length)
     call_tree = method.call_trees.callers[0]
-    assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+    assert_equal('Allocator#run', call_tree.parent.target.full_name)
     assert_equal(4, call_tree.total_time)
     assert_equal(0, call_tree.wait_time)
     assert_equal(1, call_tree.self_time)
@@ -282,8 +258,8 @@ class MeasureAllocationsTest < TestCase
     assert_equal(1, call_tree.self_time)
     assert_equal(1, call_tree.children_time)
 
-    # Method 8
-    method = methods[8]
+    # Method 7
+    method = methods[7]
     assert_equal('String#*', method.full_name)
     assert_equal(1, method.total_time)
     assert_equal(0, method.wait_time)
@@ -300,8 +276,8 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(0, method.call_trees.callees.length)
 
-    # Method 9
-    method = methods[9]
+    # Method 8
+    method = methods[8]
     assert_equal('String#initialize', method.full_name)
     assert_equal(1, method.total_time)
     assert_equal(0, method.wait_time)
@@ -318,8 +294,8 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(0, method.call_trees.callees.length)
 
-    # Method 10
-    method = methods[10]
+    # Method 9
+    method = methods[9]
     assert_equal('BasicObject#initialize', method.full_name)
     assert_equal(0, method.total_time)
     assert_equal(0, method.wait_time)
@@ -336,8 +312,8 @@ class MeasureAllocationsTest < TestCase
 
     assert_equal(0, method.call_trees.callees.length)
 
-    # Method 11
-    method = methods[11]
+    # Method 10
+    method = methods[10]
     assert_equal('Hash#initialize', method.full_name)
     assert_equal(0, method.total_time)
     assert_equal(0, method.wait_time)
@@ -353,23 +329,5 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, call_tree.children_time)
 
     assert_equal(0, method.call_trees.callees.length)
-
-    # Method 12
-    method = methods[12]
-    assert_equal('Array#initialize', method.full_name)
-    assert_equal(0, method.total_time)
-    assert_equal(0, method.wait_time)
-    assert_equal(0, method.self_time)
-    assert_equal(0, method.children_time)
-
-    assert_equal(1, method.call_trees.callers.length)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('Class#new', call_tree.parent.target.full_name)
-    assert_equal(0, call_tree.total_time)
-    assert_equal(0, call_tree.wait_time)
-    assert_equal(0, call_tree.self_time)
-    assert_equal(0, call_tree.children_time)
-
-    assert_equal(0, method.call_trees.callees.length)
   end
 end