liquid-c 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2431d1b61b78e144d34a423a60c5463fb8c21a87
-  data.tar.gz: 7cf1e00087a7c80cb6b19d099756149d3d136155
+  metadata.gz: 1f1e4b7a91ef500fc48563ecdff875658c045b0e
+  data.tar.gz: 460cbca81b9ff70a9c20e4051cdc62a26a1e2c7b
 SHA512:
-  metadata.gz: 29ebcbdcc043203d454b979ae8b136263b14d8dd885ea0556d699c7aa006375798eb408c8db048258869b91bd1cf6e519f37a1fc6609f590c078bbea15893c9d
-  data.tar.gz: 3b2628f520d13b1b487da6d473c9357b631cb860bdf74de3d288d3345584a954b2eaa71ef221d8aac4e21b5474be3d3570c709e7e846afdcbeeb8031ea7ad24d
+  metadata.gz: 1ecf742609e18e26a982897562f3ff0ef0c06e77045d12b98ad36fda3081e4350faffb9bae860ce1ecc060d8c6138b7fd482c323d763538dc38b13bc5738d1f8
+  data.tar.gz: 817638febdcb9a54399ab8aec528091b1c24f66510816e455f09b85bce9b2c1f7a5e559a89ab5611327b1d0f780c9d62fcb36ad0b231eaba35554f551bcdc80e

data/.gitignore

