kernel/common/pack.rb kernel/delta/profiler.rb vm/external_libs/libgdtoa/.gitignore vm/external_libs/libgdtoa/Makefile vm/external_libs/libgdtoa/README vm/external_libs/libgdtoa/arithchk.c vm/external_libs/libgdtoa/dmisc.c vm/external_libs/libgdtoa/dtoa.c vm/external_libs/libgdtoa/g_Qfmt.c vm/external_libs/libgdtoa/g__fmt.c vm/external_libs/libgdtoa/g_ddfmt.c vm/external_libs/libgdtoa/g_dfmt.c vm/external_libs/libgdtoa/g_ffmt.c vm/external_libs/libgdtoa/g_xLfmt.c vm/external_libs/libgdtoa/g_xfmt.c vm/external_libs/libgdtoa/gdtoa.c vm/external_libs/libgdtoa/gdtoa.h vm/external_libs/libgdtoa/gdtoaimp.h vm/external_libs/libgdtoa/gethex.c vm/external_libs/libgdtoa/gmisc.c vm/external_libs/libgdtoa/hd_init.c vm/external_libs/libgdtoa/hexnan.c vm/external_libs/libgdtoa/makefile.orig vm/external_libs/libgdtoa/misc.c vm/external_libs/libgdtoa/qnan.c vm/external_libs/libgdtoa/smisc.c vm/external_libs/libgdtoa/strtoIQ.c vm/external_libs/libgdtoa/strtoId.c vm/external_libs/libgdtoa/strtoIdd.c vm/external_libs/libgdtoa/strtoIf.c vm/external_libs/libgdtoa/strtoIg.c vm/external_libs/libgdtoa/strtoIx.c vm/external_libs/libgdtoa/strtoIxL.c vm/external_libs/libgdtoa/strtod.c vm/external_libs/libgdtoa/strtodI.c vm/external_libs/libgdtoa/strtodg.c vm/external_libs/libgdtoa/strtodnrp.c vm/external_libs/libgdtoa/strtof.c vm/external_libs/libgdtoa/strtopQ.c vm/external_libs/libgdtoa/strtopd.c vm/external_libs/libgdtoa/strtopdd.c vm/external_libs/libgdtoa/strtopf.c vm/external_libs/libgdtoa/strtopx.c vm/external_libs/libgdtoa/strtopxL.c vm/external_libs/libgdtoa/strtorQ.c vm/external_libs/libgdtoa/strtord.c vm/external_libs/libgdtoa/strtordd.c vm/external_libs/libgdtoa/strtorf.c vm/external_libs/libgdtoa/strtorx.c vm/external_libs/libgdtoa/strtorxL.c vm/external_libs/libgdtoa/sum.c vm/external_libs/libgdtoa/test/Q.ou0 vm/external_libs/libgdtoa/test/Q.ou1 vm/external_libs/libgdtoa/test/Qtest.c vm/external_libs/libgdtoa/test/README vm/external_libs/libgdtoa/test/d.out vm/external_libs/libgdtoa/test/dI.out vm/external_libs/libgdtoa/test/dIsi.out vm/external_libs/libgdtoa/test/dItest.c vm/external_libs/libgdtoa/test/dd.out vm/external_libs/libgdtoa/test/ddsi.out vm/external_libs/libgdtoa/test/ddtest.c vm/external_libs/libgdtoa/test/dt.c vm/external_libs/libgdtoa/test/dtest.c vm/external_libs/libgdtoa/test/dtst.out vm/external_libs/libgdtoa/test/f.out vm/external_libs/libgdtoa/test/ftest.c vm/external_libs/libgdtoa/test/getround.c vm/external_libs/libgdtoa/test/makefile vm/external_libs/libgdtoa/test/rtestnos vm/external_libs/libgdtoa/test/strtoIdSI.c vm/external_libs/libgdtoa/test/strtoIddSI.c vm/external_libs/libgdtoa/test/strtodISI.c vm/external_libs/libgdtoa/test/strtodt.c vm/external_libs/libgdtoa/test/strtopddSI.c vm/external_libs/libgdtoa/test/strtorddSI.c vm/external_libs/libgdtoa/test/testnos vm/external_libs/libgdtoa/test/testnos1 vm/external_libs/libgdtoa/test/testnos3 vm/external_libs/libgdtoa/test/x.ou0 vm/external_libs/libgdtoa/test/x.ou1 vm/external_libs/libgdtoa/test/xL.ou0 vm/external_libs/libgdtoa/test/xL.ou1 vm/external_libs/libgdtoa/test/xLtest.c vm/external_libs/libgdtoa/test/xQtest.c vm/external_libs/libgdtoa/test/xsum0.out vm/external_libs/libgdtoa/test/xtest.c vm/external_libs/libgdtoa/ulp.c vm/external_libs/libgdtoa/xsum0.out vm/strtod.hpp @@ -158,6 +158,15 @@ To run a ruby file named 'code.rb': bin/rbx code.rb +## Rubinius Configuration + +Rubinius provides a -X command line switch for manipulating the internal +configuration options. For example, + + -Xrbx.jit enables the jit if it's supported by the platform + -Xrbx.dyni enables the dynamic interpreter if it's supported + + ## Troubleshooting See [Common Problems](/common_problems.html) or ask questions in the #rubinius doc/getting_started.txt @@ -9,14 +9,9 @@ class Rubinius::VM raise PrimitiveFailure, "primitive failed" end - def self.start_profiler - Ruby.primitive :vm_start_profiler - raise PrimitiveFailure, "unable to start profiler" - end - - def self.stop_profiler(path) - Ruby.primitive :vm_stop_profiler - raise PrimitiveFailure, "unable to stop profiler" + def self.gc_info + Ruby.primitive :vm_gc_info + raise PrimitiveFailure, "primitive failed" end def self.write_error(str) kernel/bootstrap/vm.rb @@ -322,7 +322,7 @@ class Array # Array that do not appear in the other Array, effectively # 'deducting' those items. The matching method is Hash-based. def -(other) - other = Type.coerce_to other, Array, :to_ary + other = Type.check_and_coerce_to other, Array, :to_ary out, exclude = [], {} other.each { |x| exclude[x] = true } @@ -966,284 +966,8 @@ class Array # Z | Same as ``a'', except that null is added with * def pack schema - # The schema is an array of arrays like [["A", "6"], ["u", "*"], - # ["X", ""]]. It represents the parsed form of "A6u*X". Remove - # strings in the schema between # and \n - schema = schema.gsub(/#.*/, '') - schema = schema.scan(/([^\s\d\*][\d\*]*)/).flatten.map {|x| - x.match(/([^\s\d\*])([\d\*]*)/)[1..-1] - } - - ret = "" - arr_idx = 0 - - schema.each do |kind, t| - # p :iter => [kind, t] - item = self[arr_idx] - t = nil if t.empty? - - # MRI nil compatibilty for string functions - item = "" if item.nil? && kind =~ /[aAZbBhH]/ - - # if there's no item, that means there's more schema items than - # array items, so throw an error. All actions that DON'T - # increment arr_idx must occur before this test. - raise ArgumentError, "too few array elements" if - arr_idx >= self.length and kind !~ /x/i - - case kind # TODO: switch kind to ints - when 'X' then - size = (t || 1).to_i - raise ArgumentError, "you're backing up too far" if size > ret.size - ret[-size..-1] = '' if size > 0 - when 'x' then - size = (t || 1).to_i - ret << "\000" * size - when 'a', 'A', 'Z' then - item = Type.coerce_to(item, String, :to_str) - size = case t - when nil - 1 - when '*' then - item.size + (kind == "Z" ? 1 : 0) - else - t.to_i - end - - padsize = size - item.size - filler = kind == "A" ? " " : "\0" - - ret << item.split(//).first(size).join - ret << filler * padsize if padsize > 0 - - arr_idx += 1 - when 'b', 'B' then - item = Type.coerce_to(item, String, :to_str) - byte = 0 - lsb = (kind == "b") - size = case t - when nil - 1 - when '*' then - item.size - else - t.to_i - end - - bits = item.split(//).map { |c| c[0] & 01 } - min = [size, item.size].min - - bits.first(min).each_with_index do |bit, i| # TODO: this can be cleaner - i &= 07 - - byte |= bit << (lsb ? i : 07 - i) - - if i == 07 then - ret << byte.chr - byte = 0 - end - end - - # always output an incomplete byte - if ((size & 07) != 0 || min != size) && item.size > 0 then - ret << byte.chr - end - - # Emulate the weird MRI spec for every 2 chars over output a \000 # FIX - (item.length).step(size-1, 2) { |i| ret << 0 } if size > item.length - - arr_idx += 1 - when 'c', 'C' then - size = case t - when nil - 1 - when '*' then - self.size # TODO: - arr_idx? - else - t.to_i - end - - # FIX: uhh... size is the same as length. just tests that arr_idx == 0 - raise ArgumentError, "too few array elements" if - arr_idx + size > self.length - - sub = self[arr_idx...arr_idx+size] - sub.map! { |o| (Type.coerce_to(o, Integer, :to_int) & 0xff).chr } - ret << sub.join - - arr_idx += size - when 'M' then - # for some reason MRI responds to to_s here - item = Type.coerce_to(item, String, :to_s) - ret << item.scan(/.{1,73}/m).map { |line| # 75 chars per line incl =\n - line.gsub(/[^ -<>-~\t\n]/) { |m| "=%02X" % m[0] } + "=\n" - }.join - arr_idx += 1 - when 'm' then # REFACTOR: merge with u - item = Type.coerce_to(item, String, :to_str) - - ret << item.scan(/.{1,45}/m).map { |line| - encoded = line.scan(/(.)(.?)(.?)/m).map { |a,b,c| - a = a[0] - b = b[0] || 0 - c = c[0] || 0 - - [BASE_64_B2A[( a >> 2 ) & 077], - BASE_64_B2A[((a << 4) | ((b >> 4) & 017)) & 077], - BASE_64_B2A[((b << 2) | ((c >> 6) & 003)) & 077], - BASE_64_B2A[( c ) & 077]] - } - - "#{encoded.flatten.join}\n" - }.join.sub(/(A{1,2})\n\Z/) { "#{'=' * $1.size}\n" } - - arr_idx += 1 - when 'w' then - item = Type.coerce_to(item, Integer, :to_int) - raise ArgumentError, "can't compress negative numbers" if item < 0 - - ret << (item & 0x7f) - while (item >>= 7) > 0 do - ret << ((item & 0x7f) | 0x80) - end - - ret.reverse! # FIX - breaks anything following BER? - arr_idx += 1 - when 'u' then # REFACTOR: merge with m - item = Type.coerce_to(item, String, :to_str) - - # http://www.opengroup.org/onlinepubs/009695399/utilities/uuencode.html - ret << item.scan(/.{1,45}/m).map { |line| - encoded = line.scan(/(.)(.?)(.?)/m).map { |a,b,c| - a = a[0] - b = b[0] || 0 - c = c[0] || 0 - - [(?\s + (( a >> 2 ) & 077)).chr, - (?\s + (((a << 4) | ((b >> 4) & 017)) & 077)).chr, - (?\s + (((b << 2) | ((c >> 6) & 003)) & 077)).chr, - (?\s + (( c ) & 077)).chr] - }.flatten - - "#{(line.size + ?\s).chr}#{encoded.join}\n" - }.join.gsub(/ /, '`') - arr_idx += 1 - when 'i', 's', 'l', 'n', 'I', 'S', 'L', 'V', 'v', 'N', 'n' then - size = case t - when nil - 1 - when '*' then - self.size - arr_idx - else - t.to_i - end - - native = t && t == '_' - unsigned = (kind =~ /I|S|L/) - little_endian = case kind - when 'V', 'v' then true - when 'N', 'n' then false - else endian?(:little) - end - - raise "unsupported - fix me" if native - - unless native then - bytes = case kind - when 'L', 'l' then 4 - when 'I', 'i' then 4 - when 'S', 's' then 2 - when 'V' then 4 - when 'v' then 2 - when 'N' then 4 - when 'n' then 2 - end - end - - size.times do |i| - item = Type.coerce_to(self[arr_idx], Integer, :to_int) - - if item.abs >= 2**Rubinius::WORDSIZE - raise RangeError, "bignum too big to convert into 'unsigned long'" - end - - ret << if little_endian then - item += 2 ** (8 * bytes) if item < 0 - (0...bytes).map { |b| ((item >> (b * 8)) & 0xFF).chr } - else # ugly - (0...bytes).map {n=(item % 256).chr;item /= 256; n}.reverse - end.join - arr_idx += 1 - end - when 'H', 'h' then - size = if t.nil? - 0 - elsif t == "*" - item.length - else - t.to_i - end - str = item.scan(/..?/).first(size) - - ret << if kind == "h" then - str.map { |b| b.reverse.hex.chr }.join - else - str.map { |b| b. hex.chr }.join - end - - arr_idx += 1 - when 'U' then - count = if t.nil? then - 1 - elsif t == "*" - self.size - arr_idx - else - t.to_i - end - - raise ArgumentError, "too few array elements" if - arr_idx + count > self.length - - count.times do - item = Type.coerce_to(self[arr_idx], Integer, :to_i) - - raise RangeError, "pack(U): value out of range" if item < 0 - - bytes = 0 - f = [2 ** 7, 2 ** 11, 2 ** 16, 2 ** 21, 2 ** 26, 2 ** 31].find { |n| - bytes += 1 - item < n - } - - raise RangeError, "pack(U): value out of range" if f.nil? - - if bytes == 1 then - ret << item - bytes = 0 - end - - i = bytes - - buf = [] - if i > 0 then - (i-1).times do - buf.unshift((item | 0x80) & 0xBF) - item >>= 6 - end - # catch the highest bits - the mask depends on the byte count - buf.unshift(item | ((0x3F00 >> bytes)) & 0xFC) - end - - ret << buf.map { |n| n.chr }.join - - arr_idx += 1 - end - else - raise ArgumentError, "Unknown kind #{kind}" - end - end - - return ret + # see pack.rb for Array::Packer + Packer.new(self,schema).dispatch end # Removes and returns the last element from the Array. @@ -1327,7 +1051,7 @@ class Array while(j >= @start) do tuple.put i, @tuple.at(j) i += 1 - j -= 1 + j -= 1 end @tuple = tuple kernel/common/array.rb @@ -122,6 +122,10 @@ class CompiledMethod < Executable attr_reader :visibility end + # Any CompiledMethod with this value in it's serial slot + # is expected to be the default, kernel version + KernelMethodSerial = 47 + # Ivars: instance_variables, primitive, serial, name, iseq, stack_size, # local_count, required_args, total_args, splat, literals, exceptions, # lines, file, compiled, scope kernel/common/compiled_method.rb @@ -235,11 +235,20 @@ module Kernel # sequence number #++ - def srand(seed) + def srand(seed=0) cur = Kernel.current_srand + if seed == 0 + begin + File.open("/dev/urandom", "r") do |f| + seed = f.read(10).unpack("I*")[0] + end + rescue Errno::ENOENT, Errno::EPERM, Errno::EACCES + seed = Time.now.to_i + end + end Platform::POSIX.srand(seed.to_i) Kernel.current_srand = seed.to_i - return cur + cur end module_function :srand kernel/common/kernel.rb @@ -2375,356 +2375,7 @@ class String # -------+---------+----------------------------------------- def unpack(format) - - # some of the directives work when repeat == 0 because of this behavior: - # str[0...0] == '' and str[1..0] == '' - - raise TypeError, "can't convert nil into String" if format.nil? - - i = 0 - elements = [] - length = self.length - - schema = format.scan(/([@a-zA-Z])(-?\d+|[\*_])?/).map { |c, n| - # n in (nil, -num, num, "*", "_") - [c, n.nil? || n =~ /\*|_/ ? n : Integer(n)] - } - - schema.each do |code, count| - - count = nil if Fixnum === count and count < 0 - count ||= code == "@" ? 0 : 1 - - # TODO: profile avg occurances and reorder case - case code - when 'A' then - new_pos, str = if i >= length then - [i, ''] - elsif count == '*' then - [length, self[i..-1]] - else - new_pos = i + count - [new_pos, - new_pos <= length ? self[i...new_pos] : self[i..-1]] - end - i = new_pos - elements << str.sub(/[\x00\x20]+\Z/, '') - when 'a' then - if i >= length then - elements << '' - elsif count == '*' then - elements << self[i..-1] - i = length - else - nnd = i + count - s = if i + count <= length then - self[i...nnd] - else - self[i..-1] - end - elements << s - i = nnd - end - when 'B', 'b', 'H', 'h' then - lsb = code =~ /[bh]/ - fmt = case code - when /[Bb]/ then "%08b" - when /[Hh]/ then "%02x" - end - - if i >= length then - elements << '' - elsif count == '*' then - a = self[i..-1].split(//).map { |c| fmt % c[0] } - a.map! { |s| s.reverse } if lsb - elements << a.join - i = length - else - case code - when /[Bb]/ then - num_bytes, r = count.divmod(8) - num_drop = r != 0 ? 8 - r : 0 - when /[Hh]/ then - num_bytes, r = (count * 4).divmod(8) - num_drop = r != 0 ? 1 : 0 - end - num_bytes += 1 if r != 0 - str0 = if i + num_bytes <= length then - self[i...(i + num_bytes)] - else - self[i..-1] - end - len = str0.length - str1 = '' - str0.each_byte { |n| - len -= 1 - s = fmt % n - str1 << if lsb then - len == 0 ? s[num_drop..-1].reverse : s.reverse - else - len == 0 ? s[0..-num_drop.succ] : s - end - } - elements << str1 - i += num_bytes - end - when /[CcDdEeFfGgIiLlNnQqSsVv]/ then - num_bytes = case code - when /[DdEGQq]/ then 8 - when /[eFfgNV]/ then 4 - when /[nSsv]/ then 2 - when /[Cc]/ then 1 - when /[IiLl]/ then 1.size - end - - size = case code - when /[NncGg]/ then :big - when /[CILQSilqsFfDd]/ then :native - when /[VveE]/ then :little - else - raise "huh? #{code.inspect}" - end - - star = count == '*' - count = length - i if star - count.times do |j| - if i + num_bytes > length - break if star - elements << nil if code != 'Q' - else - start = i - offset = num_bytes - 1 - endian = size - n = exp = 0 - bytebits = 8 - - if :big == endian || (:native == endian && endian?(:big)) then - exp = bytebits * offset - bytebits = -bytebits - end - - (start..start + offset).each do |x| - n += (self[x] * 2**exp) - exp += bytebits - end - - case code - when /[NnCILQSVv]/ then - elements << n - when /[ilqsc]/ then - max = 2 ** (num_bytes * 8 - 1) - n = n >= max ? -(2**(num_bytes*8) - n) : n - elements << n - when /[eFfg]/ then - sign = (2**31 & n != 0) ? -1 : 1 - expo = ((0xFF * 2**23) & n) >> 23 - frac = (2**23 - 1) & n - result = if expo == 0 and frac == 0 then - sign.to_f * 0.0 # zero - elsif expo == 0 then # denormalized - sign * 2**(expo - 126) * (frac.to_f / 2**23.to_f) - elsif expo == 0xFF and frac == 0 then - sign.to_f / 0.0 # Infinity - elsif expo == 0xFF then - 0.0 / 0.0 # NaN - else # normalized - sign * 2**(expo - 127) * (1.0 + (frac.to_f / 2**23.to_f)) - end - elements << result - when /[DdEG]/ then - sign = (2**63 & n != 0) ? -1 : 1 - expo = ((0x7FF * 2**52) & n) >> 52 - frac = (2**52 - 1) & n - result = if expo == 0 and frac == 0 then - sign.to_f * 0.0 # zero - elsif expo == 0 then # denormalized - sign * 2**(expo - 1022) * (frac.to_f / 2**52.to_f) - elsif expo == 0x7FF and frac == 0 then - sign.to_f / 0.0 # Infinity - elsif expo == 0x7FF then - 0.0 / 0.0 # NaN - else # normalized - sign * 2**(expo-1023) * (1.0 + (frac.to_f / 2**52.to_f)) - end - elements << result - end - i += num_bytes - end - end - when 'M' then - if i >= length then - elements << '' - else - str = '' - num_bytes = 0 - regex_permissive = / \= [0-9A-Fa-f]{2} | [^=]+ | [\x00-\xFF]+ /x - regex_junk = / \A ( \= [0-9A-Fa-f]{0,1} ) /x - regex_strict = / \A (?: \= [0-9A-Fa-f]{2} | [^=]+ ) \Z /x - regex_hex = / \A \= ([0-9A-Fa-f]{2}) \Z /x - - self[i..-1].scan(regex_permissive) do |s| - if s =~ regex_strict then - num_bytes += s.length - s = $1.hex.chr if s =~ regex_hex - str << s - elsif s =~ regex_junk - num_bytes += $1.length - end - end - - elements << str - i += num_bytes - end - when 'm' then - if i >= length - elements << '' - else - buffer = '' - str = '' - num_bytes = 0 - - b64_regex_permissive = /[A-Za-z0-9+\/]{4} |[A-Za-z0-9+\/]{3} \=? - |[A-Za-z0-9+\/]{2}\={0,2} |[A-Za-z0-9+\/]\={0,3} |[^A-Za-z0-9+\/]+/x - - self[i..-1].scan(b64_regex_permissive) do |s| - num_bytes += s.length - - b64_regex_strict = /\A (?:[A-Za-z0-9+\/]{4} |[A-Za-z0-9+\/]{3} \=? - |[A-Za-z0-9+\/]{2} \={0,2} |[A-Za-z0-9+\/] \={0,3} ) \Z /x - - if s =~ b64_regex_strict then - - s << '=' while s.length != 4 if s =~ /=\Z/ - - # TODO: WHY? - if buffer == '' and s =~ /\A([A-Za-z0-9+\/])\=+\Z/ then - buffer << $1 - else - buffer << s - end - - process = buffer.length >= 4 - - if process then - s = buffer[0..3] - buffer = buffer[4..-1] - - a = BASE_64_A2B[s[0]] - b = BASE_64_A2B[s[1]] - c = BASE_64_A2B[s[2]] - d = BASE_64_A2B[s[3]] - - # http://www.opengroup.org/onlinepubs/009695399/utilities/uuencode.html - decoded = [a << 2 | b >> 4, - (b & (2**4 - 1)) << 4 | c >> 2, - (c & (2**2 - 1)) << 6 | d].pack('CCC') - - if s[3].chr == '=' - num_bytes -= 1 - decoded = decoded[0..-2] - decoded = decoded[0..-2] if s[2].chr == '=' - str << decoded - break - else - str << decoded - end - end - end - end - elements << str - i += num_bytes - end - when 'U' then - utf8_regex_strict = /\A(?:[\x00-\x7F] - |[\xC2-\xDF][\x80-\xBF] - |[\xE1-\xEF][\x80-\xBF]{2} - |[\xF1-\xF7][\x80-\xBF]{3} - |[\xF9-\xFB][\x80-\xBF]{4} - |[\xFD-\xFD][\x80-\xBF]{5} )\Z/x - - utf8_regex_permissive = / [\x00-\x7F] - |[\xC0-\xDF][\x80-\xBF] - |[\xE0-\xEF][\x80-\xBF]{2} - |[\xF0-\xF7][\x80-\xBF]{3} - |[\xF8-\xFB][\x80-\xBF]{4} - |[\xFC-\xFD][\x80-\xBF]{5} - |[\x00-\xFF]+ /x - - if i >= length then - # do nothing?!? - else - num_bytes = 0 - self[i..-1].scan(utf8_regex_permissive) do |c| - raise ArgumentError, "malformed UTF-8 character" if - c !~ utf8_regex_strict - - break if count == 0 - - if false then - elements << c.utf8_code_value - num_bytes += c.length - else - len = c.length - if len == 1 - result = c[0] - else - shift = (len - 1) * 2 - result = (((2 ** (8 - len.succ) - 1) & c[0]) * - 2 ** ((len - 1) * 8)) >> shift - (1...(len - 1)).each do |x| - shift -= 2 - result |= (((2 ** 6 - 1) & c[x]) * - 2 ** ((len - x.succ) * 8)) >> shift - end - result |= (2 ** 6 - 1) & c[-1] - end - elements << result - num_bytes += len - end - - count -= 1 if count != '*' - end - i += num_bytes - end - when 'X' then - count = length - i if count == '*' - - raise ArgumentError, "X outside of string" if count < 0 or i - count < 0 - i -= count - when 'x' then - if count == '*' then - raise ArgumentError, "x outside of string" if i > length - i = length - else - raise ArgumentError, "x outside of string" if i + count > length - i += count - end - when 'Z' then - if i >= length then - elements << '' - elsif count == '*' then - self[i..-1] =~ / \A ( [^\x00]* ) ( [\x00]? ) /x - elements << $1 - i += $1.length - i += 1 if $2 == "\0" - else - str = i + count <= length ? self[i...(i + count)] : self[i..-1] - str =~ / \A ( [^\x00]* ) /x - elements << $1 - i += count - end - when '@' then - if count == '*' then - i = length - else - raise ArgumentError, "@ outside of string" if count > length - i = count > 0 ? count : 0 - end - else - # raise "unknown directive: #{code.inspect}" - end - end - - elements + # see pack.rb for String::Unpacker + Unpacker.new(self,format).dispatch end end kernel/common/string.rb @@ -43,3 +43,6 @@ class Class alias_method :dup, :clone end + +cm = Class.method_table[:new] +cm.serial = CompiledMethod::KernelMethodSerial kernel/delta/class.rb @@ -106,10 +106,16 @@ module Rubinius str = next_string.chop # handle the special NaN, Infinity and -Infinity differently - c = str[0] - c = str[1] if c == ?- - if c.between?(?0, ?9) - return str.to_f + if str[0] == ?\ # leading space + x = str.to_f + e = str[-5..-1].to_i + + # This is necessary because (2**1024).to_f yields Infinity + if e == 1024 + return x * 2 ** 512 * 2 ** 512 + else + return x * 2 ** e + end else case str.downcase when "infinity" @@ -289,7 +295,16 @@ module Rubinius str << marshal(ele) end when Float - str << "d\n#{val}\n" + str << "d\n" + if val.infinite? + str << "-" if val < 0.0 + str << "Infinity" + elsif val.nan? + str << "NaN" + else + str << " %+.54f %5d" % Math.frexp(val) + end + str << "\n" when InstructionSequence str << "i\n#{val.size}\n" val.opcodes.each do |op| kernel/delta/compiled_file.rb @@ -1,12 +1,4 @@ class String - BASE_64_A2B = {} - (?A..?Z).each {|x| BASE_64_A2B[x] = x - ?A} - (?a..?z).each {|x| BASE_64_A2B[x] = x - ?a + 26} - (?0..?9).each {|x| BASE_64_A2B[x] = x - ?0 + 52} - BASE_64_A2B[?+] = ?> - BASE_64_A2B[?\/] = ?? - BASE_64_A2B[?=] = 0 - def self.sydney_parser alias_method :to_sexp, :to_sexp_sydney_parser end kernel/delta/string.rb @@ -14,10 +14,6 @@ rescue Object => e exit 2 end -if profile = ENV['PROFILE'] - Rubinius::VM.start_profiler -end - # Set up a handler for SIGINT that raises Interrupt on the main thread Signal.action("INT") do |_| thread = Thread.main @@ -82,12 +78,12 @@ Options: -e 'code' Directly compile and execute code (no file provided). -Idir1[:dir2] Add directories to $LOAD_PATH. -S script Run script using PATH environment variable to find it. - -p Run the profiler. - -ps Run the Selector profiler. - -pss Run the SendSite profiler. + -P Run the profiler. + -Ps Run the Selector profiler. + -Pss Run the SendSite profiler. -rlibrary Require library before execution. - -P Use SydneyParser. - -R Use RubyParser. + --sydney Use SydneyParser. + --ruby_parser Use RubyParser. -w Enable warnings. (currently does nothing--compatibility) -v Display the version and set $VERBOSE to true. END @@ -108,6 +104,7 @@ eval_code = nil script = nil begin + script_debug_requested = false until ARGV.empty? arg = ARGV.shift @@ -118,11 +115,11 @@ begin puts RBS_USAGE exit 1 when "-v" - puts "rubinius #{Rubinius::RBX_VERSION} (ruby #{RUBY_VERSION} compatible) (#{Rubinius::BUILDREV[0..8]}) (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" + puts "rubinius #{Rubinius::RBX_VERSION} (ruby #{RUBY_VERSION}) (#{Rubinius::BUILDREV[0..8]} #{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" $VERBOSE = true exit 0 if ARGV.empty? when "-vv" - puts "rubinius #{Rubinius::RBX_VERSION} (ruby #{RUBY_VERSION} compatible) (#{Rubinius::BUILDREV[0..8]}) (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" + puts "rubinius #{Rubinius::RBX_VERSION} (ruby #{RUBY_VERSION}) (#{Rubinius::BUILDREV[0..8]} #{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" $VERBOSE = true puts "Options:" puts " Interpreter type: #{Rubinius::INTERPRETER}" @@ -156,12 +153,12 @@ begin end $DEBUG_SERVER.listen script_debug_requested = true - when '-p' + when '-P' require 'profile' - when '-ps' + when '-Ps' count = (ARGV.first =~ /^\d+$/) ? ARGV.shift : '30' show_selectors = count.to_i - when '-pss' + when '-Pss' count = (ARGV.first =~ /^\d+$/) ? ARGV.shift : '30' show_sendsites = count.to_i when '-S' @@ -174,9 +171,9 @@ begin # if missing, let it die a natural death ARGV.unshift file ? file : script - when '-P' + when '--sydney' String.sydney_parser - when '-R' + when '--ruby_parser' String.ruby_parser when '-e' $0 = "(eval)" @@ -342,7 +339,7 @@ rescue Object => e end if show_selectors - ps = Sampler::Selectors.new + ps = Rubinius::Profiler::Selectors.new begin ps.show_stats show_selectors rescue Object => e @@ -355,7 +352,7 @@ if show_selectors end if show_sendsites - ps = Sampler::SendSites.new + ps = Rubinius::Profiler::SendSites.new begin ps.show_stats show_sendsites rescue Object => e @@ -367,16 +364,15 @@ if show_sendsites end end -if profile - Rubinius::VM.stop_profiler profile - puts "[Saved profiling data to '#{profile}']" -end - if Rubinius::RUBY_CONFIG['rbx.jit_stats'] stats = Rubinius::VM.jit_info puts "JIT time spent: #{stats[0] / 1000000}ms" puts " JITed methods: #{stats[1]}" end -Process.exit(code || 0) +if Rubinius::RUBY_CONFIG['rbx.gc_stats'] + timing = Rubinius::VM.gc_info + puts "Time spent in GC: #{timing / 1000000}ms" +end +Process.exit(code || 0) kernel/loader.rb @@ -183,6 +183,7 @@ class Compiler activate :const_epxr if Config['rbx-kernel'] activate_default :fastsystem activate_default :fastgeneric + activate_default :fastnew # AutoPrimitiveDetection is currently disabled # TODO - Implement the opt_* primitives it requires and reactivate # activate_default :auto_primitive lib/compiler/compiler.rb @@ -642,8 +642,9 @@ class Compiler end def check_serial(sym, serial) - idx = find_literal(sym) + idx = add_literal SendSite.new(:new) add :check_serial, idx, serial.to_i + return idx end def create_block(desc) lib/compiler/generator.rb @@ -185,6 +185,53 @@ class Compiler end ## + # Handles speeding up #new + + class FastNew < Plugin + plugin :fastnew + + # FIXME duplicated from kernel/common/compiled_method.rb + KernelMethodSerial = 47 + + def handle(g, call) + return false unless call.method == :new + return false if call.block or !call.static_args? + + slow = g.new_label + done = g.new_label + + call.receiver_bytecode(g) + g.dup + idx = g.check_serial idx, KernelMethodSerial + g.gif slow + + # fast path + g.send :allocate, 0 + g.dup + call.emit_args(g) + g.send :initialize, call.argcount, true + g.pop + + g.goto done + + # slow path + slow.set! + call.emit_args(g) + g.add :set_call_flags, 1 + count = call.argcount + if count == 0 + g.add :send_method, idx + else + g.add :send_stack, idx, count + end + + done.set! + + return true + end + end + + ## # Handles emitting save VM instructions for redifinition of math operators. class SafeMathOperators < Plugin lib/compiler/plugins.rb @@ -1,6 +1,6 @@ require 'profiler' at_exit do - Profiler__::print_profile(STDERR) + Profiler__.print_profile(STDERR) end -Profiler__::start_profile +Profiler__.start_profile lib/profile.rb @@ -1,17 +1,17 @@ module Profiler__ def start_profile - @p = Sampler.new + @p = Rubinius::Profiler::Instrumenter.new @p.start end - + def stop_profile @p.stop end - + def print_profile(f) stop_profile @p.display(f) end - + module_function :start_profile, :stop_profile, :print_profile end lib/profiler.rb @@ -146,6 +146,7 @@ end COMPILER_SOURCES = Dir["lib/compiler/*.rb"] + %w(strscan stringio racc/parser ruby_lexer ruby_parser ruby_parser_extras sexp sexp_processor).map { |f| "lib/#{f}.rb" } +COMPILER_SOURCES << "kernel/delta/compiled_file.rb" COMPILER_MTIME = COMPILER_SOURCES.map { |f| File::Stat.new(f).mtime }.max compiler = [] rakelib/kernel.rake @@ -53,7 +53,7 @@ if config.use_jit srcs += jit_srcs end -EX_INC = %w[ libtommath onig libffi/include +EX_INC = %w[ libtommath libgdtoa onig libffi/include libbstring libcchash libmquark libmpa libltdl libev llvm/include ].map { |f| "vm/external_libs/#{f}" } @@ -129,6 +129,7 @@ EXTERNALS = %W[ vm/external_libs/libmpa/libptr_array.a vm/external_libs/libmquark/libmquark.a vm/external_libs/libtommath/libtommath.a vm/external_libs/libbstring/libbstring.a + vm/external_libs/libgdtoa/libgdtoa.a vm/external_libs/onig/.libs/libonig.a vm/external_libs/libffi/.libs/libffi.a vm/external_libs/libltdl/.libs/libltdl.a rakelib/vm.rake @@ -1,52 +1,52 @@ require File.dirname(__FILE__) + '/../../spec_helper' -describe "Float#CONSTANTS" do +describe "Float#CONSTANTS" do specify "the DIG value is 15" do Float::DIG.should == 15 end - + it "the EPSILON value is " do - Float::EPSILON.should == 0.0000000000000002220446049250313080847263336181640625 + Float::EPSILON.should == eval("0.0000000000000002220446049250313080847263336181640625") end - + it "the MANT_DIG is 53" do Float::MANT_DIG.should == 53 end - + it "the MAX_10_EXP is 308" do Float::MAX_10_EXP.should == 308 end - - it "the MIN_10_EXP is -308" do + + it "the MIN_10_EXP is -308" do Float::MIN_10_EXP.should == -307 - end - - it "the MAX_EXP is 1024" do + end + + it "the MAX_EXP is 1024" do Float::MAX_EXP.should == 1024 end - + it "the MIN_EXP is -1021" do Float::MIN_EXP.should == -1021 - end - + end + it "the MAX is 1.79769313486232e+308" do - Float::MAX.should == 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0 - end - + Float::MAX.should == eval("179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0") + end + # TODO: file a bug report for MRI not_compliant_on :ruby, :jruby do - it "the MIN is 2.2250738585072e-308" do - Float::MIN.should == 2.225073858507201383090232717332404064219215980462331830553327416887204434813918195854283159012511020564067339731035811005152434161553460108856012385377718821130777993532002330479610147442583636071921565046942503734208375250806650616658158948720491179968591639648500635908770118304874799780887753749949451580451605050915399856582470818645113537935804992115981085766051992433352114352390148795699609591288891602992641511063466313393663477586513029371762047325631781485664350872122828637642044846811407613911477062801689853244110024161447421618567166150540154285084716752901903161322778896729707373123334086988983175067838846926092773977972858659654941091369095406136467568702398678315290680984617210924625396728515625e-308 + it "the MIN is 2.2250738585072e-308" do + Float::MIN.should == eval("2.225073858507201383090232717332404064219215980462331830553327416887204434813918195854283159012511020564067339731035811005152434161553460108856012385377718821130777993532002330479610147442583636071921565046942503734208375250806650616658158948720491179968591639648500635908770118304874799780887753749949451580451605050915399856582470818645113537935804992115981085766051992433352114352390148795699609591288891602992641511063466313393663477586513029371762047325631781485664350872122828637642044846811407613911477062801689853244110024161447421618567166150540154285084716752901903161322778896729707373123334086988983175067838846926092773977972858659654941091369095406136467568702398678315290680984617210924625396728515625e-308") end end - + # TODO: Does this actually constitute noncompliance? deviates_on :jruby do it "the MIN is 4.9e-324" do Float::MIN.should == 4.9e-324 end end - + it "the RADIX is 2" do Float::RADIX.should == 2 end spec/frozen/core/float/constants_spec.rb @@ -11,13 +11,13 @@ describe "Time#_dump" do ruby_bug("http://redmine.ruby-lang.org/issues/show/627", "1.8.7") do it "preserves the GMT flag" do @t.gmt?.should == true - dump = @t._dump.unpack("LL").first + dump = @t._dump.unpack("VV").first ((dump >> 30) & 0x1).should == 1 end it "dumps a Time object to a bytestring" do @s.should be_kind_of(String) - @s.should == [3222863947, 2235564032].pack("LL") + @s.should == [3222863947, 2235564032].pack("VV") end it "dumps an array with a date as first element" do @@ -28,7 +28,7 @@ describe "Time#_dump" do @t.mday << 5 | @t.hour - high.should == @s.unpack("LL").first + high.should == @s.unpack("VV").first end end @@ -36,7 +36,7 @@ describe "Time#_dump" do low = @t.min << 26 | @t.sec << 20 | @t.usec - low.should == @s.unpack("LL").last + low.should == @s.unpack("VV").last end end spec/frozen/core/time/_dump_spec.rb @@ -18,7 +18,7 @@ describe "Time#_load" do t.sec << 20 | t.usec - Time._load([high, low].pack("LL")).should == t + Time._load([high, low].pack("VV")).should == t end end @@ -30,6 +30,6 @@ describe "Time#_load" do low = t.usec - Time._load([high, low].pack("LL")).should == t + Time._load([high, low].pack("VV")).should == t end end spec/frozen/core/time/_load_spec.rb @@ -1,4 +1,3 @@ -fails:Array#pack just ignores unknown format fails:Array#pack with format 'H' encodes hexadecimal digits to byte sequence in the order of high-nibble first fails:Array#pack with format 'H' ignores rest of the pack argument when the argument is too long fails:Array#pack with format 'H' fills low-nibble of the last byte with 0 when count is odd @@ -6,34 +5,20 @@ fails:Array#pack with format 'H' fills the rest bytes with 0 if pack argument ha fails:Array#pack with format 'H' fills low-nibble of the last byte with 0 when count is odd even if pack argument has insufficient length fails:Array#pack with format 'H' considers count = 1 if count omited fails:Array#pack with format 'H' consumes only one array item per a format -fails:Array#pack with format 'H' tries to convert the pack argument to a String using #to_str -fails:Array#pack with format 'H' checks whether the pack argument responds to #to_str -fails:Array#pack with format 'h' encodes hexadecimal digits to byte sequence in the order of low-nibble first fails:Array#pack with format 'h' ignores rest of the pack argument when the argument is too long fails:Array#pack with format 'h' fills low-nibble of the last byte with 0 when count is odd fails:Array#pack with format 'h' fills the rest bytes with 0 if pack argument has insufficient length fails:Array#pack with format 'h' fills high-nibble of the last byte with 0 when count is odd even if pack argument has insufficient length fails:Array#pack with format 'h' considers count = 1 if count omited fails:Array#pack with format 'h' consumes only one array item per a format -fails:Array#pack with format 'h' tries to convert the pack argument to a String using #to_str -fails:Array#pack with format 'h' checks whether the pack argument responds to #to_str fails:Array#pack with format 'n' regards negative values as 2's complement in order to converts it to positive -fails:Array#pack with format 'n' raises an ArgumentError if count is greater than array elements left -fails:Array#pack with format 'v' raises an ArgumentError if count is greater than array elements left fails:Array#pack with format 'N' regards negative values as 2's complement in order to converts it to positive -fails:Array#pack with format 'N' raises an ArgumentError if count is greater than array elements left -fails:Array#pack with format 'V' raises an ArgumentError if count is greater than array elements left -fails:Array#pack with format 's' raises an ArgumentError if count is greater than array elements left -fails:Array#pack with format 'S' raises an ArgumentError if count is greater than array elements left -fails:Array#pack with format 'l' raises an ArgumentError if count is greater than array elements left -fails:Array#pack with format 'L' raises an ArgumentError if count is greater than array elements left fails:Array#pack with format 'q' returns a string containing 8 bytes for an integer fails:Array#pack with format 'q' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'q' raises a RangeError when a pack argument is >= 2**64 fails:Array#pack with format 'q' raises a RangeError when a pack argument is <= -2**64 fails:Array#pack with format 'q' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'q' checks whether the pack argument responds to #to_int -fails:Array#pack with format 'q' raises a TypeError if a pack argument can't be coerced to Integer fails:Array#pack with format 'q' processes count number of array elements if count given fails:Array#pack with format 'q' returns empty string if count = 0 fails:Array#pack with format 'q' with star parameter processes all remaining array items @@ -43,7 +28,6 @@ fails:Array#pack with format 'Q' raises a RangeError when a pack argument is >= fails:Array#pack with format 'Q' raises a RangeError when a pack argument is <= -2**64 fails:Array#pack with format 'Q' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'Q' checks whether the pack argument responds to #to_int -fails:Array#pack with format 'Q' raises a TypeError if a pack argument can't be coerced to Integer fails:Array#pack with format 'Q' processes count number of array elements if count given fails:Array#pack with format 'Q' returns empty string if count = 0 fails:Array#pack with format 'Q' with star parameter processes all remaining array items @@ -54,7 +38,6 @@ fails:Array#pack with format 's!' drops higher bytes when a pack argument is < - fails:Array#pack with format 's!' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 's!' checks whether the pack argument responds to #to_int fails:Array#pack with format 's!' processes count number of array elements if count given -fails:Array#pack with format 's!' returns empty string if count = 0 fails:Array#pack with format 's!' with star parameter processes all remaining array items fails:Array#pack with format 's_' returns a string containing 2 bytes for an integer fails:Array#pack with format 's_' regards negative values as 2's complement in order to converts it to positive @@ -63,9 +46,7 @@ fails:Array#pack with format 's_' drops higher bytes when a pack argument is < - fails:Array#pack with format 's_' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 's_' checks whether the pack argument responds to #to_int fails:Array#pack with format 's_' processes count number of array elements if count given -fails:Array#pack with format 's_' returns empty string if count = 0 fails:Array#pack with format 's_' with star parameter processes all remaining array items -fails:Array#pack with format 'S!' raises an ArgumentError if count is greater than array elements left fails:Array#pack with format 'S_' returns a string containing 2 bytes for an integer fails:Array#pack with format 'S_' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'S_' drops higher bytes when a pack argument is >= 2**16 @@ -73,65 +54,54 @@ fails:Array#pack with format 'S_' drops higher bytes when a pack argument is < - fails:Array#pack with format 'S_' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'S_' checks whether the pack argument responds to #to_int fails:Array#pack with format 'S_' processes count number of array elements if count given -fails:Array#pack with format 'S_' returns empty string if count = 0 fails:Array#pack with format 'S_' with star parameter processes all remaining array items -fails:Array#pack with format 'i' raises an ArgumentError if count is greater than array elements left fails:Array#pack with format 'i!' returns a string containing 4 bytes for an integer fails:Array#pack with format 'i!' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'i!' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'i!' checks whether the pack argument responds to #to_int fails:Array#pack with format 'i!' processes count number of array elements if count given -fails:Array#pack with format 'i!' returns empty string if count = 0 fails:Array#pack with format 'i!' with star parameter processes all remaining array items fails:Array#pack with format 'i_' returns a string containing 4 bytes for an integer fails:Array#pack with format 'i_' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'i_' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'i_' checks whether the pack argument responds to #to_int fails:Array#pack with format 'i_' processes count number of array elements if count given -fails:Array#pack with format 'i_' returns empty string if count = 0 fails:Array#pack with format 'i_' with star parameter processes all remaining array items -fails:Array#pack with format 'I' raises an ArgumentError if count is greater than array elements left fails:Array#pack with format 'I!' returns a string containing 4 bytes for an integer fails:Array#pack with format 'I!' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'I!' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'I!' checks whether the pack argument responds to #to_int fails:Array#pack with format 'I!' processes count number of array elements if count given -fails:Array#pack with format 'I!' returns empty string if count = 0 fails:Array#pack with format 'I!' with star parameter processes all remaining array items fails:Array#pack with format 'I_' returns a string containing 4 bytes for an integer fails:Array#pack with format 'I_' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'I_' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'I_' checks whether the pack argument responds to #to_int fails:Array#pack with format 'I_' processes count number of array elements if count given -fails:Array#pack with format 'I_' returns empty string if count = 0 fails:Array#pack with format 'I_' with star parameter processes all remaining array items fails:Array#pack with format 'l!' returns a string containing 4 bytes for an integer fails:Array#pack with format 'l!' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'l!' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'l!' checks whether the pack argument responds to #to_int fails:Array#pack with format 'l!' processes count number of array elements if count given -fails:Array#pack with format 'l!' returns empty string if count = 0 fails:Array#pack with format 'l!' with star parameter processes all remaining array items fails:Array#pack with format 'l_' returns a string containing 4 bytes for an integer fails:Array#pack with format 'l_' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'l_' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'l_' checks whether the pack argument responds to #to_int fails:Array#pack with format 'l_' processes count number of array elements if count given -fails:Array#pack with format 'l_' returns empty string if count = 0 fails:Array#pack with format 'l_' with star parameter processes all remaining array items fails:Array#pack with format 'L!' returns a string containing 4 bytes for an integer fails:Array#pack with format 'L!' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'L!' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'L!' checks whether the pack argument responds to #to_int fails:Array#pack with format 'L!' processes count number of array elements if count given -fails:Array#pack with format 'L!' returns empty string if count = 0 fails:Array#pack with format 'L!' with star parameter processes all remaining array items fails:Array#pack with format 'L_' returns a string containing 4 bytes for an integer fails:Array#pack with format 'L_' regards negative values as 2's complement in order to converts it to positive fails:Array#pack with format 'L_' tries to convert the pack argument to an Integer using #to_int fails:Array#pack with format 'L_' checks whether the pack argument responds to #to_int fails:Array#pack with format 'L_' processes count number of array elements if count given -fails:Array#pack with format 'L_' returns empty string if count = 0 fails:Array#pack with format 'L_' with star parameter processes all remaining array items fails:Array#pack with format 'f' consumes as many Floats as specified fails:Array#pack with format 'f' tries to convert the pack argument to a Float using #to_f @@ -228,23 +198,15 @@ fails:Array#pack with format 'u' appends newline whenever after consumes [number fails:Array#pack with format 'w' converts to BER-compressed integer fails:Array#pack with format 'w' raises an ArgumentError if the count is greater than the number of remaining array elements fails:Array#pack with format 'w' raises TypeError on nil and non-numeric arguments -fails:Array#pack with '@' moves the end of result string into the specified position by offset from head -fails:Array#pack with '@' fills blank with NUL bytes if the position exceeds the end of string -fails:Array#pack with '@' concatenates successing formats at the position '@' moves it into -fails:Array#pack with '@' does not recover lost bytes when shorten the string and then extends it again -fails:Array#pack with '@' is able to work with 'X' fails:Array#pack with format 'p' consumes a String fails:Array#pack with format 'p' tries to convert the pack argument to a String using #to_str fails:Array#pack with format 'p' checks whether the pack argument responds to #to_str -fails:Array#pack with format 'p' raises a TypeError if corresponding array item is not String -fails:Array#pack with format 'p' returns empty string if count = 0 with fails:Array#pack with format 'p' only takes as many elements as specified after ('p') fails:Array#pack with format 'p' consumes the whole argument string with star parameter fails:Array#pack with format 'P' consumes a String fails:Array#pack with format 'P' returns null pointer when passed nil fails:Array#pack with format 'P' tries to convert the pack argument to a String using #to_str fails:Array#pack with format 'P' checks whether the pack argument responds to #to_str -fails:Array#pack with format 'P' raises a TypeError if corresponding array item is not String fails:Array#pack with format 'P' consumes one array item per a format fails:Array#pack with format 'P' ignores '*' parameter fails:Array#pack with format 'P' returns a pointer to zero-length byte sequence if count = 0 with spec/tags/frozen/core/array/pack_tags.txt @@ -1,3 +1 @@ fails:Float#/ properly handles BigDecimal argument -fails:Float#/ does NOT raise ZeroDivisionError if other is zero -fails:Float#/ returns self divided by other spec/tags/frozen/core/float/divide_tags.txt @@ -48,14 +48,9 @@ namespace rubinius { } task->pop(); // Remove this from the stack. BlockContext* ctx = create_context(state, task->active()); - if(task->profiler) { - profiler::Method* prof_meth = task->profiler->enter_method( - as<Symbol>(home_->name()), home_->module()->name(), profiler::kBlock); - if(!prof_meth->file()) { - prof_meth->set_position(method_->file(), method_->start_line(state)); - } - } + if(unlikely(task->profiler)) task->profiler->enter_block(state, home_, method_); + task->make_active(ctx); task->push(val); } @@ -73,14 +68,8 @@ namespace rubinius { val = Qnil; } BlockContext* ctx = create_context(state, task->active()); - if(task->profiler) { - profiler::Method* prof_meth = task->profiler->enter_method( - as<Symbol>(home_->name()), home_->module()->name(), profiler::kBlock); - if(!prof_meth->file()) { - prof_meth->set_position(method_->file(), method_->start_line(state)); - } - } + if(unlikely(task->profiler)) task->profiler->enter_block(state, home_, method_); // HACK: manually clear the stack used as args. task->active()->clear_stack(msg.stack); vm/builtin/block_environment.cpp @@ -20,7 +20,7 @@ namespace rubinius { private: MethodContext* home_; // slot MethodContext* home_block_; // slot - Object* local_count_; // slot + Object* local_count_; // slot CompiledMethod* method_; // slot public: vm/builtin/block_environment.hpp @@ -213,7 +213,10 @@ namespace rubinius { return Bignum::from_double(state, this->val); } -#define FLOAT_TO_S_STRLEN 1024 +/* It requires "%.1022f" to print all digits of Float::MIN. + * If you really need more digits than that, change this constant. + */ +#define FLOAT_TO_S_STRLEN 1280 String* Float::to_s_formatted(STATE, String* format) { char str[FLOAT_TO_S_STRLEN]; vm/builtin/float.cpp @@ -57,12 +57,12 @@ namespace rubinius { const static object_type type = IncludedModuleType; private: - Object* module_; // slot + Module* module_; // slot public: /* accessors */ - attr_accessor(module, Object); + attr_accessor(module, Module); /* interface */ static IncludedModule* create(STATE); vm/builtin/module.hpp @@ -1,4 +1,5 @@ #include <iostream> +#include <sstream> #include <cstdarg> @@ -397,6 +398,36 @@ namespace rubinius { return val; } + String* Object::to_s(STATE, bool address) { + std::stringstream name; + + name << "#<"; + if(Module* mod = try_as<Module>(this)) { + if(mod->name()->nil_p()) { + name << "Class"; + } else { + name << mod->name()->c_str(state); + } + name << "(" << this->class_object(state)->name()->c_str(state) << ")"; + } else { + if(this->class_object(state)->name()->nil_p()) { + name << "Object"; + } else { + name << this->class_object(state)->name()->c_str(state); + } + } + + name << ":"; + if(address) { + name << reinterpret_cast<void*>(this); + } else { + name << "0x" << std::hex << this->id(state)->to_native(); + } + name << ">"; + + return String::create(state, name.str().c_str()); + } + Object* Object::show(STATE) { return show(state, 0); } vm/builtin/object.cpp @@ -336,6 +336,14 @@ namespace rubinius { // Ruby.primitive :object_untaint Object* untaint(); + /** + * Returns an #inspect-like representation of an Object for + * use in C++ code. Not called from Ruby code. + * + * If address is true, uses the actual address of the object. + * Otherwise, uses the object's id(). + */ + String* to_s(STATE, bool address = false); public: /* accessors */ vm/builtin/object.hpp @@ -147,6 +147,36 @@ namespace rubinius { return true; } + bool SendSite::check_serial(STATE, MethodContext* current, Object* recv, int serial) { + // If empty, fill. + if(method_ == Qnil) { + Message msg(state); + msg.recv = recv; + msg.lookup_from = recv->lookup_begin(state); + msg.name = name_; + msg.priv = false; + msg.set_caller(current); + + // Can't be resolved initially? bail. + if(!GlobalCacheResolver::resolve(state, msg)) { + return false; + } + + module(state, msg.module); + method(state, msg.method); + recv_class(state, msg.lookup_from); + method_missing = msg.method_missing; + + if(unlikely(method_missing)) { + this->performer = performer::mono_mm_performer; + } else { + this->performer = performer::mono_performer; + } + } + + return method_->serial()->to_native() == serial; + } + /* Fill in details about +msg+ by looking up the class heirarchy * and in method tables. Returns true if lookup was successful * and +msg+ is now filled in. */ vm/builtin/sendsite.cpp @@ -9,6 +9,7 @@ namespace rubinius { class Selector; class Message; class SendSite; + class MethodContext; typedef bool (*MethodResolver)(STATE, Message& msg); @@ -63,6 +64,10 @@ namespace rubinius { void initialize(STATE); bool locate(STATE, Message& msg); + // Check and see if the method referenced has the given serial + // Sideffect: populates the sendsite if empty + bool check_serial(STATE, MethodContext* current, Object* reciever, int serial); + class Info : public TypeInfo { public: BASIC_TYPEINFO(TypeInfo) vm/builtin/sendsite.hpp @@ -10,9 +10,10 @@ #include "parser/grammar.hpp" #include "vm.hpp" -#include "vm/object_utils.hpp" -#include "primitives.hpp" +#include "object_utils.hpp" #include "objectmemory.hpp" +#include "primitives.hpp" +#include "strtod.hpp" #include "bstrlib.h" vm/builtin/string.cpp @@ -95,10 +95,6 @@ namespace rubinius { } Object* System::vm_exit(STATE, Fixnum* code) { - if(getenv("JIT_STATS")) { - std::cout << "JITed methods: " << state->jitted_methods << "\n"; - std::cout << " JIT Time: " << (state->jit_timing / 1000000) << "ms\n"; - } ::exit(code->to_native()); return code; } @@ -172,14 +168,13 @@ namespace rubinius { return Qnil; } - Object* System::vm_start_profiler(STATE) { + Object* System::vm_profiler_instrumenter_start(STATE) { G(current_task)->enable_profiler(); return Qtrue; } - Object* System::vm_stop_profiler(STATE, String* path) { - G(current_task)->disable_profiler(path->c_str()); - return path; + LookupTable* System::vm_profiler_instrumenter_stop(STATE) { + return G(current_task)->disable_profiler(); } Object* System::vm_write_error(STATE, String* str) { @@ -193,10 +188,14 @@ namespace rubinius { } Array* ary = Array::create(state, 2); - ary->set(state, 0, Integer::from(state, state->jit_timing)); - ary->set(state, 1, Integer::from(state, state->jitted_methods)); + ary->set(state, 0, Integer::from(state, state->stats.jit_timing)); + ary->set(state, 1, Integer::from(state, state->stats.jitted_methods)); return ary; } + Object* System::vm_gc_info(STATE) { + return Integer::from(state, state->stats.time_in_gc); + } + } vm/builtin/system.cpp @@ -114,16 +114,16 @@ namespace rubinius { static Object* vm_show_backtrace(STATE, Object* ctx); /** - * Starts the profiler. + * Starts the instrumenting profiler. */ - // Ruby.primitive :vm_start_profiler - static Object* vm_start_profiler(STATE); + // Ruby.primitive :vm_profiler_instrumenter_start + static Object* vm_profiler_instrumenter_start(STATE); /** - * Stops the profiler. + * Stops the instrumenting profiler. */ - // Ruby.primitive :vm_stop_profiler - static Object* vm_stop_profiler(STATE, String* path); + // Ruby.primitive :vm_profiler_instrumenter_stop + static LookupTable* vm_profiler_instrumenter_stop(STATE); /** * Writes String to standard error stream. @@ -137,6 +137,12 @@ namespace rubinius { // Ruby.primitive :vm_jit_info static Object* vm_jit_info(STATE); + /** + * Returns information about the GC. + */ + // Ruby.primitive :vm_gc_info + static Object* vm_gc_info(STATE); + public: /* Type info */ vm/builtin/system.hpp @@ -557,14 +557,16 @@ namespace rubinius { profiler = new profiler::Profiler(); } - void Task::disable_profiler(const char* results) { + LookupTable* Task::disable_profiler() { + LookupTable* tbl = (LookupTable*)Qnil; + if(profiler) { - std::ofstream stream(results); - profiler->print_results(state, stream); + tbl = profiler->results(state); delete profiler; } - profiler = NULL; + + return tbl; } /* This should only ever run for CompiledMethods currently. */ vm/builtin/task.cpp @@ -21,6 +21,7 @@ namespace rubinius { class Exception; class TaskProbe; class Tuple; + class LookupTable; class LookupTableAssociation; class Task; @@ -153,7 +154,7 @@ namespace rubinius { void tragic_failure(Message& msg); void enable_profiler(); - void disable_profiler(const char* results); + LookupTable* disable_profiler(); // Add +ctx+ to the context chain by setting the active context // to +ctx+'s sender and making +ctx+ active. vm/builtin/task.hpp @@ -67,21 +67,32 @@ namespace rubinius { int olength = length->to_native(); // left end should be within range - if(olend < 0 || (size_t)olend > osize) Exception::object_bounds_exceeded_error(state, other, olend); - if(lend < 0 || (size_t)lend > size) Exception::object_bounds_exceeded_error(state, this, lend); + if(olend < 0 || (size_t)olend > osize) { + Exception::object_bounds_exceeded_error(state, other, olend); + } + + if(lend < 0 || (size_t)lend > size) { + Exception::object_bounds_exceeded_error(state, this, lend); + } // length can not be negative and must fit in src/dest if(olength < 0) { Exception::object_bounds_exceeded_error(state, "length must be positive"); } + if((size_t)(olend + olength) > osize) { - Exception::object_bounds_exceeded_error(state, "length should not exceed size of source"); + Exception::object_bounds_exceeded_error(state, + "length should not exceed size of source"); } + if((size_t)olength > (size - lend)) { - Exception::object_bounds_exceeded_error(state, "length should not exceed space in destination"); + Exception::object_bounds_exceeded_error(state, + "length should not exceed space in destination"); } - for(size_t src = olend, dst = lend; src < (size_t)(olend + olength); ++src, ++dst) { + for(size_t src = olend, dst = lend; + src < (size_t)(olend + olength); + ++src, ++dst) { // Since we have carefully checked the bounds we don't need to do it in at/put Object *obj = other->field[src]; this->field[dst] = obj; @@ -98,31 +109,36 @@ namespace rubinius { int rend = lend + length->to_native(); if(size == 0) return Fixnum::from(0); - if(lend < 0 || lend >= size) Exception::object_bounds_exceeded_error(state, this, lend); - if(rend < 0 || rend > size) Exception::object_bounds_exceeded_error(state, this, rend); + if(lend < 0 || lend >= size) { + Exception::object_bounds_exceeded_error(state, this, lend); + } + + if(rend < 0 || rend > size) { + Exception::object_bounds_exceeded_error(state, this, rend); + } int i = lend; while(i < rend) { if(this->at(state,i) == obj) { - int j = i; - ++i; - while(i < rend) { - Object *val = this->field[i]; - if(val != obj) { - // no need to set write_barrier since it's already - // referenced to this object - this->field[j] = val; - ++j; - } - ++i; - } - // cleanup all the bins after - i = j; - while(i < rend) { - this->field[i] = Qnil; - ++i; - } - return Fixnum::from(rend-j); + int j = i; + ++i; + while(i < rend) { + Object *val = this->field[i]; + if(val != obj) { + // no need to set write_barrier since it's already + // referenced to this object + this->field[j] = val; + ++j; + } + ++i; + } + // cleanup all the bins after + i = j; + while(i < rend) { + this->field[i] = Qnil; + ++i; + } + return Fixnum::from(rend-j); } ++i; } @@ -179,9 +195,9 @@ namespace rubinius { indent(level); Object* obj = tup->at(state, i); if(obj == tup) { - class_info(state, self, true); + class_info(state, self, true); } else { - obj->show(state, level); + obj->show(state, level); } } if(tup->num_fields() > stop) ellipsis(level); @@ -205,10 +221,10 @@ namespace rubinius { indent(level); Object* obj = tup->at(state, i); if(Tuple* t = try_as<Tuple>(obj)) { - class_info(state, self); - std::cout << ": " << t->num_fields() << ">" << std::endl; + class_info(state, self); + std::cout << ": " << t->num_fields() << ">" << std::endl; } else { - obj->show_simple(state, level); + obj->show_simple(state, level); } } if(tup->num_fields() > stop) ellipsis(level); vm/builtin/tuple.cpp @@ -39,7 +39,9 @@ class BasicPrimitive def output_call(str, call, args) str << "\n" str << " try {\n" + str << " if(unlikely(task->profiler)) task->profiler->enter_primitive(state, msg);\n" str << " ret = #{call}(#{args.join(', ')});\n" + str << " if(unlikely(task->profiler)) task->profiler->leave_method();\n" str << " } catch(const RubyException& exc) {\n" str << " task->raise_exception(exc.exception);\n" str << " return cExecuteRestart;\n" @@ -144,11 +146,14 @@ class CPPOverloadedPrimitive < BasicPrimitive type = prim.arg_types.first str << " if(#{type}* arg = try_as<#{type}>(msg.get_argument(0))) {\n" str << " try {\n" + str << " if(unlikely(task->profiler))\n" + str << " task->profiler->enter_primitive(state, msg);\n" if @pass_state str << " ret = recv->#{@cpp_name}(state, arg);\n" else str << " ret = recv->#{@cpp_name}(arg);\n" end + str << " if(unlikely(task->profiler)) task->profiler->leave_method();\n" str << " } catch(const RubyException& exc) {\n" str << " task->raise_exception(exc.exception);\n" str << " return cExecuteRestart;\n" vm/codegen/field_extract.rb @@ -400,7 +400,7 @@ class Instructions # [Operation] # Checks if the specified method serial number matches an expected value # [Format] - # \check_serial method serial + # \check_serial sendsite serial # [Stack Before] # * obj # * ... @@ -429,10 +429,10 @@ class Instructions def check_serial(index, serial) <<-CODE - Object* t1 = stack_pop(); - Symbol* sym = as<Symbol>(task->literals()->at(state, index)); + Object* recv = stack_pop(); + SendSite* ss = as<SendSite>(task->literals()->at(state, index)); - if(task->check_serial(t1, sym, serial)) { + if(ss->check_serial(state, ctx, recv, serial)) { stack_push(Qtrue); } else { stack_push(Qfalse); @@ -444,7 +444,8 @@ class Instructions <<-CODE Fixnum* s = Fixnum::from(100); Symbol* sym = String::create(state, "to_s")->to_sym(state); - task->literals()->put(state, 0, sym); + SendSite* ss = SendSite::create(state, sym); + task->literals()->put(state, 0, ss); TS_ASSERT_EQUALS(Qnil, cm->serial()); task->add_method(G(fixnum_class), sym, cm); @@ -2959,7 +2960,8 @@ slow_path: // === manual inline === // == restore_sender == - // if(unlikely(profiler)) profiler->leave_method(); + if(unlikely(task->profiler)) task->profiler->leave_method(); + /* Try to recycle this context to be used again. */ if(active_context->young_object_p()) { state->om->deallocate_context(active_context); vm/instructions.rb @@ -24,6 +24,7 @@ #include "objectmemory.hpp" #include "message.hpp" #include "instructions.hpp" +#include "profiler.hpp" using namespace rubinius; vm/llvm/instructions.cpp @@ -1,10 +1,13 @@ #include <cctype> #include <cstring> +#include <cmath> +#include <iomanip> #include "objectmemory.hpp" #include "marshal.hpp" -#include "vm/object_utils.hpp" +#include "object_utils.hpp" +#include "strtod.hpp" #include "builtin/sendsite.hpp" #include "builtin/array.hpp" @@ -144,8 +147,30 @@ namespace rubinius { return tup; } +#define FLOAT_EXP_OFFSET 58 +#define FLOAT_MAX_BUFFER 65 + void Marshaller::set_float(Float* flt) { - stream << "d" << endl << flt->val << endl; + double val = flt->val; + + stream << "d" << endl; + + if(std::isinf(val)) { + if(val < 0.0) stream << "-"; + stream << "Infinity"; + } else if(std::isnan(val)) { + stream << "NaN"; + } else { + char data[FLOAT_MAX_BUFFER]; + double x; + int e; + + x = ::frexp(val, &e); + snprintf(data, FLOAT_MAX_BUFFER, " %+.54f %5d", x, e); + stream << data; + } + + stream << endl; } Float* UnMarshaller::get_float() { @@ -159,12 +184,20 @@ namespace rubinius { Exception::type_error(state, "Unable to unmarshal Float: failed to read value"); } - char c = data[0]; - if(c == '-') c = data[1]; + if(data[0] == ' ') { + double x; + long e; + + x = strtod(data, NULL); + e = strtol(data+FLOAT_EXP_OFFSET, NULL, 10); - if(std::isdigit(c)) { - // @todo use ruby_strtod - return Float::create(state, strtod(data, NULL)); + // This is necessary because exp2(1024) yields inf + if(e == 1024) { + double root_exp = ::exp2(512); + return Float::create(state, x * root_exp * root_exp); + } else { + return Float::create(state, x * ::exp2(e)); + } } else { // avoid compiler warning double zero = 0.0; @@ -172,9 +205,9 @@ namespace rubinius { if(!strncasecmp(data, "Infinity", 8U)) { val = 1.0; - } else if(!strncmp(data, "-Infinity", 9U)) { + } else if(!strncasecmp(data, "-Infinity", 9U)) { val = -1.0; - } else if(!strncmp(data, "NaN", 3U)) { + } else if(!strncasecmp(data, "NaN", 3U)) { val = zero; } else { Exception::type_error(state, "Unable to unmarshal Float: invalid format"); vm/marshal.cpp @@ -9120,21 +9120,6 @@ yylex(void *yylval_v, void *vstate) yyerror(tmp); } if (is_float) { - /* Some implementations of strtod() don't guarantee to - * set errno, so we need to reset it ourselves. - */ - errno = 0; - - /* HACK: gcc 4.3.2 refuses to accept (void) to ignore - * the return value so we have to invent something - * fake for it to do instead - */ - if(strtod(tok(), 0)); - - if (errno == ERANGE) { - rb_warn("Float %s out of range", tok()); - errno = 0; - } pslval->node = NEW_FLOAT(string_new2(tok())); return tFLOAT; } vm/parser/grammar.cpp @@ -4084,21 +4084,6 @@ yylex(void *yylval_v, void *vstate) yyerror(tmp); } if (is_float) { - /* Some implementations of strtod() don't guarantee to - * set errno, so we need to reset it ourselves. - */ - errno = 0; - - /* HACK: gcc 4.3.2 refuses to accept (void) to ignore - * the return value so we have to invent something - * fake for it to do instead - */ - if(strtod(tok(), 0)); - - if (errno == ERANGE) { - rb_warn("Float %s out of range", tok()); - errno = 0; - } pslval->node = NEW_FLOAT(string_new2(tok())); return tFLOAT; } vm/parser/grammar.y @@ -4,6 +4,7 @@ #include "event.hpp" #include "gen/includes.hpp" #include "message.hpp" +#include "profiler.hpp" #include <iostream> vm/primitives.cpp @@ -1,38 +1,20 @@ #include "vm/profiler.hpp" #include "vm/object_utils.hpp" -#include "vm/vm.hpp" +#include "builtin/array.hpp" +#include "builtin/class.hpp" +#include "builtin/compiledmethod.hpp" +#include "builtin/contexts.hpp" +#include "builtin/integer.hpp" +#include "builtin/lookuptable.hpp" +#include "builtin/module.hpp" +#include "builtin/string.hpp" #include "builtin/symbol.hpp" #include "detection.hpp" +#include "message.hpp" -// HACK figure out a better way to detect if we should use -// mach_absolute_time -#if defined(OS_X_ANCIENT) || \ - defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \ - __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 - #define USE_MACH_TIME -#endif - -#ifdef USE_MACH_TIME - -#include <mach/mach_time.h> -#define current_time() mach_absolute_time() -#define METHOD "mach_absolute_time" - -#else - -uint64_t current_time() { - timespec tp; - if (clock_gettime(CLOCK_REALTIME, &tp)) { - // error! Do something about it? - return 0U; - } - return tp.tv_sec * 1000000000UL + tp.tv_nsec; -} -#define METHOD "clock_gettime" - -#endif +#include "timing.hpp" #include <time.h> @@ -54,11 +36,11 @@ namespace rubinius { } void Invocation::start() { - start_time_ = current_time(); + start_time_ = get_current_time(); } void Invocation::stop() { - leaf_->add_total_time(current_time() - start_time_); + leaf_->add_total_time(get_current_time() - start_time_); } Method::~Method() { @@ -84,6 +66,35 @@ namespace rubinius { } + String* Method::name(STATE) { + const char *module = ""; + const char *method_name = method()->c_str(state); + + if(Symbol* klass = try_as<Symbol>(container())) { + module = klass->c_str(state); + } + + String* name = String::create(state, module); + + switch(kind()) { + case kNormal: + name->append(state, "#"); + name->append(state, method_name); + break; + case kSingleton: + name->append(state, "."); + name->append(state, method_name); + break; + case kBlock: + name->append(state, "#"); + name->append(state, method_name); + name->append(state, " {}"); + break; + } + + return name; + } + uint64_t Method::total_time_in_ns() { return in_nanoseconds(total_time_); } @@ -124,32 +135,69 @@ namespace rubinius { delete top_; } - Method* Profiler::enter_method(Symbol* name, Object* container, Kind kind) { - Key key(name, container, kind); + Symbol* Profiler::module_name(Module* module) { + if(IncludedModule* im = try_as<IncludedModule>(module)) { + return im->module()->name(); + } else { + return module->name(); + } + } + + void Profiler::enter_block(STATE, MethodContext* ctx, CompiledMethod* cm) { + record_method(state, cm, as<Symbol>(ctx->name()), + module_name(ctx->module()), kBlock); + } + + void Profiler::enter_primitive(STATE, Message& msg) { + enter_method(state, msg, (CompiledMethod*)Qnil); + } + + void Profiler::enter_method(STATE, Message &msg, CompiledMethod* cm) { + if(MetaClass* mc = try_as<MetaClass>(msg.module)) { + Object* attached = mc->attached_instance(); + + if(Module* mod = try_as<Module>(attached)) { + record_method(state, cm, msg.name, mod->name(), kSingleton); + } else { + Symbol* name = msg.recv->to_s(state)->to_sym(state); + record_method(state, cm, msg.name, name, kSingleton); + } + } else { + record_method(state, cm, msg.name, module_name(msg.module), kNormal); + } + } - Method* meth; + Method* Profiler::record_method(STATE, CompiledMethod* cm, Symbol* name, + Object* container, Kind kind) { + Key key(name, container, kind); - meth = find_key(key); - if(!meth) { - meth = new Method(methods_.size(), name, container, kind); - methods_[key] = meth; + Method* method = find_key(key); + if(!method) { + method = new Method(methods_.size(), name, container, kind); + methods_[key] = method; } - Leaf* leaf = current_->find_leaf(meth); + Leaf* leaf = current_->find_leaf(method); - current_ = meth; + current_ = method; - meth->called(); + method->called(); + + if(!method->file() && !cm->nil_p()) { + method->set_position(cm->file(), cm->start_line(state)); + } Invocation invoke(leaf); invoke.start(); running_.push(invoke); - return meth; + return method; } void Profiler::leave_method() { - assert(!running_.empty()); + // Depending on when we started profiling, there could be calls + // above the first time we entered a method, so ignore these. + if(running_.empty()) return; Invocation& invoke = running_.top(); invoke.stop(); @@ -175,11 +223,7 @@ namespace rubinius { return methods_[key]; } - static bool method_cmp(Method* a, Method* b) { - return a->total_time() > b->total_time(); - } - - void Profiler::print_results(STATE, std::ostream& stream) { + LookupTable* Profiler::results(STATE) { std::vector<Method*> all_methods(0); for(MethodMap::iterator i = methods_.begin(); @@ -188,36 +232,28 @@ namespace rubinius { all_methods.push_back(i->second); } - std::sort(all_methods.begin(), all_methods.end(), method_cmp); + LookupTable* profile = LookupTable::create(state); + profile->store(state, state->symbol("num_methods"), + Integer::from(state, methods_.size())); + profile->store(state, state->symbol("method"), + String::create(state, TIMING_METHOD)); - stream << "<profile methods='" << methods_.size() << - "' method='" << METHOD << "'>\n"; + LookupTable* methods = LookupTable::create(state); + profile->store(state, state->symbol("methods"), methods); for(std::vector<Method*>::iterator i = all_methods.begin(); i != all_methods.end(); i++) { Method* meth = *i; - stream << "<method id='" << meth->id() << "' name='"; + LookupTable* method = LookupTable::create(state); - if(Symbol* klass = try_as<Symbol>(meth->container())) { - stream << klass->c_str(state); - } else { - stream << "unknown"; - } + methods->store(state, Fixnum::from(meth->id()), method); - Kind kind = meth->kind(); - if(kind == kNormal) { - stream << "."; - } else if(kind == kSingleton) { - stream << "#"; - } else if(kind == kBlock) { - stream << "#."; - } - - stream << meth->method()->c_str(state); - - stream << "' total='" << meth->total_time_in_ns() << - "' called='" << meth->called_times(); + method->store(state, state->symbol("name"), meth->name(state)); + method->store(state, state->symbol("total"), + Integer::from(state, meth->total_time_in_ns())); + method->store(state, state->symbol("called"), + Fixnum::from(meth->called_times())); if(meth->file()) { const char *file; @@ -226,23 +262,29 @@ namespace rubinius { } else { file = meth->file()->c_str(state); } - stream << "' file='" << file << - "' line='" << meth->line(); + + method->store(state, state->symbol("file"), String::create(state, file)); + method->store(state, state->symbol("line"), Fixnum::from(meth->line())); } - stream << "'>\n"; + Array* leaves = Array::create(state, meth->number_of_leaves()); + method->store(state, state->symbol("leaves"), leaves); + size_t idx = 0; for(Leaves::iterator li = meth->leaves_begin(); li != meth->leaves_end(); li++) { Leaf* leaf = li->second; - stream << " <leaf id='" << leaf->method()->id() << - "' total='" << leaf->total_time_in_ns() << "'/>\n"; + + Array* l = Array::create(state, 2); + leaves->set(state, idx++, l); + + l->set(state, 0, Fixnum::from(leaf->method()->id())); + l->set(state, 1, Integer::from(state, leaf->total_time_in_ns())); } - stream << "</method>\n"; } - stream << "</profile>\n"; + return profile; } } } vm/profiler.cpp @@ -1,6 +1,8 @@ #ifndef RBX_PROFILER_HPP #define RBX_PROFILER_HPP +#include "vm/vm.hpp" + #include <stdint.h> #include <stdio.h> @@ -13,6 +15,8 @@ namespace rubinius { class VM; class Symbol; class Object; + class LookupTable; + class String; namespace profiler { @@ -67,7 +71,7 @@ namespace rubinius { Object* container_; Kind kind_; uint64_t total_time_; - Leaves leaves_; + Leaves leaves_; uint64_t called_times_; Symbol* file_; int line_; @@ -110,6 +114,8 @@ namespace rubinius { return kind_; } + String* name(STATE); + Symbol* file() { return file_; } @@ -151,7 +157,7 @@ namespace rubinius { class Invocation { private: uint64_t start_time_; - Leaf* leaf_; + Leaf* leaf_; public: Invocation(Leaf* meth) : leaf_(meth) { } @@ -177,8 +183,12 @@ namespace std { } namespace rubinius { + class CompiledMethod; + class Message; + class MethodContext; namespace profiler { + class Profiler { typedef std::tr1::unordered_map<Key, Method*> MethodMap; @@ -191,12 +201,19 @@ namespace rubinius { public: Profiler(); ~Profiler(); - Method* enter_method(Symbol* meth, Object* container, Kind kind = kNormal); + + Symbol* module_name(Module* module); + void enter_method(STATE, Message&, CompiledMethod*); + void enter_primitive(STATE, Message&); + void enter_block(STATE, MethodContext*, CompiledMethod*); + Method* record_method(STATE, CompiledMethod*, Symbol*, Object*, Kind kind = kNormal); void leave_method(); + size_t number_of_entries(); Method* find_key(Key& key); size_t depth(); - void print_results(VM* state, std::ostream& stream); + + LookupTable* results(STATE); Method* current_method() { return current_; vm/profiler.hpp @@ -314,7 +314,7 @@ class TestFloat : public CxxTest::TestSuite { TS_ASSERT_SAME_DATA("3.14159000000000", s->c_str(), 16); TS_ASSERT_EQUALS(16U, s->size()); - format = String::create(state, "%#.1024g"); + format = String::create(state, "%#.1280g"); TS_ASSERT_THROWS_ASSERT(f->to_s_formatted(state, format), const RubyException &e, TS_ASSERT(Exception::argument_error_p(state, e.exception))); } vm/test/test_float.hpp @@ -109,8 +109,9 @@ public: } void test_float() { - mar->marshal(Float::create(state, 15.5)); - TS_ASSERT_EQUALS(mar->sstream.str(), std::string("d\n15.5\n")); + mar->marshal(Float::create(state, 1.0 / 6.0)); + TS_ASSERT_EQUALS(mar->sstream.str(), + std::string("d\n +0.666666666666666629659232512494781985878944396972656250 -2\n")); } void test_iseq() { vm/test/test_marshal.hpp @@ -17,13 +17,142 @@ class TestProfiler : public CxxTest::TestSuite { delete state; } + void test_method_name_normal() { + Symbol* meth = state->symbol("meth"); + Symbol* klass = state->symbol("Object"); + + profiler::Method method(0U, meth, klass, profiler::kNormal); + String* name = method.name(state); + + TS_ASSERT_SAME_DATA("Object#meth", name->byte_address(), 11); + } + + void test_method_name_singleton() { + Symbol* meth = state->symbol("meth"); + Symbol* klass = state->symbol("Object"); + + profiler::Method method(0U, meth, klass, profiler::kSingleton); + String* name = method.name(state); + + TS_ASSERT_SAME_DATA("Object.meth", name->byte_address(), 11); + } + + void test_method_name_block() { + Symbol* meth = state->symbol("meth"); + Symbol* klass = state->symbol("Object"); + + profiler::Method method(0U, meth, klass, profiler::kBlock); + String* name = method.name(state); + + TS_ASSERT_SAME_DATA("Object#meth {}", name->byte_address(), 14); + } + + void test_module_name() { + Symbol* name = state->symbol("ModName"); + + Module* mod = Module::create(state); + mod->name(state, name); + + IncludedModule* im = IncludedModule::create(state); + im->module(state, mod); + + profiler::Profiler prof; + + TS_ASSERT_EQUALS(name, prof.module_name(im)); + TS_ASSERT_EQUALS(name, prof.module_name(mod)); + } + + void test_enter_block() { + Symbol* meth = state->symbol("meth"); + Symbol* klass = state->symbol("Object"); + + MethodContext* ctx = MethodContext::create(state, 10); + ctx->name(state, meth); + ctx->module(state, G(object)); + + CompiledMethod* cm = CompiledMethod::create(state); + cm->name(state, meth); + + profiler::Profiler prof; + + prof.enter_block(state, ctx, cm); + TS_ASSERT_EQUALS(prof.depth(), 1U); + TS_ASSERT_EQUALS(prof.number_of_entries(), 1U); + + profiler::Key key(meth, klass, profiler::kBlock); + profiler::Method* mo = prof.find_key(key); + TS_ASSERT(mo); + } + void test_enter_method() { + Symbol* meth = state->symbol("meth"); + Symbol* klass = state->symbol("Object"); + + CompiledMethod* cm = CompiledMethod::create(state); + cm->name(state, meth); + + profiler::Profiler prof; + + Message msg(state); + msg.module = G(object); + msg.name = meth; + + prof.enter_method(state, msg, cm); + TS_ASSERT_EQUALS(prof.depth(), 1U); + TS_ASSERT_EQUALS(prof.number_of_entries(), 1U); + + profiler::Key key(meth, klass, profiler::kNormal); + TS_ASSERT(prof.find_key(key)); + + msg.module = G(object)->metaclass(state); + + prof.enter_method(state, msg, cm); + TS_ASSERT_EQUALS(prof.depth(), 2U); + TS_ASSERT_EQUALS(prof.number_of_entries(), 2U); + + profiler::Key key1(meth, klass, profiler::kNormal); + TS_ASSERT(prof.find_key(key1)); + } + + void test_enter_primitive() { + Symbol* meth = state->symbol("meth"); + Symbol* klass = state->symbol("Object"); + + CompiledMethod* cm = CompiledMethod::create(state); + cm->name(state, meth); + + profiler::Profiler prof; + + Message msg(state); + msg.module = G(object); + msg.name = meth; + + prof.enter_primitive(state, msg); + TS_ASSERT_EQUALS(prof.depth(), 1U); + TS_ASSERT_EQUALS(prof.number_of_entries(), 1U); + + profiler::Key key(meth, klass, profiler::kNormal); + TS_ASSERT(prof.find_key(key)); + + msg.module = G(object)->metaclass(state); + + prof.enter_primitive(state, msg); + TS_ASSERT_EQUALS(prof.depth(), 2U); + TS_ASSERT_EQUALS(prof.number_of_entries(), 2U); + + profiler::Key key1(meth, klass, profiler::kNormal); + TS_ASSERT(prof.find_key(key1)); + } + + void test_record_method() { Symbol* meth = state->symbol("blah"); Symbol* klass = state->symbol("Sweet"); + CompiledMethod* cm = CompiledMethod::create(state); + profiler::Profiler prof; - prof.enter_method(meth, klass); + prof.record_method(state, cm, meth, klass); TS_ASSERT_EQUALS(prof.depth(), 1U); TS_ASSERT_EQUALS(prof.number_of_entries(), 1U); @@ -35,12 +164,12 @@ class TestProfiler : public CxxTest::TestSuite { TS_ASSERT_EQUALS(mo->method(), meth); TS_ASSERT_EQUALS(mo->total_time(), 0ULL); - prof.enter_method(meth, klass); + prof.record_method(state, cm, meth, klass); TS_ASSERT_EQUALS(prof.number_of_entries(), 1U); TS_ASSERT_EQUALS(prof.depth(), 2U); Symbol* meth2 = state->symbol("woo"); - prof.enter_method(meth2, klass); + prof.record_method(state, cm, meth2, klass); TS_ASSERT_EQUALS(prof.number_of_entries(), 2U); TS_ASSERT_EQUALS(prof.depth(), 3U); @@ -50,9 +179,11 @@ class TestProfiler : public CxxTest::TestSuite { Symbol* meth = state->symbol("blah"); Symbol* klass = state->symbol("Sweet"); + CompiledMethod* cm = CompiledMethod::create(state); + profiler::Profiler prof; - prof.enter_method(meth, klass); + prof.record_method(state, cm, meth, klass); profiler::Key key(meth, klass); profiler::Method* mo = prof.find_key(key); TS_ASSERT_EQUALS(mo->total_time(), 0ULL); @@ -68,14 +199,16 @@ class TestProfiler : public CxxTest::TestSuite { Symbol* meth = state->symbol("blah"); Symbol* klass = state->symbol("Sweet"); + CompiledMethod* cm = CompiledMethod::create(state); + profiler::Profiler prof; - profiler::Method* outer = prof.enter_method(meth, klass); + profiler::Method* outer = prof.record_method(state, cm, meth, klass); TS_ASSERT_EQUALS(prof.current_method(), outer); Symbol* meth2 = state->symbol("fun"); - profiler::Method* inner = prof.enter_method(meth2, klass); + profiler::Method* inner = prof.record_method(state, cm, meth2, klass); TS_ASSERT_EQUALS(prof.current_method(), inner); prof.leave_method(); @@ -98,36 +231,54 @@ class TestProfiler : public CxxTest::TestSuite { TS_ASSERT_EQUALS(leaf->total_time(), mo2->total_time()); } - void test_print_results() { + void test_results() { Symbol* meth = state->symbol("blah"); Symbol* meth2 = state->symbol("foo"); Symbol* meth3 = state->symbol("done"); Symbol* klass = state->symbol("Sweet"); + CompiledMethod* cm = CompiledMethod::create(state); + profiler::Profiler prof; - profiler::Method* top = prof.enter_method(meth, klass); - prof.enter_method(meth2, klass); + profiler::Method* top = prof.record_method(state, cm, meth, klass); + prof.record_method(state, cm, meth2, klass); prof.leave_method(); TS_ASSERT_EQUALS(prof.current_method(), top); - prof.enter_method(meth3, klass); + prof.record_method(state, cm, meth3, klass); prof.leave_method(); TS_ASSERT_EQUALS(prof.current_method(), top); - prof.enter_method(meth2, klass); - prof.enter_method(meth3, klass); + prof.record_method(state, cm, meth2, klass); + prof.record_method(state, cm, meth3, klass); prof.leave_method(); prof.leave_method(); prof.leave_method(); - std::stringstream stream; - prof.print_results(state, stream); - - // This is a bullshit test, but i'm too lazy to test the entire - // form of the XML for now. - TS_ASSERT(stream.str().find("profile") != std::string::npos); + LookupTable* results = prof.results(state); + + TS_ASSERT(!results->nil_p()); + TS_ASSERT(!results->fetch(state, state->symbol("method"))->nil_p()); + TS_ASSERT_EQUALS(Fixnum::from(3), + results->fetch(state, state->symbol("num_methods"))); + + LookupTable* methods = as<LookupTable>( + results->fetch(state, state->symbol("methods"))); + TS_ASSERT_EQUALS(Integer::from(state, 3), methods->entries()); + + LookupTable* method = as<LookupTable>( + methods->fetch(state, Fixnum::from(1))); + TS_ASSERT_EQUALS(Integer::from(state, 6), method->entries()); + TS_ASSERT_EQUALS(Fixnum::from(1), + method->fetch(state, state->symbol("called"))); + TS_ASSERT_SAME_DATA("Sweet#blah", as<String>(method->fetch(state, + state->symbol("name")))->byte_address(), 9); + TS_ASSERT(kind_of<Array>(method->fetch(state, state->symbol("leaves")))); + TS_ASSERT(method->has_key(state, state->symbol("total"))->true_p()); + TS_ASSERT(method->has_key(state, state->symbol("file"))->true_p()); + TS_ASSERT(method->has_key(state, state->symbol("line"))->true_p()); } }; vm/test/test_profiler.hpp @@ -131,7 +131,8 @@ public: } void test_float() { - mar->sstream.str(std::string("d\n15.5\n")); + mar->sstream.str( + std::string("d\n +0.666666666666666629659232512494781985878944396972656250 -2\n")); Object* obj = mar->unmarshal(); @@ -139,7 +140,17 @@ public: Float* flt = as<Float>(obj); - TS_ASSERT_EQUALS(flt->val, 15.5); + TS_ASSERT_EQUALS(flt->val, 1.0 / 6.0); + + mar->sstream.str( + std::string("d\n +0.999999999999999888977697537484345957636833190917968750 1024\n")); + obj = mar->unmarshal(); + + TS_ASSERT(kind_of<Float>(obj)); + + flt = as<Float>(obj); + + TS_ASSERT_EQUALS(flt->val, DBL_MAX); } void test_float_infinity() { vm/test/test_unmarshal.hpp @@ -8,12 +8,13 @@ #include <mach/mach_time.h> #define get_current_time() mach_absolute_time() +#define TIMING_METHOD "mach_absolute_time" -#else +#elif defined(CLOCK_REALTIME) #include <time.h> -uint64_t get_current_time() { +static inline uint64_t get_current_time() { timespec tp; if(clock_gettime(CLOCK_REALTIME, &tp)) { // error! Do something about it? @@ -22,6 +23,24 @@ uint64_t get_current_time() { return tp.tv_sec * 1000000000UL + tp.tv_nsec; } +#define TIMING_METHOD "clock_gettime" + +#else + +#include <sys/time.h> + +static inline uint64_t get_current_time() { + struct timeval tv; + if(gettimeofday(&tv, NULL) != 0) { + // Fudge. + return 0U; + } + + return tv.tv_sec * 1000000000UL + tv.tv_usec * 1000L; +} + +#define TIMING_METHOD "gettimeofday" + #endif #endif vm/timing.hpp @@ -91,15 +91,8 @@ namespace rubinius { } void TypeInfo::class_info(STATE, const Object* self, bool newline) { - if(const Module* mod = try_as<Module>(self)) { - const char *name = mod->name()->nil_p() ? "<anonymous>" : mod->name()->c_str(state); - std::cout << "#<" << name << "(" << - self->class_object(state)->name()->c_str(state) << ")"; - } else { - std::cout << "#<" << self->class_object(state)->name()->c_str(state); - } - std::cout << ":" << (void*)self; - if(newline) std::cout << ">\n"; + std::cout << const_cast<Object*>(self)->to_s(state, true)->c_str(); + if(newline) std::cout << std::endl; } void TypeInfo::class_header(STATE, const Object* self) { vm/type_info.cpp @@ -18,6 +18,7 @@ #include "config_parser.hpp" #include "config.h" +#include "timing.hpp" #include <iostream> #include <signal.h> @@ -32,8 +33,6 @@ namespace rubinius { VM::VM(size_t bytes, bool boot) : current_mark(NULL) , reuse_llvm(true) - , jit_timing(0) - , jitted_methods(0) , use_safe_position(false) { config.compile_up_front = false; @@ -203,20 +202,32 @@ namespace rubinius { } void VM::collect() { + uint64_t start = get_current_time(); + om->collect_young(globals.roots); om->collect_mature(globals.roots); + + stats.time_in_gc += (get_current_time() - start); } void VM::collect_maybe() { if(om->collect_young_now) { om->collect_young_now = false; + + uint64_t start = get_current_time(); om->collect_young(globals.roots); + stats.time_in_gc += (get_current_time() - start); + global_cache->clear(); } if(om->collect_mature_now) { om->collect_mature_now = false; + + uint64_t start = get_current_time(); om->collect_mature(globals.roots); + stats.time_in_gc += (get_current_time() - start); + global_cache->clear(); } vm/vm.cpp @@ -59,6 +59,23 @@ namespace rubinius { { } }; + struct Stats { + // How much time is spent running the JIT + uint64_t jit_timing; + + // How many methods have been compiled by the JIT + uint64_t jitted_methods; + + // How much time is spent in the GC + uint64_t time_in_gc; + + Stats() + : jit_timing(0) + , jitted_methods(0) + , time_in_gc(0) + {} + }; + class VM { public: /* Data members */ @@ -74,6 +91,8 @@ namespace rubinius { SymbolTable symbols; ConfigParser *user_config; + Stats stats; + // Temporary holder for rb_gc_mark() in subtend ObjectMark current_mark; @@ -82,12 +101,6 @@ namespace rubinius { // The thread used to trigger preemptive thread switching pthread_t preemption_thread; - // How much time is spent running the JIT - uint64_t jit_timing; - - // How many methods have been compiled by the JIT - uint64_t jitted_methods; - // The safe position on the stack used to handle rare // events. sigjmp_buf safe_position; vm/vm.hpp @@ -336,12 +336,12 @@ namespace rubinius { // for this method. if(vmm->call_count >= 0) { if(vmm->call_count >= CALLS_TIL_JIT) { - state->jitted_methods++; + state->stats.jitted_methods++; uint64_t start = get_current_time(); MachineMethod* mm = cm->make_machine_method(state); mm->activate(); vmm->call_count = -1; - state->jit_timing += (get_current_time() - start); + state->stats.jit_timing += (get_current_time() - start); } else { vmm->call_count++; } @@ -380,23 +380,7 @@ namespace rubinius { task->make_active(ctx); - if(unlikely(task->profiler)) { - profiler::Method* prof_meth; - if(MetaClass* mc = try_as<MetaClass>(msg.module)) { - Object* attached = mc->attached_instance(); - if(Module* mod = try_as<Module>(attached)) { - prof_meth = task->profiler->enter_method(msg.name, mod->name(), profiler::kNormal); - } else { - prof_meth = task->profiler->enter_method(msg.name, attached->id(state), profiler::kNormal); - } - } else { - prof_meth = task->profiler->enter_method(msg.name, msg.module->name(), profiler::kSingleton); - } - - if(!prof_meth->file()) { - prof_meth->set_position(cm->file(), cm->start_line(state)); - } - } + if(unlikely(task->profiler)) task->profiler->enter_method(state, msg, cm); return cExecuteRestart; } @@ -481,23 +465,7 @@ namespace rubinius { task->make_active(ctx); - if(unlikely(task->profiler)) { - profiler::Method* prof_meth; - if(MetaClass* mc = try_as<MetaClass>(msg.module)) { - Object* attached = mc->attached_instance(); - if(Module* mod = try_as<Module>(attached)) { - prof_meth = task->profiler->enter_method(msg.name, mod->name(), profiler::kNormal); - } else { - prof_meth = task->profiler->enter_method(msg.name, attached->id(state), profiler::kNormal); - } - } else { - prof_meth = task->profiler->enter_method(msg.name, msg.module->name(), profiler::kSingleton); - } - - if(!prof_meth->file()) { - prof_meth->set_position(cm->file(), cm->start_line(state)); - } - } + if(unlikely(task->profiler)) task->profiler->enter_method(state, msg, cm); return cExecuteRestart; } vm/vmmethod.cpp kernel/bootstrap/sampler.rb kernel/common/sampler.rb kernel/delta/array.rb spec/tags/frozen/core/array/initialize_tags.txt spec/tags/frozen/core/array/minus_tags.txt spec/tags/frozen/core/array/new_tags.txt spec/tags/frozen/core/bignum/divide_tags.txt spec/tags/frozen/core/bignum/divmod_tags.txt spec/tags/frozen/core/bignum/exponent_tags.txt spec/tags/frozen/core/bignum/minus_tags.txt spec/tags/frozen/core/bignum/multiply_tags.txt spec/tags/frozen/core/bignum/plus_tags.txt spec/tags/frozen/core/bignum/to_f_tags.txt spec/tags/frozen/core/fixnum/abs_tags.txt spec/tags/frozen/core/fixnum/element_reference_tags.txt spec/tags/frozen/core/fixnum/minus_tags.txt spec/tags/frozen/core/fixnum/plus_tags.txt spec/tags/frozen/core/float/ceil_tags.txt spec/tags/frozen/core/float/coerce_tags.txt spec/tags/frozen/core/float/constants_tags.txt spec/tags/frozen/core/float/divmod_tags.txt spec/tags/frozen/core/float/floor_tags.txt spec/tags/frozen/core/float/induced_from_tags.txt spec/tags/frozen/core/float/infinite_tags.txt spec/tags/frozen/core/float/minus_tags.txt spec/tags/frozen/core/float/multiply_tags.txt spec/tags/frozen/core/float/plus_tags.txt spec/tags/frozen/core/float/to_i_tags.txt spec/tags/frozen/core/float/to_int_tags.txt spec/tags/frozen/core/float/truncate_tags.txt c14849545471092318f3db3accc81957c1179473 5e95249ef8ca5e6f0cec14fb4aae14113e269489 Konstantin Haase konstantin.mailinglists@googlemail.com http://github.com/evanphx/rubinius/commit/fac3883d3ec82f4766927e56e6aefb28588d7d5b fac3883d3ec82f4766927e56e6aefb28588d7d5b 2009-01-09T01:18:18-08:00 2009-01-09T01:18:18-08:00 merge conflict f083efc1d0c964ae1230bc407ad72b434182d259 Konstantin Haase konstantin.mailinglists@googlemail.com