Changeset 27794 for lang/erlang

Timestamp:

01/03/09 00:15:10 (4 years ago)

Author:

kuenishi

Message:

lang/erlang/qnesia OTPっぽくしてみた

Location:

lang/erlang/qnesia

Files:

• . (added)
• ChangeLog (copied) (copied from lang/erlang/ChangeLog)
• LICENCE (added)
• README (added)
• ebin (added)
• include (added)
• src (added)
• src/performer.erl (copied) (copied from lang/erlang/performer.erl)
• src/ptest.erl (copied) (copied from lang/erlang/ptest.erl)
• src/qnesia.erl (copied) (copied from lang/erlang/qnesia.erl) (6 diffs)
• test (added)

lang/erlang/qnesia/src/qnesia.erl

@@ -22 +22 @@
 
 -export([
-         mnesia_wrapper/0, coordinator/4,
+         coordinator/4,
          start_test/0,
          replica/0
@@ -128 +128 @@
 
 replica()->
-    mnesia_wrapper().
-
-%% mnesia wrapper
-%erl -sname b@localhost  -s qnesia mnesia_wrapper  -noshell -s init stop
-mnesia_wrapper()->
-    ok=mnesia:create_schema([node()]),
-    ok=mnesia:start(),
-    {atomic,ok}=mnesia:create_table( data, [
-                                {disc_copies, [node()]},
-                                {attributes, record_info(fields, data)}
-                                ]),
-    true=register(slave, self()),%, slave),
-    io:format("entering ~p loop.~n", [?MODULE]),
+    mnesia_wrapper_init(),
     WriteTx = fun(Data)->
                       mnesia:transaction(
@@ -153 +141 @@
     mnesia_wrapper_loop(WriteTx, ReadTx),
     mnesia:stop().
+
+%% mnesia wrapper
+%erl -sname b@localhost  -s qnesia mnesia_wrapper  -noshell -s init stop
+mnesia_wrapper_init()->
+    ok=mnesia:create_schema([node()]),
+    ok=mnesia:start(),
+    {atomic,ok}=mnesia:create_table( data, [
+                                {disc_copies, [node()]},
+                                {attributes, record_info(fields, data)}
+                                ]),
+    true=register(slave, self()),%, slave),
+    io:format("entering ~p loop.~n", [?MODULE]).
 
 mnesia_wrapper_loop(WriteTx, ReadTx)->
@@ -167 +167 @@
                                    From ! {self(), {ok, atomic}},
                                    receive
-                                       {From, {error, do_rollback}}-> mnesia:abort();
+                                       {From, {error, do_rollback}}-> mnesia:abort(rollback_done);
                                        {From, {ok, do_commit}}    -> ok;
                                        _->      mnesia:abort(unknown_error)
@@ -174 +174 @@
                                    io:format("error ~p.~n", [Reason]),
                                    From ! {self(), {error, Reason}}
-                           end)  of
+                           end
+                   end)  of
                 {atomic, ok}-> ok;
                 {aborted, _Reason} -> ng
@@ -190 +191 @@
                     From ! {self(), {error, too_many_data}}
             end,
-            mnesia_wrapper_loop();
-%       {From, be_master}->
+            mnesia_wrapper_loop(WriteTx, ReadTx);
+%       {From, be_master}-> % after master election... 
         {From, _Other} ->
             io:format("error... illegal_message ~p.~n", [_Other]),
             From ! {self(), {error, illegal_message}},
-            mnesia_wrapper_loop()
+            mnesia_wrapper_loop(WriteTx, ReadTx)
     end.