@@ -6,3 +6,4 @@ tmp
 *.o
 *.bundle
 ext/*/Makefile
+*.so

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
 gemfile:

data/Gemfile

@@ -3,3 +3,11 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'liquid', github: 'Shopify/liquid', branch: 'master'
+
+group :test do
+  gem 'spy', '0.4.1'
+end
+
+group :development do
+  gem 'byebug'
+end

data/README.md

@@ -27,6 +27,25 @@ then just use the documented API for the liquid Gem.
   of an array of strings, which only implements the shift method
   to get the next token.
 
+## Performance
+
+To compare Liquid-C's performance with plain Liquid run
+
+    bundle exec rake compare:run
+
+The latest benchmark results are shown below:
+
+                     user     system      total        real
+    Liquid:      0.000000   0.000000 246.950000 (247.499526)
+    Liquid-C:    0.000000   0.010000 224.270000 (224.794395)
+    Ratio: 90.82619215891624%
+
+## Developing
+
+    bundle install
+    # run tests
+    bundle exec rake
+
 ## Contributing
 
 1. Fork it ( http://github.com/Shopify/liquid-c/fork )

data/Rakefile

@@ -2,7 +2,9 @@ require 'rake'
 require 'rake/testtask'
 require 'bundler/gem_tasks'
 require 'rake/extensiontask'
+require 'benchmark'
 
+ENV['DEBUG'] = 'true'
 Rake::ExtensionTask.new("liquid_c")
 
 task :default => :test
@@ -34,12 +36,12 @@ end
 namespace :benchmark do
   desc "Run the liquid benchmark with lax parsing"
   task :run do
-    ruby "./performance.rb benchmark lax"
+    ruby "./performance.rb c benchmark lax"
   end
 
   desc "Run the liquid benchmark with strict parsing"
   task :strict do
-    ruby "./performance.rb benchmark strict"
+    ruby "./performance.rb c benchmark strict"
   end
 end
 
@@ -47,11 +49,28 @@ end
 namespace :profile do
   desc "Run the liquid profile/performance coverage"
   task :run do
-    ruby "./performance.rb profile lax"
+    ruby "./performance.rb c profile lax"
   end
 
   desc "Run the liquid profile/performance coverage with strict parsing"
   task :strict do
-    ruby "./performance.rb profile strict"
+    ruby "./performance.rb c profile strict"
+  end
+end
+
+namespace :compare do
+  include Benchmark
+  desc "Compare Liquid to Liquid + Liquid-C"
+  task :run do
+    bare = Benchmark.measure do
+      ruby "./performance.rb bare profile lax"
+    end
+    liquid_c = Benchmark.measure do
+      ruby "./performance.rb c profile lax"
+    end
+    Benchmark.benchmark(CAPTION, 10, FORMAT, "Liquid:", "Liquid-C:") do |x|
+      [bare, liquid_c]
+    end
+    puts "Ratio: #{liquid_c.real / bare.real * 100}%"
   end
 end

data/ext/liquid_c/extconf.rb

@@ -1,4 +1,8 @@
 require 'mkmf'
 $CFLAGS << ' -Wall -Werror'
+compiler = RbConfig::MAKEFILE_CONFIG['CC']
+if ENV['DEBUG'] == 'true' && compiler =~ /gcc|g\+\+/
+  $CFLAGS << ' -fbounds-check'
+end
 $warnflags.gsub!(/-Wdeclaration-after-statement/, "")
 create_makefile("liquid_c")

data/ext/liquid_c/liquid.c

@@ -1,9 +1,12 @@
 #include "liquid.h"
+#include "tokenizer.h"
 
 VALUE mLiquid;
+rb_encoding *utf8_encoding;
 
 void Init_liquid_c(void)
 {
+    utf8_encoding = rb_utf8_encoding();
     mLiquid = rb_define_module("Liquid");
     init_liquid_tokenizer();
 }

data/ext/liquid_c/liquid.h

@@ -1,11 +1,11 @@
-#ifndef LIQUID_H
+#if !defined(LIQUID_H)
 #define LIQUID_H
 
 #include <ruby.h>
+#include <ruby/encoding.h>
 #include <stdbool.h>
 
-#include "tokenizer.h"
-
 extern VALUE mLiquid;
+extern rb_encoding *utf8_encoding;
 
 #endif

data/ext/liquid_c/tokenizer.c

@@ -1,9 +1,10 @@
 #include "liquid.h"
+#include "tokenizer.h"
 
 VALUE cLiquidTokenizer;
-rb_encoding *utf8_encoding;
 
-static void tokenizer_mark(void *ptr) {
+static void tokenizer_mark(void *ptr)
+{
     tokenizer_t *tokenizer = ptr;
     rb_gc_mark(tokenizer->source);
 }
@@ -21,8 +22,8 @@ static size_t tokenizer_memsize(const void *ptr)
 
 const rb_data_type_t tokenizer_data_type = {
     "liquid_tokenizer",
-    {tokenizer_mark, tokenizer_free, tokenizer_memsize,},
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    { tokenizer_mark, tokenizer_free, tokenizer_memsize, },
+#if defined(RUBY_TYPED_FREE_IMMEDIATELY)
     NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 #endif
 };
@@ -134,5 +135,4 @@ void init_liquid_tokenizer()
     rb_define_alloc_func(cLiquidTokenizer, tokenizer_allocate);
     rb_define_method(cLiquidTokenizer, "initialize", tokenizer_initialize_method, 1);
     rb_define_method(cLiquidTokenizer, "shift", tokenizer_shift_method, 0);
-    utf8_encoding = rb_utf8_encoding();
 }

data/ext/liquid_c/tokenizer.h

@@ -1,9 +1,6 @@
-#ifndef LIQUID_TOKENIZER_H
+#if !defined(LIQUID_TOKENIZER_H)
 #define LIQUID_TOKENIZER_H
 
-#include <ruby.h>
-#include <ruby/encoding.h>
-
 enum token_type {
     TOKEN_NONE,
     TOKEN_INVALID,

data/lib/liquid/c.rb

@@ -1,19 +1,18 @@
 require 'liquid/c/version'
 require 'liquid'
-
-# workaround bundler issue #2947 which could cause an old extension to be used
-require 'rbconfig'
-ext_path = File.expand_path("../../liquid_c.#{RbConfig::CONFIG['DLEXT']}", __FILE__)
-if File.exists?(ext_path)
-  require ext_path
-else
-  require 'liquid_c'
-end
+require 'liquid_c'
 
 Liquid::Template.class_eval do
   private
 
+  alias_method :ruby_tokenize, :tokenize
+
   def tokenize(source)
-    Liquid::Tokenizer.new(source.to_s)
+    if @line_numbers
+      ruby_tokenize(source)
+    else
+      Liquid::Tokenizer.new(source.to_s)
+    end
   end
 end
+

data/lib/liquid/c/version.rb

@@ -1,5 +1,5 @@
 module Liquid
   module C
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/performance.rb

@@ -1,5 +1,5 @@
 require 'liquid'
-require 'liquid/c'
+require 'liquid/c' if ARGV.shift == "c"
 liquid_lib_dir = $LOAD_PATH.detect{ |p| File.exists?(File.join(p, 'liquid.rb')) }
 
 script = ARGV.shift or abort("unspecified performance script")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid-c
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid