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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines