x_runtime 0.8.0 → 0.9.0

data/README.markdown

@@ -33,7 +33,9 @@ XRuntime是一个Rack的middleware,配合Redis用来分析Http Server每个URI
 可以指定XRuntime使用的Redis的key前缀或者叫命名空间:    
 `XRuntime::NameSpace = "XRuntime::Threshold"`  
 
-### Server
+### Middleware
+
+#### Server
 
 可以通过自带的Http页面查看请求数据，这些页面可以设置Http basic auth验证以保护起来	 
 
@@ -45,7 +47,7 @@ end
 
 增加一个子页面`/incache`,可以查看缓存中没有插入Redis的数据，但要记得这些缓存数据是在每个Server各自的进程中保存，每次访问这个页面，得到的缓存数据只代表该进程正在缓存的数据。
 
-### Sinatra
+#### Sinatra
 
 收集数据 `config.ru`:  
 
@@ -61,7 +63,7 @@ run Rack::URLMap.new \
   "/xruntime" => XRuntime::Server.new
 ```
 
-### Rails3
+#### Rails3
 
 收集数据 `config/environment.rb`:   
 
@@ -75,6 +77,32 @@ config.middleware.use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6
 mount XRuntime::Server, :at => "/xruntime"
 ```
 
+### Profiler
+
+这个功能用来将web server中一段代码的执行时间记录下来以供分析    
+
+需要传递两个参数   
+
+* 一个作为这块代码的标示:key
+* 另外一个是proc代码片段
+
+调用时使用:`XRuntime.profiler.log(key){...}`或者简写`XRuntime.p.log(key){...}`    
+
+返回值是代码块的返回值，不影响原有逻辑。
+
+#### Server
+
+通过这个地址可以查看运行结果:`\profiler`
+
+#### Rails3 && Sinatra
+
+``` ruby
+XRuntime.p.log("/index") do
+  sleep(0.01*rand(10))
+  "Hello, I'am x_runtime"
+end
+```
+
 ### Test
 
 请先修改test/server.rb和test/client.rb中的Redis参数,我的地址是localhost:6380,这个请改为你的地址。

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/lib/x_runtime/middleware.rb

@@ -1,6 +1,6 @@
 module XRuntime
   class Middleware
-    attr_accessor :auth
+    attr_accessor :auth, :redis
     # threshold => ms
     def initialize(app, redis, opts = {})
       @app = app

data/lib/x_runtime/profiler.rb

@@ -0,0 +1,40 @@
+module XRuntime
+  class Profiler
+    def initialize(redis, opts = {})
+      @redis = redis
+      opts = {:cache => 100, :expire => 120}.update opts
+      @cache = opts[:cache].to_i
+      @expire = opts[:expire].to_i
+    end
+    
+    def ds
+      @ds ||= DataSet.new(redis_key, script, @cache, @expire)
+    end
+    
+    def script
+      @script ||= Script.new(@redis)
+    end
+  
+    def redis_key
+      @key ||= "#{XRuntime::NameSpace}::Profiler"
+    end
+  
+    def call(&blk)
+      start_time = Time.now
+      result = yield
+      cost = (Time.now - start_time).to_f*1000
+      
+      return cost, result
+    end
+    
+    def logredis(key, &blk)
+      raise ArgumentError, "Need a block of code for profile." unless blk
+      cost, result = call(&blk)
+      ds.add(key, cost)
+      return result
+    end
+    
+    alias :log :logredis
+    
+  end
+end

data/lib/x_runtime/server.rb

@@ -13,7 +13,7 @@ module XRuntime
     
     get '/' do
       @req = Rack::Request.new(env)
-      Template.new(XRuntime.middleware.ds, :limit => (@req.params["limit"] ? @req.params["limit"].to_i : 20), :offset => @req.params["offset"].to_i).render
+      Template.new(XRuntime.m.ds, :limit => (@req.params["limit"] ? @req.params["limit"].to_i : 20), :offset => @req.params["offset"].to_i).render
     end
     
     get '/incache' do
@@ -26,5 +26,11 @@ module XRuntime
         }
       }.to_json
     end
-  end
+    
+    get '/profiler' do
+      @req = Rack::Request.new(env)
+      Template.new(XRuntime.p.ds, :limit => (@req.params["limit"] ? @req.params["limit"].to_i : 20), :offset => @req.params["offset"].to_i).render
+    end
+    
+  end#end of server
 end

data/lib/x_runtime.rb

@@ -9,7 +9,21 @@ $:.unshift(File.dirname(__FILE__))
 module XRuntime
   NameSpace     = "XRuntime::Threshold"
   extend        self
-  attr_accessor :middleware
+  
+  def middleware
+    @middleware || raise(RuntimeError, "XRuntime::Middleware haven't been used as a middleware.")
+  end
+  
+  def middleware=(m)
+    @middleware = m
+  end
+  
+  def profiler
+    @profiler ||= Profiler.new(middleware.redis, :cache => 200, :expire => 120)
+  end
+  
+  alias :p :profiler
+  alias :m :middleware
   
   autoload :Middleware, "x_runtime/middleware"
   autoload :DataSet,    "x_runtime/data_set"
@@ -17,6 +31,7 @@ module XRuntime
   autoload :Server,     "x_runtime/server"
   autoload :Template,   "x_runtime/template"
   autoload :Utils,      "x_runtime/utils"
+  autoload :Profiler,    "x_runtime/profiler"
 end
 
 module Rack

data/test/server.ru

@@ -8,12 +8,13 @@ require "#{File.dirname(__FILE__)}/../lib/x_runtime"
 class Server < Sinatra::Base
   # use XRuntime::Middleware, 10, Redis.connect(:url => "redis://localhost:6380/")
   # XRuntime::Middleware is same as Rack::XRuntime
-  use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6379/"), :threshold => 50.0, :cache => 50, :expire => 60
+  use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6379/"), :threshold => 30.0, :cache => 50, :expire => 60
 
   get /.*/ do
-    # sleep(1)
-    sleep(0.01*rand(10))
-    "Hello, I'am x_runtime"
+    XRuntime.p.log("/index") do
+      sleep(0.01*rand(10))
+      "Hello, I'am x_runtime"
+    end
   end
 end
 

data/x_runtime.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "x_runtime"
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\u{5d14}\u{5ce5}"]
-  s.date = "2012-08-25"
+  s.date = "2012-08-27"
   s.description = "\u{7531}\u{4e8e}\u{4f7f}\u{7528}\u{5230}Redis\u{7684}lua script,\u{6240}\u{4ee5}\u{9700}\u{8981}\u{4f60}\u{7684}Redis\u{670d}\u{52a1}\u{652f}\u{6301},redis-server\u{7248}\u{672c}>2.6.x,redis(ruby gem)>3.0.1."
   s.email = "zheng.cuizh@gmail.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "lib/x_runtime.rb",
     "lib/x_runtime/data_set.rb",
     "lib/x_runtime/middleware.rb",
+    "lib/x_runtime/profiler.rb",
     "lib/x_runtime/redis.lua",
     "lib/x_runtime/script.rb",
     "lib/x_runtime/server.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: x_runtime
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -109,6 +109,7 @@ files:
 - lib/x_runtime.rb
 - lib/x_runtime/data_set.rb
 - lib/x_runtime/middleware.rb
+- lib/x_runtime/profiler.rb
 - lib/x_runtime/redis.lua
 - lib/x_runtime/script.rb
 - lib/x_runtime/server.rb
@@ -135,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3201334121123236605
+      hash: -3365753816145701982
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: