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.150 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.169 by root, Sun Jan 14 01:09:46 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.32 (); 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
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
765# object support 683# object support
766 684
767sub reattach { 685sub reattach {
768 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770 690
771 my $registry = $obj->registry; 691 my $registry = $obj->registry;
772 692
773 @$registry = (); 693 @$registry = ();
774 694
906=cut 826=cut
907 827
908sub register_extcmd { 828sub register_extcmd {
909 my ($name, $cb) = @_; 829 my ($name, $cb) = @_;
910 830
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 831 $EXTCMD{$name} = $cb;
915} 832}
916 833
917cf::player->attach ( 834cf::player->attach (
918 on_command => sub { 835 on_command => sub {
919 my ($pl, $name, $params) = @_; 836 my ($pl, $name, $params) = @_;
932 849
933 my $msg = eval { from_json $buf }; 850 my $msg = eval { from_json $buf };
934 851
935 if (ref $msg) { 852 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 853 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 854 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 855 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 856 }
940 } 857 }
941 } else { 858 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 859 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 861
945 cf::override; 862 cf::override;
946 }, 863 },
947); 864);
948 865
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 866sub load_extension {
956 my ($path) = @_; 867 my ($path) = @_;
957 868
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 869 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 870 my $base = $1;
960 my $pkg = $1; 871 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 872 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 873 $pkg = "ext::$pkg";
963 874
964 warn "loading '$path' into '$pkg'\n"; 875 warn "... loading '$path' into '$pkg'\n";
965 876
966 open my $fh, "<:utf8", $path 877 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 878 or die "$path: $!";
968 879
969 my $source = 880 my $source =
970 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
973 . "\n};\n1"; 884 . "\n};\n1";
974 885
975 eval $source 886 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 888 : "extension disabled.\n";
978 889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 890 warn $@;
980 $ext_pkg{$base} = $pkg; 891 warn "mandatory extension failed to load, exiting.\n";
981 892 exit 1;
982# no strict 'refs'; 893 }
983# @{"$pkg\::ISA"} = ext::; 894 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# } 895 }
998 896
999 # remove commands 897 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} 898}
1024 899
1025sub load_extensions { 900sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 901 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 902 next unless -r $ext;
1031 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1032 } 907 }
1033} 908}
1034 909
1035############################################################################# 910#############################################################################
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 911
1073=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1074 913
1075Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1076 915
1077=cut 916=cut
1078 917
1079package cf::player; 918package cf::player;
919
920use Coro::AIO;
1080 921
1081=head3 cf::player 922=head3 cf::player
1082 923
1083=over 4 924=over 4
1084 925
1119 return $cf::PLAYER{$_[0]} || do { 960 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0]; 961 my $login = $_[0];
1121 962
1122 my $guard = cf::lock_acquire "user_find:$login"; 963 my $guard = cf::lock_acquire "user_find:$login";
1123 964
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return); 965 $cf::PLAYER{$_[0]} || do {
966 my $pl = load_pl path $login
967 or return;
968 $cf::PLAYER{$login} = $pl
969 }
1125 }; 970 }
1126} 971}
1127 972
1128sub save($) { 973sub save($) {
1129 my ($pl) = @_; 974 my ($pl) = @_;
1130 975
1133 my $path = path $pl; 978 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path"; 979 my $guard = cf::lock_acquire "user_save:$path";
1135 980
1136 return if $pl->{deny_save}; 981 return if $pl->{deny_save};
1137 982
1138 Coro::AIO::aio_mkdir playerdir $pl, 0770; 983 aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME; 984 $pl->{last_save} = $cf::RUNTIME;
1140 985
1141 $pl->save_pl ($path); 986 $pl->save_pl ($path);
1142 Coro::cede; 987 Coro::cede;
1143} 988}
1152 997
1153 $cf::PLAYER{$login} = $self; 998 $cf::PLAYER{$login} = $self;
1154 999
1155 $self 1000 $self
1156} 1001}
1002
1003=item $pl->quit_character
1004
1005Nukes the player without looking back. If logged in, the connection will
1006be destroyed. May block for a long time.
1007
1008=cut
1157 1009
1158sub quit_character { 1010sub quit_character {
1159 my ($pl) = @_; 1011 my ($pl) = @_;
1160 1012
1161 $pl->{deny_save} = 1; 1013 $pl->{deny_save} = 1;
1166 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1018 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1167 $pl->ns->destroy if $pl->ns; 1019 $pl->ns->destroy if $pl->ns;
1168 1020
1169 my $path = playerdir $pl; 1021 my $path = playerdir $pl;
1170 my $temp = "$path~$cf::RUNTIME~deleting~"; 1022 my $temp = "$path~$cf::RUNTIME~deleting~";
1171 Coro::AIO::aio_rename $path, $temp; 1023 aio_rename $path, $temp;
1172 delete $cf::PLAYER{$pl->ob->name}; 1024 delete $cf::PLAYER{$pl->ob->name};
1173 $pl->destroy; 1025 $pl->destroy;
1174 IO::AIO::aio_rmtree $temp; 1026 IO::AIO::aio_rmtree $temp;
1175} 1027}
1176 1028
1029=item cf::player::list_logins
1030
1031Returns am arrayref of all valid playernames in the system, can take a
1032while and may block, so not sync_job-capable, ever.
1033
1034=cut
1035
1036sub list_logins {
1037 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1038 or return [];
1039
1040 my @logins;
1041
1042 for my $login (@$dirs) {
1043 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1044 aio_read $fh, 0, 512, my $buf, 0 or next;
1045 $buf !~ /^password -------------$/m or next; # official not-valid tag
1046
1047 utf8::decode $login;
1048 push @logins, $login;
1049 }
1050
1051 \@logins
1052}
1053
1054=item $player->maps
1055
1056Returns an arrayref of map paths that are private for this
1057player. May block.
1058
1059=cut
1060
1061sub maps($) {
1062 my ($pl) = @_;
1063
1064 my $files = aio_readdir playerdir $pl
1065 or return;
1066
1067 my @paths;
1068
1069 for (@$files) {
1070 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o;
1073
1074 s/\.map$//;
1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1076 }
1077
1078 \@paths
1079}
1080
1177=item $player->ext_reply ($msgid, $msgtype, %msg) 1081=item $player->ext_reply ($msgid, $msgtype, %msg)
1178 1082
1179Sends an ext reply to the player. 1083Sends an ext reply to the player.
1180 1084
1181=cut 1085=cut
1202package cf::map; 1106package cf::map;
1203 1107
1204use Fcntl; 1108use Fcntl;
1205use Coro::AIO; 1109use Coro::AIO;
1206 1110
1111use overload
1112 '""' => \&as_string;
1113
1207our $MAX_RESET = 3600; 1114our $MAX_RESET = 3600;
1208our $DEFAULT_RESET = 3000; 1115our $DEFAULT_RESET = 3000;
1209 1116
1210sub generate_random_map { 1117sub generate_random_map {
1211 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1212 1119
1213 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1214 cf::map::_create_random_map 1121 $self->_create_random_map (
1215 $path,
1216 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1217 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1218 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1219 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1220 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
1221 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1127 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1222 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1128 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1223 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1129 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1224 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1130 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1225 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1226 (cf::region::find $rmp->{region}) 1132 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 )
1134}
1135
1136sub register {
1137 my (undef, $regex) = @_;
1138 my $pkg = caller;
1139
1140 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__;
1142
1143 $EXT_MAP{$pkg} = qr<$regex>;
1144}
1145
1146# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)};
1148
1149sub normalise {
1150 my ($path, $base) = @_;
1151
1152 # map plan:
1153 #
1154 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched
1156 # ?xxx/... are special absolute paths
1157 # ?random/... random maps
1158 # /... normal maps
1159 # ~user/... per-player map of a specific user
1160
1161 $path =~ s/$PATH_SEP/\//go;
1162
1163 # treat it as relative path if it starts with
1164 # something that looks reasonable
1165 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1166 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1167
1168 $base =~ s{[^/]+/?$}{};
1169 $path = "$base/$path";
1170 }
1171
1172 for ($path) {
1173 redo if s{//}{/};
1174 redo if s{/\.?/}{/};
1175 redo if s{/[^/]+/\.\./}{/};
1176 }
1177
1178 $path
1179}
1180
1181sub new_from_path {
1182 my (undef, $path, $base) = @_;
1183
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185
1186 $path = normalise $path, $base;
1187
1188 for my $pkg (keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) {
1190 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc.
1193 return $self;
1194 }
1195 }
1196
1197 Carp::carp "unable to resolve path '$path'.";
1198 ()
1199}
1200
1201sub init {
1202 my ($self) = @_;
1203
1204 $self
1205}
1206
1207sub as_string {
1208 my ($self) = @_;
1209
1210 "$self->{path}"
1211}
1212
1213# the displayed name, this is a one way mapping
1214sub visible_name {
1215 &as_string
1216}
1217
1218# the original (read-only) location
1219sub load_path {
1220 my ($self) = @_;
1221
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1223}
1224
1225# the temporary/swap location
1226sub save_path {
1227 my ($self) = @_;
1228
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1231}
1232
1233# the unique path, undef == no special unique path
1234sub uniq_path {
1235 my ($self) = @_;
1236
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1227} 1239}
1228 1240
1229# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1230# all maps in C++... 1242# all maps in C++...
1231sub change_all_map_light { 1243sub change_all_map_light {
1233 1245
1234 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1235 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1236} 1248}
1237 1249
1250sub unlink_save {
1251 my ($self) = @_;
1252
1253 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1256}
1257
1238sub try_load_header($) { 1258sub load_header_from($) {
1239 my ($path) = @_; 1259 my ($self, $path) = @_;
1240 1260
1241 utf8::encode $path; 1261 utf8::encode $path;
1242 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1243 or return; 1263 or return;
1244 1264
1245 my $map = cf::map::new 1265 $self->_load_header ($path)
1246 or return; 1266 or return;
1247 1267
1248 # for better error messages only, will be overwritten 1268 $self->{load_path} = $path;
1249 $map->path ($path);
1250 1269
1251 $map->load_header ($path) 1270 1
1271}
1272
1273sub load_orig {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->load_path)
1277}
1278
1279sub load_temp {
1280 my ($self) = @_;
1281
1282 $self->load_header_from ($self->save_path)
1283}
1284
1285sub load_header {
1286 my ($self) = @_;
1287
1288 if ($self->load_temp) {
1289 $self->last_access ((delete $self->{last_access})
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else {
1295 $self->load_orig
1252 or return; 1296 or return;
1253 1297
1254 $map->{load_path} = $path; 1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 }
1255 1303
1256 $map 1304 1
1257} 1305}
1258 1306
1259sub find; 1307sub find;
1260sub find { 1308sub find {
1261 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1262 1310
1263 #warn "find<$path,$origin>\n";#d#
1264
1265 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1266 my $key = $path->as_string;
1267 1312
1268 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1269 1314
1270 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1271 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1272 1317 my $map = new_from_path cf::map $path
1273 # do it the slow way
1274 my $map = try_load_header $path->save_path;
1275
1276 Coro::cede;
1277
1278 if ($map) {
1279 $map->last_access ((delete $map->{last_access})
1280 || $cf::RUNTIME); #d#
1281 # safety
1282 $map->{instantiate_time} = $cf::RUNTIME
1283 if $map->{instantiate_time} > $cf::RUNTIME;
1284 } else {
1285 if (my $rmp = $path->random_map_params) {
1286 $map = generate_random_map $key, $rmp;
1287 } else {
1288 $map = try_load_header $path->load_path;
1289 }
1290
1291 $map or return; 1318 or return;
1292 1319
1293 $map->{load_original} = 1;
1294 $map->{instantiate_time} = $cf::RUNTIME;
1295 $map->last_access ($cf::RUNTIME);
1296 $map->instantiate;
1297
1298 # per-player maps become, after loading, normal maps
1299 $map->per_player (0) if $path->{user_rel};
1300 }
1301
1302 $map->path ($key);
1303 $map->{path} = $path;
1304 $map->{last_save} = $cf::RUNTIME; 1320 $map->{last_save} = $cf::RUNTIME;
1305 1321
1306 Coro::cede; 1322 $map->load_header
1323 or return;
1307 1324
1308 if ($map->should_reset) { 1325 if ($map->should_reset) {
1309 $map->reset; 1326 $map->reset;
1310 undef $guard; 1327 undef $guard;
1311 $map = find $path 1328 $map = find $path
1312 or return; 1329 or return;
1313 } 1330 }
1314 1331
1315 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1316 } 1333 }
1317} 1334}
1318 1335
1319sub load { 1336sub load {
1320 my ($self) = @_; 1337 my ($self) = @_;
1321 1338
1322 my $path = $self->{path}; 1339 my $path = $self->{path};
1323 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1324 1341
1325 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1326 1343
1327 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1328 1345
1329 $self->alloc; 1346 $self->alloc;
1330 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1331 or return; 1348 or return;
1332 1349
1333 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1334 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1335 1352
1336 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1337 utf8::encode $uniq; 1354 utf8::encode $uniq;
1338 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1339 $self->clear_unique_items; 1356 $self->clear_unique_items;
1340 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1341 } 1358 }
1342 } 1359 }
1343 1360
1344 Coro::cede; 1361 Coro::cede;
1345 1362
1346 # now do the right thing for maps 1363 # now do the right thing for maps
1347 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1348 1365
1349 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1350 $self->{deny_save} = 1; 1367 $self->decay_objects;
1351 $self->{deny_reset} = 1;
1352 } else {
1353 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1354 $self->decay_objects;
1355 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1356 $self->set_darkness_map; 1371 $self->set_darkness_map;
1357 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1358 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1359 $self->activate; 1375 $self->activate;
1360 } 1376 }
1361 1377
1362 Coro::cede;
1363
1364 $self->in_memory (cf::MAP_IN_MEMORY); 1378 $self->in_memory (cf::MAP_IN_MEMORY);
1379}
1380
1381sub customise_for {
1382 my ($self, $ob) = @_;
1383
1384 return find "~" . $ob->name . "/" . $self->{path}
1385 if $self->per_player;
1386
1387 $self
1388}
1389
1390# find and load all maps in the 3x3 area around a map
1391sub load_diag {
1392 my ($map) = @_;
1393
1394 my @diag; # diagonal neighbours
1395
1396 for (0 .. 3) {
1397 my $neigh = $map->tile_path ($_)
1398 or next;
1399 $neigh = find $neigh, $map
1400 or next;
1401 $neigh->load;
1402
1403 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1404 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1405 }
1406
1407 for (@diag) {
1408 my $neigh = find @$_
1409 or next;
1410 $neigh->load;
1411 }
1365} 1412}
1366 1413
1367sub find_sync { 1414sub find_sync {
1368 my ($path, $origin) = @_; 1415 my ($path, $origin) = @_;
1369 1416
1370 cf::sync_job { cf::map::find $path, $origin } 1417 cf::sync_job { find $path, $origin }
1371} 1418}
1372 1419
1373sub do_load_sync { 1420sub do_load_sync {
1374 my ($map) = @_; 1421 my ($map) = @_;
1375 1422
1376 cf::sync_job { $map->load }; 1423 cf::sync_job { $map->load };
1377} 1424}
1378 1425
1426our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async {
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439
1440sub find_async {
1441 my ($path, $origin) = @_;
1442
1443 $path = normalise $path, $origin && $origin->{path};
1444
1445 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 }
1448
1449 $MAP_PREFETCH{$path} = 0;
1450 $MAP_PREFETCHER->ready;
1451
1452 ()
1453}
1454
1379sub save { 1455sub save {
1380 my ($self) = @_; 1456 my ($self) = @_;
1381 1457
1382 my $lock = cf::lock_acquire "map_data:" . $self->path; 1458 my $lock = cf::lock_acquire "map_data:" . $self->path;
1383 1459
1384 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1385 1461
1386 return unless $self->dirty; 1462 return unless $self->dirty;
1387 1463
1388 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1389 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1390 1466
1391 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1392 1468
1393 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1394 1470
1397 cf::async { 1473 cf::async {
1398 $_->contr->save for $self->players; 1474 $_->contr->save for $self->players;
1399 }; 1475 };
1400 1476
1401 if ($uniq) { 1477 if ($uniq) {
1402 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1403 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1404 } else { 1480 } else {
1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1481 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1406 } 1482 }
1407} 1483}
1408 1484
1409sub swap_out { 1485sub swap_out {
1410 my ($self) = @_; 1486 my ($self) = @_;
1424 1500
1425sub reset_at { 1501sub reset_at {
1426 my ($self) = @_; 1502 my ($self) = @_;
1427 1503
1428 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1429 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1430 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1431 1507
1432 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1433 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1434 1510
1439 my ($self) = @_; 1515 my ($self) = @_;
1440 1516
1441 $self->reset_at <= $cf::RUNTIME 1517 $self->reset_at <= $cf::RUNTIME
1442} 1518}
1443 1519
1444sub unlink_save {
1445 my ($self) = @_;
1446
1447 utf8::encode (my $save = $self->{path}->save_path);
1448 aioreq_pri 3; IO::AIO::aio_unlink $save;
1449 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1450}
1451
1452sub rename { 1520sub rename {
1453 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1454 1522
1523 normalise $new_path;
1524
1455 $self->unlink_save; 1525 $self->unlink_save;
1456 1526
1457 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1458 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1459 $self->path ($self->{path}->as_string);
1460 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1461 1530
1462 $self->save; 1531 $self->save;
1463} 1532}
1464 1533
1465sub reset { 1534sub reset {
1466 my ($self) = @_; 1535 my ($self) = @_;
1467 1536
1468 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1469 1538
1470 return if $self->players; 1539 return if $self->players;
1471 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1472 1541
1473 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1474 1543
1475 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1476 1548
1477 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1478 1550
1479 $self->unlink_save; 1551 $self->unlink_save;
1480 $self->destroy; 1552 $self->destroy;
1489 $self->reset_timeout (1); 1561 $self->reset_timeout (1);
1490 $self->rename ("{nuke}/" . ($nuke_counter++)); 1562 $self->rename ("{nuke}/" . ($nuke_counter++));
1491 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1492} 1564}
1493 1565
1494sub customise_for { 1566=item cf::map::unique_maps
1495 my ($map, $ob) = @_;
1496 1567
1497 if ($map->per_player) { 1568Returns an arrayref of paths of all shared maps that have
1498 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1569instantiated unique items. May block.
1499 }
1500 1570
1501 $map 1571=cut
1502}
1503 1572
1504sub emergency_save { 1573sub unique_maps() {
1505 my $freeze_guard = cf::freeze_mainloop; 1574 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1575 or return;
1506 1576
1507 warn "enter emergency perl save\n"; 1577 my @paths;
1508 1578
1509 cf::sync_job { 1579 for (@$files) {
1510 warn "begin emergency player save\n"; 1580 utf8::decode $_;
1511 $_->save for values %cf::PLAYER; 1581 next if /\.pst$/;
1512 warn "end emergency player save\n"; 1582 next unless /^$PATH_SEP/o;
1513 1583
1514 warn "begin emergency map save\n"; 1584 s/\.map$//;
1515 $_->save for values %cf::MAP; 1585 push @paths, $_;
1516 warn "end emergency map save\n";
1517 }; 1586 }
1518 1587
1519 warn "leave emergency perl save\n"; 1588 \@paths
1520} 1589}
1521 1590
1522package cf; 1591package cf;
1523 1592
1524=back 1593=back
1525 1594
1595=head3 cf::object
1596
1597=cut
1598
1599package cf::object;
1600
1601=over 4
1602
1603=item $ob->inv_recursive
1604
1605Returns the inventory of the object _and_ their inventories, recursively.
1606
1607=cut
1608
1609sub inv_recursive_;
1610sub inv_recursive_ {
1611 map { $_, inv_recursive_ $_->inv } @_
1612}
1613
1614sub inv_recursive {
1615 inv_recursive_ inv $_[0]
1616}
1617
1618package cf;
1619
1620=back
1526 1621
1527=head3 cf::object::player 1622=head3 cf::object::player
1528 1623
1529=over 4 1624=over 4
1530 1625
1570 1665
1571=item $player_object->enter_link 1666=item $player_object->enter_link
1572 1667
1573Freezes the player and moves him/her to a special map (C<{link}>). 1668Freezes the player and moves him/her to a special map (C<{link}>).
1574 1669
1575The player should be reaosnably safe there for short amounts of time. You 1670The player should be reasonably safe there for short amounts of time. You
1576I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1577 1672
1673Will never block.
1674
1578=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1579 1676
1580Moves the player out of the specila link map onto the given map. If the 1677Moves the player out of the special C<{link}> map onto the specified
1581map is not valid (or omitted), the player will be moved back to the 1678map. If the map is not valid (or omitted), the player will be moved back
1582location he/she was before the call to C<enter_link>, or, if that fails, 1679to the location he/she was before the call to C<enter_link>, or, if that
1583to the emergency map position. 1680fails, to the emergency map position.
1584 1681
1585Might block. 1682Might block.
1586 1683
1587=cut 1684=cut
1685
1686sub link_map {
1687 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1690 $LINK_MAP->load;
1691 }
1692
1693 $LINK_MAP
1694}
1588 1695
1589sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1590 my ($self) = @_; 1697 my ($self) = @_;
1591 1698
1592 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1593 1700
1594 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1595 1702
1596 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1597 if $self->map; 1704 if $self->map;
1598 1705
1599 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1600} 1707}
1601 1708
1602sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1603 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1604 1711
1622 # use -1 or undef as default coordinates, not 0, 0 1729 # use -1 or undef as default coordinates, not 0, 0
1623 ($x, $y) = ($map->enter_x, $map->enter_y) 1730 ($x, $y) = ($map->enter_x, $map->enter_y)
1624 if $x <=0 && $y <= 0; 1731 if $x <=0 && $y <= 0;
1625 1732
1626 $map->load; 1733 $map->load;
1734 $map->load_diag;
1627 1735
1628 return unless $self->contr->active; 1736 return unless $self->contr->active;
1629 $self->activate_recursive; 1737 $self->activate_recursive;
1630 $self->enter_map ($map, $x, $y); 1738 $self->enter_map ($map, $x, $y);
1631} 1739}
1670 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1671 1779
1672 $self->enter_link; 1780 $self->enter_link;
1673 1781
1674 (async { 1782 (async {
1675 $path = new cf::path $path;
1676
1677 my $map = cf::map::find $path->as_string; 1783 my $map = cf::map::find $path;
1678 $map = $map->customise_for ($self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1679 1785
1680# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1681# if $map; 1787# if $map;
1682 1788
1683 $map or $map->cluck ("oy");#d#
1684 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1685 1790
1686 $self->leave_link ($map, $x, $y); 1791 $self->leave_link ($map, $x, $y);
1687 })->prio (1); 1792 })->prio (1);
1688} 1793}
1748 $self->deactivate_recursive; # just to be sure 1853 $self->deactivate_recursive; # just to be sure
1749 unless (eval { 1854 unless (eval {
1750 prepare_random_map $exit 1855 prepare_random_map $exit
1751 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1752 1857
1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1755 1860
1756 1; 1861 1;
1757 }) { 1862 }) {
1758 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
1759 . "I'll try to bring you back to the map you were before. " 1864 . "I'll try to bring you back to the map you were before. "
1760 . "Please report this to the dungeon master", 1865 . "Please report this to the dungeon master!",
1761 cf::NDI_UNIQUE | cf::NDI_RED); 1866 cf::NDI_UNIQUE | cf::NDI_RED);
1762 1867
1763 warn "ERROR in enter_exit: $@"; 1868 warn "ERROR in enter_exit: $@";
1764 $self->leave_link; 1869 $self->leave_link;
1765 } 1870 }
2118 load_extensions; 2223 load_extensions;
2119 Event::loop; 2224 Event::loop;
2120} 2225}
2121 2226
2122############################################################################# 2227#############################################################################
2123# initialisation 2228# initialisation and cleanup
2229
2230# install some emergency cleanup handlers
2231BEGIN {
2232 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal (
2234 data => WF_AUTOCANCEL,
2235 signal => $signal,
2236 cb => sub {
2237 cf::cleanup "SIG$signal";
2238 },
2239 );
2240 }
2241}
2242
2243sub emergency_save() {
2244 my $freeze_guard = cf::freeze_mainloop;
2245
2246 warn "enter emergency perl save\n";
2247
2248 cf::sync_job {
2249 # use a peculiar iteration method to avoid tripping on perl
2250 # refcount bugs in for. also avoids problems with players
2251 # and maps saved/destroyed asynchronously.
2252 warn "begin emergency player save\n";
2253 for my $login (keys %cf::PLAYER) {
2254 my $pl = $cf::PLAYER{$login} or next;
2255 $pl->valid or next;
2256 $pl->save;
2257 }
2258 warn "end emergency player save\n";
2259
2260 warn "begin emergency map save\n";
2261 for my $path (keys %cf::MAP) {
2262 my $map = $cf::MAP{$path} or next;
2263 $map->valid or next;
2264 $map->save;
2265 }
2266 warn "end emergency map save\n";
2267 };
2268
2269 warn "leave emergency perl save\n";
2270}
2124 2271
2125sub reload() { 2272sub reload() {
2126 # can/must only be called in main 2273 # can/must only be called in main
2127 if ($Coro::current != $Coro::main) { 2274 if ($Coro::current != $Coro::main) {
2128 warn "can only reload from main coroutine\n"; 2275 warn "can only reload from main coroutine\n";
2129 return; 2276 return;
2130 } 2277 }
2131 2278
2132 warn "reloading..."; 2279 warn "reloading...";
2133 2280
2281 warn "freezing server";
2134 my $guard = freeze_mainloop; 2282 my $guard = freeze_mainloop;
2135 cf::emergency_save; 2283 cf::emergency_save;
2136 2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288
2137 eval { 2289 eval {
2138 # if anything goes wrong in here, we should simply crash as we already saved 2290 # if anything goes wrong in here, we should simply crash as we already saved
2139 2291
2140 # cancel all watchers 2292 warn "cancel all watchers";
2141 for (Event::all_watchers) { 2293 for (Event::all_watchers) {
2142 $_->cancel if $_->data & WF_AUTOCANCEL; 2294 $_->cancel if $_->data & WF_AUTOCANCEL;
2143 } 2295 }
2144 2296
2145 # cancel all extension coros 2297 warn "cancel all extension coros";
2146 $_->cancel for values %EXT_CORO; 2298 $_->cancel for values %EXT_CORO;
2147 %EXT_CORO = (); 2299 %EXT_CORO = ();
2148 2300
2301 warn "remove commands";
2302 %COMMAND = ();
2303
2304 warn "remove ext commands";
2305 %EXTCMD = ();
2306
2149 # unload all extensions 2307 warn "unload/nuke all extensions";
2150 for (@exts) { 2308 for my $pkg (@EXTS) {
2151 warn "unloading <$_>"; 2309 warn "... unloading $pkg";
2152 unload_extension $_; 2310
2311 if (my $cb = $pkg->can ("unload")) {
2312 eval {
2313 $cb->($pkg);
2314 1
2315 } or warn "$pkg unloaded, but with errors: $@";
2153 } 2316 }
2154 2317
2318 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg;
2320 }
2321
2155 # unload all modules loaded from $LIBDIR 2322 warn "unload all perl modules loaded from $LIBDIR";
2156 while (my ($k, $v) = each %INC) { 2323 while (my ($k, $v) = each %INC) {
2157 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2158 2325
2159 warn "removing <$k>"; 2326 warn "removing <$k>";
2160 delete $INC{$k}; 2327 delete $INC{$k};
2167 } 2334 }
2168 2335
2169 Symbol::delete_package $k; 2336 Symbol::delete_package $k;
2170 } 2337 }
2171 2338
2172 # sync database to disk
2173 cf::db_sync;
2174 IO::AIO::flush;
2175
2176 # get rid of safe::, as good as possible 2339 warn "get rid of safe::, as good as possible";
2177 Symbol::delete_package "safe::$_" 2340 Symbol::delete_package "safe::$_"
2178 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2179 2342
2180 # remove register_script_function callbacks
2181 # TODO
2182
2183 # unload cf.pm "a bit" 2343 warn "unload cf.pm \"a bit\"";
2184 delete $INC{"cf.pm"}; 2344 delete $INC{"cf.pm"};
2185 2345
2186 # don't, removes xs symbols, too, 2346 # don't, removes xs symbols, too,
2187 # and global variables created in xs 2347 # and global variables created in xs
2188 #Symbol::delete_package __PACKAGE__; 2348 #Symbol::delete_package __PACKAGE__;
2189 2349
2190 # reload cf.pm
2191 warn "reloading cf.pm"; 2350 warn "reloading cf.pm";
2192 require cf; 2351 require cf;
2193 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2194 2353
2195 # load config and database again 2354 warn "load config and database again";
2196 cf::cfg_load; 2355 cf::cfg_load;
2197 cf::db_load; 2356 cf::db_load;
2198 2357
2199 # load extensions
2200 warn "load extensions"; 2358 warn "load extensions";
2201 cf::load_extensions; 2359 cf::load_extensions;
2202 2360
2203 # reattach attachments to objects 2361 warn "reattach attachments to objects/players";
2204 warn "reattach";
2205 _global_reattach; 2362 _global_reattach;
2363 warn "reattach attachments to maps";
2206 reattach $_ for values %MAP; 2364 reattach $_ for values %MAP;
2207 }; 2365 };
2208 2366
2209 if ($@) { 2367 if ($@) {
2210 warn $@; 2368 warn $@;
2211 warn "error while reloading, exiting."; 2369 warn "error while reloading, exiting.";
2212 exit 1; 2370 exit 1;
2213 } 2371 }
2214 2372
2215 warn "reloaded successfully"; 2373 warn "reloaded";
2216}; 2374};
2217
2218#############################################################################
2219
2220unless ($LINK_MAP) {
2221 $LINK_MAP = cf::map::new;
2222
2223 $LINK_MAP->width (41);
2224 $LINK_MAP->height (41);
2225 $LINK_MAP->alloc;
2226 $LINK_MAP->path ("{link}");
2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2229
2230 # dirty hack because... archetypes are not yet loaded
2231 Event->timer (
2232 after => 10,
2233 cb => sub {
2234 $_[0]->w->cancel;
2235
2236 # provide some exits "home"
2237 my $exit = cf::object::new "exit";
2238
2239 $exit->slaying ($EMERGENCY_POSITION->[0]);
2240 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2241 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2242
2243 $LINK_MAP->insert ($exit->clone, 19, 19);
2244 $LINK_MAP->insert ($exit->clone, 19, 20);
2245 $LINK_MAP->insert ($exit->clone, 19, 21);
2246 $LINK_MAP->insert ($exit->clone, 20, 19);
2247 $LINK_MAP->insert ($exit->clone, 20, 21);
2248 $LINK_MAP->insert ($exit->clone, 21, 19);
2249 $LINK_MAP->insert ($exit->clone, 21, 20);
2250 $LINK_MAP->insert ($exit->clone, 21, 21);
2251
2252 $exit->destroy;
2253 });
2254
2255 $LINK_MAP->{deny_save} = 1;
2256 $LINK_MAP->{deny_reset} = 1;
2257
2258 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2259}
2260
2261register "<global>", __PACKAGE__;
2262 2375
2263register_command "reload" => sub { 2376register_command "reload" => sub {
2264 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2265 2378
2266 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
2276 reentrant => 0, 2389 reentrant => 0,
2277 prio => 0, 2390 prio => 0,
2278 at => $NEXT_TICK || $TICK, 2391 at => $NEXT_TICK || $TICK,
2279 data => WF_AUTOCANCEL, 2392 data => WF_AUTOCANCEL,
2280 cb => sub { 2393 cb => sub {
2394 $NOW = Event::time;
2395
2281 cf::server_tick; # one server iteration 2396 cf::server_tick; # one server iteration
2282 $RUNTIME += $TICK; 2397 $RUNTIME += $TICK;
2283 $NEXT_TICK += $TICK; 2398 $NEXT_TICK += $TICK;
2399
2400 $WAIT_FOR_TICK->broadcast;
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2284 2402
2285 # if we are delayed by four ticks or more, skip them all 2403 # if we are delayed by four ticks or more, skip them all
2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2287 2405
2288 $TICK_WATCHER->at ($NEXT_TICK); 2406 $TICK_WATCHER->at ($NEXT_TICK);
2290 }, 2408 },
2291); 2409);
2292 2410
2293IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2294 2412
2295Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2296 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2297 poll => 'r', 2415 poll => 'r',
2298 prio => 5, 2416 prio => 5,
2299 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2300 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2301); 2419);
2302 2420
2303Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2304 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2305 after => 0, 2423 after => 0,
2306 interval => 10, 2424 interval => 10,
2307 cb => sub { 2425 cb => sub {
2308 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines