overlook-csgo 0.2.9 → 0.3.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87a7cd83f7ad143ebf6ce47b5cf32fb9e43769f0
-  data.tar.gz: 37b4c303d2e4c3893f3b81eb7ebd581464c18d81
+  metadata.gz: ebb21e76a090cdede06e6dee594ef17bb3fb0b06
+  data.tar.gz: 24ba1f70ca0140d1a3809bc2b413acacbab47733
 SHA512:
-  metadata.gz: 30216334445101d00fbb60ab18b8e0edc4db471cab11fbfc6e0152311f298c73045c5383d28b720a0c9471d0aac05affbeaf6e59dd41df8fc19c875b60fbc8eb
-  data.tar.gz: 59c971f5ebb5069d6eefcc7217225d16a861637f5dacb1bdf06016c24f8008ec799823544abf67a516f6d04c11ddd05ff2b8d61a8892683803d2a741703d647e
+  metadata.gz: b478a8594315996bb718f0e8bdf458f66f5ed7658178dcdec6f4beec31bc8dc5ac969b36230d6cbd1227df909cd76e5d8f00cb699542ea3659f9dc2a3f9eef2b
+  data.tar.gz: a52bffacb6a71bb6e259983d1b7c9a912c6f5cf3fba47a5dc0f90e33b2e2f2601d1c06fd5b8292c3bbce13df5a8a333e1313ff456b7d1b29262955b7c4917fe7

data/.travis.yml

@@ -17,4 +17,4 @@ before_install:
   - git-lfs/bin/git-lfs pull | cat
 install:
   - bundle
-script: rake spec:all
+script: rake compile && rake spec:all

data/Rakefile

@@ -6,3 +6,7 @@ load './lib/tasks/spec.rake'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: 'spec:fast'
+
+require 'rake/extensiontask'
+spec = Gem::Specification.load('overlook-csgo.gemspec')
+Rake::ExtensionTask.new('fast_byte_reader', spec)

data/bin/benchmark

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'overlook'
+require 'benchmark'
+
+class Subscriber
+end
+
+def parse
+  raise "give demo file as argument usage: ./bin/benchmark mydemo.dem" unless ARGV.first
+  @subscriber = Subscriber.new
+
+  @parser = Overlook::Csgo::Demo.open(File.open(ARGV.first))
+  @parser.subscribe(@subscriber)
+  @parser.parse
+end
+
+benchmark = Benchmark.realtime do
+  50.times { parse }
+end
+puts benchmark

data/ext/fast_byte_reader/extconf.rb

@@ -0,0 +1,4 @@
+require 'mkmf'
+extension_name = 'fast_byte_reader'
+dir_config(extension_name)
+create_makefile(extension_name)

data/ext/fast_byte_reader/fast_byte_reader.c

@@ -0,0 +1,90 @@
+#include <ruby.h>
+
+static VALUE fast_byte_reader_initialize(VALUE fbr, VALUE io);
+static VALUE fast_byte_reader_read(VALUE fbr, int len);
+static VALUE fast_byte_reader_seek(VALUE fbr, VALUE pos);
+static VALUE fast_byte_reader_byte(VALUE fbr);
+static VALUE fast_byte_reader_var_int32(VALUE fbr);
+static VALUE fast_byte_reader_eof(VALUE fbr);
+static VALUE fast_byte_reader_close(VALUE fbr);
+
+static ID id_read, id_write;
+
+VALUE fast_byte_reader_initialize(VALUE obj, VALUE arg) {
+  if(rb_respond_to(arg, rb_intern("read"))) {
+    rb_funcall(arg, rb_intern("binmode"), 0);
+    rb_iv_set(obj, "@io", arg);
+  } else {
+    rb_raise(rb_eTypeError, "IO required to init FastByteReader");
+  }
+  return obj;
+}
+
+VALUE fast_byte_reader_read(VALUE obj, int len) {
+  VALUE io = rb_iv_get(obj, "@io");
+  VALUE string = rb_funcall(io, id_read, 1, len);
+  return string;
+}
+
+VALUE fast_byte_reader_byte(VALUE obj) {
+  VALUE io = rb_iv_get(obj, "@io");
+  VALUE string = rb_funcall(io, rb_intern("getbyte"), 0);
+  return string;
+}
+
+VALUE fast_byte_reader_seek(VALUE obj, VALUE pos) {
+  VALUE io = rb_iv_get(obj, "@io");
+  return rb_funcall(io, rb_intern("seek"), 2, pos, INT2FIX(1));
+}
+
+static VALUE fast_byte_reader_var_int32(VALUE fbr) {
+  unsigned long long int_val = 0;
+  unsigned shift = 0;
+  unsigned char byte;
+  unsigned int count = 0;
+
+  while (1) {
+    if((count + 1) == 4) {
+      return INT2NUM(int_val);
+    }
+    if (shift >= 64) {
+      rb_raise(rb_eArgError, "too many bytes when decoding varint");
+    }
+    byte = (unsigned char)NUM2INT(fast_byte_reader_byte(fbr));
+    int_val |= ((unsigned long long)(byte & 0x7f)) << shift;
+    shift += 7;
+    count = count + 1;
+    if ((byte & 0x80) == 0) {
+      return INT2NUM(int_val);
+    }
+  }
+}
+
+VALUE fast_byte_reader_eof(VALUE obj) {
+  VALUE io = rb_iv_get(obj, "@io");
+  VALUE eof = rb_funcall(io, rb_intern("eof?"), 0);
+  return eof;
+}
+
+VALUE fast_byte_reader_close(VALUE obj) {
+  VALUE io = rb_iv_get(obj, "@io");
+  VALUE close = rb_funcall(io, rb_intern("close"), 0);
+  return close;
+}
+
+void Init_fast_byte_reader()
+{
+    id_read = rb_intern("read");
+    static VALUE klass;
+
+    klass = rb_define_class("FastByteReader", rb_cObject);
+
+    rb_define_attr(klass, "io", 1, 1);
+    rb_define_method(klass, "initialize", fast_byte_reader_initialize, 1);
+    rb_define_method(klass, "read", fast_byte_reader_read, 1);
+    rb_define_method(klass, "byte", fast_byte_reader_byte, 0);
+    rb_define_method(klass, "seek", fast_byte_reader_seek, 1);
+    rb_define_method(klass, "var_int32", fast_byte_reader_var_int32, 0);
+    rb_define_method(klass, "eof?", fast_byte_reader_eof, 0);
+    rb_define_method(klass, "close", fast_byte_reader_close, 0);
+}

data/lib/overlook/byte_reader.rb

@@ -54,5 +54,6 @@ module Overlook
     def_delegator :@io, :read, :read
     def_delegator :@io, :tell, :tell
     def_delegator :@io, :lineno, :lineno
+    def_delegator :@io, :close, :close
   end
 end

data/lib/overlook/csgo/demo/packet_handler.rb

@@ -19,7 +19,7 @@ module Overlook
         end
 
         def handle(packet)
-          reader = BitReader.new(packet.data)
+          reader = FastByteReader.new(packet.data)
 
           loop do
             message_type  = reader.var_int32
@@ -27,19 +27,22 @@ module Overlook
 
             handler = handlers[message_type]
             if handler && handle?(handler)
-              handler.handle(reader.bytes(message_size))
+              handler.handle(reader.read(message_size))
             else
-              reader.skip(message_size)
+              reader.seek(message_size)
             end
 
-            break if reader.eof?
+            if reader.eof?
+              reader.close
+              break
+            end
           end
         end
 
         private
 
         def handlers
-          {
+          @handlers ||= {
             ::Csgo::SVC_Messages::Svc_UserMessage   => UserMessageMessageHandler.new(parser),
             ::Csgo::SVC_Messages::Svc_GameEventList => GameEventListMessageHandler.new(parser),
             ::Csgo::SVC_Messages::Svc_GameEvent     => GameEventMessageHandler.new(parser),

data/lib/overlook/csgo/demo/parser.rb

@@ -39,6 +39,7 @@ module Overlook
 
         def done
           emit(:done)
+          @reader.close
           true
         end
 

data/lib/overlook/version.rb

@@ -1,3 +1,3 @@
 module Overlook
-  VERSION = '0.2.9'.freeze
+  VERSION = '0.3.0.pre1'.freeze
 end

data/lib/overlook.rb

@@ -9,6 +9,8 @@ require 'overlook/bit_buffer'
 require 'overlook/bit_reader'
 require 'overlook/byte_reader'
 
+require 'fast_byte_reader'
+
 module Overlook
   def self.decode_share_code(code)
     decoder = Csgo::SharecodeDecoder.new(code)

data/overlook-csgo.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.extensions << "ext/fast_byte_reader/extconf.rb"
+
   spec.required_ruby_version = '>= 2.3.1'
 
   # For protobuf
@@ -39,4 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10.4'
   spec.add_development_dependency 'yard', '~> 0.9.5'
   spec.add_development_dependency 'rubycritic', '~> 3.0'
+  spec.add_development_dependency 'rake-compiler'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overlook-csgo
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0.pre1
 platform: ruby
 authors:
 - Taylor Finnell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -150,11 +150,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby access to CS:GO demo files.
 email:
 - tmfinnell@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/fast_byte_reader/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitattributes"
@@ -165,8 +180,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/benchmark
 - bin/console
 - bin/setup
+- ext/fast_byte_reader/extconf.rb
+- ext/fast_byte_reader/fast_byte_reader.c
+- lib/fast_byte_reader.bundle
 - lib/overlook.rb
 - lib/overlook/bit_buffer.rb
 - lib/overlook/bit_reader.rb
@@ -206,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1