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.17 by root, Fri Aug 10 04:02:13 2007 UTC

… …
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 => @_);
66}
67
68sub logprint($$$) {
69 CFPlus::DB::Server::req (logprint => @_);
62} 70}
63 71
64our $tilemap; 72our $tilemap;
65 73
66sub get_tile_id_sync($) { 74sub get_tile_id_sync($) {
… …
133our ($fh_r_watcher, $fh_w_watcher); 141our ($fh_r_watcher, $fh_w_watcher);
134our $sync_timer; 142our $sync_timer;
135our $write_buf; 143our $write_buf;
136our $read_buf; 144our $read_buf;
137 145
138our $SYNC = Event->idle (min => 5, max => 60, parked => 1, cb => sub { 146our $SYNC = Event->idle (min => 10, max => 60, parked => 1, cb => sub {
139 CFPlus::DB::Server::req (sync => sub { }); 147 CFPlus::DB::Server::req (sync => sub { });
140 $_[0]->w->stop; 148 $_[0]->w->stop;
141}); 149});
142 150
143sub fh_write { 151sub fh_write {
… …
270 278
271sub do_unlink { 279sub do_unlink {
272 unlink $_[0]; 280 unlink $_[0];
273} 281}
274 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
275sub do_write_file { 294sub do_write_file {
276 my ($file, $data) = @_; 295 my ($path, $data) = @_;
277 296
278 utf8::downgrade $file; 297 utf8::downgrade $path;
279 utf8::downgrade $data; 298 utf8::downgrade $data;
280 open my $fh, ">:raw", $file 299 open my $fh, ">:raw", $path
281 or return; 300 or return;
282 print $fh $data; 301 syswrite $fh, $data;
283 close $fh; 302 close $fh;
284 303
285 1 304 1
286} 305}
287 306
288sub do_prefetch_file { 307sub do_prefetch_file {
289 my ($file, $size) = @_; 308 my ($path, $size) = @_;
290 309
291 utf8::downgrade $file; 310 utf8::downgrade $path;
292 open my $fh, "<:raw", $file 311 open my $fh, "<:raw", $path
293 or return; 312 or return;
294 sysread $fh, my $buf, $size; 313 sysread $fh, my $buf, $size;
295 314
296 1 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"
297} 338}
298 339
299sub run { 340sub run {
300 ($FH, my $fh) = CFPlus::socketpipe; 341 ($FH, my $fh) = CFPlus::socketpipe;
301 342
… …
303 my $oldfh = select $fh; $| = 1; select $oldfh; 344 my $oldfh = select $fh; $| = 1; select $oldfh;
304 345
305 my $pid = fork; 346 my $pid = fork;
306 347
307 if (defined $pid && !$pid) { 348 if (defined $pid && !$pid) {
349 local $SIG{QUIT};
308 local $SIG{__DIE__}; 350 local $SIG{__DIE__};
351 local $SIG{__WARN__};
309 eval { 352 eval {
310 close $FH; 353 close $FH;
311 354
312 unless (eval { open_db }) { 355 unless (eval { open_db }) {
313 eval { File::Path::rmtree $DB_HOME }; 356 eval { File::Path::rmtree $DB_HOME };

Diff Legend

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