kai

Revision: 116
          http://kai.svn.sourceforge.net/kai/?rev=116&view=rev
Author:   cooldaemon
Date:     2009-03-06 15:39:34 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Fixed the kai_tcp_server. Divided the source file of it. Added the monitor process.

Modified Paths:
--------------
    branches/cooldaemon_count_current_tcp_connections/src/Makefile
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl
    branches/cooldaemon_count_current_tcp_connections/test/kai.coverspec

Added Paths:
-----------
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl

Modified: branches/cooldaemon_count_current_tcp_connections/src/Makefile
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/Makefile	2009-03-06 15:38:51 UTC (rev 115)
+++ branches/cooldaemon_count_current_tcp_connections/src/Makefile	2009-03-06 15:39:34 UTC (rev 116)
@@ -22,7 +22,9 @@
 SOURCES = \
 	kai_config kai_log kai_hash kai_store kai_store_ets kai_store_dets \
 	kai_stat kai_version kai_connection kai_sync kai_membership \
-	kai_coordinator kai_tcp_server kai_rpc kai_memcache kai_sup kai vclock
+	kai_coordinator kai_tcp_server \
+	kai_tcp_server_sup kai_tcp_server_acceptor kai_tcp_server_monitor \
+	kai_rpc kai_memcache kai_sup kai vclock
 
 MODS = ${SOURCES:%=$(EBIN)/%.$(EMULATOR)} $(APP_TARGET)
 

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl	2009-03-06 15:38:51 UTC (rev 115)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl	2009-03-06 15:39:34 UTC (rev 116)
@@ -11,13 +11,10 @@
 % the License.
 
 -module(kai_tcp_server).
--behaviour(supervisor).
 
 -export([behaviour_info/1]).
 -export([start_link/1, start_link/2, start_link/3, start_link/4]).
 -export([stop/0, stop/1]).
--export([init/1, acceptor_init/5]).
--export([acceptor_start_link/5]).
 
 -include("kai.hrl").
 
@@ -25,146 +22,15 @@
 behaviour_info(callbacks) -> [{init, 1}, {handle_call, 3}];
 behaviour_info(_Other)    -> undefined.
 
-% Supervisor - tcp_server
-%% External APIs
+% External APIs
 start_link(Mod)       -> start_link(Mod, []).
 start_link(Mod, Args) -> start_link(Mod, Args, #tcp_server_option{}).
 start_link(Mod, Args, Option) ->
     start_link({local, ?MODULE}, Mod, Args, Option).
 start_link(Name, Mod, Args, Option) ->
-    supervisor:start_link(Name, ?MODULE, [Name, Mod, Args, Option]).
+    kai_tcp_server_sup:start_link(Name, Mod, Args, Option).
 
 stop() -> stop(?MODULE).
 stop(Name) ->
-    case whereis(Name) of
-        Pid when is_pid(Pid) ->
-            exit(Pid, normal),
-            ok;
-        _ -> not_started
-    end.
+    kai_tcp_server_sup:stop(Name).
 
-%% Callbacks
-init([Name, Mod, Args, Option]) ->
-    case Mod:init(Args) of 
-        {ok, State}    -> listen(State, Name, Mod, Option);
-        {stop, Reason} -> Reason;
-        Other          -> Other % 'ignore' is contained.
-    end.
-
-%% Internal Functions
-listen(State, Name, Mod, Option) ->
-    case gen_tcp:listen(
-        Option#tcp_server_option.port,
-        Option#tcp_server_option.listen
-    ) of
-        {ok, ListenSocket} ->
-            init_acceptors(ListenSocket, State, Name, Mod, Option);
-        {error, Reason} ->
-            ?warning(io_lib:format("listen(~p) ~p", [Mod, {error, Reason}])),
-            {stop, Reason}
-    end.
-
-init_acceptors(ListenSocket, State, {Dest, Name}, Mod, Option) ->
-    #tcp_server_option{
-        max_processes = MaxProcesses,
-        max_restarts  = MaxRestarts,
-        time          = Time,
-        shutdown      = Shutdown
-    } = Option,
-    {ok, {{one_for_one, MaxRestarts, Time}, lists:map(
-        fun (N) ->
-            AcceptorName = list_to_atom(
-                atom_to_list(Name) ++ "_acceptor_" ++ integer_to_list(N)
-            ),
-            {
-                AcceptorName,
-                {
-                    ?MODULE,
-                    acceptor_start_link,
-                    [{Dest, AcceptorName}, ListenSocket, State, Mod, Option]
-                },
-                permanent,
-                Shutdown,
-                worker,
-                []
-            }
-        end,
-        lists:seq(1, MaxProcesses)
-    )}}.
-
-% ProcLib - tcp_acceptor_N
-%% External APIs
-acceptor_start_link({Dest, Name}, ListenSocket, State, Mod, Option) ->
-    {ok, Pid} = proc_lib:start_link(
-        ?MODULE, acceptor_init, [self(), ListenSocket, State, Mod, Option]
-    ),
-    case Dest of
-        local   -> register(Name, Pid);
-        _Global -> global:register_name(Name, Pid)
-    end,
-    {ok, Pid}.
-
-%% Callbacks
-acceptor_init(Parent, ListenSocket, State, Mod, Option) ->
-    proc_lib:init_ack(Parent, {ok, self()}),
-    acceptor_accept(ListenSocket, State, Mod, Option).
-
-acceptor_accept(ListenSocket, State, Mod, Option) ->
-    case gen_tcp:accept(
-        ListenSocket, Option#tcp_server_option.accept_timeout
-    ) of 
-        {ok, Socket} ->
-            acceptor_loop(
-                proplists:get_value(active, Option#tcp_server_option.listen),
-                Socket, State, Mod, Option
-            ),
-            gen_tcp:close(Socket);
-        {error, Reason} ->
-            ?warning(io_lib:format("acceptor_accept(~p) ~p", [Mod, {error, Reason}])),
-            timer:sleep(Option#tcp_server_option.accept_error_sleep_time)
-    end,
-    acceptor_accept(ListenSocket, State, Mod, Option).
-
-acceptor_loop(false, Socket, State, Mod, Option) ->
-    case gen_tcp:recv(
-        Socket,
-        Option#tcp_server_option.recv_length,
-        Option#tcp_server_option.recv_timeout
-    ) of
-        {ok, Data} ->
-            call_mod(false, Socket, Data, State, Mod, Option);
-        {error, closed} ->
-            tcp_closed;
-        {error, Reason} ->
-            ?warning(io_lib:format("acceptor_loop(~p) ~p", [Mod, {error, Reason}])),
-            error
-    end;
-
-acceptor_loop(true, _DummySocket, State, Mod, Option) ->
-    receive
-        {tcp, Socket, Data} ->
-            call_mod(true, Socket, Data, State, Mod, Option);
-        {tcp_closed, _Socket} ->
-            tcp_closed;
-        Error ->
-            ?warning(io_lib:format("acceptor_loop(~p) ~p", [Mod, {error, Error}])),
-            error
-    after Option#tcp_server_option.recv_timeout ->
-        tcp_timeout
-    end.
- 
-call_mod(Active, Socket, Data, State, Mod, Option) ->
-    case Mod:handle_call(Socket, Data, State) of
-        {reply, DataToSend, State} ->
-            gen_tcp:send(Socket, DataToSend),
-            acceptor_loop(Active, Socket, State, Mod, Option);
-        {noreply, State} ->
-            acceptor_loop(Active, Socket, State, Mod, Option);
-        {close, State} ->
-            tcp_closed;
-        {close, DataToSend, State} ->
-            gen_tcp:send(Socket, DataToSend);
-        Other ->
-            ?warning(io_lib:format("call_mod(~p) ~p", [Mod, {unexpected_result, Other}]))
-    end.
-

Added: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl	                        (rev 0)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl	2009-03-06 15:39:34 UTC (rev 116)
@@ -0,0 +1,98 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License.  You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(kai_tcp_server_acceptor).
+
+-export([start_link/6]).
+-export([init/6]).
+
+-include("kai.hrl").
+
+% External APIs
+start_link({Dest, Name}, ListenSocket, State, MonitorName, Mod, Option) ->
+    {ok, Pid} = proc_lib:start_link(
+        ?MODULE, init,
+        [self(), ListenSocket, State, MonitorName, Mod, Option]
+    ),
+    case Dest of
+        local   -> register(Name, Pid);
+        _Global -> global:register_name(Name, Pid)
+    end,
+    {ok, Pid}.
+
+% Callbacks
+init(Parent, ListenSocket, State, MonitorName, Mod, Option) ->
+    proc_lib:init_ack(Parent, {ok, self()}),
+    kai_tcp_server_monitor:regist(MonitorName, self()),
+    accept(ListenSocket, State, MonitorName, Mod, Option).
+
+accept(ListenSocket, State, MonitorName, Mod, Option) ->
+    case gen_tcp:accept(
+        ListenSocket, Option#tcp_server_option.accept_timeout
+    ) of 
+        {ok, Socket} ->
+            kai_tcp_server_monitor:increment(MonitorName, self()),
+            recv(
+                proplists:get_value(active, Option#tcp_server_option.listen),
+                Socket, State, Mod, Option
+            ),
+            kai_tcp_server_monitor:decrement(MonitorName, self()),
+            gen_tcp:close(Socket);
+        {error, Reason} ->
+            ?warning(io_lib:format("acceptor_accept(~p) ~p", [Mod, {error, Reason}])),
+            timer:sleep(Option#tcp_server_option.accept_error_sleep_time)
+    end,
+    accept(ListenSocket, State, MonitorName, Mod, Option).
+
+recv(false, Socket, State, Mod, Option) ->
+    case gen_tcp:recv(
+        Socket,
+        Option#tcp_server_option.recv_length,
+        Option#tcp_server_option.recv_timeout
+    ) of
+        {ok, Data} ->
+            call_mod(false, Socket, Data, State, Mod, Option);
+        {error, closed} ->
+            tcp_closed;
+        {error, Reason} ->
+            ?warning(io_lib:format("acceptor_loop(~p) ~p", [Mod, {error, Reason}])),
+            error
+    end;
+
+recv(true, _DummySocket, State, Mod, Option) ->
+    receive
+        {tcp, Socket, Data} ->
+            call_mod(true, Socket, Data, State, Mod, Option);
+        {tcp_closed, _Socket} ->
+            tcp_closed;
+        Error ->
+            ?warning(io_lib:format("acceptor_loop(~p) ~p", [Mod, {error, Error}])),
+            error
+    after Option#tcp_server_option.recv_timeout ->
+        tcp_timeout
+    end.
+ 
+call_mod(Active, Socket, Data, State, Mod, Option) ->
+    case Mod:handle_call(Socket, Data, State) of
+        {reply, DataToSend, State} ->
+            gen_tcp:send(Socket, DataToSend),
+            recv(Active, Socket, State, Mod, Option);
+        {noreply, State} ->
+            recv(Active, Socket, State, Mod, Option);
+        {close, State} ->
+            tcp_closed;
+        {close, DataToSend, State} ->
+            gen_tcp:send(Socket, DataToSend);
+        Other ->
+            ?warning(io_lib:format("call_mod(~p) ~p", [Mod, {unexpected_result, Other}]))
+    end.
+

Added: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl	                        (rev 0)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl	2009-03-06 15:39:34 UTC (rev 116)
@@ -0,0 +1,92 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License.  You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(kai_tcp_server_monitor).
+-behaviour(gen_server).
+
+-export([start_link/1, stop/1]).
+-export([
+    regist/2,
+    increment/2, decrement/2,
+    state/1
+]).
+-export([
+    init/1,
+    handle_call/3, handle_cast/2, handle_info/2,
+    terminate/2, code_change/3
+]).
+
+-include("kai.hrl").
+
+% External APIs
+start_link(Name) ->
+    gen_server:start_link(Name, ?MODULE, [], []).
+
+stop(ServerRef) ->
+    gen_server:call(ServerRef, stop).
+
+regist(ServerRef, Pid) ->
+    gen_server:call(ServerRef, {regist, Pid}).
+
+increment(ServerRef, Pid) ->
+    gen_server:cast(ServerRef, {increment, Pid}).
+
+decrement(ServerRef, Pid) ->
+    gen_server:cast(ServerRef, {decrement, Pid}).
+
+state(ServerRef) ->
+    gen_server:call(ServerRef, state).
+
+% Callbacks
+init(_Args) ->
+    {ok, {_MonitorRefs = [], _Pids = []}}.
+
+handle_call(stop, _From, State) ->
+    {stop, normal, stopped, State};
+
+handle_call({regist, Pid}, _From, {MonitorRefs, Pids}) ->
+    {reply, ok, {
+        [erlang:monitor(process, Pid) | MonitorRefs],
+        Pids
+    }};
+      
+handle_call(state, _From, State) ->
+    {reply, State, State};
+
+handle_call(_Message, _From, State) ->
+    {reply, ok, State}.
+
+handle_cast({increment, Pid}, {MonitorRefs, Pids}) ->
+    {noreply, {MonitorRefs, [Pid | Pids]}};
+
+handle_cast({decrement, Pid}, {MonitorRefs, Pids}) ->
+    {noreply, {MonitorRefs, lists:delete(Pid, Pids)}};
+
+handle_cast(_Message, State) ->
+    {noreply, State}.
+
+handle_info({'DOWN', MonitorRef, _Type, Pid, _Info}, {MonitorRefs, Pids}) ->
+    erlang:demonitor(MonitorRef),
+    {noreply, {
+        lists:delete(MonitorRef, MonitorRefs),
+        lists:delete(Pid, Pids)
+    }};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+

Added: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl	                        (rev 0)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl	2009-03-06 15:39:34 UTC (rev 116)
@@ -0,0 +1,128 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License.  You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(kai_tcp_server_sup).
+-behaviour(supervisor).
+
+-export([start_link/4, stop/1]).
+-export([init/1]).
+
+-include("kai.hrl").
+
+% External APIs
+start_link(Name, Mod, Args, Option) ->
+    supervisor:start_link(Name, ?MODULE, [Name, Mod, Args, Option]).
+
+stop(Name) ->
+    case whereis(Name) of
+        Pid when is_pid(Pid) ->
+            exit(Pid, normal),
+            ok;
+        _ -> not_started
+    end.
+
+% Callbacks
+init([Name, Mod, Args, Option]) ->
+    case Mod:init(Args) of 
+        {ok, State}    -> listen(State, Name, Mod, Option);
+        {stop, Reason} -> Reason;
+        Other          -> Other % 'ignore' is contained.
+    end.
+
+% Internal Functions
+listen(State, Name, Mod, Option) ->
+    case gen_tcp:listen(
+        Option#tcp_server_option.port,
+        Option#tcp_server_option.listen
+    ) of
+        {ok, ListenSocket} ->
+            build_result(ListenSocket, State, Name, Mod, Option);
+        {error, Reason} ->
+            ?warning(io_lib:format("listen(~p) ~p", [Mod, {error, Reason}])),
+            {stop, Reason}
+    end.
+
+build_result(ListenSocket, State, {Dest, Name}, Mod, Option) ->
+    #tcp_server_option{
+        max_restarts = MaxRestarts,
+        time         = Time
+    } = Option,
+    MonitorName = build_monitor_name(Name),
+    {ok, {
+        {one_for_one, MaxRestarts, Time},
+        [
+            monitor_spec({Dest, MonitorName}) |
+            acceptor_specs(
+                ListenSocket, State, {Dest, Name}, MonitorName, Mod, Option
+            )
+        ]
+    }}.
+
+monitor_spec({Dest, MonitorName}) ->
+    {
+        MonitorName,
+        {
+            kai_tcp_server_monitor,
+            start_link,
+            [{Dest, MonitorName}]
+        },
+        permanent,
+        brutal_kill,
+        worker,
+        []
+    }.
+
+acceptor_specs(
+  ListenSocket, State, {Dest, Name}, MonitorBaseName, Mod, Option
+) ->
+    #tcp_server_option{
+        max_processes = MaxProcesses,
+        shutdown      = Shutdown
+    } = Option,
+    MonitorName = case Dest of
+      local   -> MonitorBaseName;
+      _Global -> {Dest, MonitorBaseName}
+    end,
+    lists:map(
+        fun (N) ->
+            AcceptorName = build_acceptor_name(Name, N),
+            {
+                AcceptorName,
+                {
+                    kai_tcp_server_acceptor,
+                    start_link,
+                    [
+                        {Dest, AcceptorName},
+                        ListenSocket,
+                        State,
+                        MonitorName,
+                        Mod,
+                        Option
+                    ]
+                },
+                permanent,
+                Shutdown,
+                worker,
+                []
+            }
+        end,
+        lists:seq(1, MaxProcesses)
+    ).
+
+build_monitor_name(Prefix) ->
+    list_to_atom(atom_to_list(Prefix) ++ "_monitor").
+
+build_acceptor_name(Prefix, Number) ->
+    list_to_atom(
+        atom_to_list(Prefix) ++ "_acceptor_" ++ integer_to_list(Number)
+    ).
+ 

Modified: branches/cooldaemon_count_current_tcp_connections/test/kai.coverspec
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/test/kai.coverspec	2009-03-06 15:38:51 UTC (rev 115)
+++ branches/cooldaemon_count_current_tcp_connections/test/kai.coverspec	2009-03-06 15:39:34 UTC (rev 116)
@@ -2,6 +2,8 @@
 {incl_mods, [
     kai_config, kai_log, kai_hash, kai_store, kai_stat, kai_version,
     kai_connection, kai_sync, kai_membership, kai_coordinator,
-    kai_tcp_server, kai_rpc, kai_memcache
+    kai_tcp_server,
+    kai_tcp_server_sup, kai_tcp_server_acceptor, kai_tcp_server_monitor,
+    kai_rpc, kai_memcache
 ]}.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 120
          http://kai.svn.sourceforge.net/kai/?rev=120&view=rev
Author:   cooldaemon
Date:     2009-03-15 07:21:09 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Merge branch 'master' into count_current_tcp_connections

Modified Paths:
--------------
    branches/cooldaemon_count_current_tcp_connections/src/kai_memcache.erl
    branches/cooldaemon_count_current_tcp_connections/test/kai_coordinator_SUITE.erl
    branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_memcache.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_memcache.erl	2009-03-13 15:05:25 UTC (rev 119)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_memcache.erl	2009-03-15 07:21:09 UTC (rev 120)
@@ -78,6 +78,14 @@
          ),
     {reply, [Response|"END\r\n"], State};
 
+dispatch(_Socket, ["version"], State) ->
+    Version =
+        case application:get_key(kai, vsn) of
+            {ok, V} -> V;
+            _       -> "0"
+        end,
+    {reply, "VERSION " ++ Version ++ "\r\n", State};
+
 dispatch(_Socket, ["quit"], _State) -> quit;
 
 dispatch(_Socket, _Unknown, State) ->

Modified: branches/cooldaemon_count_current_tcp_connections/test/kai_coordinator_SUITE.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/test/kai_coordinator_SUITE.erl	2009-03-13 15:05:25 UTC (rev 119)
+++ branches/cooldaemon_count_current_tcp_connections/test/kai_coordinator_SUITE.erl	2009-03-15 07:21:09 UTC (rev 120)
@@ -17,7 +17,8 @@
 -include("kai_test.hrl").
 -include("ct.hrl").
 
-all() -> [test1, get_concurrent_data, put_concurrent_data].
+all() -> [test1, get_concurrent_data, put_concurrent_data,
+         put_and_overwrite_stale_data, put_and_fail_overwrite_stale_data].
 
 init_per_suite(Config) ->
     net_kernel:start([hoge, shortnames]),
@@ -143,6 +144,46 @@
     p("put error reason:", Reason),
     ok.
 
+put_and_overwrite_stale_data() -> [].
+put_and_overwrite_stale_data(Config) ->
+    Key = "key3",
+    Node1 = ?config(node1, Config),
+    _Node2 = ?config(node2, Config),
+    ok = rpc:call(Node1, kai_coordinator, route, [{put, #data{key=Key, value="value1"}}]),
+    [Data] = rpc:call(Node1, kai_coordinator, route, [{get, #data{key=Key}}]),
+    IntentionalAhreadVCAtNode1 = vclock:increment(rpc:call(Node1, kai_config, get, [node]),
+                                               Data#data.vector_clocks),
+    ok = rpc:call(Node1, kai_store, put, [Data#data{vector_clocks=IntentionalAhreadVCAtNode1}]),
+    ok = rpc:call(Node1,
+                               kai_coordinator, route,
+                               [{put, #data{key=Key,
+                                            flags = "0",
+                                            value = (<<"value-1">>)}
+                                }]),
+    ok.
+
+put_and_fail_overwrite_stale_data() -> [].
+put_and_fail_overwrite_stale_data(Config) ->
+    Key = "key3",
+    Node1 = ?config(node1, Config),
+    Node2 = ?config(node2, Config),
+    ok = rpc:call(Node1, kai_coordinator, route, [{put, #data{key=Key, value="value1"}}]),
+    [Data] = rpc:call(Node1, kai_coordinator, route, [{get, #data{key=Key}}]),
+    IntentionalAhreadVCAtNode1 = vclock:increment(rpc:call(Node1, kai_config, get, [node]),
+                                               Data#data.vector_clocks),
+    ok = rpc:call(Node1, kai_store, put, [Data#data{vector_clocks=IntentionalAhreadVCAtNode1}]),
+    %% FIXME: this rpc:call should succeceed. Correct pattern matching is as below:
+    %% ok = rpc:call(Node2,
+    {error, Reason} = rpc:call(Node2,
+                               kai_coordinator, route,
+                               [{put, #data{key=Key,
+                                            flags = "0",
+                                            value = (<<"value-1">>)}
+                                }]),
+    ?assertEqual(ebusy, Reason),
+    p("put error reason:", Reason),
+    ok.
+
 start_kai_node(MemcachePort, N, R, W) ->
     {ok, Node} = slave:start(net_adm:localhost(),
                              list_to_atom("kai_test_" ++ integer_to_list(MemcachePort)),

Modified: branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl	2009-03-13 15:05:25 UTC (rev 119)
+++ branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl	2009-03-15 07:21:09 UTC (rev 120)
@@ -142,6 +142,10 @@
        gen_tcp:recv(MemcacheSocket, 0)
       ),
 
+    gen_tcp:send(MemcacheSocket, "version\r\n"),
+    {ok, Version2} = gen_tcp:recv(MemcacheSocket, 0),
+    {match, _Si, _Li} = regexp:match(binary_to_list(Version2), "VERSION "),
+
     gen_tcp:send(MemcacheSocket, "quit\r\n"),
 
     gen_tcp:close(MemcacheSocket),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 122
          http://kai.svn.sourceforge.net/kai/?rev=122&view=rev
Author:   cooldaemon
Date:     2009-03-15 07:21:50 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Caught all the errors of the kai_tcp_server callback module.

Modified Paths:
--------------
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl
    branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl	2009-03-15 07:21:28 UTC (rev 121)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl	2009-03-15 07:21:50 UTC (rev 122)
@@ -40,15 +40,27 @@
         ListenSocket, Option#tcp_server_option.accept_timeout
     ) of 
         {ok, Socket} ->
-            kai_tcp_server_monitor:increment(MonitorName, self()),
-            recv(
-                proplists:get_value(active, Option#tcp_server_option.listen),
-                Socket, State, Mod, Option
-            ),
-            kai_tcp_server_monitor:decrement(MonitorName, self()),
-            gen_tcp:close(Socket);
+            try
+                kai_tcp_server_monitor:increment(MonitorName, self()),
+                recv(
+                    proplists:get_value(
+                        active, Option#tcp_server_option.listen
+                    ),
+                    Socket, State, Mod, Option
+                )
+            catch
+                Type:Reason ->
+                    ?warning(io_lib:format(
+                        "accept(~p) ~p", [Mod, {Type, Reason}]
+                    ))
+            after
+                kai_tcp_server_monitor:decrement(MonitorName, self()),
+                gen_tcp:close(Socket)
+            end;
         {error, Reason} ->
-            ?warning(io_lib:format("acceptor_accept(~p) ~p", [Mod, {error, Reason}])),
+            ?warning(io_lib:format(
+                "accept(~p) ~p", [Mod, {error, Reason}]
+            )),
             timer:sleep(Option#tcp_server_option.accept_error_sleep_time)
     end,
     accept(ListenSocket, State, MonitorName, Mod, Option).
@@ -64,7 +76,7 @@
         {error, closed} ->
             tcp_closed;
         {error, Reason} ->
-            ?warning(io_lib:format("acceptor_loop(~p) ~p", [Mod, {error, Reason}])),
+            ?warning(io_lib:format("recv(~p) ~p", [Mod, {error, Reason}])),
             error
     end;
 
@@ -75,7 +87,7 @@
         {tcp_closed, _Socket} ->
             tcp_closed;
         Error ->
-            ?warning(io_lib:format("acceptor_loop(~p) ~p", [Mod, {error, Error}])),
+            ?warning(io_lib:format("recv(~p) ~p", [Mod, {error, Error}])),
             error
     after Option#tcp_server_option.recv_timeout ->
         tcp_timeout
@@ -93,6 +105,8 @@
         {close, DataToSend, State} ->
             gen_tcp:send(Socket, DataToSend);
         Other ->
-            ?warning(io_lib:format("call_mod(~p) ~p", [Mod, {unexpected_result, Other}]))
+            ?warning(io_lib:format(
+                "call_mod(~p) ~p", [Mod, {unexpected_result, Other}]
+            ))
     end.
 

Modified: branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl	2009-03-15 07:21:28 UTC (rev 121)
+++ branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl	2009-03-15 07:21:50 UTC (rev 122)
@@ -18,30 +18,52 @@
 -include("kai.hrl").
 -include("kai_test.hrl").
 
-%sequences() -> [{sequences1, [testcase1, testcase2]}].
-sequences() -> [{sequences1, [testcase1]}].
+sequences() -> [{sequences1, [testcase1, testcase2, testcase3]}].
 
 all() -> [{sequence, sequences1}].
 
 init_per_testcase(testcase1, Config) ->
+    start_server(),
+    Config;
+
+init_per_testcase(testcase2, Config) ->
+    start_server(),
+    Config;
+
+init_per_testcase(testcase3, Config) ->
+    start_server(),
+    Config;
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+start_server() ->
     kai_tcp_server:start_link(
         ?MODULE, [], #tcp_server_option{max_processes=1}
-    ),
-    Config;
+    ).
 
-init_per_testcase(_TestCase, Config) -> Config.
-
 end_per_testcase(testcase1, _Config) ->
     kai_tcp_server:stop(),
     ok;
 
-end_per_testcase(_TestCase, _Config) -> ok.
+end_per_testcase(testcase2, _Config) ->
+    kai_tcp_server:stop(),
+    ok;
 
+end_per_testcase(testcase3, _Config) ->
+    kai_tcp_server:stop(),
+    ok;
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
 testcase1() -> [].
 testcase1(_Conf) ->
-    {ok, Socket} = gen_tcp:connect(
-        {127,0,0,1}, 11211, [binary, {packet, line}, {active, false}]
-    ),
+    normal_test(),
+    ok.
+
+normal_test() ->
+    {ok, Socket} = connect_to_echo_server(),
     gen_tcp:send(Socket, <<"hello\r\n">>),
     case gen_tcp:recv(Socket, 0) of
        {ok, <<"hello\r\n">>} -> ok;
@@ -55,11 +77,37 @@
     gen_tcp:close(Socket),
     ok.
 
+testcase2() -> [].
+testcase2(_Conf) ->
+    {ok, Socket} = connect_to_echo_server(),
+    gen_tcp:send(Socket, <<"error\r\n">>),
+    {error, closed} = gen_tcp:recv(Socket, 0),
+    gen_tcp:close(Socket),
+
+    normal_test(), % check the echo server rebooted.
+    ok.
+
+testcase3() -> [].
+testcase3(_Conf) ->
+    lists:foreach(fun (_N) ->
+        {ok, Socket} = connect_to_echo_server(),
+        gen_tcp:close(Socket)
+    end, lists:seq(1, 10000)),
+    ok.
+
+connect_to_echo_server() ->
+    gen_tcp:connect(
+        {127,0,0,1}, 11211, [binary, {packet, line}, {active, false}]
+    ).
+
 % echo server
 init(_Args) -> {ok, {}}.
 
 handle_call(_Socket, <<"bye\r\n">>, State) ->
     {close, <<"cya\r\n">>, State};
+handle_call(_Socket, <<"error\r\n">>, State) ->
+    BadArith = 1/0,
+    {close, <<"error\r\n">>, State};
 handle_call(_Socket, Data, State) ->
     {reply, Data, State}.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 123
          http://kai.svn.sourceforge.net/kai/?rev=123&view=rev
Author:   cooldaemon
Date:     2009-03-15 07:22:15 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Added the function for getting the curr_connections.

Modified Paths:
--------------
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl
    branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl
    branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl	2009-03-15 07:21:50 UTC (rev 122)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server.erl	2009-03-15 07:22:15 UTC (rev 123)
@@ -15,6 +15,7 @@
 -export([behaviour_info/1]).
 -export([start_link/1, start_link/2, start_link/3, start_link/4]).
 -export([stop/0, stop/1]).
+-export([info/1, info/2]).
 
 -include("kai.hrl").
 
@@ -34,3 +35,9 @@
 stop(Name) ->
     kai_tcp_server_sup:stop(Name).
 
+info(Key) -> info(?MODULE, Key).
+info(Name, Key) ->
+    kai_tcp_server_monitor:info(
+        kai_tcp_server_sup:build_monitor_name(Name), Key
+    ).
+

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl	2009-03-15 07:21:50 UTC (rev 122)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_acceptor.erl	2009-03-15 07:22:15 UTC (rev 123)
@@ -35,6 +35,7 @@
     kai_tcp_server_monitor:register(MonitorName, self()),
     accept(ListenSocket, State, MonitorName, Mod, Option).
 
+% Internal Functions
 accept(ListenSocket, State, MonitorName, Mod, Option) ->
     case gen_tcp:accept(
         ListenSocket, Option#tcp_server_option.accept_timeout

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl	2009-03-15 07:21:50 UTC (rev 122)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_monitor.erl	2009-03-15 07:22:15 UTC (rev 123)
@@ -17,7 +17,7 @@
 -export([
     register/2,
     increment/2, decrement/2,
-    state/1
+    info/2
 ]).
 -export([
     init/1,
@@ -43,8 +43,8 @@
 decrement(ServerRef, Pid) ->
     gen_server:cast(ServerRef, {decrement, Pid}).
 
-state(ServerRef) ->
-    gen_server:call(ServerRef, state).
+info(ServerRef, Key) ->
+    gen_server:call(ServerRef, {info, Key}).
 
 % Callbacks
 init(_Args) ->
@@ -59,8 +59,8 @@
         Pids
     }};
       
-handle_call(state, _From, State) ->
-    {reply, State, State};
+handle_call({info, Key}, _From, State) ->
+    {reply, state_to_info(State, Key), State};
 
 handle_call(_Message, _From, State) ->
     {reply, ok, State}.
@@ -90,3 +90,10 @@
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
+% Internal Functions
+state_to_info({_MonitorRefs, Pids}, curr_connections) ->
+    length(Pids); 
+
+state_to_info(_State, _Key) ->
+    undefined.
+

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl	2009-03-15 07:21:50 UTC (rev 122)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_tcp_server_sup.erl	2009-03-15 07:22:15 UTC (rev 123)
@@ -15,6 +15,7 @@
 
 -export([start_link/4, stop/1]).
 -export([init/1]).
+-export([build_monitor_name/1]).
 
 -include("kai.hrl").
 

Modified: branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl	2009-03-15 07:21:50 UTC (rev 122)
+++ branches/cooldaemon_count_current_tcp_connections/test/kai_tcp_server_SUITE.erl	2009-03-15 07:22:15 UTC (rev 123)
@@ -18,43 +18,27 @@
 -include("kai.hrl").
 -include("kai_test.hrl").
 
-sequences() -> [{sequences1, [testcase1, testcase2, testcase3]}].
+sequences() ->
+    [{sequences1, [testcase1, testcase2, testcase3, testcase4]}].
 
-all() -> [{sequence, sequences1}].
+all() ->
+    [{sequence, sequences1}].
 
-init_per_testcase(testcase1, Config) ->
-    start_server(),
+init_per_testcase(testcase4, Config) ->
+    start_server(10),
     Config;
 
-init_per_testcase(testcase2, Config) ->
-    start_server(),
-    Config;
-
-init_per_testcase(testcase3, Config) ->
-    start_server(),
-    Config;
-
 init_per_testcase(_TestCase, Config) ->
+    start_server(1),
     Config.
 
-start_server() ->
+start_server(MaxProcesses) ->
     kai_tcp_server:start_link(
-        ?MODULE, [], #tcp_server_option{max_processes=1}
+        ?MODULE, [], #tcp_server_option{max_processes=MaxProcesses}
     ).
 
-end_per_testcase(testcase1, _Config) ->
-    kai_tcp_server:stop(),
-    ok;
-
-end_per_testcase(testcase2, _Config) ->
-    kai_tcp_server:stop(),
-    ok;
-
-end_per_testcase(testcase3, _Config) ->
-    kai_tcp_server:stop(),
-    ok;
-
 end_per_testcase(_TestCase, _Config) ->
+    kai_tcp_server:stop(),
     ok.
 
 testcase1() -> [].
@@ -83,7 +67,6 @@
     gen_tcp:send(Socket, <<"error\r\n">>),
     {error, closed} = gen_tcp:recv(Socket, 0),
     gen_tcp:close(Socket),
-
     normal_test(), % check the echo server rebooted.
     ok.
 
@@ -95,6 +78,21 @@
     end, lists:seq(1, 10000)),
     ok.
 
+testcase4() -> [].
+testcase4(_Conf) ->
+    Sockets = lists:map(fun (_N) ->
+        {ok, Socket} = connect_to_echo_server(),
+        Socket
+    end, lists:seq(1, 5)),
+    case kai_tcp_server:info(curr_connections) of
+        5 -> ok;
+        Error ->
+            ct:comment(io:format("bad_info:~p", [Error])),
+            ct:fail(bad_info)
+    end,
+    lists:foreach(fun (Socket) -> gen_tcp:close(Socket) end, Sockets),
+    ok.
+
 connect_to_echo_server() ->
     gen_tcp:connect(
         {127,0,0,1}, 11211, [binary, {packet, line}, {active, false}]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 127
          http://kai.svn.sourceforge.net/kai/?rev=127&view=rev
Author:   cooldaemon
Date:     2009-03-19 10:01:53 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
curr_connections was added to the status.

Modified Paths:
--------------
    branches/cooldaemon_count_current_tcp_connections/src/kai_stat.erl
    branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl
    branches/cooldaemon_count_current_tcp_connections/test/kai_stat_SUITE.erl

Modified: branches/cooldaemon_count_current_tcp_connections/src/kai_stat.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/src/kai_stat.erl	2009-03-19 10:01:05 UTC (rev 126)
+++ branches/cooldaemon_count_current_tcp_connections/src/kai_stat.erl	2009-03-19 10:01:53 UTC (rev 127)
@@ -92,6 +92,9 @@
         curr_items ->
             Size = kai_store:info(size),
             {curr_items, integer_to_list(Size)};
+        curr_connections ->
+            Connections = kai_tcp_server:info(kai_memcache, curr_connections),
+            {curr_connections, integer_to_list(Connections)};
         cmd_get ->
             {cmd_get, integer_to_list(State#state.cmd_get)};
         cmd_set ->
@@ -131,7 +134,8 @@
     Stats =
         lists:map(
           fun(Name) -> stat(Name, State) end,
-          [uptime, time, version, bytes, curr_items, cmd_get, cmd_set,
+          [uptime, time, version, bytes,
+           curr_items, curr_connections, cmd_get, cmd_set,
            bytes_read, bytes_write,
            kai_node, kai_quorum, kai_number_of_buckets,
            kai_number_of_virtual_nodes, kai_store, kai_curr_nodes,

Modified: branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl	2009-03-19 10:01:05 UTC (rev 126)
+++ branches/cooldaemon_count_current_tcp_connections/test/kai_memcache_SUITE.erl	2009-03-19 10:01:53 UTC (rev 127)
@@ -106,6 +106,7 @@
     {ok, Version             } = gen_tcp:recv(MemcacheSocket, 0),
     {ok, Bytes               } = gen_tcp:recv(MemcacheSocket, 0),
     {ok, CurrItems           } = gen_tcp:recv(MemcacheSocket, 0),
+    {ok, CurrConnections     } = gen_tcp:recv(MemcacheSocket, 0),
     {ok, CmdGet              } = gen_tcp:recv(MemcacheSocket, 0),
     {ok, CmdSet              } = gen_tcp:recv(MemcacheSocket, 0),
     {ok, BytesRead           } = gen_tcp:recv(MemcacheSocket, 0),
@@ -124,19 +125,20 @@
     {match, _S3, _L3} = regexp:match(binary_to_list(Version),              "version"),
     {match, _S4, _L4} = regexp:match(binary_to_list(Bytes),                "bytes"),
     {match, _S5, _L5} = regexp:match(binary_to_list(CurrItems),            "curr_items"),
-    {match, _S6, _L6} = regexp:match(binary_to_list(CmdGet),               "cmd_get"),
-    {match, _S7, _L7} = regexp:match(binary_to_list(CmdSet),               "cmd_set"),
-    {match, _S8, _L8} = regexp:match(binary_to_list(BytesRead),            "bytes_read"),
-    {match, _S9, _L9} = regexp:match(binary_to_list(BytesWrite),           "bytes_write"),
-    {match, _S0, _L0} = regexp:match(binary_to_list(LocalNode),            "kai_node"),
-    {match, _Sa, _La} = regexp:match(binary_to_list(Quorum),               "kai_quorum"),
-    {match, _Sb, _Lb} = regexp:match(binary_to_list(NumberOfBuckets),      "kai_number_of_buckets"),
-    {match, _Sc, _Lc} = regexp:match(binary_to_list(NumberOfVirtualNodes), "kai_number_of_virtual_nodes"),
-    {match, _Sd, _Ld} = regexp:match(binary_to_list(Store),                "kai_store"),
-    {match, _Se, _Le} = regexp:match(binary_to_list(Nodes),                "kai_curr_nodes"),
-%    {match, _Sf, _Lf} = regexp:match(binary_to_list(Buckets),              "kai_curr_buckets"),
-    {match, _Sg, _Lg} = regexp:match(binary_to_list(ErlangProcs),          "erlang_procs"),
-    {match, _Sh, _Lh} = regexp:match(binary_to_list(ErlangVersion),        "erlang_version"),
+    {match, _S6, _L6} = regexp:match(binary_to_list(CurrConnections),            "curr_connections"),
+    {match, _S7, _L7} = regexp:match(binary_to_list(CmdGet),               "cmd_get"),
+    {match, _S8, _L8} = regexp:match(binary_to_list(CmdSet),               "cmd_set"),
+    {match, _S9, _L9} = regexp:match(binary_to_list(BytesRead),            "bytes_read"),
+    {match, _S0, _L0} = regexp:match(binary_to_list(BytesWrite),           "bytes_write"),
+    {match, _Sa, _La} = regexp:match(binary_to_list(LocalNode),            "kai_node"),
+    {match, _Sb, _Lb} = regexp:match(binary_to_list(Quorum),               "kai_quorum"),
+    {match, _Sc, _Lc} = regexp:match(binary_to_list(NumberOfBuckets),      "kai_number_of_buckets"),
+    {match, _Sd, _Ld} = regexp:match(binary_to_list(NumberOfVirtualNodes), "kai_number_of_virtual_nodes"),
+    {match, _Se, _Le} = regexp:match(binary_to_list(Store),                "kai_store"),
+    {match, _Sf, _Lf} = regexp:match(binary_to_list(Nodes),                "kai_curr_nodes"),
+%    {match, _Sg, _Lg} = regexp:match(binary_to_list(Buckets),              "kai_curr_buckets"),
+    {match, _Sh, _Lh} = regexp:match(binary_to_list(ErlangProcs),          "erlang_procs"),
+    {match, _Si, _Li} = regexp:match(binary_to_list(ErlangVersion),        "erlang_version"),
     ?assertEqual(
        {ok, <<"END\r\n">>},
        gen_tcp:recv(MemcacheSocket, 0)
@@ -144,7 +146,7 @@
 
     gen_tcp:send(MemcacheSocket, "version\r\n"),
     {ok, Version2} = gen_tcp:recv(MemcacheSocket, 0),
-    {match, _Si, _Li} = regexp:match(binary_to_list(Version2), "VERSION "),
+    {match, _Sj, _Lj} = regexp:match(binary_to_list(Version2), "VERSION "),
 
     gen_tcp:send(MemcacheSocket, "quit\r\n"),
 

Modified: branches/cooldaemon_count_current_tcp_connections/test/kai_stat_SUITE.erl
===================================================================
--- branches/cooldaemon_count_current_tcp_connections/test/kai_stat_SUITE.erl	2009-03-19 10:01:05 UTC (rev 126)
+++ branches/cooldaemon_count_current_tcp_connections/test/kai_stat_SUITE.erl	2009-03-19 10:01:53 UTC (rev 127)
@@ -23,6 +23,8 @@
     kai_config:start_link([
         {hostname, "localhost"},
         {rpc_port, 11011},
+        {memcache_port, 11211},
+        {memcache_max_processes, 1},
         {n, 3}, {r, 2}, {w, 2},
         {number_of_buckets, 8},
         {number_of_virtual_nodes, 2},
@@ -31,6 +33,7 @@
     kai_hash:start_link(),
     kai_store:start_link(),
     kai_stat:start_link(),
+    kai_memcache:start_link(),
 
     kai_stat:incr_cmd_get(),
     kai_stat:incr_cmd_set(),
@@ -44,6 +47,7 @@
      {version,                     Version             },
      {bytes,                       Bytes               },
      {curr_items,                  CurrItems           },
+     {curr_connections,            CurrConnections     },
      {cmd_get,                     CmdGet              },
      {cmd_set,                     CmdSet              },
      {bytes_read,                  BytesRead           },
@@ -62,6 +66,7 @@
     {match, _S3, _L3} = regexp:match(Version,       "[.0-9]+"),
     {match, _S4, _L4} = regexp:match(Bytes,         "[0-9]+"),
     ?assertEqual("0",               CurrItems           ),
+    ?assertEqual("0",               CurrConnections     ),
     ?assertEqual("1",               CmdGet              ),
     ?assertEqual("1",               CmdSet              ),
     ?assertEqual("14",              BytesRead           ),
@@ -76,6 +81,7 @@
     {match, _S5, _L5} = regexp:match(ErlangProcs,   "[0-9]+"),
     {match, _S6, _L6} = regexp:match(ErlangVersion, "[.0-9]+"),
 
+    kai_memcache:stop(),
     kai_stat:stop(),
     kai_store:stop(),
     kai_hash:stop(),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.