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.11 by root, Sat Jul 14 12:05:53 2007 UTC vs.
Revision 1.19 by root, Mon Aug 20 16:16:06 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_res($) { 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
59sub prefetch_file($$$) { 64sub prefetch_file($$$) {
60 CFPlus::DB::Server::req (prefetch_file => @_); 65 CFPlus::DB::Server::req (prefetch_file => @_);
66}
67
68sub logprint($$$) {
69 CFPlus::DB::Server::req (logprint => @_);
61} 70}
62 71
63our $tilemap; 72our $tilemap;
64 73
65sub get_tile_id_sync($) { 74sub get_tile_id_sync($) {
… …
101 -Cachesize => 8_000_000, 110 -Cachesize => 8_000_000,
102 -ErrFile => "$DB_HOME/errorlog.txt", 111 -ErrFile => "$DB_HOME/errorlog.txt",
103# -ErrPrefix => "DATABASE", 112# -ErrPrefix => "DATABASE",
104 -Verbose => 1, 113 -Verbose => 1,
105 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 114 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
106 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 115 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE | DB_TXN_WRITE_NOSYNC,
107 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error"; 116 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
108 117
109 1 118 1
110} 119}
111 120
… …
119 -Env => $DB_ENV, 128 -Env => $DB_ENV,
120 -Filename => $table, 129 -Filename => $table,
121# -Filename => "database", 130# -Filename => "database",
122# -Subname => $table, 131# -Subname => $table,
123 -Property => DB_CHKSUM, 132 -Property => DB_CHKSUM,
124 -Flags => DB_CREATE | DB_UPGRADE, 133 -Flags => DB_AUTO_COMMIT | DB_CREATE | DB_UPGRADE,
125 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 134 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
126 } 135 }
127} 136}
128
129our $SYNC_INTERVAL = 60;
130 137
131our %CB; 138our %CB;
132our $FH; 139our $FH;
133our $ID = "aaa0"; 140our $ID = "aaa0";
134our ($fh_r_watcher, $fh_w_watcher); 141our ($fh_r_watcher, $fh_w_watcher);
135our $sync_timer; 142our $sync_timer;
136our $write_buf; 143our $write_buf;
137our $read_buf; 144our $read_buf;
138 145
146our $SYNC = Event->idle (min => 120, max => 180, parked => 1, cb => sub {
147 CFPlus::DB::Server::req (sync => sub { });
148 $_[0]->w->stop;
149});
150
139sub fh_write { 151sub fh_write {
140 my $len = syswrite $FH, $write_buf; 152 my $len = syswrite $FH, $write_buf;
141 153
142 substr $write_buf, 0, $len, ""; 154 substr $write_buf, 0, $len, "";
143 155
144 undef $fh_w_watcher 156 $fh_w_watcher->stop
145 unless length $write_buf; 157 unless length $write_buf;
146} 158}
147 159
148sub fh_read { 160sub fh_read {
149 my $status = sysread $FH, $read_buf, 16384, length $read_buf; 161 my $status = sysread $FH, $read_buf, 16384, length $read_buf;
… …
185 197
186 my $id = ++$ID; 198 my $id = ++$ID;
187 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args]; 199 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args];
188 $CB{$id} = $cb; 200 $CB{$id} = $cb;
189 201
190 $fh_w_watcher = AnyEvent->io (fh => $FH, poll => 'w', cb => \&fh_write); 202 $fh_w_watcher->start;
191} 203 $SYNC->start;
192
193sub sync_tick {
194 req "sync", sub { };
195 $sync_timer = AnyEvent->timer (after => $SYNC_INTERVAL, cb => \&sync_tick);
196} 204}
197 205
198sub do_sync { 206sub do_sync {
199 $DB_ENV->txn_checkpoint (0, 0, 0); 207 $DB_ENV->txn_checkpoint (0, 0, 0);
200 () 208 ()
… …
261 269
262 return $id; 270 return $id;
263 } 271 }
264 } 272 }
265 $txn->txn_abort; 273 $txn->txn_abort;
274 select undef, undef, undef, 0.01 * rand;
266 } 275 }
267 276
268 die "maximum number of transaction retries reached - database problems?"; 277 die "maximum number of transaction retries reached - database problems?";
269} 278}
270 279
271sub do_unlink { 280sub do_unlink {
272 unlink $_[0]; 281 unlink $_[0];
273} 282}
274 283
284sub do_read_file {
285 my ($path) = @_;
286
287 utf8::downgrade $path;
288 open my $fh, "<:raw", $path
289 or return;
290 sysread $fh, my $buf, -s $fh;
291
292 $buf
293}
294
275sub do_write_file { 295sub do_write_file {
276 my ($file, $data) = @_; 296 my ($path, $data) = @_;
277 297
278 utf8::downgrade $file; 298 utf8::downgrade $path;
279 utf8::downgrade $data; 299 utf8::downgrade $data;
280 open my $fh, ">:raw", $file 300 open my $fh, ">:raw", $path
281 or return; 301 or return;
282 print $fh $data; 302 syswrite $fh, $data;
283 close $fh; 303 close $fh;
284 304
285 1 305 1
286} 306}
287 307
288sub do_prefetch_file { 308sub do_prefetch_file {
289 my ($file, $size) = @_; 309 my ($path, $size) = @_;
290 310
291 utf8::downgrade $file; 311 utf8::downgrade $path;
292 open my $fh, "<:raw", $file 312 open my $fh, "<:raw", $path
293 or return; 313 or return;
294 sysread $fh, my $buf, $size; 314 sysread $fh, my $buf, $size;
295 315
296 1 316 1
317}
318
319our %LOG_FH;
320
321sub do_logprint {
322 my ($path, $line) = @_;
323
324 $LOG_FH{$path} ||= do {
325 open my $fh, ">>:utf8", $path
326 or warn "Couldn't open logfile $path: $!";
327
328 $fh->autoflush (1);
329
330 $fh
331 };
332
333 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
334
335 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
336 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
337
338 print { $LOG_FH{$path} } "$ts $line\n"
297} 339}
298 340
299sub run { 341sub run {
300 ($FH, my $fh) = CFPlus::socketpipe; 342 ($FH, my $fh) = CFPlus::socketpipe;
301 343
… …
303 my $oldfh = select $fh; $| = 1; select $oldfh; 345 my $oldfh = select $fh; $| = 1; select $oldfh;
304 346
305 my $pid = fork; 347 my $pid = fork;
306 348
307 if (defined $pid && !$pid) { 349 if (defined $pid && !$pid) {
350 local $SIG{QUIT};
308 local $SIG{__DIE__}; 351 local $SIG{__DIE__};
352 local $SIG{__WARN__};
309 eval { 353 eval {
310 close $FH; 354 close $FH;
311 355
312 unless (eval { open_db }) { 356 unless (eval { open_db }) {
313 eval { File::Path::rmtree $DB_HOME }; 357 eval { File::Path::rmtree $DB_HOME };
… …
347 close $fh; 391 close $fh;
348 CFPlus::fh_nonblocking $FH, 1; 392 CFPlus::fh_nonblocking $FH, 1;
349 393
350 $CB{die} = sub { die shift }; 394 $CB{die} = sub { die shift };
351 395
352 $fh_r_watcher = AnyEvent->io (fh => $FH, poll => 'r', cb => \&fh_read); 396 $fh_r_watcher = Event->io (fd => $FH, poll => 'r', nice => 1, cb => \&fh_read);
353 397 $fh_w_watcher = Event->io (fd => $FH, poll => 'w', nice => -1, parked => 1, cb => \&fh_write);
354 sync_tick; 398 $SYNC->start;
355} 399}
356 400
357sub stop { 401sub stop {
358 close $FH; 402 close $FH;
359} 403}

Diff Legend

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