mojombo-ernie 0.1.0 → 0.2.0

data/README.md

@@ -26,8 +26,8 @@ Running
 -------
 
     Usage: ernie [options] <handler>
-        -n, --name NAME                  Node name
         -p, --port PORT                  Port
+        -n, --number NUMBER              Number of handler instances
         -d, --detached                   Run as a daemon
         -P, --pidfile PIDFILE            Location to write pid file.
 
@@ -52,6 +52,18 @@ Example BERT-RPC call for above example
     <- {reply, 3}
 
 
+Using the BERTRPC gem to make calls to Ernie
+--------------------------------------------
+
+You can make BERT-RPC calls from Ruby with the [BERTRPC gem](http://github.com/mojombo/bertrpc):
+
+    require 'bertrpc'
+    
+    svc = BERTRPC::Service.new('localhost', 8000)
+    svc.calc.add.call(1, 2)
+    # => 3
+
+
 Contribute
 ----------
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
+:minor: 2
 :patch: 0
 :major: 0

data/bin/ernie

@@ -33,6 +33,10 @@ OptionParser.new do |opts|
     options[:port] = x
   end
 
+  opts.on("-n NUMBER", "--number NUMBER", "Number of handler instances") do |x|
+    options[:number] = x
+  end
+
   opts.on("-d", "--detached", "Run as a daemon") do
     options[:detached] = true
   end
@@ -50,6 +54,7 @@ unless handler
 end
 
 port = options[:port] || 8000
+number = options[:number] || 1
 pidfile = options[:pidfile] ? "-ernie_server_app pidfile \"'#{options[:pidfile]}'\"" : ''
 detached = options[:detached] ? '-detached' : ''
 
@@ -62,6 +67,7 @@ cmd = %Q{erl -boot start_sasl \
              #{pidfile} \
              -ernie_server_app port #{port} \
              -ernie_server_app handler '"#{handler}"' \
+             -ernie_server_app number #{number} \
              -run ernie_server_app boot}.squeeze(' ')
 puts cmd
 exec(cmd)

data/elib/asset_pool.erl

@@ -0,0 +1,100 @@
+-module(asset_pool).
+-behaviour(gen_server).
+
+%% api
+-export([start_link/1, start/1, lease/0, return/1]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+-record(state, {assets = undefined,
+                handler = undefined}).
+
+%%====================================================================
+%% API
+%%====================================================================
+
+start_link(Args) ->
+  gen_server:start_link({global, ?MODULE}, ?MODULE, Args, []).
+
+start(Args) ->
+  gen_server:start({global, ?MODULE}, ?MODULE, Args, []).
+
+lease() ->
+  gen_server:call({global, ?MODULE}, {lease}).
+
+return(Asset) ->
+  gen_server:call({global, ?MODULE}, {return, Asset}).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: init(Args) -> {ok, State} |
+%%                         {ok, State, Timeout} |
+%%                         ignore               |
+%%                         {stop, Reason}
+%% Description: Initiates the server
+%%--------------------------------------------------------------------
+init([Count, Handler]) ->
+  process_flag(trap_exit, true),
+  error_logger:info_msg("~p starting~n", [?MODULE]),
+  Assets = start_handlers(Count, Handler),
+  {ok, #state{assets = Assets, handler = Handler}}.
+
+%%--------------------------------------------------------------------
+%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
+%%                                      {reply, Reply, State, Timeout} |
+%%                                      {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, Reply, State} |
+%%                                      {stop, Reason, State}
+%% Description: Handling call messages
+%%--------------------------------------------------------------------
+handle_call({lease}, _From, State) ->
+  case queue:out(State#state.assets) of
+    {{value, Asset}, Assets2} -> {reply, {ok, Asset}, State#state{assets = Assets2}};
+    {empty, _Assets2} -> {reply, empty, State}
+  end;
+handle_call({return, Asset}, _From, State) ->
+  Assets2 = queue:in(Asset, State#state.assets),
+  {reply, ok, State#state{assets = Assets2}};
+handle_call(_Request, _From, State) ->
+  {reply, ok, State}.
+
+%%--------------------------------------------------------------------
+%% Function: handle_cast(Msg, State) -> {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, State}
+%% Description: Handling cast messages
+%%--------------------------------------------------------------------
+handle_cast(_Msg, State) -> {noreply, State}.
+
+handle_info({'EXIT', _Pid, _Error}, State) ->
+  error_logger:error_msg("Port closed, restarting port...~n", []),
+  Handler = State#state.handler,
+  Asset = port_wrapper:wrap_link("ruby " ++ Handler),
+  Assets = queue:in(Asset, State#state.assets),
+  {noreply, State#state{assets = Assets}};
+handle_info(Msg, State) ->
+  error_logger:error_msg("Unexpected message: ~p~n", [Msg]),
+  {noreply, State}.
+
+terminate(_Reason, _State) -> ok.
+code_change(_OldVersion, State, _Extra) -> {ok, State}.
+
+%%====================================================================
+%% Internal
+%%====================================================================
+
+start_handlers(Count, Handler) ->
+  start_handlers(queue:new(), Count, Handler).
+
+start_handlers(Assets, 0, _Handler) ->
+  Assets;
+start_handlers(Assets, Count, Handler) ->
+  Asset = port_wrapper:wrap_link("ruby " ++ Handler),
+  Assets2 = queue:in(Asset, Assets),
+  start_handlers(Assets2, Count - 1, Handler).

data/elib/asset_pool_sup.erl

@@ -0,0 +1,15 @@
+-module(asset_pool_sup).
+-behaviour(supervisor).
+-export([start_link/0, init/1]).
+
+start_link() ->
+  supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+  {ok, Handler} = application:get_env(ernie_server_app, handler),
+  io:format("Using handler ~p~n", [Handler]),
+  {ok, Number} = application:get_env(ernie_server_app, number),
+  io:format("Using ~p handler instances~n", [Number]),
+  {ok, {{one_for_one, 1, 60},
+    [{asset_pool, {asset_pool, start_link, [[Number, Handler]]},
+    permanent, brutal_kill, worker, [asset_pool]}]}}.

data/elib/ernie_server.erl

@@ -2,14 +2,14 @@
 -behaviour(gen_server).
 
 %% api
--export([start_link/1, start/1]).
+-export([start_link/1, start/1, process/1, asset_freed/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 
 -record(state, {lsock = undefined,
-                ducky = undefined}).
+                pending = queue:new()}).
 
 %%====================================================================
 %% API
@@ -21,6 +21,12 @@ start_link(Args) ->
 start(Args) ->
   gen_server:start({global, ?MODULE}, ?MODULE, Args, []).
 
+process(Sock) ->
+  gen_server:cast({global, ?MODULE}, {process, Sock}).
+
+asset_freed() ->
+  gen_server:cast({global, ?MODULE}, {asset_freed}).
+
 %%====================================================================
 %% gen_server callbacks
 %%====================================================================
@@ -32,13 +38,12 @@ start(Args) ->
 %%                         {stop, Reason}
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
-init([Port, Handler]) ->
+init([Port]) ->
   process_flag(trap_exit, true),
   error_logger:info_msg("~p starting~n", [?MODULE]),
-  Ducky = port_wrapper:wrap("ruby " ++ Handler),
   {ok, LSock} = try_listen(Port, 500),
-  spawn(fun() -> loop(LSock, Ducky) end),
-  {ok, #state{lsock = LSock, ducky = Ducky}}.
+  spawn(fun() -> loop(LSock) end),
+  {ok, #state{lsock = LSock}}.
 
 %%--------------------------------------------------------------------
 %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
@@ -58,6 +63,32 @@ handle_call(_Request, _From, State) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
+handle_cast({process, Sock}, State) ->
+  case queue:is_empty(State#state.pending) of
+    false ->
+      Pending2 = queue:in(Sock, State#state.pending),
+      io:format("Q", []),
+      {noreply, State#state{pending = Pending2}};
+    true ->
+      State2 = try_process_now(Sock, State),
+      {noreply, State2}
+    end;
+handle_cast({asset_freed}, State) ->
+  case queue:is_empty(State#state.pending) of
+    false ->
+      case asset_pool:lease() of
+        {ok, Asset} ->
+          {{value, Sock}, Pending2} = queue:out(State#state.pending),
+          io:format("d", []),
+          spawn(fun() -> process_now(Sock, Asset) end),
+          {noreply, State#state{pending = Pending2}};
+        empty ->
+          io:format(".", []),
+          {noreply, State}
+      end;
+    true ->
+      {noreply, State}
+    end;
 handle_cast(_Msg, State) -> {noreply, State}.
 
 handle_info(Msg, State) ->
@@ -86,19 +117,37 @@ try_listen(Port, Times) ->
       try_listen(Port, Times - 1)
   end.
 
-loop(LSock, Ducky) ->
+loop(LSock) ->
   {ok, Sock} = gen_tcp:accept(LSock),
-  spawn(fun() -> handle_method(Sock, Ducky) end),
-  loop(LSock, Ducky).
+  ernie_server:process(Sock),
+  loop(LSock).
+
+try_process_now(Sock, State) ->
+  case asset_pool:lease() of
+    {ok, Asset} ->
+      io:format("i", []),
+      spawn(fun() -> process_now(Sock, Asset) end),
+      State;
+    empty ->
+      io:format("q", []),
+      Pending2 = queue:in(Sock, State#state.pending),
+      State#state{pending = Pending2}
+  end.
 
-handle_method(Sock, Ducky) ->
+process_now(Sock, Asset) ->
   case gen_tcp:recv(Sock, 0) of
     {ok, BinaryTerm} ->
+      % io:format(".", []),
       % error_logger:info_msg("From Internet: ~p~n", [BinaryTerm]),
-      {ok, Data} = port_wrapper:rpc(Ducky, BinaryTerm),
+      {ok, Data} = port_wrapper:rpc(Asset, BinaryTerm),
       % error_logger:info_msg("From Port: ~p~n", [Data]),
+      asset_pool:return(Asset),
+      ernie_server:asset_freed(),
       gen_tcp:send(Sock, Data),
       ok = gen_tcp:close(Sock);
     {error, closed} ->
+      asset_pool:return(Asset),
+      ernie_server:asset_freed(),
+      io:format("c", []),
       ok = gen_tcp:close(Sock)
   end.

data/elib/ernie_server_app.erl

@@ -7,7 +7,8 @@ boot() ->
   application:start(ernie_server_app).
 
 start(_Type, _Args) ->
-  ernie_server_sup:start_link().
+  ernie_server_sup:start_link(),
+  asset_pool_sup:start_link().
 
 stop(_State) ->
   ok.

data/elib/ernie_server_sup.erl

@@ -8,8 +8,6 @@ start_link() ->
 init([]) ->
   {ok, Port} = application:get_env(ernie_server_app, port),
   io:format("Using port ~p~n", [Port]),
-  {ok, Handler} = application:get_env(ernie_server_app, handler),
-  io:format("Using handler ~p~n", [Handler]),
   case application:get_env(ernie_server_app, pidfile) of
     {ok, Location} ->
       Pid = os:getpid(),
@@ -17,5 +15,5 @@ init([]) ->
     undefined -> ok
   end,
   {ok, {{one_for_one, 1, 60},
-    [{ernie_server, {ernie_server, start_link, [[Port, Handler]]},
+    [{ernie_server, {ernie_server, start_link, [[Port]]},
     permanent, brutal_kill, worker, [ernie_server]}]}}.

data/ernie.gemspec

@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ernie}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tom Preston-Werner"]
+  s.date = %q{2009-07-09}
+  s.default_executable = %q{ernie}
+  s.email = %q{tom@mojombo.com}
+  s.executables = ["ernie"]
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION.yml",
+     "bin/ernie",
+     "ebin/ernie_server_app.app",
+     "elib/asset_pool.erl",
+     "elib/asset_pool_sup.erl",
+     "elib/ernie_server.erl",
+     "elib/ernie_server_app.erl",
+     "elib/ernie_server_sup.erl",
+     "elib/port_wrapper.erl",
+     "ernie.gemspec",
+     "examples/calc.rb",
+     "ext/Makefile",
+     "ext/extconf.rb",
+     "lib/ernie.rb",
+     "test/ernie_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/mojombo/ernie}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.0}
+  s.summary = %q{TODO}
+  s.test_files = [
+    "test/ernie_test.rb",
+     "test/test_helper.rb",
+     "examples/calc.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<erlectricity>, [">= 1.0.1"])
+    else
+      s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
+    end
+  else
+    s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
+  end
+end

data/examples/calc.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ernie'
+
+mod(:calc) do
+  fun(:add) do |a, b|
+    a + b
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-ernie
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,10 +40,14 @@ files:
 - VERSION.yml
 - bin/ernie
 - ebin/ernie_server_app.app
+- elib/asset_pool.erl
+- elib/asset_pool_sup.erl
 - elib/ernie_server.erl
 - elib/ernie_server_app.erl
 - elib/ernie_server_sup.erl
 - elib/port_wrapper.erl
+- ernie.gemspec
+- examples/calc.rb
 - ext/Makefile
 - ext/extconf.rb
 - lib/ernie.rb
@@ -78,3 +82,4 @@ summary: TODO
 test_files: 
 - test/ernie_test.rb
 - test/test_helper.rb
+- examples/calc.rb