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.220 by root, Sat Feb 17 23:54:35 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") {
… …
1037=cut 1030=cut
1038 1031
1039sub quit_character { 1032sub quit_character {
1040 my ($pl) = @_; 1033 my ($pl) = @_;
1041 1034
1035 my $name = $pl->ob->name;
1036
1042 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1039
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1046 $pl->deactivate; 1041 $pl->deactivate;
… …
1050 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1055 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1056} 1057}
1057 1058
1058=item cf::player::list_logins 1059=item cf::player::list_logins
1059 1060
… …
1305 my ($self) = @_; 1306 my ($self) = @_;
1306 1307
1307 utf8::encode (my $save = $self->save_path); 1308 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1310 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} 1311}
1316 1312
1317sub load_header_from($) { 1313sub load_header_from($) {
1318 my ($self, $path) = @_; 1314 my ($self, $path) = @_;
1319 1315
… …
2256} 2252}
2257 2253
2258############################################################################# 2254#############################################################################
2259# the server's init and main functions 2255# the server's init and main functions
2260 2256
2261sub load_resources { 2257sub init_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d# 2259 or die "unable to load regions file\n";#d#
2264} 2260}
2265 2261
2266sub cfg_load { 2262sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2263 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2283 warn $@ if $@; 2279 warn $@ if $@;
2284 } 2280 }
2285} 2281}
2286 2282
2287sub init { 2283sub init {
2288 load_resources; 2284 init_resources;
2289} 2285}
2290 2286
2291sub main { 2287sub main {
2292 # we must not ever block the main coroutine 2288 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2289 local $Coro::idle = sub {
… …
2467 _global_reattach; 2463 _global_reattach;
2468 warn "reattaching attachments to maps"; 2464 warn "reattaching attachments to maps";
2469 reattach $_ for values %MAP; 2465 reattach $_ for values %MAP;
2470 2466
2471 warn "loading reloadable resources"; 2467 warn "loading reloadable resources";
2472 load_resources; 2468 init_resources;
2473 2469
2474 warn "leaving sync_job"; 2470 warn "leaving sync_job";
2475 2471
2476 1 2472 1
2477 } or do { 2473 } or do {
… …
2534 Coro::async_pool { 2530 Coro::async_pool {
2535 write_runtime 2531 write_runtime
2536 or warn "ERROR: unable to write runtime file: $!"; 2532 or warn "ERROR: unable to write runtime file: $!";
2537 }; 2533 };
2538 } 2534 }
2539
2540 2535
2541 $WAIT_FOR_TICK->broadcast; 2536 $WAIT_FOR_TICK->broadcast;
2542 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2543 2538
2544# my $AFTER = Event::time; 2539# my $AFTER = Event::time;

Diff Legend

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