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.9 by root, Thu Jul 12 17:56:51 2007 UTC vs.
Revision 1.17 by root, Fri Aug 10 04:02:13 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 "$DB_HOME/data-$_[0]" 30 utf8::downgrade $_[0]; # bug in unpack "H*"
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 => @_);
62}
63
64sub prefetch_file($$$) {
65 CFPlus::DB::Server::req (prefetch_file => @_);
66}
67
68sub logprint($$$) {
69 CFPlus::DB::Server::req (logprint => @_);
57} 70}
58 71
59our $tilemap; 72our $tilemap;
60 73
61sub get_tile_id_sync($) { 74sub get_tile_id_sync($) {
… …
120 -Flags => DB_CREATE | DB_UPGRADE, 133 -Flags => DB_CREATE | DB_UPGRADE,
121 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 134 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
122 } 135 }
123} 136}
124 137
125our $SYNC_INTERVAL = 60;
126
127our %CB; 138our %CB;
128our $FH; 139our $FH;
129our $ID = "aaa0"; 140our $ID = "aaa0";
130our ($fh_r_watcher, $fh_w_watcher); 141our ($fh_r_watcher, $fh_w_watcher);
131our $sync_timer; 142our $sync_timer;
132our $write_buf; 143our $write_buf;
133our $read_buf; 144our $read_buf;
134 145
146our $SYNC = Event->idle (min => 10, max => 60, parked => 1, cb => sub {
147 CFPlus::DB::Server::req (sync => sub { });
148 $_[0]->w->stop;
149});
150
135sub fh_write { 151sub fh_write {
136 my $len = syswrite $FH, $write_buf; 152 my $len = syswrite $FH, $write_buf;
137 153
138 substr $write_buf, 0, $len, ""; 154 substr $write_buf, 0, $len, "";
139 155
140 undef $fh_w_watcher 156 $fh_w_watcher->stop
141 unless length $write_buf; 157 unless length $write_buf;
142} 158}
143 159
144sub fh_read { 160sub fh_read {
145 my $status = sysread $FH, $read_buf, 16384, length $read_buf; 161 my $status = sysread $FH, $read_buf, 16384, length $read_buf;
… …
181 197
182 my $id = ++$ID; 198 my $id = ++$ID;
183 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args]; 199 $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args];
184 $CB{$id} = $cb; 200 $CB{$id} = $cb;
185 201
186 $fh_w_watcher = AnyEvent->io (fh => $FH, poll => 'w', cb => \&fh_write); 202 $fh_w_watcher->start;
187} 203 $SYNC->start;
188
189sub sync_tick {
190 req "sync", sub { };
191 $sync_timer = AnyEvent->timer (after => $SYNC_INTERVAL, cb => \&sync_tick);
192} 204}
193 205
194sub do_sync { 206sub do_sync {
195 $DB_ENV->txn_checkpoint (0, 0, 0); 207 $DB_ENV->txn_checkpoint (0, 0, 0);
196 () 208 ()
… …
266 278
267sub do_unlink { 279sub do_unlink {
268 unlink $_[0]; 280 unlink $_[0];
269} 281}
270 282
283sub do_read_file {
284 my ($path) = @_;
285
286 utf8::downgrade $path;
287 open my $fh, "<:raw", $path
288 or return;
289 sysread $fh, my $buf, -s $fh;
290
291 $buf
292}
293
271sub do_write_file { 294sub do_write_file {
272 my ($file, $data) = @_; 295 my ($path, $data) = @_;
273 296
274 utf8::downgrade $file; 297 utf8::downgrade $path;
275 utf8::downgrade $data; 298 utf8::downgrade $data;
276 open my $fh, ">:raw", CFPlus::DB::path_of $file 299 open my $fh, ">:raw", $path
277 or return; 300 or return;
278 print $fh $data; 301 syswrite $fh, $data;
279 close $fh; 302 close $fh;
280 303
281 1 304 1
305}
306
307sub do_prefetch_file {
308 my ($path, $size) = @_;
309
310 utf8::downgrade $path;
311 open my $fh, "<:raw", $path
312 or return;
313 sysread $fh, my $buf, $size;
314
315 1
316}
317
318our %LOG_FH;
319
320sub do_logprint {
321 my ($path, $line) = @_;
322
323 $LOG_FH{$path} ||= do {
324 open my $fh, ">>:utf8", $path
325 or warn "Couldn't open logfile $path: $!";
326
327 $fh->autoflush (1);
328
329 $fh
330 };
331
332 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
333
334 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
335 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
336
337 print { $LOG_FH{$path} } "$ts $line\n"
282} 338}
283 339
284sub run { 340sub run {
285 ($FH, my $fh) = CFPlus::socketpipe; 341 ($FH, my $fh) = CFPlus::socketpipe;
286 342
… …
288 my $oldfh = select $fh; $| = 1; select $oldfh; 344 my $oldfh = select $fh; $| = 1; select $oldfh;
289 345
290 my $pid = fork; 346 my $pid = fork;
291 347
292 if (defined $pid && !$pid) { 348 if (defined $pid && !$pid) {
349 local $SIG{QUIT};
293 local $SIG{__DIE__}; 350 local $SIG{__DIE__};
351 local $SIG{__WARN__};
294 eval { 352 eval {
295 close $FH; 353 close $FH;
296 354
297 unless (eval { open_db }) { 355 unless (eval { open_db }) {
298 eval { File::Path::rmtree $DB_HOME }; 356 eval { File::Path::rmtree $DB_HOME };
… …
332 close $fh; 390 close $fh;
333 CFPlus::fh_nonblocking $FH, 1; 391 CFPlus::fh_nonblocking $FH, 1;
334 392
335 $CB{die} = sub { die shift }; 393 $CB{die} = sub { die shift };
336 394
337 $fh_r_watcher = AnyEvent->io (fh => $FH, poll => 'r', cb => \&fh_read); 395 $fh_r_watcher = Event->io (fd => $FH, poll => 'r', nice => 1, cb => \&fh_read);
338 396 $fh_w_watcher = Event->io (fd => $FH, poll => 'w', nice => -1, parked => 1, cb => \&fh_write);
339 sync_tick; 397 $SYNC->start;
340} 398}
341 399
342sub stop { 400sub stop {
343 close $FH; 401 close $FH;
344} 402}

Diff Legend

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