loadaboy 0.1.1 → 0.2.0

data/Rakefile

@@ -18,6 +18,7 @@ begin
     gem.email = "jean-louis@icehouse.se"
     gem.homepage = "http://github.com/Jell/loadaboy"
     gem.authors = ["Jell"]
+    gem.files.exclude 'ebin/test_*', 'elib/minitest.erl'
     gem.files.include(["ext"])
     gem.extensions << 'ext/extconf.rb'
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
@@ -36,6 +37,10 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+task :etest do
+  sh "cd ebin && ./test_load_test.erl"
+end
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
@@ -51,7 +56,7 @@ end
 
 task :test => :check_dependencies
 
-task :default => :test
+task :default => [:test, :etest]
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/ebin/run_loadaboy

@@ -2,22 +2,22 @@
 %% -*- erlang -*-
 
 main(String) ->
-	try
-	  error_logger:tty(false),
-		[Domain, WorkerCount, RequestCount] = String,
-		LoadTest = load_test:new(Domain, list_to_integer(WorkerCount), list_to_integer(RequestCount)),
-		LoadTest:start(),
-		LoadTest:prepare(),
-		LoadTest:run()
-	catch
-		_:_ ->
-			usage()
-	end;
+  try
+    error_logger:tty(false),
+    [Domain, WorkerCount, RequestCount | Services ] = String,
+    LoadTest = load_test:new(Domain, list_to_integer(WorkerCount), list_to_integer(RequestCount), Services),
+    LoadTest:start(),
+    LoadTest:prepare(),
+    LoadTest:run()
+  catch
+    _:_ ->
+      usage()
+  end;
 
 main(_) ->
-	io:format("no header\n"),
-	usage().
+  io:format("no header\n"),
+  usage().
 
 usage() ->
-	io:format("usage: loadaboy domain worker-count request-count\n"),
-	halt(1).
+  io:format("usage: loadaboy domain worker-count request-count\n"),
+  halt(1).

data/elib/load_test.erl

@@ -1,90 +1,92 @@
--module(load_test, [Domain, WorkerCount, RequestCount]).
+-module(load_test, [Domain, WorkerCount, RequestCount, ServiceList]).
 %-export([start/0, stop/0, run/0, generate_services/1, get_services/0, get_workers/1, get_jobs/2, get_urls/3, set_urls/4]).
 -compile(export_all).
 -record(load_entry, {key, urls}).
 
 start() ->
-	inets:start(),
-	mnesia:start().
+  inets:start(),
+  mnesia:start().
 
 stop() ->
-	mnesia:stop().
+  inets:stop(),
+  mnesia:stop().
+
+prepare_mnesia() ->
+  mnesia:delete_table(load_entry),
+  mnesia:create_table(load_entry, [{attributes, record_info(fields, load_entry)}]).
+
+open_ruby_port() ->
+  Cmd = "ruby ../lib/erlang_interface.rb",
+  open_port({spawn, Cmd}, [{packet, 4}, nouse_stdio, exit_status, binary]).
 
 prepare() ->
-	mnesia:delete_table(load_entry),
-	mnesia:create_table(load_entry, [{attributes, record_info(fields, load_entry)}]),
-	Cmd = "ruby ../lib/erlang_interface.rb",
-	Port = open_port({spawn, Cmd}, [{packet, 4}, nouse_stdio, exit_status, binary]),
-	Payload = term_to_binary([prepare, [WorkerCount, RequestCount]]),
-	port_command(Port, Payload),
-	receive
-		{Port, {data, Data}} ->
-			{result, Text} = binary_to_term(Data),
-			[set_urls(test, WorkerName, tuple_to_list(Urls)) || {WorkerName, Urls}<- tuple_to_list(Text)]
-	end.
-	
+  prepare_mnesia(),
+  Port = open_ruby_port(),
+  Payload = case ServiceList of
+    [Service] ->
+      term_to_binary([prepare, [WorkerCount, RequestCount, list_to_binary(Service)]]);
+    _ ->
+      term_to_binary([prepare, [WorkerCount, RequestCount]])
+  end,
+  port_command(Port, Payload),
+  receive
+    {Port, {data, Data}} ->
+      {result, Text} = binary_to_term(Data),
+      [set_urls(test, WorkerName, tuple_to_list(Urls)) || {WorkerName, Urls}<- tuple_to_list(Text)]
+  end.
+  
 run() ->
-	{atomic, Services} = get_services(),
-	generate_services(lists:usort(Services)),
-	wait_for_workers(WorkerCount).
+  {atomic, Services} = get_services(),
+  generate_services(lists:usort(Services)),
+  wait_for_workers(WorkerCount).
 
-generate_services(Services) ->
-	case Services of
-		[] ->
-			done;
-		[Service | Remaining] ->
-			{atomic, Workers} = get_workers(Service),
-			generate_workers(Service, Workers),
-			generate_services(Remaining)
-  end.
+generate_services([]) ->
+  done;
+generate_services([Service | Remaining]) ->
+  {atomic, Workers} = get_workers(Service),
+  generate_workers(Service, Workers),
+  generate_services(Remaining).
 
-generate_workers(Service, Workers) ->
-	case Workers of
-		[] ->
-			done;
-		[WorkerName | Remaining] ->
-			{atomic, [Urls]} = get_urls(Service, WorkerName),
-			Worker = worker:new(self(), WorkerName, Domain, Urls),
-			Worker:run(),
-			generate_workers(Service, Remaining)
-  end.
+generate_workers(_Service, []) ->
+  done;
+generate_workers(Service, [WorkerName | Remaining]) ->
+  {atomic, [Urls]} = get_urls(Service, WorkerName),
+  gen_server:start_link({local, WorkerName}, worker, [self(), WorkerName, Domain, Urls], []),
+  gen_server:cast(WorkerName, run),
+  generate_workers(Service, Remaining).
 
+wait_for_workers(0) ->
+  done;
 wait_for_workers(RemainingWorkers) ->
-	receive
-		done ->
-			case RemainingWorkers - 1 of
-				0 ->
-					done;
-				_ ->
-					wait_for_workers(RemainingWorkers - 1)
-			end
-		end.
+  receive
+    done ->
+      wait_for_workers(RemainingWorkers - 1)
+  end.
 
 get_services() ->
-	F = fun() ->
-			LoadEntry = #load_entry{key = {'$1', '_'}, urls = '_'},
-			mnesia:select(load_entry, [{LoadEntry, [], ['$1']}])
-		end,
-	mnesia:transaction(F).
+  F = fun() ->
+      LoadEntry = #load_entry{key = {'$1', '_'}, urls = '_'},
+      mnesia:select(load_entry, [{LoadEntry, [], ['$1']}])
+    end,
+  mnesia:transaction(F).
 
 get_workers(Service) ->
-	F = fun() ->
-			LoadEntry = #load_entry{key = {Service, '$1'}, urls = '_'},
-			mnesia:select(load_entry, [{LoadEntry, [], ['$1']}])
-		end,
-	mnesia:transaction(F).
-
+  F = fun() ->
+      LoadEntry = #load_entry{key = {Service, '$1'}, urls = '_'},
+      mnesia:select(load_entry, [{LoadEntry, [], ['$1']}])
+    end,
+  mnesia:transaction(F).
 
 get_urls(Service, Worker) ->
-	F = fun() ->
-			LoadEntry = #load_entry{key = {Service, Worker}, urls = '$1'},
-			mnesia:select(load_entry, [{LoadEntry, [], ['$1']}])
-		end,
-	mnesia:transaction(F).
+  F = fun() ->
+      LoadEntry = #load_entry{key = {Service, Worker}, urls = '$1'},
+      mnesia:select(load_entry, [{LoadEntry, [], ['$1']}])
+    end,
+  mnesia:transaction(F).
 
 set_urls(Service, Worker, Urls) ->
-	LoadEntry  = #load_entry{key = {Service, Worker}, urls = Urls},
-	F = fun() ->
-			mnesia:write(LoadEntry)
-		end,
-	mnesia:transaction(F).
+  LoadEntry = #load_entry{key = {Service, Worker}, urls = Urls},
+  F = fun() ->
+      mnesia:write(LoadEntry)
+    end,
+  mnesia:transaction(F).

data/elib/worker.erl

@@ -1,51 +1,67 @@
--module(worker, [Parent, ProfileName, Domain, Urls]).
--compile(export_all).
-
-run() ->
-	spawn(
-		fun() ->
-			inets:start(httpc, [{profile, ProfileName}]),
-			fetch_urls(Urls)
-		end
-		).
-
-fetch_urls(UrlList) ->
-	case UrlList of
-		[] ->
-			Parent!done;
-		[Url|Tail] ->
-			{Name, Request} = Url,
-			[Header, Time] = fetch_url(Domain ++ binary_to_list(Request)),
-			io:format("~p ~p ~p~n", [Header, Name, Time]),
-			fetch_urls(Tail)
-	end.
-
-fetch_url(Url) ->
-	try
-		Tic = erlang:now(),
-		Result = get_over_http(Url),
-		Tac = erlang:now(),
-		Time = time_to_ms(Tac) - time_to_ms(Tic),
-		case Result of
-			timeout ->
-				[{"HTTP/1.1", 408, "Request Timeout"}, Time];
-			{Header, _Params, _Body} ->
-				[Header, Time]
-		end
-	catch
-		_:_ ->
-			[{"HTTP/1.1", 400, "Bad Request"}, 0]
-	end.
+-module(worker).
+-export([code_change/3, handle_cast/2, handle_call/3, handle_info/2, init/1, terminate/2]).
+-behavior(gen_server).
+
+init([Parent, ProfileName, Domain, Urls]) ->
+  inets:start(httpc, [{profile, ProfileName}]),
+  {ok, [Parent, ProfileName, Domain, Urls]}.
+
+handle_call(_Message, _From, [Parent, ProfileName, Domain, Urls]) ->
+  fetch_urls([ProfileName, Domain, Urls]),
+  {reply, done, [Parent, ProfileName, Domain, Urls]}.
+
+handle_cast(run, [Parent, ProfileName, Domain, Urls]) ->
+  fetch_urls([ProfileName, Domain, Urls]),
+  Parent!done,
+  {noreply, [Parent, ProfileName, Domain, Urls]}.
+
+handle_info(Msg, State) ->
+  io:format("Unexpected message: ~p~n",[Msg]),
+  {noreply, State}.
+
+code_change(_OldVsn, State, _Extra) ->
+  %% No change planned. The function is there for the behaviour,
+  %% but will not be used. Only a version on the next
+  {ok, State}.
+
+terminate(_, _) -> ok.
+
+fetch_urls([_ProfileName, _Domain, []]) ->
+  done;
+fetch_urls([ProfileName, Domain, [{Name, Url}|Tail]]) ->
+  [Header, Time] = fetch_url(Domain ++ binary_to_list(Url), ProfileName),
+  forecast_result(Header, Name, Time, Url),
+  fetch_urls([ProfileName, Domain, Tail]).
+
+forecast_result(Header, Name, Time, Url) ->
+  io:format("~p ~p ~p ~s~n", [Header, Name, Time, Url]).
+
+fetch_url(Url, ProfileName) ->
+  try
+    Tic = erlang:now(),
+    Result = get_over_http(Url, ProfileName),
+    Tac = erlang:now(),
+    Time = time_to_ms(Tac) - time_to_ms(Tic),
+    case Result of
+      timeout ->
+        [{"HTTP/1.1", 408, "Request Timeout"}, Time];
+      {Header, _Params, _Body} ->
+        [Header, Time]
+    end
+  catch
+    _:_ ->
+      [{"HTTP/1.1", 400, "Bad Request"}, 0]
+  end.
 
 time_to_ms({Mega, Sec, Micro})->
