ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/DB.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/DB.pm (file contents):
Revision 1.32 by root, Sat Jan 19 04:49:37 2008 UTC vs.
Revision 1.35 by root, Sun Mar 30 06:05:52 2008 UTC

… …
15package DC::DB; 15package DC::DB;
16 16
17use strict; 17use strict;
18use utf8; 18use utf8;
19 19
20use File::Path ();
20use Carp (); 21use Carp ();
21use Storable (); 22use Storable ();
22use Config; 23use Config;
23use BDB; 24use BDB;
24 25
… …
26 27
27our $ODBDIR = "cfplus-" . BDB::VERSION . "-$Config{archname}"; 28our $ODBDIR = "cfplus-" . BDB::VERSION . "-$Config{archname}";
28our $DBDIR = "client-" . BDB::VERSION . "-$Config{archname}"; 29our $DBDIR = "client-" . BDB::VERSION . "-$Config{archname}";
29our $DB_HOME = "$Deliantra::VARDIR/$DBDIR"; 30our $DB_HOME = "$Deliantra::VARDIR/$DBDIR";
30 31
32unless (-d $DB_HOME) {
31if (!-e $DB_HOME and -e "$Deliantra::VARDIR/$ODBDIR") { 33 if (-d "$Deliantra::VARDIR/$ODBDIR") {
32 rename "$Deliantra::VARDIR/$ODBDIR", $DB_HOME; 34 rename "$Deliantra::VARDIR/$ODBDIR", $DB_HOME;
33 print STDERR "INFO: moved old database from $Deliantra::VARDIR/$ODBDIR to $DB_HOME\n"; 35 print STDERR "INFO: moved old database from $Deliantra::VARDIR/$ODBDIR to $DB_HOME\n";
34}
35
36if (!-e $DB_HOME and -e "$Deliantra::OLDDIR/$ODBDIR") { 36 } elsif (-d "$Deliantra::OLDDIR/$ODBDIR") {
37 rename "$Deliantra::OLDDIR/$DBDIR", $DB_HOME; 37 rename "$Deliantra::OLDDIR/$DBDIR", $DB_HOME;
38 print STDERR "INFO: moved old database from $Deliantra::OLDDIR/$ODBDIR to $DB_HOME\n"; 38 print STDERR "INFO: moved old database from $Deliantra::OLDDIR/$ODBDIR to $DB_HOME\n";
39 } else {
40 File::Path::mkpath [$DB_HOME]
41 or die "unable to create database directory $DB_HOME: $!";
42 }
39} 43}
40 44
41BDB::max_poll_time 0.03; 45BDB::max_poll_time 0.03;
42BDB::max_parallel 1; 46BDB::max_parallel 1;
43 47
44our $DB_ENV; 48our $DB_ENV;
45our $DB_STATE; 49our $DB_STATE;
46our %DB_TABLE; 50our %DB_TABLE;
51our $TILE_SEQ;
47 52
48sub open_db { 53sub try_open_db {
49 mkdir $DB_HOME, 0777; 54 File::Path::mkpath [$DB_HOME];
50 55
51 $DB_ENV = db_env_create; 56 $DB_ENV = db_env_create;
52 57
53 $DB_ENV->set_errfile (\*STDERR); 58 $DB_ENV->set_errfile (\*STDERR);
54 $DB_ENV->set_msgfile (\*STDERR); 59 $DB_ENV->set_msgfile (\*STDERR);
… …
84 } 89 }
85} 90}
86 91
87############################################################################# 92#############################################################################
88 93
89unless (eval { open_db }) { 94our $WATCHER;
90 warn "$@";#d# 95our $SYNC;
91 eval { File::Path::rmtree $DB_HOME };
92 open_db;
93}
94
95our $WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
96
97our $SYNC = EV::timer_ns 0, 60, sub {
98 $_[0]->stop;
99 db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
100};
101
102our $tilemap; 96our $facemap;
103 97
104sub exists($$$) { 98sub exists($$$) {
105 my ($db, $key, $cb) = @_; 99 my ($db, $key, $cb) = @_;
106 100
107 my $data; 101 my $data;
… …
149 my ($name, $cb) = @_; 143 my ($name, $cb) = @_;
150 144
151 my $table = table "facemap"; 145 my $table = table "facemap";
152 my $id; 146 my $id;
153 147
154 db_get $table, undef, $name, $id, 0; 148 db_get $table, undef, $name => $id, 0;
155 return $cb->($id) unless $!; 149 $! or return $cb->($id);
156 150
157 for (1..100) { 151 unless ($TILE_SEQ) {
158 my $txn = $DB_ENV->txn_begin; 152 $TILE_SEQ = $table->sequence;
159 db_get $table, $txn, id => $id, 0; 153 $TILE_SEQ->initial_value (64);
154 $TILE_SEQ->set_cachesize (0);
155 db_sequence_open $TILE_SEQ, undef, "id", BDB::CREATE;
156 }
160 157
161 $id = 64 if $id < 64; 158 db_sequence_get $TILE_SEQ, undef, 1, my $id;
162 159
163 ++$id; 160 die "unable to allocate tile id: $!"
164 161 if $!;
165 db_put $table, $txn, id => $id, 0;
166 db_txn_finish $txn;
167
168 $SYNC->again unless $SYNC->is_active;
169
170 return $cb->($id) unless $!;
171
172 select undef, undef, undef, 0.01 * rand;
173 } 162
163 db_put $table, undef, $name => $id, 0;
164 $cb->($id);
174 165
175 die "maximum number of transaction retries reached - database problems?";
176} 166}
177 167
178sub get_tile_id_sync($) { 168sub get_tile_id_sync($) {
179 my ($name) = @_; 169 my ($name) = @_;
180 170
181 $tilemap->{$name} ||= do { 171 $facemap->{$name} ||= do {
182 my $id; 172 my $id;
183 do_get_tile_id $name, sub { 173 do_get_tile_id $name, sub {
184 $id = $_[0]; 174 $id = $_[0];
185 }; 175 };
186 BDB::flush; 176 BDB::flush;
… …
220sub logprint($$$) { 210sub logprint($$$) {
221 DC::DB::Server::req (logprint => @_); 211 DC::DB::Server::req (logprint => @_);
222} 212}
223 213
224############################################################################# 214#############################################################################
225
226# fetch the full face table first
227unless ($tilemap) {
228 do_table facemap => sub {
229 $tilemap = $_[0];
230 delete $tilemap->{id};
231 my %maptile = reverse %$tilemap;#d#
232 if ((scalar keys %$tilemap) != (scalar keys %maptile)) {#d#
233 $tilemap = { };#d#
234 DC::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
235 }#d#
236 };
237}
238 215
239package DC::DB::Server; 216package DC::DB::Server;
240 217
241use strict; 218use strict;
242 219
… …
422 399
423sub stop { 400sub stop {
424 close $FH; 401 close $FH;
425} 402}
426 403
404package DC::DB;
405
406sub nuke_db {
407 File::Path::mkpath [$DB_HOME];
408 eval { File::Path::rmtree $DB_HOME };
409}
410
411sub open_db {
412 unless (eval { try_open_db }) {
413 warn "$@";#d#
414 eval { nuke_db };
415 try_open_db;
416 }
417
418 # fetch the full face table first
419 unless ($facemap) {
420 do_table facemap => sub {
421 $facemap = $_[0];
422 delete $facemap->{id};
423 my %maptile = reverse %$facemap;#d#
424 if ((scalar keys %$facemap) != (scalar keys %maptile)) {#d#
425 $facemap = { };#d#
426 DC::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
427 }#d#
428 };
429 }
430
431 $WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
432 $SYNC = EV::timer_ns 0, 60, sub {
433 $_[0]->stop;
434 db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
435 };
436}
437
438END {
439 undef $TILE_SEQ;
440 %DB_TABLE = ();
441 undef $DB_ENV;
442}
443
4271; 4441;
428 445
429=back 446=back
430 447
431=head1 AUTHOR 448=head1 AUTHOR

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines