You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/01/17 23:53:04 UTC
[27/50] git commit: run userdefined profile_fun for accept timing,
handle state upgrade, document and test.
run userdefined profile_fun for accept timing, handle state upgrade, document and test.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/54aa7e03
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/54aa7e03
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/54aa7e03
Branch: refs/heads/import
Commit: 54aa7e0314f82b539d31832760435da371c9d7fb
Parents: 8a6ad73
Author: Emad El-Haraty <em...@mochimedia.com>
Authored: Mon Nov 1 15:18:59 2010 -0700
Committer: Emad El-Haraty <em...@mochimedia.com>
Committed: Mon Nov 1 15:18:59 2010 -0700
----------------------------------------------------------------------
src/mochiweb_http.erl | 10 +++++
src/mochiweb_socket_server.erl | 88 ++++++++++++++++++++++++++++++++++---
2 files changed, 91 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/54aa7e03/src/mochiweb_http.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_http.erl b/src/mochiweb_http.erl
index 2414099..d8c7956 100644
--- a/src/mochiweb_http.erl
+++ b/src/mochiweb_http.erl
@@ -35,6 +35,16 @@ start() ->
start([{ip, "127.0.0.1"},
{loop, {?MODULE, default_body}}]).
+%% @spec start(Options) -> ServerRet
+%% Options = [option()]
+%% Option = {name, atom()} | {ip, string() | tuple()} | {backlog, integer()}
+%% | {nodelay, boolean()} | {acceptor_pool_size, integer()}
+%% | {ssl, boolean()} | {profile_fun, undefined | fun/1}
+%% @doc Start a mochiweb server.
+%% profile_fun is used to profile accept timing.
+%% After each accept, if defined, profile_fun is called with a proplist of a subset of the mochiweb_socket_server state and timing information.
+%% The proplist is as follows: [{name, Name}, {port, Port}, {active_sockets, ActiveSockets}, {timing, Timing}].
+%% @end
start(Options) ->
mochiweb_socket_server:start(parse_options(Options)).
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/54aa7e03/src/mochiweb_socket_server.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_socket_server.erl b/src/mochiweb_socket_server.erl
index a0abf54..ff0d8f3 100644
--- a/src/mochiweb_socket_server.erl
+++ b/src/mochiweb_socket_server.erl
@@ -12,7 +12,7 @@
-export([start/1, stop/1]).
-export([init/1, handle_call/3, handle_cast/2, terminate/2, code_change/3,
handle_info/2]).
--export([get/2]).
+-export([get/2, set/3]).
-record(mochiweb_socket_server,
{port,
@@ -28,7 +28,10 @@
acceptor_pool_size=16,
ssl=false,
ssl_opts=[{ssl_imp, new}],
- acceptor_pool=sets:new()}).
+ acceptor_pool=sets:new(),
+ profile_fun=undefined}).
+
+-define(is_old_state(State), not is_record(State, mochiweb_socket_server)).
start(State=#mochiweb_socket_server{}) ->
start_server(State);
@@ -38,6 +41,12 @@ start(Options) ->
get(Name, Property) ->
gen_server:call(Name, {get, Property}).
+set(Name, profile_fun, Fun) ->
+ gen_server:cast(Name, {set, profile_fun, Fun});
+set(Name, Property, _Value) ->
+ error_logger:info_msg("?MODULE:set for ~p with ~p not implemented~n",
+ [Name, Property]).
+
stop(Name) when is_atom(Name) ->
gen_server:cast(Name, stop);
stop(Pid) when is_pid(Pid) ->
@@ -102,7 +111,10 @@ parse_options([{ssl, Ssl} | Rest], State) when is_boolean(Ssl) ->
parse_options(Rest, State#mochiweb_socket_server{ssl=Ssl});
parse_options([{ssl_opts, SslOpts} | Rest], State) when is_list(SslOpts) ->
SslOpts1 = [{ssl_imp, new} | proplists:delete(ssl_imp, SslOpts)],
- parse_options(Rest, State#mochiweb_socket_server{ssl_opts=SslOpts1}).
+ parse_options(Rest, State#mochiweb_socket_server{ssl_opts=SslOpts1});
+parse_options([{profile_fun, ProfileFun} | Rest], State) when is_function(ProfileFun) ->
+ parse_options(Rest, State#mochiweb_socket_server{profile_fun=ProfileFun}).
+
start_server(State=#mochiweb_socket_server{ssl=Ssl, name=Name}) ->
case Ssl of
@@ -203,6 +215,28 @@ do_get(port, #mochiweb_socket_server{port=Port}) ->
do_get(active_sockets, #mochiweb_socket_server{active_sockets=ActiveSockets}) ->
ActiveSockets.
+
+state_to_proplist(#mochiweb_socket_server{name=Name,
+ port=Port,
+ active_sockets=ActiveSockets}) ->
+ [{name, Name}, {port, Port}, {active_sockets, ActiveSockets}].
+
+upgrade_state(State = #mochiweb_socket_server{}) ->
+ State;
+upgrade_state({mochiweb_socket_server, Port, Loop, Name,
+ Max, IP, Listen, NoDelay, Backlog, ActiveSockets,
+ AcceptorPoolSize, SSL, SSL_opts,
+ AcceptorPool}) ->
+ #mochiweb_socket_server{port=Port, loop=Loop, name=Name, max=Max, ip=IP,
+ listen=Listen, nodelay=NoDelay, backlog=Backlog,
+ active_sockets=ActiveSockets,
+ acceptor_pool_size=AcceptorPoolSize,
+ ssl=SSL,
+ ssl_opts=SSL_opts,
+ acceptor_pool=AcceptorPool}.
+
+handle_call(Req, From, State) when ?is_old_state(State) ->
+ handle_call(Req, From, upgrade_state(State));
handle_call({get, Property}, _From, State) ->
Res = do_get(Property, State),
{reply, Res, State};
@@ -210,17 +244,33 @@ handle_call(_Message, _From, State) ->
Res = error,
{reply, Res, State}.
+
+handle_cast(Req, State) when ?is_old_state(State) ->
+ handle_cast(Req, upgrade_state(State));
handle_cast({accepted, Pid, Timing},
State=#mochiweb_socket_server{active_sockets=ActiveSockets}) ->
State1 = State#mochiweb_socket_server{active_sockets=1 + ActiveSockets},
- udplog:log(mochiweb, [{type, accept}, {time_elapsed, Timing},
- {port, State1#mochiweb_socket_server.port},
- {active_sockets, State1#mochiweb_socket_server.active_sockets},
- {name, State1#mochiweb_socket_server.name}]),
+ case State#mochiweb_socket_server.profile_fun of
+ undefined ->
+ undefined;
+ F when is_function(F) ->
+ catch F([{timing, Timing} | state_to_proplist(State1)])
+ end,
{noreply, recycle_acceptor(Pid, State1)};
+handle_cast({set, profile_fun, ProfileFun}, State) ->
+ State1 = case ProfileFun of
+ ProfileFun when is_function(ProfileFun); ProfileFun =:= undefined ->
+ State#mochiweb_socket_server{profile_fun=ProfileFun};
+ _ ->
+ State
+ end,
+ {noreply, State1};
handle_cast(stop, State) ->
{stop, normal, State}.
+
+terminate(Reason, State) when ?is_old_state(State) ->
+ terminate(Reason, upgrade_state(State));
terminate(_Reason, #mochiweb_socket_server{listen=Listen, port=Port}) ->
mochiweb_socket:close(Listen),
case Port < 1024 of
@@ -248,6 +298,8 @@ recycle_acceptor(Pid, State=#mochiweb_socket_server{
State#mochiweb_socket_server{active_sockets=ActiveSockets - 1}
end.
+handle_info(Msg, State) when ?is_old_state(State) ->
+ handle_info(Msg, upgrade_state(State));
handle_info({'EXIT', Pid, normal}, State) ->
{noreply, recycle_acceptor(Pid, State)};
handle_info({'EXIT', Pid, Reason},
@@ -287,4 +339,26 @@ handle_info(Info, State) ->
%%
-include_lib("eunit/include/eunit.hrl").
-ifdef(TEST).
+
+upgrade_state_test() ->
+ OldState = {mochiweb_socket_server,
+ port, loop, name,
+ max, ip, listen,
+ nodelay, backlog,
+ active_sockets,
+ acceptor_pool_size,
+ ssl, ssl_opts, acceptor_pool},
+ State = upgrade_state(OldState),
+ CmpState = #mochiweb_socket_server{port=port, loop=loop,
+ name=name, max=max, ip=ip,
+ listen=listen, nodelay=nodelay,
+ backlog=backlog,
+ active_sockets=active_sockets,
+ acceptor_pool_size=acceptor_pool_size,
+ ssl=ssl, ssl_opts=ssl_opts,
+ acceptor_pool=acceptor_pool,
+ profile_fun=undefined},
+ ?assertEqual(CmpState, State).
+
-endif.
+