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.14 by root, Sun Jul 29 19:32:29 2007 UTC vs.
Revision 1.22 by root, Tue Nov 13 02:47:30 2007 UTC

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

Diff Legend

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