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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines