diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-02-02 14:37:22 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2015-02-19 12:33:51 +0100 |
| commit | e5d870308d6e71dd12f46ec4745640e6e75d43d9 (patch) | |
| tree | 50f01c07b984da3ca0b1d27455fededd4bde9c2b | |
| parent | a287b6c12c4d81b9fd09dd4ae9a85d8f6eef1cb9 (diff) | |
Only serialize the actual write on storagedb, not the fsync
| -rw-r--r-- | src/index.erl | 14 | ||||
| -rw-r--r-- | src/storagedb.erl | 8 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/index.erl b/src/index.erl index c0e344a..9d0df96 100644 --- a/src/index.erl +++ b/src/index.erl @@ -12,7 +12,7 @@ %% TODO: Checksums -module(index). --export([get/2, getrange/3, add/3, add_nosync/3, addlast/2, indexsize/1]). +-export([get/2, getrange/3, add/3, add_nosync/3, addlast_nosync/2, indexsize/1, sync/1]). -define(ENTRYSIZE, 32). -define(ENTRYSIZEINFILE, (?ENTRYSIZE*2+1)). @@ -64,7 +64,7 @@ add(Basepath, Index, Entry, Syncflag) when is_binary(Entry), size(Entry) == ?ENT ok = file:close(File), case Syncflag of sync -> - util:fsync([Basepath, filename:dirname(Basepath)]); + sync(Basepath); nosync -> ok end; @@ -74,9 +74,13 @@ add(Basepath, Index, Entry, Syncflag) when is_binary(Entry), size(Entry) == ?ENT end. --spec addlast(string(), integer()) -> ok. -addlast(Basepath, Entry) -> - add(Basepath, last, Entry). +-spec sync(string()) -> ok. +sync(Basepath) -> + util:fsync([Basepath, filename:dirname(Basepath)]). + +-spec addlast_nosync(string(), integer()) -> ok. +addlast_nosync(Basepath, Entry) -> + add_nosync(Basepath, last, Entry). decodedata(Binary) -> lists:reverse(decodedata(Binary, [])). diff --git a/src/storagedb.erl b/src/storagedb.erl index 444abc1..9cdf4c1 100644 --- a/src/storagedb.erl +++ b/src/storagedb.erl @@ -36,7 +36,9 @@ fetchnewhashes(Index) -> -spec add(binary()) -> ok. add(LeafHash) -> - call(?MODULE, {add, LeafHash}). + ok = call(?MODULE, {add_nosync, LeafHash}), + ok = index:sync(newentries_path()), + ok. %%%%%%%%%%%%%%%%%%%% %% gen_server callbacks. @@ -63,6 +65,6 @@ newentries_path() -> handle_call(stop, _From, State) -> {stop, normal, stopped, State}; -handle_call({add, LeafHash}, _From, State) -> - ok = index:addlast(newentries_path(), LeafHash), +handle_call({add_nosync, LeafHash}, _From, State) -> + ok = index:addlast_nosync(newentries_path(), LeafHash), {reply, ok, State}. |