Merge branch 'elanfs-master'

Author: mworrell

README.md

@@ -109,6 +109,11 @@ application's environment:
 `pool_size`
   Specifies the size of the port program pool. Defaults to ``4``.
 
+`nif_pool_size`
+  Specifies the size of the nif program pool. Defaults to ``4``.
+
+`nif_pool_max_overflow`
+  Specifies the max workers to overflow of the nif program pool. Defaults to ``10``.
 
 Run tests
 ---------

rebar.config

@@ -12,3 +12,6 @@
 {post_hooks,
   [{"(linux|darwin|solaris)", clean, "make -C c_src clean"},
    {"(freebsd)", clean, "gmake -C c_src clean"}]}.
+{deps, [
+  {poolboy, "1.5.2"}
+]}.

rebar.lock

@@ -1 +1,6 @@
-[].
+{"1.1.0",
+[{<<"poolboy">>,{pkg,<<"poolboy">>,<<"1.5.2">>},0}]}.
+[
+{pkg_hash,[
+ {<<"poolboy">>, <<"392B007A1693A64540CEAD79830443ABF5762F5D30CF50BC95CB2C1AAAFA006B">>}]}
+].

src/bcrypt.app.src

@@ -2,9 +2,9 @@
 {application, bcrypt, [
     {description, "An Erlang wrapper (NIF or port program) for the OpenBSD password scheme, bcrypt."},
     {vsn, "git"},
-    {registered, [bcrypt_sup, bcrypt_nif_worker, bcrypt_port_sup, bcrypt_pool]},
+    {registered, [bcrypt_sup, bcrypt_port_sup, bcrypt_pool]},
     {mod, {bcrypt_app, []}},
-    {applications, [kernel, stdlib, crypto]},
+    {applications, [kernel, stdlib, crypto, poolboy]},
     {env, [
         % Default number of 'rounds', defining the hashing complexity
         {default_log_rounds, 12},
@@ -13,7 +13,11 @@
         {mechanism, nif},
 
         % Size of port program pool
-        {pool_size, 4}
+        {pool_size, 4},
+
+        {nif_pool_size, 4},
+        {nif_pool_max_overflow, 10}
+
     ]},
     {maintainers, ["Hunter Morris", "Mrinal Wadhwa", "ErlangPack"]},
     {licenses, ["MIT"]},

src/bcrypt_nif_pool_sup.erl

@@ -0,0 +1,27 @@
+%% Copyright (c) 2011 Hunter Morris
+%% Distributed under the MIT license; see LICENSE for details.
+-module(bcrypt_nif_pool_sup).
+
+-behaviour(supervisor).
+
+-export([start_link/0, start_child/0, init/1]).
+
+start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+start_child() -> supervisor:start_child(?MODULE, []).
+
+init([]) ->
+    {ok, PoolSize} = application:get_env(bcrypt, nif_pool_size),
+    {ok, MaxOverFlow} = application:get_env(bcrypt, nif_pool_max_overflow),
+    
+    PoolArgs = [
+        {name, {local, nif_pool}},
+        {nif_pool_size, PoolSize},
+        {nif_pool_max_overflow, MaxOverFlow},
+        {worker_module, bcrypt_nif_worker}
+    ],
+
+    PoolSpecs = [
+        poolboy:child_spec(nif_pool, PoolArgs, [])
+    ],
+
+    {ok, {{one_for_one, 10, 10}, PoolSpecs}}.

src/bcrypt_nif_worker.erl

@@ -5,7 +5,7 @@
 
 -behaviour(gen_server).
 
--export([start_link/0]).
+-export([start_link/1]).
 -export([gen_salt/0, gen_salt/1]).
 -export([hashpw/2]).
 
@@ -18,19 +18,26 @@
           context
          }).
 
-start_link() ->
-  gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+start_link(Args) -> gen_server:start_link(?MODULE, Args, []).
 
-gen_salt() ->
-  gen_server:call(?MODULE, gen_salt, infinity).
+gen_salt() -> 
+    poolboy:transaction(nif_pool, fun(Worker) ->
+        gen_server:call(Worker, gen_salt, infinity)
+    end).
 
 gen_salt(Rounds) ->
-    gen_server:call(?MODULE, {gen_salt, Rounds}, infinity).
+    poolboy:transaction(nif_pool, fun(Worker) ->
+        gen_server:call(Worker, {gen_salt, Rounds}, infinity)
+    end).
+
 
 hashpw(Password, Salt) ->
-    gen_server:call(?MODULE, {hashpw, Password, Salt}, infinity).
+    poolboy:transaction(nif_pool, fun(Worker) ->
+         gen_server:call(Worker, {hashpw, Password, Salt}, infinity)
+    end).
 
 init([]) ->
+    process_flag(trap_exit, true),    
     {ok, Default} = application:get_env(bcrypt, default_log_rounds),
     Ctx = bcrypt_nif:create_ctx(),
     {ok, #state{default_log_rounds = Default, context = Ctx}}.

src/bcrypt_sup.erl

@@ -16,10 +16,10 @@ init([]) ->
            {bcrypt_pool, {bcrypt_pool, start_link, []}, permanent,
             16#ffffffff, worker, [bcrypt_pool]}],
     NifChildren
-        = [{bcrypt_nif_worker, {bcrypt_nif_worker, start_link, []}, permanent,
-            16#ffffffff, worker, [bcrypt_nif_worker]}],
+        = [{bcrypt_nif_pool_sup, {bcrypt_nif_pool_sup, start_link, []}, permanent,
+            16#ffffffff, supervisor, [bcrypt_nif_pool_sup]}],
     case application:get_env(bcrypt, mechanism) of
         undefined  -> {stop, no_mechanism_defined};
-        {ok, nif}  -> {ok, {{one_for_all, 1, 1}, NifChildren}};
+        {ok, nif}  -> {ok, {{one_for_all, 15, 60}, NifChildren}};
         {ok, port} -> {ok, {{one_for_all, 15, 60}, PortChildren}}
     end.

test/bcrypt_tests.erl

@@ -84,6 +84,7 @@
 
 start_with(Mechanism) when Mechanism =:= nif; Mechanism =:= port ->
     application:start(crypto),
+    application:start(poolboy),
     case application:load(bcrypt) of
         {error, {already_loaded, bcrypt}} -> ok;
         ok -> ok