httperfrb 0.2.0 → 0.2.1

data/HISTORY.md

@@ -1,6 +1,11 @@
 HTTPerf.rb
 ==========
 
+### 0.2.1 
+
+* added verbose handling
+* refactored parser a bit
+
 ### 0.2.0
 
 * added parser

data/README.md

@@ -1,7 +1,7 @@
 HTTPERF.rb
 ==========
 
-### [Documentation](http://rubyops.github.com/httperfrb/doc/) | [Coverage](http://rubyops.github.com/httperfrb/coverage/) 
+### [Documentation](http://rubyops.github.com/httperfrb/doc/) | [Coverage](http://rubyops.github.com/httperfrb/coverage/) | [RSpec Out](https://github.com/rubyops/httperfrb/blob/master/RSPECOUT.md)
 
 Simple Ruby interface for httperf.
 
@@ -10,28 +10,27 @@ Simple Ruby interface for httperf.
 This currently needs a lot of work to be production ready. It's done more in a scripting style then a true solid application style. 
 
 
-
-### Installing 'httperf'
+## Installing 'httperf'
 
 Requires httperf, of course...
 
-##### Mac
+#### Mac
 
     sudo port install httperf
 
-##### Debian / Ubuntu
+#### Debian / Ubuntu
 
     sudo apt-get install httperf
 
-##### Redhat / CentOS
+#### Redhat / CentOS
 
     sudo yum install httperf
 
-#### Install
+## Install
 
     gem install httperfrb
 
-### Usage
+## Usage - HTTPerf
 
 Some basic usage examples.
 
@@ -49,7 +48,7 @@ Some basic usage examples.
       puts perf.fork_out
     end
 
-#### With HTTPerf::Parser
+### With HTTPerf::Parser
 
     require 'httperf'
     perf = HTTPerf.new( "server" => "host", "port" => 8080, "uri" => "/foo" )
@@ -60,6 +59,17 @@ Some basic usage examples.
 
     puts HTTPerf::Parser.parse( HTTPerf.new( "server" => "host", "port" => 8080, "uri" => "/foo" ).run )
 
+## Useage - HTTPerf::Parser
+
+    require 'httperf/parser' 
+     
+    # read result from a file, for example   
+    puts HTTPerf.parse( File.open("httperf.out", "r").read )
+    
+    # or verbose output
+    puts HTTPerf.parse( File.open("httperf_verbose.out", "r").read, true )
+
+
 ##### Parser Keys: 
 
     :command
@@ -114,3 +124,11 @@ Some basic usage examples.
     :errors_other
   
 
+##### Addtional Verbose Parser Keys: 
+
+    :connection_time_75_pct
+    :connection_time_80_pct
+    :connection_time_85_pct
+    :connection_time_90_pct
+    :connection_time_95_pct
+    :connection_time_99_pct

data/lib/{parser.rb → httperf/parser.rb}

@@ -1,3 +1,4 @@
+#require 'parser/verbose'
 class HTTPerf
 
   # Parse httperf output to a [Hash]
@@ -5,14 +6,60 @@ class HTTPerf
   # This can be used standalone or with HTTPerf results.
   class Parser
 
+    attr_accessor :verbose
+
     # @return [Hash] returns hash of parsed httperf output
     # @param [String] raw httperf output
-    def self.parse raw
+    def self.parse raw, verbose=false
 
       lines = raw.split("\n") 
+      matches = {}
+
+      # for verbose matching
+      verbose_connection_lifetime = []
+
+      lines.each do |line|
+
+        if verbose and verbose_expression.match(line)
+          verbose_connection_lifetime.push($1) 
+          next
+        end
+
+        matched = false
+        unless line.empty?
+          next if matched
+          expressions.each do |key,exp|
+            if exp.match(line) and $1
+              matches[key] = $1
+              matched = true
+            end
+          end
+        end
+      end
 
