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.143 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
49our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 55our $RUNTIME;
51 56
52our %PLAYER; # all users 57our %PLAYER; # all users
53our %MAP; # all maps 58our %MAP; # all maps
54our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
55our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; # coroutines bound to extensions 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64
65# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 67
58binmode STDOUT; 68binmode STDOUT;
59binmode STDERR; 69binmode STDERR;
60 70
61# read virtual server time, if available 71# read virtual server time, if available
69mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
73 83
74# a special map that is always available
75our $LINK_MAP;
76our $EMERGENCY_POSITION; 84our $EMERGENCY_POSITION;
77 85
78############################################################################# 86#############################################################################
79 87
80=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
105 113
106=item %cf::CFG 114=item %cf::CFG
107 115
108Configuration for the server, loaded from C</etc/crossfire/config>, or 116Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 117from wherever your confdir points to.
118
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
120
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
123processing has been done. Call C<< ->wait >> on them to maximise the
124window of cpu time available, or simply to synchronise to the server tick.
110 125
111=back 126=back
112 127
113=cut 128=cut
114 129
118 utf8::encode $msg; 133 utf8::encode $msg;
119 134
120 $msg .= "\n" 135 $msg .= "\n"
121 unless $msg =~ /\n$/; 136 unless $msg =~ /\n$/;
122 137
123 LOG llevError, "cfperl: $msg"; 138 LOG llevError, $msg;
124 }; 139 };
125} 140}
126 141
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146 161
147$Event::DIED = sub { 162$Event::DIED = sub {
148 warn "error in event callback: @_"; 163 warn "error in event callback: @_";
149}; 164};
150 165
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
156 167
157=over 4 168=over 4
158 169
170=item dumpval $ref
171
159=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
160 192
161use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
162 194
163=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
164 196
287 } 319 }
288} 320}
289 321
290=item $coro = cf::async_ext { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
291 323
292Like async, but this coro is automcatially being canceled when the 324Like async, but this coro is automatically being canceled when the
293extension calling this is being unloaded. 325extension calling this is being unloaded.
294 326
295=cut 327=cut
296 328
297sub async_ext(&) { 329sub async_ext(&) {
306 338
307 $coro 339 $coro
308} 340}
309 341
310sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
311 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
312 346
313 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
314 or return; 348 or return;
315 349
330} 364}
331 365
332=back 366=back
333 367
334=cut 368=cut
335
336#############################################################################
337
338package cf::path;
339
340sub new {
341 my ($class, $path, $base) = @_;
342
343 $path = $path->as_string if ref $path;
344
345 my $self = bless { }, $class;
346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
357 } elsif ($path =~ s{^\?random/}{}) {
358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
359 $self->{random} = cf::from_json $data;
360 } else {
361 if ($path =~ s{^~([^/]+)?}{}) {
362 $self->{user_rel} = 1;
363
364 if (defined $1) {
365 $self->{user} = $1;
366 } elsif ($base =~ m{^~([^/]+)/}) {
367 $self->{user} = $1;
368 } else {
369 warn "cannot resolve user-relative path without user <$path,$base>\n";
370 }
371 } elsif ($path =~ /^\//) {
372 # already absolute
373 } else {
374 $base =~ s{[^/]+/?$}{};
375 return $class->new ("$base/$path");
376 }
377
378 for ($path) {
379 redo if s{/\.?/}{/};
380 redo if s{/[^/]+/\.\./}{/};
381 }
382 }
383
384 $self->{path} = $path;
385
386 $self
387}
388
389# the name / primary key / in-game path
390sub as_string {
391 my ($self) = @_;
392
393 $self->{user_rel} ? "~$self->{user}$self->{path}"
394 : $self->{random} ? "?random/$self->{path}"
395 : $self->{path}
396}
397
398# the displayed name, this is a one way mapping
399sub visible_name {
400 my ($self) = @_;
401
402# if (my $rmp = $self->{random}) {
403# # todo: be more intelligent about this
404# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
405# } else {
406 $self->as_string
407# }
408}
409
410# escape the /'s in the path
411sub _escaped_path {
412 # ∕ is U+2215
413 (my $path = $_[0]{path}) =~ s/\//∕/g;
414 $path
415}
416
417# the original (read-only) location
418sub load_path {
419 my ($self) = @_;
420
421 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
422}
423
424# the temporary/swap location
425sub save_path {
426 my ($self) = @_;
427
428 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
429 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
430 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
431}
432
433# the unique path, might be eq to save_path
434sub uniq_path {
435 my ($self) = @_;
436
437 $self->{user_rel} || $self->{random}
438 ? undef
439 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
440}
441
442# return random map parameters, or undef
443sub random_map_params {
444 my ($self) = @_;
445
446 $self->{random}
447}
448
449# this is somewhat ugly, but style maps do need special treatment
450sub is_style_map {
451 $_[0]{path} =~ m{^/styles/}
452}
453
454package cf;
455 369
456############################################################################# 370#############################################################################
457 371
458=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
459 373
906=cut 820=cut
907 821
908sub register_extcmd { 822sub register_extcmd {
909 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
910 824
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
915} 826}
916 827
917cf::player->attach ( 828cf::player->attach (
918 on_command => sub { 829 on_command => sub {
919 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
932 843
933 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
934 845
935 if (ref $msg) { 846 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 850 }
940 } 851 }
941 } else { 852 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 855
945 cf::override; 856 cf::override;
946 }, 857 },
947); 858);
948 859
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 860sub load_extension {
956 my ($path) = @_; 861 my ($path) = @_;
957 862
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 864 my $base = $1;
960 my $pkg = $1; 865 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
963 868
964 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
965 870
966 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 872 or die "$path: $!";
968 873
969 my $source = 874 my $source =
970 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
973 . "\n};\n1"; 878 . "\n};\n1";
974 879
975 eval $source 880 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 882 : "extension disabled.\n";
978 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 884 warn $@;
980 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
981 886 exit 1;
982# no strict 'refs'; 887 }
983# @{"$pkg\::ISA"} = ext::; 888 die $@;
984
985 register $base, $pkg;
986}
987
988sub unload_extension {
989 my ($pkg) = @_;
990
991 warn "removing extension $pkg\n";
992
993 # remove hooks
994 #TODO
995# for my $idx (0 .. $#PLUGIN_EVENT) {
996# delete $hook[$idx]{$pkg};
997# } 889 }
998 890
999 # remove commands 891 push @EXTS, $pkg;
1000 for my $name (keys %COMMAND) {
1001 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1002
1003 if (@cb) {
1004 $COMMAND{$name} = \@cb;
1005 } else {
1006 delete $COMMAND{$name};
1007 }
1008 }
1009
1010 # remove extcmds
1011 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1012 delete $EXTCMD{$name};
1013 }
1014
1015 if (my $cb = $pkg->can ("unload")) {
1016 eval {
1017 $cb->($pkg);
1018 1
1019 } or warn "$pkg unloaded, but with errors: $@";
1020 }
1021
1022 Symbol::delete_package $pkg;
1023} 892}
1024 893
1025sub load_extensions { 894sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 896 next unless -r $ext;
1031 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1032 } 901 }
1033} 902}
1034 903
1035############################################################################# 904#############################################################################
1036# load/save/clean perl data associated with a map
1037
1038*cf::mapsupport::on_clean = sub {
1039 my ($map) = @_;
1040
1041 my $path = $map->tmpname;
1042 defined $path or return;
1043
1044 unlink "$path.pst";
1045};
1046
1047cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048
1049#############################################################################
1050# load/save perl data associated with player->ob objects
1051
1052sub all_objects(@) {
1053 @_, map all_objects ($_->inv), @_
1054}
1055
1056# TODO: compatibility cruft, remove when no longer needed
1057cf::player->attach (
1058 on_load => sub {
1059 my ($pl, $path) = @_;
1060
1061 for my $o (all_objects $pl->ob) {
1062 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063 $o->set_ob_key_value ("_perl_data");
1064
1065 %$o = %{ Storable::thaw pack "H*", $value };
1066 }
1067 }
1068 },
1069);
1070
1071#############################################################################
1072 905
1073=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1074 907
1075Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1076 909
1077=cut 910=cut
1078 911
1079package cf::player; 912package cf::player;
1080 913
914use Coro::AIO;
915
1081=head3 cf::player 916=head3 cf::player
1082 917
1083=over 4 918=over 4
1084 919
1085=item cf::player::find $login 920=item cf::player::find $login
1086 921
1087Returns the given player object, loading it if necessary (might block). 922Returns the given player object, loading it if necessary (might block).
1088 923
1089=cut 924=cut
1090 925
926sub playerdir($) {
927 cf::localdir
928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932}
933
1091sub path($) { 934sub path($) {
1092 sprintf "%s/%s/%s/%s.pl", 935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1093 cf::localdir, cf::playerdir, 936
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2 937 (playerdir $login) . "/$login.pl"
1095} 938}
1096 939
1097sub find_active($) { 940sub find_active($) {
1098 $cf::PLAYER{$_[0]} 941 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active 942 and $cf::PLAYER{$_[0]}->active
1111 return $cf::PLAYER{$_[0]} || do { 954 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0]; 955 my $login = $_[0];
1113 956
1114 my $guard = cf::lock_acquire "user_find:$login"; 957 my $guard = cf::lock_acquire "user_find:$login";
1115 958
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return); 959 $cf::PLAYER{$_[0]} || do {
960 my $pl = load_pl path $login
961 or return;
962 $cf::PLAYER{$login} = $pl
963 }
1117 }; 964 }
1118} 965}
1119 966
1120sub save($) { 967sub save($) {
1121 my ($pl) = @_; 968 my ($pl) = @_;
1122 969
1124 971
1125 my $path = path $pl; 972 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path"; 973 my $guard = cf::lock_acquire "user_save:$path";
1127 974
1128 return if $pl->{deny_save}; 975 return if $pl->{deny_save};
976
977 aio_mkdir playerdir $pl, 0770;
1129 $pl->{last_save} = $cf::RUNTIME; 978 $pl->{last_save} = $cf::RUNTIME;
1130 979
1131 Coro::cede;
1132 $pl->save_pl ($path); 980 $pl->save_pl ($path);
1133 Coro::cede; 981 Coro::cede;
1134} 982}
1135 983
1136sub new($) { 984sub new($) {
1144 $cf::PLAYER{$login} = $self; 992 $cf::PLAYER{$login} = $self;
1145 993
1146 $self 994 $self
1147} 995}
1148 996
997=item $pl->quit_character
998
999Nukes the player without looking back. If logged in, the connection will
1000be destroyed. May block for a long time.
1001
1002=cut
1003
1004sub quit_character {
1005 my ($pl) = @_;
1006
1007 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1011 $pl->deactivate;
1012 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1013 $pl->ns->destroy if $pl->ns;
1014
1015 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy;
1020 IO::AIO::aio_rmtree $temp;
1021}
1022
1023=item cf::player::list_logins
1024
1025Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever.
1027
1028=cut
1029
1030sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1032 or return [];
1033
1034 my @logins;
1035
1036 for my $login (@$dirs) {
1037 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1038 aio_read $fh, 0, 512, my $buf, 0 or next;
1039 $buf !~ /^password -------------$/m or next; # official not-valid tag
1040
1041 utf8::decode $login;
1042 push @logins, $login;
1043 }
1044
1045 \@logins
1046}
1047
1048=item $player->maps
1049
1050Returns an arrayref of map paths that are private for this
1051player. May block.
1052
1053=cut
1054
1055sub maps($) {
1056 my ($pl) = @_;
1057
1058 my $files = aio_readdir playerdir $pl
1059 or return;
1060
1061 my @paths;
1062
1063 for (@$files) {
1064 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o;
1067
1068 s/\.map$//;
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 }
1071
1072 \@paths
1073}
1074
1149=item $player->ext_reply ($msgid, $msgtype, %msg) 1075=item $player->ext_reply ($msgid, $msgtype, %msg)
1150 1076
1151Sends an ext reply to the player. 1077Sends an ext reply to the player.
1152 1078
1153=cut 1079=cut
1174package cf::map; 1100package cf::map;
1175 1101
1176use Fcntl; 1102use Fcntl;
1177use Coro::AIO; 1103use Coro::AIO;
1178 1104
1105use overload
1106 '""' => \&as_string;
1107
1179our $MAX_RESET = 3600; 1108our $MAX_RESET = 3600;
1180our $DEFAULT_RESET = 3000; 1109our $DEFAULT_RESET = 3000;
1181 1110
1182sub generate_random_map { 1111sub generate_random_map {
1183 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1184 1113
1185 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1186 cf::map::_create_random_map 1115 $self->_create_random_map (
1187 $path,
1188 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1189 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1190 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1191 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1192 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
1193 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1121 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1194 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1122 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1195 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1123 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1196 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1124 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1197 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1198 (cf::region::find $rmp->{region}) 1126 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 )
1128}
1129
1130sub register {
1131 my (undef, $regex) = @_;
1132 my $pkg = caller;
1133
1134 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__;
1136
1137 $EXT_MAP{$pkg} = qr<$regex>;
1138}
1139
1140# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142
1143sub normalise {
1144 my ($path, $base) = @_;
1145
1146 # map plan:
1147 #
1148 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched
1150 # ?xxx/... are special absolute paths
1151 # ?random/... random maps
1152 # /... normal maps
1153 # ~user/... per-player map of a specific user
1154
1155 $path =~ s/$PATH_SEP/\//go;
1156
1157 # treat it as relative path if it starts with
1158 # something that looks reasonable
1159 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1160 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1161
1162 $base =~ s{[^/]+/?$}{};
1163 $path = "$base/$path";
1164 }
1165
1166 for ($path) {
1167 redo if s{//}{/};
1168 redo if s{/\.?/}{/};
1169 redo if s{/[^/]+/\.\./}{/};
1170 }
1171
1172 $path
1173}
1174
1175sub new_from_path {
1176 my (undef, $path, $base) = @_;
1177
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179
1180 $path = normalise $path, $base;
1181
1182 for my $pkg (keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) {
1184 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc.
1187 return $self;
1188 }
1189 }
1190
1191 Carp::carp "unable to resolve path '$path'.";
1192 ()
1193}
1194
1195sub init {
1196 my ($self) = @_;
1197
1198 $self
1199}
1200
1201sub as_string {
1202 my ($self) = @_;
1203
1204 "$self->{path}"
1205}
1206
1207# the displayed name, this is a one way mapping
1208sub visible_name {
1209 &as_string
1210}
1211
1212# the original (read-only) location
1213sub load_path {
1214 my ($self) = @_;
1215
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1217}
1218
1219# the temporary/swap location
1220sub save_path {
1221 my ($self) = @_;
1222
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1225}
1226
1227# the unique path, undef == no special unique path
1228sub uniq_path {
1229 my ($self) = @_;
1230
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1199} 1233}
1200 1234
1201# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1202# all maps in C++... 1236# all maps in C++...
1203sub change_all_map_light { 1237sub change_all_map_light {
1205 1239
1206 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1208} 1242}
1209 1243
1244sub unlink_save {
1245 my ($self) = @_;
1246
1247 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1250}
1251
1210sub try_load_header($) { 1252sub load_header_from($) {
1211 my ($path) = @_; 1253 my ($self, $path) = @_;
1212 1254
1213 utf8::encode $path; 1255 utf8::encode $path;
1214 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1215 or return; 1257 or return;
1216 1258
1217 my $map = cf::map::new 1259 $self->_load_header ($path)
1218 or return; 1260 or return;
1219 1261
1220 # for better error messages only, will be overwritten 1262 $self->{load_path} = $path;
1221 $map->path ($path);
1222 1263
1223 $map->load_header ($path) 1264 1
1265}
1266
1267sub load_orig {
1268 my ($self) = @_;
1269
1270 $self->load_header_from ($self->load_path)
1271}
1272
1273sub load_temp {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->save_path)
1277}
1278
1279sub load_header {
1280 my ($self) = @_;
1281
1282 if ($self->load_temp) {
1283 $self->last_access ((delete $self->{last_access})
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else {
1289 $self->load_orig
1224 or return; 1290 or return;
1225 1291
1226 $map->{load_path} = $path; 1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 }
1227 1297
1228 $map 1298 1
1229} 1299}
1230 1300
1231sub find; 1301sub find;
1232sub find { 1302sub find {
1233 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1234 1304
1235 #warn "find<$path,$origin>\n";#d#
1236
1237 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1238 my $key = $path->as_string;
1239 1306
1240 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1241 1308
1242 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1243 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1244 1311 my $map = new_from_path cf::map $path
1245 # do it the slow way
1246 my $map = try_load_header $path->save_path;
1247
1248 Coro::cede;
1249
1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1253 # safety
1254 $map->{instantiate_time} = $cf::RUNTIME
1255 if $map->{instantiate_time} > $cf::RUNTIME;
1256 } else {
1257 if (my $rmp = $path->random_map_params) {
1258 $map = generate_random_map $key, $rmp;
1259 } else {
1260 $map = try_load_header $path->load_path;
1261 }
1262
1263 $map or return; 1312 or return;
1264 1313
1265 $map->{load_original} = 1;
1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1268 $map->instantiate;
1269
1270 # per-player maps become, after loading, normal maps
1271 $map->per_player (0) if $path->{user_rel};
1272 }
1273
1274 $map->path ($key);
1275 $map->{path} = $path;
1276 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1277 1315
1278 Coro::cede; 1316 $map->load_header
1317 or return;
1279 1318
1280 if ($map->should_reset) { 1319 if ($map->should_reset) {
1281 $map->reset; 1320 $map->reset;
1282 undef $guard; 1321 undef $guard;
1283 $map = find $path 1322 $map = find $path
1284 or return; 1323 or return;
1285 } 1324 }
1286 1325
1287 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1288 } 1327 }
1289} 1328}
1290 1329
1291sub load { 1330sub load {
1292 my ($self) = @_; 1331 my ($self) = @_;
1293 1332
1294 my $path = $self->{path}; 1333 my $path = $self->{path};
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1296 1335
1297 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1298 1337
1299 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1300 1339
1301 $self->alloc; 1340 $self->alloc;
1302 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1303 or return; 1342 or return;
1304 1343
1305 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1306 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1307 1346
1308 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1309 utf8::encode $uniq; 1348 utf8::encode $uniq;
1310 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1311 $self->clear_unique_items; 1350 $self->clear_unique_items;
1312 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1313 } 1352 }
1314 } 1353 }
1315 1354
1316 Coro::cede; 1355 Coro::cede;
1317 1356
1318 # now do the right thing for maps 1357 # now do the right thing for maps
1319 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1320 1359
1321 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1322 $self->{deny_save} = 1; 1361 $self->decay_objects;
1323 $self->{deny_reset} = 1;
1324 } else {
1325 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1326 $self->decay_objects;
1327 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1328 $self->set_darkness_map; 1365 $self->set_darkness_map;
1329 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1330 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1331 $self->activate; 1369 $self->activate;
1332 } 1370 }
1333 1371
1334 Coro::cede;
1335
1336 $self->in_memory (cf::MAP_IN_MEMORY); 1372 $self->in_memory (cf::MAP_IN_MEMORY);
1373}
1374
1375sub customise_for {
1376 my ($self, $ob) = @_;
1377
1378 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player;
1380
1381 $self
1382}
1383
1384# find and load all maps in the 3x3 area around a map
1385sub load_diag {
1386 my ($map) = @_;
1387
1388 my @diag; # diagonal neighbours
1389
1390 for (0 .. 3) {
1391 my $neigh = $map->tile_path ($_)
1392 or next;
1393 $neigh = find $neigh, $map
1394 or next;
1395 $neigh->load;
1396
1397 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1398 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1399 }
1400
1401 for (@diag) {
1402 my $neigh = find @$_
1403 or next;
1404 $neigh->load;
1405 }
1337} 1406}
1338 1407
1339sub find_sync { 1408sub find_sync {
1340 my ($path, $origin) = @_; 1409 my ($path, $origin) = @_;
1341 1410
1342 cf::sync_job { cf::map::find $path, $origin } 1411 cf::sync_job { find $path, $origin }
1343} 1412}
1344 1413
1345sub do_load_sync { 1414sub do_load_sync {
1346 my ($map) = @_; 1415 my ($map) = @_;
1347 1416
1348 cf::sync_job { $map->load }; 1417 cf::sync_job { $map->load };
1349} 1418}
1350 1419
1420our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async {
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433
1434sub find_async {
1435 my ($path, $origin) = @_;
1436
1437 $path = normalise $path, $origin && $origin->{path};
1438
1439 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 }
1442
1443 $MAP_PREFETCH{$path} = 0;
1444 $MAP_PREFETCHER->ready;
1445
1446 ()
1447}
1448
1351sub save { 1449sub save {
1352 my ($self) = @_; 1450 my ($self) = @_;
1353 1451
1354 my $lock = cf::lock_acquire "map_data:" . $self->path; 1452 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355 1453
1356 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1357 1455
1358 return unless $self->dirty; 1456 return unless $self->dirty;
1359 1457
1360 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1362 1460
1363 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1364 1462
1365 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1366 1464
1369 cf::async { 1467 cf::async {
1370 $_->contr->save for $self->players; 1468 $_->contr->save for $self->players;
1371 }; 1469 };
1372 1470
1373 if ($uniq) { 1471 if ($uniq) {
1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1375 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1376 } else { 1474 } else {
1377 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1475 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1378 } 1476 }
1379} 1477}
1380 1478
1381sub swap_out { 1479sub swap_out {
1382 my ($self) = @_; 1480 my ($self) = @_;
1396 1494
1397sub reset_at { 1495sub reset_at {
1398 my ($self) = @_; 1496 my ($self) = @_;
1399 1497
1400 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1401 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1402 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1403 1501
1404 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1405 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1406 1504
1411 my ($self) = @_; 1509 my ($self) = @_;
1412 1510
1413 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1414} 1512}
1415 1513
1416sub unlink_save {
1417 my ($self) = @_;
1418
1419 utf8::encode (my $save = $self->{path}->save_path);
1420 aioreq_pri 3; IO::AIO::aio_unlink $save;
1421 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1422}
1423
1424sub rename { 1514sub rename {
1425 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1426 1516
1517 normalise $new_path;
1518
1427 $self->unlink_save; 1519 $self->unlink_save;
1428 1520
1429 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1430 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1431 $self->path ($self->{path}->as_string);
1432 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1433 1524
1434 $self->save; 1525 $self->save;
1435} 1526}
1436 1527
1437sub reset { 1528sub reset {
1438 my ($self) = @_; 1529 my ($self) = @_;
1439 1530
1440 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1441 1532
1442 return if $self->players; 1533 return if $self->players;
1443 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1444 1535
1445 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1446 1537
1447 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1448 1542
1449 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1450 1544
1451 $self->unlink_save; 1545 $self->unlink_save;
1452 $self->destroy; 1546 $self->destroy;
1461 $self->reset_timeout (1); 1555 $self->reset_timeout (1);
1462 $self->rename ("{nuke}/" . ($nuke_counter++)); 1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1463 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1464} 1558}
1465 1559
1466sub customise_for { 1560=item cf::map::unique_maps
1467 my ($map, $ob) = @_;
1468 1561
1469 if ($map->per_player) { 1562Returns an arrayref of paths of all shared maps that have
1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1563instantiated unique items. May block.
1471 }
1472 1564
1473 $map 1565=cut
1474}
1475 1566
1476sub emergency_save { 1567sub unique_maps() {
1477 my $freeze_guard = cf::freeze_mainloop; 1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1569 or return;
1478 1570
1479 warn "enter emergency map save\n"; 1571 my @paths;
1480 1572
1481 cf::sync_job { 1573 for (@$files) {
1482 warn "begin emergency map save\n"; 1574 utf8::decode $_;
1483 $_->save for values %cf::MAP; 1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//;
1579 push @paths, $_;
1484 }; 1580 }
1485 1581
1486 warn "end emergency map save\n"; 1582 \@paths
1487} 1583}
1488 1584
1489package cf; 1585package cf;
1490 1586
1491=back 1587=back
1492 1588
1589=head3 cf::object
1590
1591=cut
1592
1593package cf::object;
1594
1595=over 4
1596
1597=item $ob->inv_recursive
1598
1599Returns the inventory of the object _and_ their inventories, recursively.
1600
1601=cut
1602
1603sub inv_recursive_;
1604sub inv_recursive_ {
1605 map { $_, inv_recursive_ $_->inv } @_
1606}
1607
1608sub inv_recursive {
1609 inv_recursive_ inv $_[0]
1610}
1611
1612package cf;
1613
1614=back
1493 1615
1494=head3 cf::object::player 1616=head3 cf::object::player
1495 1617
1496=over 4 1618=over 4
1497 1619
1537 1659
1538=item $player_object->enter_link 1660=item $player_object->enter_link
1539 1661
1540Freezes the player and moves him/her to a special map (C<{link}>). 1662Freezes the player and moves him/her to a special map (C<{link}>).
1541 1663
1542The player should be reaosnably safe there for short amounts of time. You 1664The player should be reasonably safe there for short amounts of time. You
1543I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1544 1666
1667Will never block.
1668
1545=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1546 1670
1547Moves the player out of the specila link map onto the given map. If the 1671Moves the player out of the special C<{link}> map onto the specified
1548map is not valid (or omitted), the player will be moved back to the 1672map. If the map is not valid (or omitted), the player will be moved back
1549location he/she was before the call to C<enter_link>, or, if that fails, 1673to the location he/she was before the call to C<enter_link>, or, if that
1550to the emergency map position. 1674fails, to the emergency map position.
1551 1675
1552Might block. 1676Might block.
1553 1677
1554=cut 1678=cut
1679
1680sub link_map {
1681 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1684 $LINK_MAP->load;
1685 }
1686
1687 $LINK_MAP
1688}
1555 1689
1556sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1557 my ($self) = @_; 1691 my ($self) = @_;
1558 1692
1559 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1560 1694
1561 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1562 1696
1563 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1564 if $self->map; 1698 if $self->map;
1565 1699
1566 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1567} 1701}
1568 1702
1569sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1570 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1571 1705
1589 # use -1 or undef as default coordinates, not 0, 0 1723 # use -1 or undef as default coordinates, not 0, 0
1590 ($x, $y) = ($map->enter_x, $map->enter_y) 1724 ($x, $y) = ($map->enter_x, $map->enter_y)
1591 if $x <=0 && $y <= 0; 1725 if $x <=0 && $y <= 0;
1592 1726
1593 $map->load; 1727 $map->load;
1728 $map->load_diag;
1594 1729
1595 return unless $self->contr->active; 1730 return unless $self->contr->active;
1596 $self->activate_recursive; 1731 $self->activate_recursive;
1597 $self->enter_map ($map, $x, $y); 1732 $self->enter_map ($map, $x, $y);
1598} 1733}
1637 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1638 1773
1639 $self->enter_link; 1774 $self->enter_link;
1640 1775
1641 (async { 1776 (async {
1642 $path = new cf::path $path;
1643
1644 my $map = cf::map::find $path->as_string; 1777 my $map = cf::map::find $path;
1645 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1646 1779
1647# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1648# if $map; 1781# if $map;
1649 1782
1650 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1651 1784
1652 $self->leave_link ($map, $x, $y); 1785 $self->leave_link ($map, $x, $y);
1653 })->prio (1); 1786 })->prio (1);
1654} 1787}
1655 1788
1714 $self->deactivate_recursive; # just to be sure 1847 $self->deactivate_recursive; # just to be sure
1715 unless (eval { 1848 unless (eval {
1716 prepare_random_map $exit 1849 prepare_random_map $exit
1717 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1718 1851
1719 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1720 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1721 1854
1722 1; 1855 1;
1723 }) { 1856 }) {
1724 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
1725 . "I'll try to bring you back to the map you were before. " 1858 . "I'll try to bring you back to the map you were before. "
1726 . "Please report this to the dungeon master", 1859 . "Please report this to the dungeon master!",
1727 cf::NDI_UNIQUE | cf::NDI_RED); 1860 cf::NDI_UNIQUE | cf::NDI_RED);
1728 1861
1729 warn "ERROR in enter_exit: $@"; 1862 warn "ERROR in enter_exit: $@";
1730 $self->leave_link; 1863 $self->leave_link;
1731 } 1864 }
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2196 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2197 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065 2198
2066 if (exists $CFG{mlockall}) { 2199 if (exists $CFG{mlockall}) {
2067 eval { 2200 eval {
2068 $CFG{mlockall} ? &mlockall : &munlockall 2201 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2069 and die "WARNING: m(un)lockall failed: $!\n"; 2202 and die "WARNING: m(un)lockall failed: $!\n";
2070 }; 2203 };
2071 warn $@ if $@; 2204 warn $@ if $@;
2072 } 2205 }
2073} 2206}
2084 load_extensions; 2217 load_extensions;
2085 Event::loop; 2218 Event::loop;
2086} 2219}
2087 2220
2088############################################################################# 2221#############################################################################
2089# initialisation 2222# initialisation and cleanup
2223
2224# install some emergency cleanup handlers
2225BEGIN {
2226 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal (
2228 data => WF_AUTOCANCEL,
2229 signal => $signal,
2230 cb => sub {
2231 cf::cleanup "SIG$signal";
2232 },
2233 );
2234 }
2235}
2236
2237sub emergency_save() {
2238 my $freeze_guard = cf::freeze_mainloop;
2239
2240 warn "enter emergency perl save\n";
2241
2242 cf::sync_job {
2243 # use a peculiar iteration method to avoid tripping on perl
2244 # refcount bugs in for. also avoids problems with players
2245 # and maps saved/destroyed asynchronously.
2246 warn "begin emergency player save\n";
2247 for my $login (keys %cf::PLAYER) {
2248 my $pl = $cf::PLAYER{$login} or next;
2249 $pl->valid or next;
2250 $pl->save;
2251 }
2252 warn "end emergency player save\n";
2253
2254 warn "begin emergency map save\n";
2255 for my $path (keys %cf::MAP) {
2256 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next;
2258 $map->save;
2259 }
2260 warn "end emergency map save\n";
2261 };
2262
2263 warn "leave emergency perl save\n";
2264}
2090 2265
2091sub reload() { 2266sub reload() {
2092 # can/must only be called in main 2267 # can/must only be called in main
2093 if ($Coro::current != $Coro::main) { 2268 if ($Coro::current != $Coro::main) {
2094 warn "can only reload from main coroutine\n"; 2269 warn "can only reload from main coroutine\n";
2095 return; 2270 return;
2096 } 2271 }
2097 2272
2098 warn "reloading..."; 2273 warn "reloading...";
2099 2274
2275 warn "freezing server";
2100 my $guard = freeze_mainloop; 2276 my $guard = freeze_mainloop;
2101 cf::emergency_save; 2277 cf::emergency_save;
2102 2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2282
2103 eval { 2283 eval {
2104 # if anything goes wrong in here, we should simply crash as we already saved 2284 # if anything goes wrong in here, we should simply crash as we already saved
2105 2285
2106 # cancel all watchers 2286 warn "cancel all watchers";
2107 for (Event::all_watchers) { 2287 for (Event::all_watchers) {
2108 $_->cancel if $_->data & WF_AUTOCANCEL; 2288 $_->cancel if $_->data & WF_AUTOCANCEL;
2109 } 2289 }
2110 2290
2111 # cancel all extension coros 2291 warn "cancel all extension coros";
2112 $_->cancel for values %EXT_CORO; 2292 $_->cancel for values %EXT_CORO;
2113 %EXT_CORO = (); 2293 %EXT_CORO = ();
2114 2294
2295 warn "remove commands";
2296 %COMMAND = ();
2297
2298 warn "remove ext commands";
2299 %EXTCMD = ();
2300
2115 # unload all extensions 2301 warn "unload/nuke all extensions";
2116 for (@exts) { 2302 for my $pkg (@EXTS) {
2117 warn "unloading <$_>"; 2303 warn "... unloading $pkg";
2118 unload_extension $_; 2304
2305 if (my $cb = $pkg->can ("unload")) {
2306 eval {
2307 $cb->($pkg);
2308 1
2309 } or warn "$pkg unloaded, but with errors: $@";
2119 } 2310 }
2120 2311
2312 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg;
2314 }
2315
2121 # unload all modules loaded from $LIBDIR 2316 warn "unload all perl modules loaded from $LIBDIR";
2122 while (my ($k, $v) = each %INC) { 2317 while (my ($k, $v) = each %INC) {
2123 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2124 2319
2125 warn "removing <$k>"; 2320 warn "removing <$k>";
2126 delete $INC{$k}; 2321 delete $INC{$k};
2133 } 2328 }
2134 2329
2135 Symbol::delete_package $k; 2330 Symbol::delete_package $k;
2136 } 2331 }
2137 2332
2138 # sync database to disk
2139 cf::db_sync;
2140 IO::AIO::flush;
2141
2142 # get rid of safe::, as good as possible 2333 warn "get rid of safe::, as good as possible";
2143 Symbol::delete_package "safe::$_" 2334 Symbol::delete_package "safe::$_"
2144 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2145 2336
2146 # remove register_script_function callbacks
2147 # TODO
2148
2149 # unload cf.pm "a bit" 2337 warn "unload cf.pm \"a bit\"";
2150 delete $INC{"cf.pm"}; 2338 delete $INC{"cf.pm"};
2151 2339
2152 # don't, removes xs symbols, too, 2340 # don't, removes xs symbols, too,
2153 # and global variables created in xs 2341 # and global variables created in xs
2154 #Symbol::delete_package __PACKAGE__; 2342 #Symbol::delete_package __PACKAGE__;
2155 2343
2156 # reload cf.pm
2157 warn "reloading cf.pm"; 2344 warn "reloading cf.pm";
2158 require cf; 2345 require cf;
2159 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2160 2347
2161 # load config and database again 2348 warn "load config and database again";
2162 cf::cfg_load; 2349 cf::cfg_load;
2163 cf::db_load; 2350 cf::db_load;
2164 2351
2165 # load extensions
2166 warn "load extensions"; 2352 warn "load extensions";
2167 cf::load_extensions; 2353 cf::load_extensions;
2168 2354
2169 # reattach attachments to objects 2355 warn "reattach attachments to objects/players";
2170 warn "reattach";
2171 _global_reattach; 2356 _global_reattach;
2357 warn "reattach attachments to maps";
2358 reattach $_ for values %MAP;
2172 }; 2359 };
2173 2360
2174 if ($@) { 2361 if ($@) {
2175 warn $@; 2362 warn $@;
2176 warn "error while reloading, exiting."; 2363 warn "error while reloading, exiting.";
2177 exit 1; 2364 exit 1;
2178 } 2365 }
2179 2366
2180 warn "reloaded successfully"; 2367 warn "reloaded";
2181}; 2368};
2182
2183#############################################################################
2184
2185unless ($LINK_MAP) {
2186 $LINK_MAP = cf::map::new;
2187
2188 $LINK_MAP->width (41);
2189 $LINK_MAP->height (41);
2190 $LINK_MAP->alloc;
2191 $LINK_MAP->path ("{link}");
2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2194
2195 # dirty hack because... archetypes are not yet loaded
2196 Event->timer (
2197 after => 10,
2198 cb => sub {
2199 $_[0]->w->cancel;
2200
2201 # provide some exits "home"
2202 my $exit = cf::object::new "exit";
2203
2204 $exit->slaying ($EMERGENCY_POSITION->[0]);
2205 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2206 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2207
2208 $LINK_MAP->insert ($exit->clone, 19, 19);
2209 $LINK_MAP->insert ($exit->clone, 19, 20);
2210 $LINK_MAP->insert ($exit->clone, 19, 21);
2211 $LINK_MAP->insert ($exit->clone, 20, 19);
2212 $LINK_MAP->insert ($exit->clone, 20, 21);
2213 $LINK_MAP->insert ($exit->clone, 21, 19);
2214 $LINK_MAP->insert ($exit->clone, 21, 20);
2215 $LINK_MAP->insert ($exit->clone, 21, 21);
2216
2217 $exit->destroy;
2218 });
2219
2220 $LINK_MAP->{deny_save} = 1;
2221 $LINK_MAP->{deny_reset} = 1;
2222
2223 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2224}
2225
2226register "<global>", __PACKAGE__;
2227 2369
2228register_command "reload" => sub { 2370register_command "reload" => sub {
2229 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2230 2372
2231 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {
2241 reentrant => 0, 2383 reentrant => 0,
2242 prio => 0, 2384 prio => 0,
2243 at => $NEXT_TICK || $TICK, 2385 at => $NEXT_TICK || $TICK,
2244 data => WF_AUTOCANCEL, 2386 data => WF_AUTOCANCEL,
2245 cb => sub { 2387 cb => sub {
2388 $NOW = Event::time;
2389
2246 cf::server_tick; # one server iteration 2390 cf::server_tick; # one server iteration
2247 $RUNTIME += $TICK; 2391 $RUNTIME += $TICK;
2248 $NEXT_TICK += $TICK; 2392 $NEXT_TICK += $TICK;
2393
2394 $WAIT_FOR_TICK->broadcast;
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2249 2396
2250 # if we are delayed by four ticks or more, skip them all 2397 # if we are delayed by four ticks or more, skip them all
2251 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2252 2399
2253 $TICK_WATCHER->at ($NEXT_TICK); 2400 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines