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.10 by root, Fri Jul 13 05:31:31 2007 UTC vs.
Revision 1.20 by root, Tue Aug 28 20:07:18 2007 UTC

16 16
17use strict; 17use strict;
18use utf8; 18use utf8;
19 19
20use Carp (); 20use Carp ();
21use AnyEvent ();
22use Storable (); 21use Storable ();
23use Config; 22use Config;
23use Event ();
24 24
25use CFPlus; 25use CFPlus;
26 26
27our $DB_HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version-$Config{archname}"; 27our $DB_HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version-$Config{archname}";
28 28
29sub path_of($) { 29sub path_of_res($) {
30 utf8::downgrade $_[0]; # bug in unpack "H*"
30 "$DB_HOME/res-data-$_[0]" 31 "$DB_HOME/res-data-" . unpack "H*", $_[0]
31} 32}
32 33
33sub sync { 34sub sync {
34 # for debugging 35 # for debugging
35 #CFPlus::DB::Server::req (sync => sub { }); 36 #CFPlus::DB::Server::req (sync => sub { });
50 51
51sub unlink($$) { 52sub unlink($$) {
52 CFPlus::DB::Server::req (unlink => @_); 53 CFPlus::DB::Server::req (unlink => @_);
53} 54}
54 55
56sub read_file($$) {
57 CFPlus::DB::Server::req (read_file => @_);
58}
59
55sub write_file($$$) { 60sub write_file($$$) {
56 CFPlus::DB::Server::req (write_file => @_); 61 CFPlus::DB::Server::req (write_file => @_);
57} 62}
58 63
64sub prefetch_file($$$) {
65 CFPlus::DB::Server::req (prefetch_file => @_);
66}
67
68sub logprint($$$) {
69 CFPlus::DB::Server::req (logprint => @_);
70}
71
59our $tilemap; 72our $tilemap;
60 73
61sub get_tile_id_sync($) { 74sub get_tile_id_sync($) {
62 my ($hash) = @_; 75 my ($name) = @_;
63 76
64 # fetch the full face table first 77 # fetch the full face table first
65 unless ($tilemap) { 78 unless ($tilemap) {
66 CFPlus::DB::Server::req (table => facemap => sub { $tilemap = $_[0] }); 79 CFPlus::DB::Server::req (table => facemap => sub {
80 $tilemap = $_[0];
81 delete $tilemap->{id};
82 my %maptile = reverse %$tilemap;#d#
83 if ((scalar keys %$tilemap) != (scalar keys %maptile)) {#d#
84 $tilemap = { };#d#
85 CFPlus::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
86 }#d#
87 });
67 sync; 88 sync;
68 } 89 }
69 90
70 $tilemap->{$hash} ||= do { 91 $tilemap->{$name} ||= do {
71 my $id; 92 my $id;
72 CFPlus::DB::Server::req (get_tile_id => $hash, sub { $id = $_[0] }); 93 CFPlus::DB::Server::req (get_tile_id => $name, sub { $id = $_[0] });
73 sync; 94 sync;
74 $id 95 $id
75 } 96 }
76} 97}
77 98
97 -Cachesize => 8_000_000, 118 -Cachesize => 8_000_000,
98 -ErrFile => "$DB_HOME/errorlog.txt", 119 -ErrFile => "$DB_HOME/errorlog.txt",
99# -ErrPrefix => "DATABASE", 120# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 121 -Verbose => 1,
101 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 122 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
102 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 123 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE | DB_TXN_WRITE_NOSYNC,
103 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error"; 124 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
104 125
105 1 126 1
106} 127}
107 128
115 -Env => $DB_ENV, 136 -Env => $DB_ENV,
116 -Filename => $table, 137 -Filename => $table,
117# -Filename => "database", 138# -Filename => "database",
118# -Subname => $table, 139# -Subname => $table,
119 -Property => DB_CHKSUM, 140 -Property => DB_CHKSUM,
120 -Flags => DB_CREATE | DB_UPGRADE, 141 -Flags => DB_AUTO_COMMIT | DB_CREATE | DB_UPGRADE,
121 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 142 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
122 } 143 }
123} 144}
124
125our $SYNC_INTERVAL = 60;
126 145
127our %CB; 146our %CB;
128our $FH; 147our $FH;
129our $ID = "aaa0"; 148our $ID = "aaa0";
130our ($fh_r_watcher, $fh_w_watcher); 149our ($fh_r_watcher, $fh_w_watcher);
131our $sync_timer; 150our $sync_timer;
132our $write_buf; 151our $write_buf;
133our $read_buf; 152our $read_buf;
134 153
154our $SYNC = Event->idle (min => 120, max => 180, parked => 1, cb => sub {
155 CFPlus::DB::Server::req (sync => sub { });
156 $_[0]->w->stop;
157});
158
135sub fh_write { 159sub fh_write {
136 my $len = syswrite $FH, $write_buf; 160 my $len = syswrite $FH, $write_buf;
137 161
138 substr $write_buf, 0, $len, ""; 162 substr $write_buf, 0, $len, "";
139 163
140 undef $fh_w_watcher 164 $fh_w_watcher->stop
141 unless length $write_buf; 165 unless length $write_buf;
142} 166}
143 167
144sub fh_read { 168sub fh_read {
145 my $status = sysread $FH, $read_buf, 16384, length $read_buf; 169 my $status = sysread $FH, $read_buf, 16384, length $read_buf;
181 205
182 my $id = ++$ID; 206 my $id = ++$ID;
183 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args]; 207 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args];
184 $CB{$id} = $cb; 208 $CB{$id} = $cb;
185 209
186 $fh_w_watcher = AnyEvent->io (fh => $FH, poll => 'w', cb => \&fh_write); 210 $fh_w_watcher->start;
187} 211 $SYNC->start;
188
189sub sync_tick {
190 req "sync", sub { };
191 $sync_timer = AnyEvent->timer (after => $SYNC_INTERVAL, cb => \&sync_tick);
192} 212}
193 213
194sub do_sync { 214sub do_sync {
195 $DB_ENV->txn_checkpoint (0, 0, 0); 215 $DB_ENV->txn_checkpoint (0, 0, 0);
196 () 216 ()
236 256
237 \%kv 257 \%kv
238} 258}
239 259
240sub do_get_tile_id { 260sub do_get_tile_id {
241 my ($hash) = @_; 261 my ($name) = @_;
242 262
243 my $id; 263 my $id;
244 my $table = table "facemap"; 264 my $table = table "facemap";
245 265
246 return $id 266 return $id
247 if $table->db_get ($hash, $id) == 0; 267 if $table->db_get ($name, $id) == 0;
248 268
249 for (1..100) { 269 for (1..100) {
250 my $txn = $DB_ENV->txn_begin; 270 my $txn = $DB_ENV->txn_begin;
251 my $status = $table->db_get (id => $id); 271 my $status = $table->db_get (id => $id);
252 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 272 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
253 $id = ($id || 64) + 1; 273 $id = ($id || 64) + 1;
254 if ($table->db_put (id => $id) == 0 274 if ($table->db_put (id => $id) == 0
255 && $table->db_put ($hash => $id) == 0) { 275 && $table->db_put ($name => $id) == 0) {
256 $txn->txn_commit; 276 $txn->txn_commit;
257 277
258 return $id; 278 return $id;
259 } 279 }
260 } 280 }
261 $txn->txn_abort; 281 $txn->txn_abort;
282 select undef, undef, undef, 0.01 * rand;
262 } 283 }
263 284
264 die "maximum number of transaction retries reached - database problems?"; 285 die "maximum number of transaction retries reached - database problems?";
265} 286}
266 287
267sub do_unlink { 288sub do_unlink {
268 unlink $_[0]; 289 unlink $_[0];
269} 290}
270 291
292sub do_read_file {
293 my ($path) = @_;
294
295 utf8::downgrade $path;
296 open my $fh, "<:raw", $path
297 or return;
298 sysread $fh, my $buf, -s $fh;
299
300 $buf
301}
302
271sub do_write_file { 303sub do_write_file {
272 my ($file, $data) = @_; 304 my ($path, $data) = @_;
273 305
274 utf8::downgrade $file; 306 utf8::downgrade $path;
275 utf8::downgrade $data; 307 utf8::downgrade $data;
276 open my $fh, ">:raw", CFPlus::DB::path_of $file 308 open my $fh, ">:raw", $path
277 or return; 309 or return;
278 print $fh $data; 310 syswrite $fh, $data;
279 close $fh; 311 close $fh;
280 312
281 1 313 1
314}
315
316sub do_prefetch_file {
317 my ($path, $size) = @_;
318
319 utf8::downgrade $path;
320 open my $fh, "<:raw", $path
321 or return;
322 sysread $fh, my $buf, $size;
323
324 1
325}
326
327our %LOG_FH;
328
329sub do_logprint {
330 my ($path, $line) = @_;
331
332 $LOG_FH{$path} ||= do {
333 open my $fh, ">>:utf8", $path
334 or warn "Couldn't open logfile $path: $!";
335
336 $fh->autoflush (1);
337
338 $fh
339 };
340
341 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
342
343 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
344 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
345
346 print { $LOG_FH{$path} } "$ts $line\n"
282} 347}
283 348
284sub run { 349sub run {
285 ($FH, my $fh) = CFPlus::socketpipe; 350 ($FH, my $fh) = CFPlus::socketpipe;
286 351
288 my $oldfh = select $fh; $| = 1; select $oldfh; 353 my $oldfh = select $fh; $| = 1; select $oldfh;
289 354
290 my $pid = fork; 355 my $pid = fork;
291 356
292 if (defined $pid && !$pid) { 357 if (defined $pid && !$pid) {
358 local $SIG{QUIT};
293 local $SIG{__DIE__}; 359 local $SIG{__DIE__};
360 local $SIG{__WARN__};
294 eval { 361 eval {
295 close $FH; 362 close $FH;
296 363
297 unless (eval { open_db }) { 364 unless (eval { open_db }) {
298 eval { File::Path::rmtree $DB_HOME }; 365 eval { File::Path::rmtree $DB_HOME };
332 close $fh; 399 close $fh;
333 CFPlus::fh_nonblocking $FH, 1; 400 CFPlus::fh_nonblocking $FH, 1;
334 401
335 $CB{die} = sub { die shift }; 402 $CB{die} = sub { die shift };
336 403
337 $fh_r_watcher = AnyEvent->io (fh => $FH, poll => 'r', cb => \&fh_read); 404 $fh_r_watcher = Event->io (fd => $FH, poll => 'r', nice => 1, cb => \&fh_read);
338 405 $fh_w_watcher = Event->io (fd => $FH, poll => 'w', nice => -1, parked => 1, cb => \&fh_write);
339 sync_tick; 406 $SYNC->start;
340} 407}
341 408
342sub stop { 409sub stop {
343 close $FH; 410 close $FH;
344} 411}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines