ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.215 by root, Thu Feb 15 03:19:02 2007 UTC vs.
Revision 1.219 by root, Sat Feb 17 03:19:44 2007 UTC

… …
354 354
355 $coro 355 $coro
356} 356}
357 357
358sub write_runtime { 358sub write_runtime {
359 my $guard = cf::lock_acquire "write_runtime";
360
359 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
360 362
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362 or return; 364 or return;
363 365
… …
785 } 787 }
786 } else { 788 } else {
787 aio_unlink $filename; 789 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
789 } 791 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
796 } 792 }
797} 793}
798 794
799sub object_freezer_as_string { 795sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 796 my ($rdata, $objs) = @_;
… …
806 802
807sub object_thawer_load { 803sub object_thawer_load {
808 my ($filename) = @_; 804 my ($filename) = @_;
809 805
810 my ($data, $av); 806 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 807
815 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
816 or return; 809 or return;
817 810
818 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1305 my ($self) = @_; 1298 my ($self) = @_;
1306 1299
1307 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315} 1303}
1316 1304
1317sub load_header_from($) { 1305sub load_header_from($) {
1318 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1319 1307
… …
2256} 2244}
2257 2245
2258############################################################################# 2246#############################################################################
2259# the server's init and main functions 2247# the server's init and main functions
2260 2248
2261sub load_resources { 2249sub init_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d# 2251 or die "unable to load regions file\n";#d#
2264} 2252}
2265 2253
2266sub cfg_load { 2254sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2283 warn $@ if $@; 2271 warn $@ if $@;
2284 } 2272 }
2285} 2273}
2286 2274
2287sub init { 2275sub init {
2288 load_resources; 2276 init_resources;
2289} 2277}
2290 2278
2291sub main { 2279sub main {
2292 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2467 _global_reattach; 2455 _global_reattach;
2468 warn "reattaching attachments to maps"; 2456 warn "reattaching attachments to maps";
2469 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2470 2458
2471 warn "loading reloadable resources"; 2459 warn "loading reloadable resources";
2472 load_resources; 2460 init_resources;
2473 2461
2474 warn "leaving sync_job"; 2462 warn "leaving sync_job";
2475 2463
2476 1 2464 1
2477 } or do { 2465 } or do {
… …
2534 Coro::async_pool { 2522 Coro::async_pool {
2535 write_runtime 2523 write_runtime
2536 or warn "ERROR: unable to write runtime file: $!"; 2524 or warn "ERROR: unable to write runtime file: $!";
2537 }; 2525 };
2538 } 2526 }
2539
2540 2527
2541 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2542 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2543 2530
2544# my $AFTER = Event::time; 2531# my $AFTER = Event::time;

Diff Legend

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