-	Mega * 1000000000 + Sec * 1000 + Micro / 1000.
-
-get_over_http(Url) ->
-	{ok, RequestId} = httpc:request(get, {Url, []}, [], [{sync, false}], ProfileName),
-	receive
-		{http, {RequestId, Result}} ->
-			Result
-	after
-		10000 ->
-			timeout
-	end.
+  Mega * 1000000000 + Sec * 1000 + Micro / 1000.
+
+get_over_http(Url, ProfileName) ->
+  {ok, RequestId} = httpc:request(get, {Url, []}, [], [{sync, false}], ProfileName),
+  receive
+    {http, {RequestId, Result}} ->
+      Result
+  after
+    10000 ->
+      timeout
+  end.

data/lib/erlang_interface.rb

@@ -9,7 +9,8 @@ require "#{LOADABOY_EXEC_DIR}/Loadafile" if File.exist? "#{LOADABOY_EXEC_DIR}/Lo
 
 receive do |f|
   f.when([:prepare, Array]) do |array|
-    f.send!([:result, generate_requests(array[0], array[1])])
+    workers, jobs, service = array
+    f.send!([:result, generate_requests(workers, jobs, service)])
     f.receive_loop
   end
 end

data/lib/loadaboy.rb

@@ -3,29 +3,31 @@ require 'enumerator'
 module LoadaBoy
 
   class << self
-    def generator(&block)
-      define_method :generate, &block
+    def generator(service = 'default', &block)
+      define_method "generate_#{service}", &block
+    end
+    def set_generator(name)
+      alias_method(:generate, "generate_#{name}")
     end
   end
 
-  protected
-
-  def generate
+  def generate_default
     { :default => "/" }
   end
 
-  def generate_requests(workers_count, jobs_count)
+  alias_method :generate, :generate_default
+
+  protected
+
+  def generate_requests(workers_count, jobs_count, service = nil)
+    methods.include?("generate_#{service}") ? LoadaBoy.set_generator(service) : LoadaBoy.set_generator(:default)
     (1..workers_count).map do |i|
       ["worker#{i}".to_sym, generate_urls(jobs_count)]
     end
   end
 
   def generate_urls(jobs_count)
-    urls = []
-    (1..jobs_count).map { generate.to_a }.flatten.each_slice(2) do |slice|
-      urls << slice
-    end
-    urls
+    (1..jobs_count).inject([]){ |acc, _| acc + generate.to_a}
   end
 end
 

data/loadaboy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loadaboy}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jell"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2010-11-15}
   s.default_executable = %q{loadaboy}
   s.description = %q{LoadaBoy is a load testing gem.}
   s.email = %q{jean-louis@icehouse.se}

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_loadaboy.rb

@@ -1,7 +1,48 @@
 require 'helper'
 
 class TestLoadaboy < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  include LoadaBoy
+
+  context ".generator" do
+    should "define a generate function running the given block" do
+      LoadaBoy.generator do
+        "custom generator"
+      end
+      assert_equal "custom generator", generate_default
+    end
+    should "define a generate function running the given block with proper name" do
+      LoadaBoy.generator :test do
+        "custom generator"
+      end
+      assert_equal "custom generator", generate_test
+    end
+  end
+
+  context "#generate" do
+    should "return a default url" do
+      assert_equal({:default => "/"}, generate)
+    end
+  end
+
+  context "#generate_requests" do
+    should "return a list of n-workers with their url list" do
+      stubs(:generate_urls).returns("url_list")
+      assert_equal [[:worker1, "url_list"], [:worker2, "url_list"]], generate_requests(2, 1)
+    end
+    should "set proper generator" do
+      LoadaBoy.generator :test do
+        "custom generator"
+      end
+      generate_requests(2, 1, :test)
+      assert_equal "custom generator", generate
+    end
+  end
+
+  context "#generate_urls" do
+    should "return a list of n urls" do
+      stubs(:generate).returns("name" => "url")
+      assert_equal [["name", "url"], ["name", "url"]], generate_urls(2)
+    end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loadaboy
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +02:00
+date: 2010-11-15 00:00:00 +01:00
 default_executable: loadaboy
 dependencies: 
 - !ruby/object:Gem::Dependency