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.33 by root, Tue Mar 25 21:11:51 2008 UTC vs.
Revision 1.40 by root, Wed Nov 26 23:08:34 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
25use DC; 26use DC;
26 27
27our $ODBDIR = "cfplus-" . BDB::VERSION . "-$Config{archname}"; 28our $ODBDIR = "cfplus-" . BDB::VERSION_MAJOR . "." . BDB::VERSION_MINOR . "-$Config{archname}";
28our $DBDIR = "client-" . BDB::VERSION . "-$Config{archname}"; 29our $DBDIR = "client-" . BDB::VERSION_MAJOR . "." . BDB::VERSION_MINOR . "-$Config{archname}";
29our $DB_HOME = "$Deliantra::VARDIR/$DBDIR"; 30our $DB_HOME = "$Deliantra::VARDIR/$DBDIR";
30 31
32sub FIRST_TILE_ID () { 64 }
33
34unless (-d $DB_HOME) {
31if (!-e $DB_HOME and -e "$Deliantra::VARDIR/$ODBDIR") { 35 if (-d "$Deliantra::VARDIR/$ODBDIR") {
32 rename "$Deliantra::VARDIR/$ODBDIR", $DB_HOME; 36 rename "$Deliantra::VARDIR/$ODBDIR", $DB_HOME;
33 print STDERR "INFO: moved old database from $Deliantra::VARDIR/$ODBDIR to $DB_HOME\n"; 37 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") { 38 } elsif (-d "$Deliantra::OLDDIR/$ODBDIR") {
37 rename "$Deliantra::OLDDIR/$DBDIR", $DB_HOME; 39 rename "$Deliantra::OLDDIR/$DBDIR", $DB_HOME;
38 print STDERR "INFO: moved old database from $Deliantra::OLDDIR/$ODBDIR to $DB_HOME\n"; 40 print STDERR "INFO: moved old database from $Deliantra::OLDDIR/$ODBDIR to $DB_HOME\n";
41 } else {
42 File::Path::mkpath [$DB_HOME]
43 or die "unable to create database directory $DB_HOME: $!";
44 }
39} 45}
40 46
41BDB::max_poll_time 0.03; 47BDB::max_poll_time 0.03;
42BDB::max_parallel 1; 48BDB::max_parallel 1;
43 49
44our $DB_ENV; 50our $DB_ENV;
45our $DB_STATE; 51our $DB_STATE;
46our %DB_TABLE; 52our %DB_TABLE;
53our $TILE_SEQ;
47 54
48sub try_open_db { 55sub try_open_db {
49 mkdir $DB_HOME, 0777; 56 File::Path::mkpath [$DB_HOME];
50 57
51 $DB_ENV = db_env_create; 58 my $env = db_env_create;
52 59
53 $DB_ENV->set_errfile (\*STDERR); 60 $env->set_errfile (\*STDERR);
54 $DB_ENV->set_msgfile (\*STDERR); 61 $env->set_msgfile (\*STDERR);
55 $DB_ENV->set_verbose (-1, 1); 62 $env->set_verbose (-1, 1);
56 63
57 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::LOG_AUTOREMOVE | BDB::TXN_WRITE_NOSYNC); 64 $env->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
65 $env->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
66 $env->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
67
68 $env->set_timeout (3, BDB::SET_TXN_TIMEOUT);
69 $env->set_timeout (3, BDB::SET_LOCK_TIMEOUT);
70
58 $DB_ENV->set_cachesize (0, 2048 * 1024, 0); 71 $env->set_cachesize (0, 2048 * 1024, 0);
59 72
60 db_env_open $DB_ENV, $DB_HOME, 73 db_env_open $env, $DB_HOME,
61 BDB::CREATE | BDB::REGISTER | BDB::RECOVER | BDB::INIT_MPOOL | BDB::INIT_LOCK | BDB::INIT_TXN, 74 BDB::CREATE | BDB::REGISTER | BDB::RECOVER | BDB::INIT_MPOOL | BDB::INIT_LOCK | BDB::INIT_TXN,
62 0666; 75 0666;
63 76
64 $! and die "cannot open database environment $DB_HOME: " . BDB::strerror; 77 $! and die "cannot open database environment $DB_HOME: " . BDB::strerror;
78
79 $DB_ENV = $env;
65 80
66 1 81 1
67} 82}
68 83
69sub table($) { 84sub table($) {
… …
86 101
87############################################################################# 102#############################################################################
88 103
89our $WATCHER; 104our $WATCHER;
90our $SYNC; 105our $SYNC;
91our $tilemap; 106our $facemap;
92 107
93sub exists($$$) { 108sub exists($$$) {
94 my ($db, $key, $cb) = @_; 109 my ($db, $key, $cb) = @_;
95 110
96 my $data; 111 my $data;
… …
138 my ($name, $cb) = @_; 153 my ($name, $cb) = @_;
139 154
140 my $table = table "facemap"; 155 my $table = table "facemap";
141 my $id; 156 my $id;
142 157
143 db_get $table, undef, $name, $id, 0; 158 db_get $table, undef, $name => $id, 0;
144 return $cb->($id) unless $!; 159 $! or return $cb->($id);
145 160
146 for (1..100) { 161 unless ($TILE_SEQ) {
147 my $txn = $DB_ENV->txn_begin; 162 $TILE_SEQ = $table->sequence;
148 db_get $table, $txn, id => $id, 0; 163 $TILE_SEQ->initial_value (FIRST_TILE_ID);
164 $TILE_SEQ->set_cachesize (0);
165 db_sequence_open $TILE_SEQ, undef, "id", BDB::CREATE;
166 }
149 167
150 $id = 64 if $id < 64; 168 db_sequence_get $TILE_SEQ, undef, 1, my $id;
151 169
152 ++$id; 170 die "unable to allocate tile id: $!"
153 171 if $!;
154 db_put $table, $txn, id => $id, 0;
155 db_txn_finish $txn;
156
157 $SYNC->again unless $SYNC->is_active;
158
159 return $cb->($id) unless $!;
160
161 select undef, undef, undef, 0.01 * rand;
162 } 172
173 db_put $table, undef, $name => $id, 0;
174 $cb->($id);
163 175
164 die "maximum number of transaction retries reached - database problems?";
165} 176}
166 177
167sub get_tile_id_sync($) { 178sub get_tile_id_sync($) {
168 my ($name) = @_; 179 my ($name) = @_;
169 180
170 $tilemap->{$name} ||= do { 181 $facemap->{$name} ||= do {
171 my $id; 182 my $id;
172 do_get_tile_id $name, sub { 183 do_get_tile_id $name, sub {
173 $id = $_[0]; 184 $id = $_[0];
174 }; 185 };
175 BDB::flush; 186 BDB::flush;
… …
400 close $FH; 411 close $FH;
401} 412}
402 413
403package DC::DB; 414package DC::DB;
404 415
416sub nuke_db {
417 File::Path::mkpath [$DB_HOME];
418 eval { File::Path::rmtree $DB_HOME };
419}
420
405sub open_db { 421sub open_db {
406 unless (eval { try_open_db }) { 422 unless (eval { try_open_db }) {
407 warn "$@";#d# 423 warn "$@";#d#
408 eval { File::Path::rmtree $DB_HOME }; 424 eval { nuke_db };
409 try_open_db; 425 try_open_db;
410 } 426 }
411 427
412 # fetch the full face table first 428 # fetch the full face table first
413 unless ($tilemap) { 429 unless ($facemap) {
414 do_table facemap => sub { 430 do_table facemap => sub {
415 $tilemap = $_[0]; 431 $facemap = $_[0];
416 delete $tilemap->{id}; 432 delete $facemap->{id};
417 my %maptile = reverse %$tilemap;#d# 433 my %maptile = reverse %$facemap;#d#
418 if ((scalar keys %$tilemap) != (scalar keys %maptile)) {#d# 434 if ((scalar keys %$facemap) != (scalar keys %maptile)) {#d#
419 $tilemap = { };#d# 435 $facemap = { };#d#
420 DC::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d# 436 DC::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
421 }#d# 437 }#d#
422 }; 438 };
423 } 439 }
424 440
… …
428 db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 444 db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
429 }; 445 };
430} 446}
431 447
432END { 448END {
449 db_env_txn_checkpoint $DB_ENV, 0, 0, 0
450 if $DB_ENV;
451
452 undef $TILE_SEQ;
433 %DB_TABLE = (); 453 %DB_TABLE = ();
434 undef $DB_ENV; 454 undef $DB_ENV;
435} 455}
436 456
4371; 4571;

Diff Legend

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