@@ -1 +1 @@ -{'src/merle.erl', [{outdir, "ebin"}]}. +{'src/*', [{outdir, "ebin"}]}. Emakefile @@ -7,6 +7,9 @@ Contributors : Nick Gerakines <nick@gerakines.net> Info : http://github.com/joewilliams/merle/ +merle uses LShift's gen_server2 module/behavior for faster message queues. +(http://hg.rabbitmq.com/rabbitmq-server/file/b95f2fd4e3f6/src/gen_server2.erl) + This code is available as Open Source Software under the MIT license. README @@ -33,7 +33,7 @@ %% Updates at http://github.com/joewilliams/merle/ -module(merle). --behaviour(gen_server). +-behaviour(gen_server2). -author("Joe Williams <joe@joetify.com>"). -version("Version: 0.2"). @@ -62,30 +62,30 @@ %% @doc retrieve memcached stats stats() -> - gen_server:call(?SERVER, {stats}). + gen_server2:call(?SERVER, {stats}). %% @doc retrieve memcached stats based on args stats(Args) when is_atom(Args)-> stats(atom_to_list(Args)); stats(Args) -> - gen_server:call(?SERVER, {stats, {Args}}). + gen_server2:call(?SERVER, {stats, {Args}}). %% @doc retrieve memcached version version() -> - gen_server:call(?SERVER, {version}). + gen_server2:call(?SERVER, {version}). %% @doc set the verbosity level of the logging output verbosity(Args) when is_integer(Args) -> verbosity(integer_to_list(Args)); verbosity(Args)-> - case gen_server:call(?SERVER, {verbosity, {Args}}) of + case gen_server2:call(?SERVER, {verbosity, {Args}}) of ["OK"] -> ok; [X] -> X end. %% @doc invalidate all existing items immediately flushall() -> - case gen_server:call(?SERVER, {flushall}) of + case gen_server2:call(?SERVER, {flushall}) of ["OK"] -> ok; [X] -> X end. @@ -94,7 +94,7 @@ flushall() -> flushall(Delay) when is_integer(Delay) -> flushall(integer_to_list(Delay)); flushall(Delay) -> - case gen_server:call(?SERVER, {flushall, {Delay}}) of + case gen_server2:call(?SERVER, {flushall, {Delay}}) of ["OK"] -> ok; [X] -> X end. @@ -103,7 +103,7 @@ flushall(Delay) -> getkey(Key) when is_atom(Key) -> getkey(atom_to_list(Key)); getkey(Key) -> - case gen_server:call(?SERVER, {getkey,{Key}}) of + case gen_server2:call(?SERVER, {getkey,{Key}}) of ["END"] -> undefined; [X] -> X end. @@ -112,7 +112,7 @@ getkey(Key) -> getskey(Key) when is_atom(Key) -> getskey(atom_to_list(Key)); getskey(Key) -> - case gen_server:call(?SERVER, {getskey,{Key}}) of + case gen_server2:call(?SERVER, {getskey,{Key}}) of ["END"] -> undefined; [X] -> X end. @@ -126,7 +126,7 @@ delete(Key, Time) when is_atom(Key) -> delete(Key, Time) when is_integer(Time) -> delete(Key, integer_to_list(Time)); delete(Key, Time) -> - case gen_server:call(?SERVER, {delete, {Key, Time}}) of + case gen_server2:call(?SERVER, {delete, {Key, Time}}) of ["DELETED"] -> ok; ["NOT_FOUND"] -> not_found; [X] -> X @@ -166,7 +166,7 @@ set(Key, Flag, ExpTime, Value) when is_integer(Flag) -> set(Key, Flag, ExpTime, Value) when is_integer(ExpTime) -> set(Key, Flag, integer_to_list(ExpTime), Value); set(Key, Flag, ExpTime, Value) -> - case gen_server:call(?SERVER, {set, {Key, Flag, ExpTime, Value}}) of + case gen_server2:call(?SERVER, {set, {Key, Flag, ExpTime, Value}}) of ["STORED"] -> ok; ["NOT_STORED"] -> not_stored; [X] -> X @@ -184,7 +184,7 @@ add(Key, Flag, ExpTime, Value) when is_integer(Flag) -> add(Key, Flag, ExpTime, Value) when is_integer(ExpTime) -> add(Key, Flag, integer_to_list(ExpTime), Value); add(Key, Flag, ExpTime, Value) -> - case gen_server:call(?SERVER, {add, {Key, Flag, ExpTime, Value}}) of + case gen_server2:call(?SERVER, {add, {Key, Flag, ExpTime, Value}}) of ["STORED"] -> ok; ["NOT_STORED"] -> not_stored; [X] -> X @@ -202,7 +202,7 @@ replace(Key, Flag, ExpTime, Value) when is_integer(Flag) -> replace(Key, Flag, ExpTime, Value) when is_integer(ExpTime) -> replace(Key, Flag, integer_to_list(ExpTime), Value); replace(Key, Flag, ExpTime, Value) -> - case gen_server:call(?SERVER, {replace, {Key, Flag, ExpTime, Value}}) of + case gen_server2:call(?SERVER, {replace, {Key, Flag, ExpTime, Value}}) of ["STORED"] -> ok; ["NOT_STORED"] -> not_stored; [X] -> X @@ -222,7 +222,7 @@ cas(Key, Flag, ExpTime, CasUniq, Value) when is_integer(ExpTime) -> cas(Key, Flag, ExpTime, CasUniq, Value) when is_integer(CasUniq) -> cas(Key, Flag, ExpTime, integer_to_list(CasUniq), Value); cas(Key, Flag, ExpTime, CasUniq, Value) -> - case gen_server:call(?SERVER, {cas, {Key, Flag, ExpTime, CasUniq, Value}}) of + case gen_server2:call(?SERVER, {cas, {Key, Flag, ExpTime, CasUniq, Value}}) of ["STORED"] -> ok; ["NOT_STORED"] -> not_stored; [X] -> X @@ -238,12 +238,12 @@ connect(Host, Port) -> %% @doc disconnect from memcached disconnect() -> - gen_server:call(?SERVER, {stop}), + gen_server2:call(?SERVER, {stop}), ok. %% @private start_link(Host, Port) -> - gen_server:start_link({local, ?SERVER}, ?MODULE, [Host, Port], []). + gen_server2:start_link({local, ?SERVER}, ?MODULE, [Host, Port], []). %% @private init([Host, Port]) -> src/merle.erl e064d0da471ac99a684109772ba17d2c1781bfa2 zeusfaber joe@joetify.com http://github.com/cstar/merle/commit/c7b90c5512d8f95442b40d81c9ceefb8e3a566e3 c7b90c5512d8f95442b40d81c9ceefb8e3a566e3 2009-02-06T12:19:17-08:00 2009-02-06T12:19:17-08:00 changed out gen_server for lshift's gen_server2 6a2530fe7a90d29a6e086007e4d5c37071c333b7 zeusfaber joe@joetify.com