+      unless verbose_connection_lifetime.empty?
+        percentiles.each do |percentile|
+          matches["connection_time_#{percentile}_pct".to_sym] = calculate_percentile(percentile, verbose_connection_lifetime)
+        end
+      end
+
+      if verbose
+        raise "mismatch error occurred" unless expressions.keys.count+percentiles.count == matches.keys.count
+      else
+        raise "mismatch error occurred" unless expressions.keys.count == matches.keys.count
+      end
+      return matches
+    end
+
+    protected
+
+    def self.verbose_expression
+      /^Connection lifetime = ([0-9]*?\.?[0-9]+)$/
+    end
+
+    def self.expressions
       # While this isn't the most efficent way of doing this, it's the most maintainable.
-      expressions = {
+      {
         :command                    => /^(httperf .+)$/,
 
         # Maximum connect burst length:
@@ -92,25 +139,21 @@ class HTTPerf
         :errors_ftab_full           => /^Errors: fd-unavail .+ ftab-full ([0-9]*?\.?[0-9]+) /,
         :errors_other               => /^Errors: fd-unavail .+ other ([0-9]*?\.?[0-9]+)/
       }
-      
-      matches = {}
+    end
 
-      lines.each do |line|
-        matched = false
-        unless line.empty?
-          expressions.each do |key,exp|
-            matchdata = (exp.match(line)).to_a
-            if $1
-              matches[key] = $1
-              matched = true
-              next
-            end
-          end
-          next if matched
-        end
-      end
-      raise "mismatch error occurred" unless expressions.keys.count == matches.keys.count
-      return matches
+    def self.percentiles
+      [ 75, 80, 85, 90, 95, 99 ]
+    end
+
+    private
+    def self.calculate_percentile percentile, values
+      values.sort!
+      values[percentile_index(percentile, values.count)]
+    end
+
+    def self.percentile_index percentile, count
+      ((count/100)*percentile)-1
     end
   end
 end
+

data/lib/httperf/version.rb

@@ -0,0 +1,3 @@
+class HTTPerf
+  VERSION = "0.2.1"
+end

data/lib/httperf.rb

@@ -1,12 +1,11 @@
 # @author Joshua Mervine <joshua@mervine.net>
 require 'open4'
-require 'parser'
+require 'httperf/parser'
+require 'httperf/version'
 class HTTPerf
-  # gem version
-  VERSION = "0.2.0"
 
   # @return [Boolean] parse flag
-  attr_accessor :parse
+  attr_accessor :parse, :verbose
 
   # availbe instance methods
   @fork_out, @fork_err = ''
@@ -57,6 +56,8 @@ class HTTPerf
   #   -  wsesslog
   #   -  wset
   def initialize options={}, path=nil
+    self.parse = options.delete("parse") 
+    self.verbose = true if options.has_key?("verbose")
     options.each_key do |k|
       raise "'#{k}' is an invalid httperf param" unless params.keys.include?(k)
     end
@@ -89,7 +90,7 @@ class HTTPerf
     end
     if status == 0
       if @parse
-        return Parser.parse(out.join)
+        return Parser.parse(out.join, self.verbose)
       else
         return out.join
       end
@@ -109,7 +110,7 @@ class HTTPerf
   # return results of last fork
   def fork_out
     if @parse
-      return Parse.parse @fork_out
+      return Parse.parse(@fork_out, self.parse)
     else
       return @fork_out
     end
@@ -126,6 +127,10 @@ class HTTPerf
     return "#{@command} #{options}"
   end
 
+  def verbose
+    @verbose||false
+  end
+
   private
   # build commandline options string
   def options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httperfrb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19603340 !ruby/object:Gem::Requirement
+  requirement: &13320100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19603340
+  version_requirements: *13320100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &19602580 !ruby/object:Gem::Requirement
+  requirement: &13317140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19602580
+  version_requirements: *13317140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &19602060 !ruby/object:Gem::Requirement
+  requirement: &13316620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19602060
+  version_requirements: *13316620
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &19601460 !ruby/object:Gem::Requirement
+  requirement: &13316040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19601460
+  version_requirements: *13316040
 description: Simple interface for calling httperf via ruby.
 email:
 - joshua@mervine.net
@@ -62,7 +62,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/parser.rb
+- lib/httperf/version.rb
+- lib/httperf/parser.rb
 - lib/httperf.rb
 - README.md
 - HISTORY.md
@@ -81,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1424181618950298738
+      hash: 4261295427007759208
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: