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.38 by root, Fri Jul 18 22:40:51 2008 UTC vs.
Revision 1.47 by root, Sat Aug 13 23:18:19 2011 UTC

… …
12 12
13=cut 13=cut
14 14
15package DC::DB; 15package DC::DB;
16 16
17use strict; 17use common::sense;
18use utf8;
19 18
20use File::Path (); 19use File::Path ();
21use Carp (); 20use Carp ();
22use Storable (); 21use Storable ();
22use AnyEvent::Util ();
23use Config; 23use Config;
24use BDB; 24use BDB;
25use Fcntl ();
25 26
26use DC; 27use DC;
27 28
28our $ODBDIR = "cfplus-" . BDB::VERSION_MAJOR . "." . BDB::VERSION_MINOR . "-$Config{archname}"; 29our $ODBDIR = "cfplus-" . BDB::VERSION_MAJOR . "." . BDB::VERSION_MINOR . "-$Config{archname}";
29our $DBDIR = "client-" . BDB::VERSION_MAJOR . "." . BDB::VERSION_MINOR . "-$Config{archname}"; 30our $DBDIR = "client-" . BDB::VERSION_MAJOR . "." . BDB::VERSION_MINOR . "-$Config{archname}";
30our $DB_HOME = "$Deliantra::VARDIR/$DBDIR"; 31our $DB_HOME = "$Deliantra::VARDIR/$DBDIR";
32
33sub FIRST_TILE_ID () { 64 }
31 34
32unless (-d $DB_HOME) { 35unless (-d $DB_HOME) {
33 if (-d "$Deliantra::VARDIR/$ODBDIR") { 36 if (-d "$Deliantra::VARDIR/$ODBDIR") {
34 rename "$Deliantra::VARDIR/$ODBDIR", $DB_HOME; 37 rename "$Deliantra::VARDIR/$ODBDIR", $DB_HOME;
35 print STDERR "INFO: moved old database from $Deliantra::VARDIR/$ODBDIR to $DB_HOME\n"; 38 print STDERR "INFO: moved old database from $Deliantra::VARDIR/$ODBDIR to $DB_HOME\n";
… …
44 47
45BDB::max_poll_time 0.03; 48BDB::max_poll_time 0.03;
46BDB::max_parallel 1; 49BDB::max_parallel 1;
47 50
48our $DB_ENV; 51our $DB_ENV;
52our $DB_ENV_FH;
49our $DB_STATE; 53our $DB_STATE;
50our %DB_TABLE; 54our %DB_TABLE;
51our $TILE_SEQ; 55our $TILE_SEQ;
52 56
57sub all_databases {
58 opendir my $fh, $DB_HOME
59 or return;
60
61 grep !/^(?:\.|log\.|_)/, readdir $fh
62}
63
64sub try_verify_env($) {
65 my ($env) = @_;
66
67 open my $lock, "+>$DB_HOME/__lock"
68 or die "__lock: $!";
69
70 flock $lock, &Fcntl::LOCK_EX
71 or die "flock: $!";
72
73 # we look at the __db.register env file that has been created by now
74 # and check for the number of registered processes - if there is
75 # only one, we verify all databases, otherwise we skip this
76 # we MUST NOT close the filehandle as longa swe keep the env open, as
77 # this destroys the record locks on it.
78 open $DB_ENV_FH, "<$DB_HOME/__db.register"
79 or die "__db.register: $!";
80
81 # __db.register contains one record per process, with X signifying
82 # empty records (of course, this is completely private to bdb...)
83 my $count = grep /^[^X]/, <$DB_ENV_FH>;
84
85 if ($count == 1) {
86 # if any databases are corrupted, we simply delete all of them
87
88 for (all_databases) {
89 my $dbh = db_create $env
90 or last;
91
92 # a failed verify will panic the environment, which is fine with us
93 db_verify $dbh, "$DB_HOME/$_";
94
95 return if $!; # nuke database and recreate if verification failure
96 }
97
98 }
99
100 # close probably cleans those up, but we also want to run on windows,
101 # so better be safe.
102 flock $lock, &Fcntl::LOCK_UN
103 or die "funlock: $!";
104
105 1
106}
107
53sub try_open_db { 108sub try_open_db {
54 File::Path::mkpath [$DB_HOME]; 109 File::Path::mkpath [$DB_HOME];
110
111 undef $DB_ENV;
112 undef $DB_ENV_FH;
55 113
56 my $env = db_env_create; 114 my $env = db_env_create;
57 115
58 $env->set_errfile (\*STDERR); 116 $env->set_errfile (\*STDERR);
59 $env->set_msgfile (\*STDERR); 117 $env->set_msgfile (\*STDERR);
60 $env->set_verbose (-1, 1); 118 $env->set_verbose (-1, 1);
61 119
62 $env->set_flags (BDB::AUTO_COMMIT | BDB::LOG_AUTOREMOVE | BDB::TXN_WRITE_NOSYNC); 120 $env->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
121 $env->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
122 $env->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
123
124 $env->set_timeout (3, BDB::SET_TXN_TIMEOUT);
125 $env->set_timeout (3, BDB::SET_LOCK_TIMEOUT);
126
63 $env->set_cachesize (0, 2048 * 1024, 0); 127 $env->set_cachesize (0, 2048 * 1024, 0);
64 128
65 db_env_open $env, $DB_HOME, 129 db_env_open $env, $DB_HOME,
66 BDB::CREATE | BDB::REGISTER | BDB::RECOVER | BDB::INIT_MPOOL | BDB::INIT_LOCK | BDB::INIT_TXN, 130 BDB::CREATE | BDB::REGISTER | BDB::RECOVER | BDB::INIT_MPOOL | BDB::INIT_LOCK | BDB::INIT_TXN,
67 0666; 131 0666;
68 132
69 $! and die "cannot open database environment $DB_HOME: " . BDB::strerror; 133 $! and die "cannot open database environment $DB_HOME: " . BDB::strerror;
70 134
135 # now we go through the registered processes, if there is only one, we verify all files
136 # to make sure windows didn't corrupt them (as windows does....)
137 try_verify_env $env
138 or die "database environment failed verification";
139
71 $DB_ENV = $env; 140 $DB_ENV = $env;
72 141
73 1 142 1
74} 143}
75 144
76sub table($) { 145sub table($) {
77 $DB_TABLE{$_[0]} ||= do { 146 $DB_TABLE{$_[0]} ||= do {
78 my ($table) = @_; 147 my ($table) = @_;
79 148
80 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 149 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
150
151 $DB_ENV#d#
152 or return ::clienterror ("trying to create table $_[0] with empty db_env $DB_ENV" => 1);#d#
81 153
82 my $db = db_create $DB_ENV; 154 my $db = db_create $DB_ENV;
83 $db->set_flags (BDB::CHKSUM); 155 $db->set_flags (BDB::CHKSUM);
84 156
85 db_open $db, undef, $table, undef, BDB::BTREE, 157 db_open $db, undef, $table, undef, BDB::BTREE,
… …
150 db_get $table, undef, $name => $id, 0; 222 db_get $table, undef, $name => $id, 0;
151 $! or return $cb->($id); 223 $! or return $cb->($id);
152 224
153 unless ($TILE_SEQ) { 225 unless ($TILE_SEQ) {
154 $TILE_SEQ = $table->sequence; 226 $TILE_SEQ = $table->sequence;
155 $TILE_SEQ->initial_value (64); 227 $TILE_SEQ->initial_value (FIRST_TILE_ID);
156 $TILE_SEQ->set_cachesize (0); 228 $TILE_SEQ->set_cachesize (0);
157 db_sequence_open $TILE_SEQ, undef, "id", BDB::CREATE; 229 db_sequence_open $TILE_SEQ, undef, "id", BDB::CREATE;
158 } 230 }
159 231
160 db_sequence_get $TILE_SEQ, undef, 1, my $id; 232 db_sequence_get $TILE_SEQ, undef, 1, my $id;
… …
215 287
216############################################################################# 288#############################################################################
217 289
218package DC::DB::Server; 290package DC::DB::Server;
219 291
220use strict; 292use common::sense;
221 293
222use EV (); 294use EV ();
295use AnyEvent ();
223use Fcntl; 296use Fcntl;
224 297
225our %CB; 298our %CB;
226our $FH; 299our $FH;
227our $ID = "aaa0"; 300our $ID = "aaa0";
… …
344 417
345 print { $LOG_FH{$path} } "$ts $line\n" 418 print { $LOG_FH{$path} } "$ts $line\n"
346} 419}
347 420
348sub run { 421sub run {
349 ($FH, my $fh) = DC::socketpipe; 422 ($FH, my $fh) = AnyEvent::Util::portable_socketpair
423 or die "unable to create database socketpair: $!";
350 424
351 my $oldfh = select $FH; $| = 1; select $oldfh; 425 my $oldfh = select $FH; $| = 1; select $oldfh;
352 my $oldfh = select $fh; $| = 1; select $oldfh; 426 my $oldfh = select $fh; $| = 1; select $oldfh;
353 427
354 my $pid = fork; 428 my $pid = fork;
… …
393 close $fh; 467 close $fh;
394 DC::fh_nonblocking $FH, 1; 468 DC::fh_nonblocking $FH, 1;
395 469
396 $CB{die} = sub { die shift }; 470 $CB{die} = sub { die shift };
397 471
398 $fh_r_watcher = EV::io $FH, EV::READ , \&fh_read; 472 $fh_r_watcher = AE::io $FH, 0, \&fh_read;
399 $fh_w_watcher = EV::io $FH, EV::WRITE, \&fh_write; 473 $fh_w_watcher = EV::io $FH, EV::WRITE, \&fh_write;
400} 474}
401 475
402sub stop { 476sub stop {
403 close $FH; 477 close $FH;
404} 478}
405 479
406package DC::DB; 480package DC::DB;
407 481
408sub nuke_db { 482sub nuke_db {
483 undef $DB_ENV;
484 undef $DB_ENV_FH;
485
409 File::Path::mkpath [$DB_HOME]; 486 File::Path::mkpath [$DB_HOME];
410 eval { File::Path::rmtree $DB_HOME }; 487 eval { File::Path::rmtree $DB_HOME };
411} 488}
412 489
413sub open_db { 490sub open_db {
… …
428 DC::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d# 505 DC::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
429 }#d# 506 }#d#
430 }; 507 };
431 } 508 }
432 509
433 $WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 510 $WATCHER = AE::io BDB::poll_fileno, 0, \&BDB::poll_cb;
434 $SYNC = EV::timer_ns 0, 60, sub { 511 $SYNC = EV::timer_ns 0, 60, sub {
435 $_[0]->stop; 512 $_[0]->stop;
436 db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 513 db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
437 }; 514 };
438} 515}

Diff Legend

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