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.13 by root, Sun Jul 29 04:14:45 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
… …
51 51
52sub unlink($$) { 52sub unlink($$) {
53 CFPlus::DB::Server::req (unlink => @_); 53 CFPlus::DB::Server::req (unlink => @_);
54} 54}
55 55
56sub read_file($$) {
57 CFPlus::DB::Server::req (read_file => @_);
58}
59
56sub write_file($$$) { 60sub write_file($$$) {
57 CFPlus::DB::Server::req (write_file => @_); 61 CFPlus::DB::Server::req (write_file => @_);
58} 62}
59 63
60sub prefetch_file($$$) { 64sub prefetch_file($$$) {
61 CFPlus::DB::Server::req (prefetch_file => @_); 65 CFPlus::DB::Server::req (prefetch_file => @_);
62} 66}
63 67
68sub logprint($$$) {
69 CFPlus::DB::Server::req (logprint => @_);
70}
71
64our $tilemap; 72our $tilemap;
65 73
66sub get_tile_id_sync($) { 74sub get_tile_id_sync($) {
67 my ($hash) = @_; 75 my ($name) = @_;
68 76
69 # fetch the full face table first 77 # fetch the full face table first
70 unless ($tilemap) { 78 unless ($tilemap) {
71 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 });
72 sync; 88 sync;
73 } 89 }
74 90
75 $tilemap->{$hash} ||= do { 91 $tilemap->{$name} ||= do {
76 my $id; 92 my $id;
77 CFPlus::DB::Server::req (get_tile_id => $hash, sub { $id = $_[0] }); 93 CFPlus::DB::Server::req (get_tile_id => $name, sub { $id = $_[0] });
78 sync; 94 sync;
79 $id 95 $id
80 } 96 }
81} 97}
82 98
… …
102 -Cachesize => 8_000_000, 118 -Cachesize => 8_000_000,
103 -ErrFile => "$DB_HOME/errorlog.txt", 119 -ErrFile => "$DB_HOME/errorlog.txt",
104# -ErrPrefix => "DATABASE", 120# -ErrPrefix => "DATABASE",
105 -Verbose => 1, 121 -Verbose => 1,
106 -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,
107 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 123 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE | DB_TXN_WRITE_NOSYNC,
108 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";
109 125
110 1 126 1
111} 127}
112 128
… …
120 -Env => $DB_ENV, 136 -Env => $DB_ENV,
121 -Filename => $table, 137 -Filename => $table,
122# -Filename => "database", 138# -Filename => "database",
123# -Subname => $table, 139# -Subname => $table,
124 -Property => DB_CHKSUM, 140 -Property => DB_CHKSUM,
125 -Flags => DB_CREATE | DB_UPGRADE, 141 -Flags => DB_AUTO_COMMIT | DB_CREATE | DB_UPGRADE,
126 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 142 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
127 } 143 }
128} 144}
129
130our $SYNC_INTERVAL = 60;
131 145
132our %CB; 146our %CB;
133our $FH; 147our $FH;
134our $ID = "aaa0"; 148our $ID = "aaa0";
135our ($fh_r_watcher, $fh_w_watcher); 149our ($fh_r_watcher, $fh_w_watcher);
136our $sync_timer; 150our $sync_timer;
137our $write_buf; 151our $write_buf;
138our $read_buf; 152our $read_buf;
139 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
140sub fh_write { 159sub fh_write {
141 my $len = syswrite $FH, $write_buf; 160 my $len = syswrite $FH, $write_buf;
142 161
143 substr $write_buf, 0, $len, ""; 162 substr $write_buf, 0, $len, "";
144 163
145 undef $fh_w_watcher 164 $fh_w_watcher->stop
146 unless length $write_buf; 165 unless length $write_buf;
147} 166}
148 167
149sub fh_read { 168sub fh_read {
150 my $status = sysread $FH, $read_buf, 16384, length $read_buf; 169 my $status = sysread $FH, $read_buf, 16384, length $read_buf;
… …
186 205
187 my $id = ++$ID; 206 my $id = ++$ID;
188 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args]; 207 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args];
189 $CB{$id} = $cb; 208 $CB{$id} = $cb;
190 209
191 $fh_w_watcher = AnyEvent->io (fh => $FH, poll => 'w', cb => \&fh_write); 210 $fh_w_watcher->start;
192} 211 $SYNC->start;
193
194sub sync_tick {
195 req "sync", sub { };
196 $sync_timer = AnyEvent->timer (after => $SYNC_INTERVAL, cb => \&sync_tick);
197} 212}
198 213
199sub do_sync { 214sub do_sync {
200 $DB_ENV->txn_checkpoint (0, 0, 0); 215 $DB_ENV->txn_checkpoint (0, 0, 0);
201 () 216 ()
… …
241 256
242 \%kv 257 \%kv
243} 258}
244 259
245sub do_get_tile_id { 260sub do_get_tile_id {
246 my ($hash) = @_; 261 my ($name) = @_;
247 262
248 my $id; 263 my $id;
249 my $table = table "facemap"; 264 my $table = table "facemap";
250 265
251 return $id 266 return $id
252 if $table->db_get ($hash, $id) == 0; 267 if $table->db_get ($name, $id) == 0;
253 268
254 for (1..100) { 269 for (1..100) {
255 my $txn = $DB_ENV->txn_begin; 270 my $txn = $DB_ENV->txn_begin;
256 my $status = $table->db_get (id => $id); 271 my $status = $table->db_get (id => $id);
257 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 272 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
258 $id = ($id || 64) + 1; 273 $id = ($id || 64) + 1;
259 if ($table->db_put (id => $id) == 0 274 if ($table->db_put (id => $id) == 0
260 && $table->db_put ($hash => $id) == 0) { 275 && $table->db_put ($name => $id) == 0) {
261 $txn->txn_commit; 276 $txn->txn_commit;
262 277
263 return $id; 278 return $id;
264 } 279 }
265 } 280 }
266 $txn->txn_abort; 281 $txn->txn_abort;
282 select undef, undef, undef, 0.01 * rand;
267 } 283 }
268 284
269 die "maximum number of transaction retries reached - database problems?"; 285 die "maximum number of transaction retries reached - database problems?";
270} 286}
271 287
272sub do_unlink { 288sub do_unlink {
273 unlink $_[0]; 289 unlink $_[0];
274} 290}
275 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
276sub do_write_file { 303sub do_write_file {
277 my ($file, $data) = @_; 304 my ($path, $data) = @_;
278 305
279 utf8::downgrade $file; 306 utf8::downgrade $path;
280 utf8::downgrade $data; 307 utf8::downgrade $data;
281 open my $fh, ">:raw", $file 308 open my $fh, ">:raw", $path
282 or return; 309 or return;
283 print $fh $data; 310 syswrite $fh, $data;
284 close $fh; 311 close $fh;
285 312
286 1 313 1
287} 314}
288 315
289sub do_prefetch_file { 316sub do_prefetch_file {
290 my ($file, $size) = @_; 317 my ($path, $size) = @_;
291 318
292 utf8::downgrade $file; 319 utf8::downgrade $path;
293 open my $fh, "<:raw", $file 320 open my $fh, "<:raw", $path
294 or return; 321 or return;
295 sysread $fh, my $buf, $size; 322 sysread $fh, my $buf, $size;
296 323
297 1 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"
298} 347}
299 348
300sub run { 349sub run {
301 ($FH, my $fh) = CFPlus::socketpipe; 350 ($FH, my $fh) = CFPlus::socketpipe;
302 351
… …
304 my $oldfh = select $fh; $| = 1; select $oldfh; 353 my $oldfh = select $fh; $| = 1; select $oldfh;
305 354
306 my $pid = fork; 355 my $pid = fork;
307 356
308 if (defined $pid && !$pid) { 357 if (defined $pid && !$pid) {
358 local $SIG{QUIT};
309 local $SIG{__DIE__}; 359 local $SIG{__DIE__};
360 local $SIG{__WARN__};
310 eval { 361 eval {
311 close $FH; 362 close $FH;
312 363
313 unless (eval { open_db }) { 364 unless (eval { open_db }) {
314 eval { File::Path::rmtree $DB_HOME }; 365 eval { File::Path::rmtree $DB_HOME };
… …
348 close $fh; 399 close $fh;
349 CFPlus::fh_nonblocking $FH, 1; 400 CFPlus::fh_nonblocking $FH, 1;
350 401
351 $CB{die} = sub { die shift }; 402 $CB{die} = sub { die shift };
352 403
353 $fh_r_watcher = AnyEvent->io (fh => $FH, poll => 'r', nice => 1, cb => \&fh_read); 404 $fh_r_watcher = Event->io (fd => $FH, poll => 'r', nice => 1, cb => \&fh_read);
354 405 $fh_w_watcher = Event->io (fd => $FH, poll => 'w', nice => -1, parked => 1, cb => \&fh_write);
355 sync_tick; 406 $SYNC->start;
356} 407}
357 408
358sub stop { 409sub stop {
359 close $FH; 410 close $FH;
360} 411}

Diff Legend

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