fairy 0.6.0 → 0.6.5

data/tools/git-tag

@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
+# encoding: UTF-8
 #
 #   svn-tags - 
 #   	$Release Version: $

data/tools/log-analysis.rb

@@ -22,20 +22,44 @@ module Fairy
 
     def compile
       @input.each{|line|
-	next unless line =~ /(START|FINISH)\s+(PROCESSING|EXPORT|IMPORT|STORE)/
 	line.chomp!
-	line =~ PAT
-	date, time, host, process, file, object, method, mes = $1, $2, $3, $4, $5, $6, $7, $8
-	uuid = [host, process, object].join(" ")
-
-	abs_time = Time.parse(date+" "+time)
-	mes =~ /(START|FINISH)\s+(PROCESSING|EXPORT|IMPORT|STORE)/
-	@events[uuid] ||= []
-	@events[uuid].push [$2, $1, abs_time]
+	if line =~ /(START|FINISH)\s+(PROCESSING|EXPORT|IMPORT|STORE|M\.STORE|M\.RESTORE)/
+	  compile_stat(line)
+	elsif line =~ /PROCESS MONITOR:$/
+	  compile_ps(line)
+	elsif line =~ /MONITOR: PS:/
+	  compile_psdetail(line)
+	end
       }
     end
 
+    def compile_stat(line)
+      line =~ PAT
+      date, time, host, process, file, object, method, mes = $1, $2, $3, $4, $5, $6, $7, $8
+      uuid = [host, process, object].join(" ")
+
+      abs_time = Time.parse(date+" "+time)
+      mes =~ /(START|FINISH)\s+(PROCESSING|EXPORT|IMPORT|STORE|M\.STORE|M\.RESTORE)/
+      @events[[uuid, $2]] ||= []
+      @events[[uuid, $2]].push [$2, $1, abs_time]
+    end
+
+    def compile_ps(line)
+      line =~ PAT
+      date, time, host, process, file, object, method, mes = $1, $2, $3, $4, $5, $6, $7, $8
+      abs_time = Time.parse(date+" "+time)
+      @last_mon_datetime = [[host, process, object].join(" "), abs_time]
+    end
+
+    def compile_psdetail(line)
+      line =~ /([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9.]+)\s+([0-9.]+)\s+([0-9]+)\s+([0-9:]+)/
+      key = [@last_mon_datetime[0], "PS"]
+      @events[key] ||= []
+      @events[key].push ["PS", @last_mon_datetime[1], $1, $2, $3, $4, $5, $6, $7]
+    end
+
     def analyze
+#p @events
       for k, values in @events
 	case values.first[0]
 	when "STORE"
@@ -43,13 +67,37 @@ module Fairy
 	  values.each_slice(2) do |start, finish|
 	    time += finish[2]-start[2]
 	  end
-	  puts "#{k}, #{values.first[0]}, , , #{time}"
+	  puts "#{k.first}, #{values.first[0]}, , , #{time}"
+
+	when "M.STORE"
+	  time = 0
+	  values.each_slice(2) do |start, finish|
+	    time += finish[2]-start[2]
+	  end
+	  puts "#{k.first}, #{values.first[0]}, , , #{time}"
+
+	when "M.RESTORE"
+	  time = 0
+	  values.each_slice(2) do |start, finish|
+	    time += finish[2]-start[2]
+	  end
+	  puts "#{k.first}, #{values.first[0]}, , , #{time}"
 
+	when "PS"
+	  values.each do |ps, datetime, *args|
+#p ps, datetime
+	    puts "#{k.first}, #{values.first[0]}, #{datetime}, #{args.join(', ')}"
+	  end
 	else
 	  st = values.find{|v| v[1] == "START"}
 	  fn = values.find{|v| v[1] == "FINISH"}
 
-	  puts "#{k}, #{st[0]}, #{st[2]}, #{fn[2]}, #{fn[2] - st[2]}"
+	  begin
+	    puts "#{k.first}, #{st[0]}, #{st[2]}, #{fn[2]}, #{fn[2] - st[2]}"
+	  rescue
+	    STDERR.puts "Warn: #{$!}"
+	    STDERR.puts $@
+	  end
 	end
       end
     end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fairy
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  prerelease: 
+  version: 0.6.5
 platform: ruby
 authors: 
 - Rakuten, Inc.
@@ -15,23 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +09:00
-default_executable: fairy
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: DeepConnect
+  name: xthread
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        - 6
-        version: 0.4.06
+        version: 0.1.4.001
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,14 +31,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+        version: 0.2.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: DeepConnect
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.06
+  type: :runtime
+  version_requirements: *id003
 description: |
   fairy is a framework for distributed processing in Ruby, originally
   designed at Rakuten Institute of Technology with Yukihiro Matsumoto,
@@ -70,8 +65,8 @@ executables:
 - fairy-cat
 - fairy-cp
 - fairy-rm
-extensions: []
-
+extensions: 
+- ext/extconf.rb
 extra_rdoc_files: []
 
 files: 
@@ -234,8 +229,18 @@ files:
 - bin/subcmd/inspector
 - bin/subcmd/master
 - bin/subcmd/processor
-- ext/simple_hash/extconf.rb
-- ext/simple_hash/simple_hash.c
+- ext/extconf.rb
+- ext/fairy.c
+- ext/p-group-by.c
+- ext/simple-hash.c
+- ext/xsized-queue.c
+- ext/p-xgroup-by.c
+- ext/xmarshaled-queue.c
+- ext/string-buffer.c
+- ext/fixnum-buffer.c
+- ext/fiber_mon.h
+- ext/fairy.h
+- ext/xthread.h
 - doc/programming-interface.rd
 - doc/programming-interface.html
 - spec/README
@@ -255,12 +260,12 @@ files:
 - test/testc.rb
 - tools/git-tag
 - tools/svn-tags
+- tools/fairy_conf_wizard.rb
 - tools/log-analysis.rb
 - tools/cap_recipe/cluster.yml.sample
 - tools/cap_recipe/Capfile
 - tools/fairy_perf_graph.rb
 - tools/svn-ls-diff
-has_rdoc: true
 homepage: http://code.google.com/p/fairy-prj/
 licenses: []
 
@@ -274,23 +279,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: fairy
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: fairy is a framework for distributed processing in Ruby, originally designed at Rakuten Institute of Technology with Yukihiro Matsumoto, the founder of Ruby.

data/ext/simple_hash/extconf.rb

@@ -1,4 +0,0 @@
-require 'mkmf'
-
-create_makefile("simple_hash")
-

data/ext/simple_hash/simple_hash.c

@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2007-2010 Rakuten, Inc.
- */
-
-#include <ruby.h>
-
-#define MULTIPLIER  137
-
-static VALUE simple_hash(VALUE self, VALUE vstr);
-
-
-static VALUE mFairy;
-static VALUE mSimpleHash;
-
-
-static VALUE simple_hash(VALUE self, VALUE vstr) {
-    VALUE vh;
-    char *str;
-    int len;
-    char *p;
-    unsigned int h = 0;
-
-    str = StringValuePtr(vstr);
-    len = RSTRING_LEN(vstr);
-
-    for (p = str; p - str < len; p++) {
-        h = h * MULTIPLIER + *p;
-    }
-
-    /* vh = UINT2NUM(h); */
-    vh = INT2FIX(h);
-    return vh;
-}
-
-void Init_simple_hash(void) {
-    mFairy = rb_define_module("Fairy");
-    mSimpleHash = rb_define_module_under(mFairy, "SimpleHash");
-    
-    rb_define_module_function(mSimpleHash, "hash", simple_hash, 1);
-}
-
-