Remove egs_db. Rename the ids table to counters. Update it directly.

ebin/egs.app

@@ -9,7 +9,6 @@
 		egs_exit_mon,
 		egs_user_model,
 		reloader,
-		egs_db,
 		psu_game,
 		psu_login,
 		psu_patch,

include/records.hrl

@@ -16,9 +16,8 @@
 %	You should have received a copy of the GNU General Public License
 %	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
 
-%% @doc Temporary table for generating a new GID at each connection.
-
--record(ids, {type, id}).
+%% @doc Table containing counters current values.
+-record(counters, {name, id}).
 
 %% @doc Character position data structure.
 

src/egs_app.erl

@@ -56,7 +56,6 @@ is_fresh_startup() ->
 	end.
 
 %% @todo doc
-%% @todo Rename ids to counters. Remove objects and use a FSM instead.
 db_init() ->
 	Nodes = [node()],
 	case mnesia:system_info(is_running) of
@@ -69,7 +68,7 @@ db_init() ->
 	error_logger:info_report("mnesia schema created"),
 	error_logger:info_report("starting mnesia"),
 	mnesia:start(),
-	mnesia:create_table(ids, [{attributes, record_info(fields, ids)}]),
+	mnesia:create_table(counters, [{attributes, record_info(fields, counters)}]),
 	mnesia:create_table(psu_object, [{attributes, record_info(fields, psu_object)}]),
 	mnesia:create_table(egs_user_model, [{attributes, record_info(fields, egs_user_model)}]),
 	error_logger:info_report("mnesia tables created").

src/egs_db.erl

@@ -1,25 +0,0 @@
-%	EGS: Erlang Game Server
-%	Copyright (C) 2010  Loic Hoguin
-%
-%	This file is part of EGS.
-%
-%	EGS is free software: you can redistribute it and/or modify
-%	it under the terms of the GNU General Public License as published by
-%	the Free Software Foundation, either version 3 of the License, or
-%	(at your option) any later version.
-%
-%	EGS is distributed in the hope that it will be useful,
-%	but WITHOUT ANY WARRANTY; without even the implied warranty of
-%	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%	GNU General Public License for more details.
-%
-%	You should have received a copy of the GNU General Public License
-%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
-
--module(egs_db).
--compile(export_all).
-
-%% @doc Retrieve the next unique ID.
-%% @todo Used only for the LID so far...
-next(Type) ->
-	mnesia:dirty_update_counter(ids, Type, 1).

src/psu/psu_game.erl

@@ -105,7 +105,7 @@ process_handle(16#020d, << GID:32/little-unsigned-integer, Auth:32/bits, _/bits
 				{wait_for_authentication, Auth} ->
 					put(gid, GID),
 					log("auth success"),
-					LID = 1 + egs_db:next(lobby) rem 1023,
+					LID = 1 + mnesia:dirty_update_counter(counters, lobby, 1) rem 1023,
 					Time = calendar:datetime_to_gregorian_seconds(calendar:universal_time()),
 					egs_user_model:write(#egs_user_model{id=GID, pid=self(), socket=CSocket, state=authenticated, time=Time, folder=User#egs_user_model.folder, lid=LID}),
 					send_0d05(),