@@ -14,7 +14,9 @@ -define (NBIT, 160). % number of bits in the hash function -endif. --define (DEFAULT_CONFIG, []). +-define (DEFAULT_CONFIG, [ + {comm, chordjerl_com} + ]). % may merge finger-like attributes into the srv state. Maybe % srv_state.finger_of_self? @@ -27,7 +29,9 @@ pid, ip, port, - next % the index of the next finger to fix + next, % the index of the next finger to fix + % Other options + comm % }). -record(finger, { include/defines.hrl @@ -152,9 +152,16 @@ get_finger_ref() -> %% Description: Initiates the server %%-------------------------------------------------------------------- init([Config]) -> + [Comm] = config:fetch_or_default_config([comm], Config, ?DEFAULT_CONFIG), ShaInt = make_sha([]), {ok, TRef} = timer:send_interval(timer:minutes(60), run_stabilization_tasks), % stub - {ok, #srv_state{sha=ShaInt,pid=self(),predecessor=undefined,next=0,tref=TRef}}. + {ok, #srv_state{ + sha=ShaInt, + pid=self(), + predecessor=undefined, + next=0, + tref=TRef, + comm=Comm}}. %%-------------------------------------------------------------------- %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} | @@ -272,14 +279,14 @@ handle_create_ring(State) -> NewState = State#srv_state{predecessor=undefined, fingers=[]}, {ok, NewState}. -handle_join(Finger, State) -> +handle_join(Finger, #srv_state{comm = Comm} = State) -> % ?NTRACE("handle_join", [{State#srv_state.pid, State#srv_state.sha}, {joining, Finger#finger.pid} ]), - Response = chordjerl_com:send(Finger, {find_successor, State#srv_state.sha}), + Response = Comm:send(Finger, {find_successor, State#srv_state.sha}), case Response of {ok, NewFinger} -> NewFingers = [NewFinger|State#srv_state.fingers], NewState = State#srv_state{fingers=NewFingers}, - _Response = chordjerl_com:send(Finger, {joined_by, make_finger_from_self(State)}), % tell the node we joined it + _Response = Comm:send(Finger, {joined_by, make_finger_from_self(State)}), % tell the node we joined it {ok, NewState}; _Err -> ?NTRACE("bad response", Response), @@ -301,7 +308,7 @@ handle_joined_by(_Finger, State) -> %% Description: find the successor of Id %% returns in finger format %%-------------------------------------------------------------------- -handle_find_successor(Id, State) -> % could use a refactoring... +handle_find_successor(Id, #srv_state{comm = Comm} = State) -> % could use a refactoring... SuccessorFinger = successor(State), SuccessorId = SuccessorFinger#finger.sha, case ch_id_utils:id_between_oc(State#srv_state.sha, SuccessorId, Id) of @@ -313,7 +320,7 @@ handle_find_successor(Id, State) -> % could use a refactoring... true -> % hmm, suspecious clause here. {{ok, Finger}, State}; false -> - {chordjerl_com:send(Finger, {find_successor, Id}), State} + {Comm:send(Finger, {find_successor, Id}), State} end end. @@ -348,13 +355,13 @@ handle_stabilize(State) -> %% Function: handle_stabilize(State, Successor) -> %% Arguments: Successor must not be self as a finger %%-------------------------------------------------------------------- -handle_stabilize(State, Successor) -> +handle_stabilize(#srv_state{comm = Comm} = State, Successor) -> % ?NTRACE("stabilizing", []), SuccPred01 = case Successor#finger.sha =:= State#srv_state.sha of true -> handle_return_predecessor(State); false -> - chordjerl_com:send(Successor, {return_predecessor}) + Comm:send(Successor, {return_predecessor}) end, SuccPred = case SuccPred01 of @@ -380,7 +387,7 @@ handle_stabilize(State, Successor) -> end, {SelfAsFinger, _State} = handle_return_finger_ref(State), - Response = chordjerl_com:send(RealSuccessor, {claim_to_be_predecessor, SelfAsFinger}), + Response = Comm:send(RealSuccessor, {claim_to_be_predecessor, SelfAsFinger}), {Response, NewState}. handle_return_predecessor(State) -> src/chordjerl_srv.erl 3efc729a0c5b4a26ed0a865831ae39be5ee5a9c0 Ari Lerner alerner@YPCMC05591.local http://github.com/jashmenn/chordjerl/commit/128349e69631f08032795f64f8e8ea6773f254c1 128349e69631f08032795f64f8e8ea6773f254c1 2009-02-27T17:33:00-08:00 2009-02-27T17:33:00-08:00 Added comm as an option 51ab5e0a67192a5f6d39ce9743885f8f815e3591 Ari Lerner alerner@YPCMC05591.local