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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.214 by root, Wed Feb 14 00:40:05 2007 UTC vs.
Revision 1.223 by root, Sun Mar 11 02:12:44 2007 UTC

… …
43our @EXTS = (); # list of extension package names 43our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 44our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 45our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 46our %EXT_MAP = (); # pluggable maps
47 47
48our $RELOAD; # number of reloads so far
48our @EVENT; 49our @EVENT;
49our $LIBDIR = datadir . "/ext"; 50our $LIBDIR = datadir . "/ext";
50 51
51our $TICK = MAX_TIME * 1e-6; 52our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 53our $TICK_WATCHER;
… …
354 355
355 $coro 356 $coro
356} 357}
357 358
358sub write_runtime { 359sub write_runtime {
360 my $guard = cf::lock_acquire "write_runtime";
361
359 my $runtime = cf::localdir . "/runtime"; 362 my $runtime = cf::localdir . "/runtime";
360 363
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 364 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362 or return; 365 or return;
363 366
… …
785 } 788 }
786 } else { 789 } else {
787 aio_unlink $filename; 790 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 791 aio_unlink "$filename.pst";
789 } 792 }
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 } 793 }
797} 794}
798 795
799sub object_freezer_as_string { 796sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 797 my ($rdata, $objs) = @_;
… …
806 803
807sub object_thawer_load { 804sub object_thawer_load {
808 my ($filename) = @_; 805 my ($filename) = @_;
809 806
810 my ($data, $av); 807 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 808
815 (aio_load $filename, $data) >= 0 809 (aio_load $filename, $data) >= 0
816 or return; 810 or return;
817 811
818 unless (aio_stat "$filename.pst") { 812 unless (aio_stat "$filename.pst") {
… …
1037=cut 1031=cut
1038 1032
1039sub quit_character { 1033sub quit_character {
1040 my ($pl) = @_; 1034 my ($pl) = @_;
1041 1035
1036 my $name = $pl->ob->name;
1037
1042 $pl->{deny_save} = 1; 1038 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1039 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1040
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1041 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1046 $pl->deactivate; 1042 $pl->deactivate;
… …
1050 my $path = playerdir $pl; 1046 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1047 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1048 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1049 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1050 $pl->destroy;
1051
1052 my $prefix = qr<^~\Q$name\E/>;
1053
1054 # nuke player maps
1055 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1056
1055 IO::AIO::aio_rmtree $temp; 1057 IO::AIO::aio_rmtree $temp;
1058}
1059
1060=item $pl->kick
1061
1062Kicks a player out of the game. This destroys the connection.
1063
1064=cut
1065
1066sub kick {
1067 my ($pl, $kicker) = @_;
1068
1069 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1070 $pl->killer ("kicked");
1071 $pl->ns->destroy;
1056} 1072}
1057 1073
1058=item cf::player::list_logins 1074=item cf::player::list_logins
1059 1075
1060Returns am arrayref of all valid playernames in the system, can take a 1076Returns am arrayref of all valid playernames in the system, can take a
… …
1305 my ($self) = @_; 1321 my ($self) = @_;
1306 1322
1307 utf8::encode (my $save = $self->save_path); 1323 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1324 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1325 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} 1326}
1316 1327
1317sub load_header_from($) { 1328sub load_header_from($) {
1318 my ($self, $path) = @_; 1329 my ($self, $path) = @_;
1319 1330
… …
1818 $map->load; 1829 $map->load;
1819 $map->load_diag; 1830 $map->load_diag;
1820 1831
1821 return unless $self->contr->active; 1832 return unless $self->contr->active;
1822 $self->activate_recursive; 1833 $self->activate_recursive;
1834
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 1836 $self->enter_map ($map, $x, $y);
1824} 1837}
1825 1838
1826cf::player->attach ( 1839cf::player->attach (
1827 on_logout => sub { 1840 on_logout => sub {
… …
1840 # try to abort aborted map switching on player login :) 1853 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes 1854 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) { 1855 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link; 1856 $pl->ob->enter_link;
1844 (async { 1857 (async {
1845 # we need this sleep as the login has a concurrent enter_exit running
1846 # and this sleep increases chances of the player not ending up in scorn
1847 $pl->ob->reply (undef, 1858 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, " 1859 "There was an internal problem at your last logout, "
1849 . "the server will try to bring you to your intended destination in a second.", 1860 . "the server will try to bring you to your intended destination in a second.",
1850 cf::NDI_RED); 1861 cf::NDI_RED);
1862 # we need this sleep as the login has a concurrent enter_exit running
1863 # and this sleep increases chances of the player not ending up in scorn
1851 Coro::Timer::sleep 1; 1864 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link; 1865 $pl->ob->leave_link;
1853 })->prio (2); 1866 })->prio (2);
1854 } 1867 }
1855 }, 1868 },
… …
2254} 2267}
2255 2268
2256############################################################################# 2269#############################################################################
2257# the server's init and main functions 2270# the server's init and main functions
2258 2271
2272sub load_faces {
2273 my $path = sprintf "%s/faces", cf::datadir;
2274
2275 warn "loading faces from $path\n";
2276
2277 my $faces;
2278 0 < aio_load $path, $faces
2279 or die "$path: $!";
2280
2281 Coro::cede;
2282 $faces = Storable::thaw $faces;
2283 Coro::cede;
2284
2285 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2289 Coro::cede;
2290 }
2291
2292 1
2293}
2294
2259sub load_resources { 2295sub reload_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d# 2297 or die "unable to load regions file\n";#d#
2298 load_faces
2299 or die "unable to load faces\n";#d#
2300}
2301
2302sub init {
2303 reload_resources;
2262} 2304}
2263 2305
2264sub cfg_load { 2306sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2307 open my $fh, "<:utf8", cf::confdir . "/config"
2266 or return; 2308 or return;
… …
2278 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2320 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2279 and die "WARNING: m(un)lockall failed: $!\n"; 2321 and die "WARNING: m(un)lockall failed: $!\n";
2280 }; 2322 };
2281 warn $@ if $@; 2323 warn $@ if $@;
2282 } 2324 }
2283}
2284
2285sub init {
2286 load_resources;
2287} 2325}
2288 2326
2289sub main { 2327sub main {
2290 # we must not ever block the main coroutine 2328 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2329 local $Coro::idle = sub {
… …
2394 Coro::cede; 2432 Coro::cede;
2395 last unless IO::AIO::nreqs || BDB::nreqs; 2433 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate..."; 2434 warn "iterate...";
2397 } 2435 }
2398 2436
2437 ++$RELOAD;
2438
2399 warn "cancelling all extension coros"; 2439 warn "cancelling all extension coros";
2400 $_->cancel for values %EXT_CORO; 2440 $_->cancel for values %EXT_CORO;
2401 %EXT_CORO = (); 2441 %EXT_CORO = ();
2402 2442
2403 warn "removing commands"; 2443 warn "removing commands";
… …
2460 2500
2461 warn "loading extensions"; 2501 warn "loading extensions";
2462 cf::load_extensions; 2502 cf::load_extensions;
2463 2503
2464 warn "reattaching attachments to objects/players"; 2504 warn "reattaching attachments to objects/players";
2465 _global_reattach; 2505 _global_reattach; # objects, sockets
2466 warn "reattaching attachments to maps"; 2506 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 2507 reattach $_ for values %MAP;
2508 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER;
2468 2510
2469 warn "loading reloadable resources"; 2511 warn "loading reloadable resources";
2470 load_resources; 2512 reload_resources;
2471 2513
2472 warn "leaving sync_job"; 2514 warn "leaving sync_job";
2473 2515
2474 1 2516 1
2475 } or do { 2517 } or do {
… …
2532 Coro::async_pool { 2574 Coro::async_pool {
2533 write_runtime 2575 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 2576 or warn "ERROR: unable to write runtime file: $!";
2535 }; 2577 };
2536 } 2578 }
2537
2538 2579
2539 $WAIT_FOR_TICK->broadcast; 2580 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2581 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541 2582
2542# my $AFTER = Event::time; 2583# my $AFTER = Event::time;

Diff Legend

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