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.146 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.171 by root, Sun Jan 14 12:24:48 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 IO::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 Coro::cede;
1142 $pl->save_pl ($path); 992 $pl->save_pl ($path);
1143 Coro::cede; 993 Coro::cede;
1144} 994}
1145 995
1146sub new($) { 996sub new($) {
1153 1003
1154 $cf::PLAYER{$login} = $self; 1004 $cf::PLAYER{$login} = $self;
1155 1005
1156 $self 1006 $self
1157} 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
1158 1015
1159sub quit_character { 1016sub quit_character {
1160 my ($pl) = @_; 1017 my ($pl) = @_;
1161 1018
1162 $pl->{deny_save} = 1; 1019 $pl->{deny_save} = 1;
1167 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1024 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1168 $pl->ns->destroy if $pl->ns; 1025 $pl->ns->destroy if $pl->ns;
1169 1026
1170 my $path = playerdir $pl; 1027 my $path = playerdir $pl;
1171 my $temp = "$path~$cf::RUNTIME~deleting~"; 1028 my $temp = "$path~$cf::RUNTIME~deleting~";
1172 IO::AIO::aio_rename $path, $temp, sub { 1029 aio_rename $path, $temp;
1173 delete $cf::PLAYER{$pl->ob->name}; 1030 delete $cf::PLAYER{$pl->ob->name};
1174 $pl->destroy; 1031 $pl->destroy;
1175
1176 IO::AIO::aio_rmtree $temp; 1032 IO::AIO::aio_rmtree $temp;
1033}
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;
1177 }; 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
1178} 1085}
1179 1086
1180=item $player->ext_reply ($msgid, $msgtype, %msg) 1087=item $player->ext_reply ($msgid, $msgtype, %msg)
1181 1088
1182Sends an ext reply to the player. 1089Sends an ext reply to the player.
1205package cf::map; 1112package cf::map;
1206 1113
1207use Fcntl; 1114use Fcntl;
1208use Coro::AIO; 1115use Coro::AIO;
1209 1116
1117use overload
1118 '""' => \&as_string;
1119
1210our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1211our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1212 1122
1213sub generate_random_map { 1123sub generate_random_map {
1214 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1215 1125
1216 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1217 cf::map::_create_random_map 1127 $self->_create_random_map (
1218 $path,
1219 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1220 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1221 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1222 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1223 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1224 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1225 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1226 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1227 $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},
1228 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1229 (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
1230} 1254}
1231 1255
1232# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1233# all maps in C++... 1257# all maps in C++...
1234sub change_all_map_light { 1258sub change_all_map_light {
1236 1260
1237 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1238 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1239} 1263}
1240 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
1241sub try_load_header($) { 1273sub load_header_from($) {
1242 my ($path) = @_; 1274 my ($self, $path) = @_;
1243 1275
1244 utf8::encode $path; 1276 utf8::encode $path;
1245 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1246 or return; 1278 or return;
1247 1279
1248 my $map = cf::map::new 1280 $self->_load_header ($path)
1249 or return; 1281 or return;
1250 1282
1251 # for better error messages only, will be overwritten 1283 $self->{load_path} = $path;
1252 $map->path ($path);
1253 1284
1254 $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
1255 or return; 1311 or return;
1256 1312
1257 $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 }
1258 1318
1259 $map 1319 1
1260} 1320}
1261 1321
1262sub find; 1322sub find;
1263sub find { 1323sub find {
1264 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1265 1325
1266 #warn "find<$path,$origin>\n";#d#
1267
1268 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1269 my $key = $path->as_string;
1270 1327
1271 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1272 1329
1273 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1274 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1275 1332 my $map = new_from_path cf::map $path
1276 # do it the slow way
1277 my $map = try_load_header $path->save_path;
1278
1279 Coro::cede;
1280
1281 if ($map) {
1282 $map->last_access ((delete $map->{last_access})
1283 || $cf::RUNTIME); #d#
1284 # safety
1285 $map->{instantiate_time} = $cf::RUNTIME
1286 if $map->{instantiate_time} > $cf::RUNTIME;
1287 } else {
1288 if (my $rmp = $path->random_map_params) {
1289 $map = generate_random_map $key, $rmp;
1290 } else {
1291 $map = try_load_header $path->load_path;
1292 }
1293
1294 $map or return; 1333 or return;
1295 1334
1296 $map->{load_original} = 1;
1297 $map->{instantiate_time} = $cf::RUNTIME;
1298 $map->last_access ($cf::RUNTIME);
1299 $map->instantiate;
1300
1301 # per-player maps become, after loading, normal maps
1302 $map->per_player (0) if $path->{user_rel};
1303 }
1304
1305 $map->path ($key);
1306 $map->{path} = $path;
1307 $map->{last_save} = $cf::RUNTIME; 1335 $map->{last_save} = $cf::RUNTIME;
1308 1336
1309 Coro::cede; 1337 $map->load_header
1338 or return;
1310 1339
1311 if ($map->should_reset) { 1340 if ($map->should_reset) {
1341 $cf::WAIT_FOR_TICK->wait;
1312 $map->reset; 1342 $map->reset;
1313 undef $guard; 1343 undef $guard;
1314 $map = find $path 1344 $map = find $path
1315 or return; 1345 or return;
1316 } 1346 }
1317 1347
1318 $cf::MAP{$key} = $map 1348 $cf::MAP{$path} = $map
1319 } 1349 }
1320} 1350}
1321 1351
1322sub load { 1352sub load {
1323 my ($self) = @_; 1353 my ($self) = @_;
1324 1354
1325 my $path = $self->{path}; 1355 my $path = $self->{path};
1326 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1356 my $guard = cf::lock_acquire "map_load:$path";
1327 1357
1328 return if $self->in_memory != cf::MAP_SWAPPED; 1358 return if $self->in_memory != cf::MAP_SWAPPED;
1329 1359
1330 $self->in_memory (cf::MAP_LOADING); 1360 $self->in_memory (cf::MAP_LOADING);
1331 1361
1332 $self->alloc; 1362 $self->alloc;
1333 $self->load_objects ($self->{load_path}, 1) 1363 $self->_load_objects ($self->{load_path}, 1)
1334 or return; 1364 or return;
1335 1365
1336 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1337 if delete $self->{load_original}; 1367 if delete $self->{load_original};
1338 1368
1339 if (my $uniq = $path->uniq_path) { 1369 if (my $uniq = $self->uniq_path) {
1340 utf8::encode $uniq; 1370 utf8::encode $uniq;
1341 if (aio_open $uniq, O_RDONLY, 0) { 1371 if (aio_open $uniq, O_RDONLY, 0) {
1342 $self->clear_unique_items; 1372 $self->clear_unique_items;
1343 $self->load_objects ($uniq, 0); 1373 $self->_load_objects ($uniq, 0);
1344 } 1374 }
1345 } 1375 }
1346 1376
1347 Coro::cede; 1377 Coro::cede;
1348 1378
1349 # now do the right thing for maps 1379 # now do the right thing for maps
1350 $self->link_multipart_objects; 1380 $self->link_multipart_objects;
1351 1381
1352 if ($self->{path}->is_style_map) { 1382 unless ($self->{deny_activate}) {
1353 $self->{deny_save} = 1; 1383 $self->decay_objects;
1354 $self->{deny_reset} = 1;
1355 } else {
1356 $self->fix_auto_apply; 1384 $self->fix_auto_apply;
1357 $self->decay_objects;
1358 $self->update_buttons; 1385 $self->update_buttons;
1386 Coro::cede;
1359 $self->set_darkness_map; 1387 $self->set_darkness_map;
1360 $self->difficulty ($self->estimate_difficulty) 1388 $self->difficulty ($self->estimate_difficulty)
1361 unless $self->difficulty; 1389 unless $self->difficulty;
1390 Coro::cede;
1362 $self->activate; 1391 $self->activate;
1363 } 1392 }
1364 1393
1365 Coro::cede;
1366
1367 $self->in_memory (cf::MAP_IN_MEMORY); 1394 $self->in_memory (cf::MAP_IN_MEMORY);
1395}
1396
1397sub customise_for {
1398 my ($self, $ob) = @_;
1399
1400 return find "~" . $ob->name . "/" . $self->{path}
1401 if $self->per_player;
1402
1403 $self
1404}
1405
1406# find and load all maps in the 3x3 area around a map
1407sub load_diag {
1408 my ($map) = @_;
1409
1410 my @diag; # diagonal neighbours
1411
1412 for (0 .. 3) {
1413 my $neigh = $map->tile_path ($_)
1414 or next;
1415 $neigh = find $neigh, $map
1416 or next;
1417 $neigh->load;
1418
1419 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1420 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1421 }
1422
1423 for (@diag) {
1424 my $neigh = find @$_
1425 or next;
1426 $neigh->load;
1427 }
1368} 1428}
1369 1429
1370sub find_sync { 1430sub find_sync {
1371 my ($path, $origin) = @_; 1431 my ($path, $origin) = @_;
1372 1432
1373 cf::sync_job { cf::map::find $path, $origin } 1433 cf::sync_job { find $path, $origin }
1374} 1434}
1375 1435
1376sub do_load_sync { 1436sub do_load_sync {
1377 my ($map) = @_; 1437 my ($map) = @_;
1378 1438
1379 cf::sync_job { $map->load }; 1439 cf::sync_job { $map->load };
1380} 1440}
1381 1441
1442our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async {
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455
1456sub find_async {
1457 my ($path, $origin) = @_;
1458
1459 $path = normalise $path, $origin && $origin->{path};
1460
1461 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 }
1464
1465 $MAP_PREFETCH{$path} = 0;
1466 $MAP_PREFETCHER->ready;
1467
1468 ()
1469}
1470
1382sub save { 1471sub save {
1383 my ($self) = @_; 1472 my ($self) = @_;
1384 1473
1385 my $lock = cf::lock_acquire "map_data:" . $self->path; 1474 my $lock = cf::lock_acquire "map_data:" . $self->path;
1386 1475
1387 $self->{last_save} = $cf::RUNTIME; 1476 $self->{last_save} = $cf::RUNTIME;
1388 1477
1389 return unless $self->dirty; 1478 return unless $self->dirty;
1390 1479
1391 my $save = $self->{path}->save_path; utf8::encode $save; 1480 my $save = $self->save_path; utf8::encode $save;
1392 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1481 my $uniq = $self->uniq_path; utf8::encode $uniq;
1393 1482
1394 $self->{load_path} = $save; 1483 $self->{load_path} = $save;
1395 1484
1396 return if $self->{deny_save}; 1485 return if $self->{deny_save};
1397 1486
1400 cf::async { 1489 cf::async {
1401 $_->contr->save for $self->players; 1490 $_->contr->save for $self->players;
1402 }; 1491 };
1403 1492
1404 if ($uniq) { 1493 if ($uniq) {
1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1494 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1406 $self->save_objects ($uniq, cf::IO_UNIQUES); 1495 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1407 } else { 1496 } else {
1408 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1409 } 1498 }
1410} 1499}
1411 1500
1412sub swap_out { 1501sub swap_out {
1413 my ($self) = @_; 1502 my ($self) = @_;
1427 1516
1428sub reset_at { 1517sub reset_at {
1429 my ($self) = @_; 1518 my ($self) = @_;
1430 1519
1431 # TODO: safety, remove and allow resettable per-player maps 1520 # TODO: safety, remove and allow resettable per-player maps
1432 return 1e99 if $self->{path}{user_rel}; 1521 return 1e99 if $self->isa ("ext::map_per_player");#d#
1433 return 1e99 if $self->{deny_reset}; 1522 return 1e99 if $self->{deny_reset};
1434 1523
1435 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1524 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1436 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1525 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1437 1526
1442 my ($self) = @_; 1531 my ($self) = @_;
1443 1532
1444 $self->reset_at <= $cf::RUNTIME 1533 $self->reset_at <= $cf::RUNTIME
1445} 1534}
1446 1535
1447sub unlink_save {
1448 my ($self) = @_;
1449
1450 utf8::encode (my $save = $self->{path}->save_path);
1451 aioreq_pri 3; IO::AIO::aio_unlink $save;
1452 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1453}
1454
1455sub rename { 1536sub rename {
1456 my ($self, $new_path) = @_; 1537 my ($self, $new_path) = @_;
1457 1538
1539 normalise $new_path;
1540
1458 $self->unlink_save; 1541 $self->unlink_save;
1459 1542
1460 delete $cf::MAP{$self->path}; 1543 delete $cf::MAP{$self->path};
1461 $self->{path} = new cf::path $new_path; 1544 $self->{path} = $new_path; $self->path ($self->{path});
1462 $self->path ($self->{path}->as_string);
1463 $cf::MAP{$self->path} = $self; 1545 $cf::MAP{$self->path} = $self;
1464 1546
1465 $self->save; 1547 $self->save;
1466} 1548}
1467 1549
1468sub reset { 1550sub reset {
1469 my ($self) = @_; 1551 my ($self) = @_;
1470 1552
1471 my $lock = cf::lock_acquire "map_data:" . $self->path; 1553 my $lock = cf::lock_acquire "map_data:$self->{path}";
1472 1554
1473 return if $self->players; 1555 return if $self->players;
1474 return if $self->{path}{user_rel};#d# 1556 return if $self->isa ("ext::map_per_player");#d#
1475 1557
1476 warn "resetting map ", $self->path;#d# 1558 warn "resetting map ", $self->path;#d#
1477 1559
1478 delete $cf::MAP{$self->path}; 1560 delete $cf::MAP{$self->path};
1561
1562 $self->in_memory (cf::MAP_SWAPPED);
1563 $self->clear;
1479 1564
1480 $_->clear_links_to ($self) for values %cf::MAP; 1565 $_->clear_links_to ($self) for values %cf::MAP;
1481 1566
1482 $self->unlink_save; 1567 $self->unlink_save;
1483 $self->destroy; 1568 $self->destroy;
1492 $self->reset_timeout (1); 1577 $self->reset_timeout (1);
1493 $self->rename ("{nuke}/" . ($nuke_counter++)); 1578 $self->rename ("{nuke}/" . ($nuke_counter++));
1494 $self->reset; # polite request, might not happen 1579 $self->reset; # polite request, might not happen
1495} 1580}
1496 1581
1497sub customise_for { 1582=item cf::map::unique_maps
1498 my ($map, $ob) = @_;
1499 1583
1500 if ($map->per_player) { 1584Returns an arrayref of paths of all shared maps that have
1501 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1585instantiated unique items. May block.
1502 }
1503 1586
1504 $map 1587=cut
1505}
1506 1588
1507sub emergency_save { 1589sub unique_maps() {
1508 my $freeze_guard = cf::freeze_mainloop; 1590 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1591 or return;
1509 1592
1510 warn "enter emergency perl save\n"; 1593 my @paths;
1511 1594
1512 cf::sync_job { 1595 for (@$files) {
1513 warn "begin emergency player save\n"; 1596 utf8::decode $_;
1514 $_->save for values %cf::PLAYER; 1597 next if /\.pst$/;
1515 warn "end emergency player save\n"; 1598 next unless /^$PATH_SEP/o;
1516 1599
1517 warn "begin emergency map save\n"; 1600 s/\.map$//;
1518 $_->save for values %cf::MAP; 1601 push @paths, $_;
1519 warn "end emergency map save\n";
1520 }; 1602 }
1521 1603
1522 warn "leave emergency perl save\n"; 1604 \@paths
1523} 1605}
1524 1606
1525package cf; 1607package cf;
1526 1608
1527=back 1609=back
1528 1610
1611=head3 cf::object
1612
1613=cut
1614
1615package cf::object;
1616
1617=over 4
1618
1619=item $ob->inv_recursive
1620
1621Returns the inventory of the object _and_ their inventories, recursively.
1622
1623=cut
1624
1625sub inv_recursive_;
1626sub inv_recursive_ {
1627 map { $_, inv_recursive_ $_->inv } @_
1628}
1629
1630sub inv_recursive {
1631 inv_recursive_ inv $_[0]
1632}
1633
1634package cf;
1635
1636=back
1529 1637
1530=head3 cf::object::player 1638=head3 cf::object::player
1531 1639
1532=over 4 1640=over 4
1533 1641
1573 1681
1574=item $player_object->enter_link 1682=item $player_object->enter_link
1575 1683
1576Freezes the player and moves him/her to a special map (C<{link}>). 1684Freezes the player and moves him/her to a special map (C<{link}>).
1577 1685
1578The player should be reaosnably safe there for short amounts of time. You 1686The player should be reasonably safe there for short amounts of time. You
1579I<MUST> call C<leave_link> as soon as possible, though. 1687I<MUST> call C<leave_link> as soon as possible, though.
1580 1688
1689Will never block.
1690
1581=item $player_object->leave_link ($map, $x, $y) 1691=item $player_object->leave_link ($map, $x, $y)
1582 1692
1583Moves the player out of the specila link map onto the given map. If the 1693Moves the player out of the special C<{link}> map onto the specified
1584map is not valid (or omitted), the player will be moved back to the 1694map. If the map is not valid (or omitted), the player will be moved back
1585location he/she was before the call to C<enter_link>, or, if that fails, 1695to the location he/she was before the call to C<enter_link>, or, if that
1586to the emergency map position. 1696fails, to the emergency map position.
1587 1697
1588Might block. 1698Might block.
1589 1699
1590=cut 1700=cut
1701
1702sub link_map {
1703 unless ($LINK_MAP) {
1704 $LINK_MAP = cf::map::find "{link}"
1705 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1706 $LINK_MAP->load;
1707 }
1708
1709 $LINK_MAP
1710}
1591 1711
1592sub cf::object::player::enter_link { 1712sub cf::object::player::enter_link {
1593 my ($self) = @_; 1713 my ($self) = @_;
1594 1714
1595 $self->deactivate_recursive; 1715 $self->deactivate_recursive;
1596 1716
1597 return if $self->map == $LINK_MAP; 1717 return if UNIVERSAL::isa $self->map, "ext::map_link";
1598 1718
1599 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1719 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1600 if $self->map; 1720 if $self->map;
1601 1721
1602 $self->enter_map ($LINK_MAP, 20, 20); 1722 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1603} 1723}
1604 1724
1605sub cf::object::player::leave_link { 1725sub cf::object::player::leave_link {
1606 my ($self, $map, $x, $y) = @_; 1726 my ($self, $map, $x, $y) = @_;
1607 1727
1625 # use -1 or undef as default coordinates, not 0, 0 1745 # use -1 or undef as default coordinates, not 0, 0
1626 ($x, $y) = ($map->enter_x, $map->enter_y) 1746 ($x, $y) = ($map->enter_x, $map->enter_y)
1627 if $x <=0 && $y <= 0; 1747 if $x <=0 && $y <= 0;
1628 1748
1629 $map->load; 1749 $map->load;
1750 $map->load_diag;
1630 1751
1631 return unless $self->contr->active; 1752 return unless $self->contr->active;
1632 $self->activate_recursive; 1753 $self->activate_recursive;
1633 $self->enter_map ($map, $x, $y); 1754 $self->enter_map ($map, $x, $y);
1634} 1755}
1673 my ($self, $path, $x, $y) = @_; 1794 my ($self, $path, $x, $y) = @_;
1674 1795
1675 $self->enter_link; 1796 $self->enter_link;
1676 1797
1677 (async { 1798 (async {
1678 $path = new cf::path $path;
1679
1680 my $map = cf::map::find $path->as_string; 1799 my $map = cf::map::find $path;
1681 $map = $map->customise_for ($self) if $map; 1800 $map = $map->customise_for ($self) if $map;
1682 1801
1683# warn "entering ", $map->path, " at ($x, $y)\n" 1802# warn "entering ", $map->path, " at ($x, $y)\n"
1684# if $map; 1803# if $map;
1685 1804
1686 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1805 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1687 1806
1688 $self->leave_link ($map, $x, $y); 1807 $self->leave_link ($map, $x, $y);
1689 })->prio (1); 1808 })->prio (1);
1690} 1809}
1691 1810
1750 $self->deactivate_recursive; # just to be sure 1869 $self->deactivate_recursive; # just to be sure
1751 unless (eval { 1870 unless (eval {
1752 prepare_random_map $exit 1871 prepare_random_map $exit
1753 if $exit->slaying eq "/!"; 1872 if $exit->slaying eq "/!";
1754 1873
1755 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1874 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1756 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1875 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1757 1876
1758 1; 1877 1;
1759 }) { 1878 }) {
1760 $self->message ("Something went wrong deep within the crossfire server. " 1879 $self->message ("Something went wrong deep within the crossfire server. "
1761 . "I'll try to bring you back to the map you were before. " 1880 . "I'll try to bring you back to the map you were before. "
1762 . "Please report this to the dungeon master", 1881 . "Please report this to the dungeon master!",
1763 cf::NDI_UNIQUE | cf::NDI_RED); 1882 cf::NDI_UNIQUE | cf::NDI_RED);
1764 1883
1765 warn "ERROR in enter_exit: $@"; 1884 warn "ERROR in enter_exit: $@";
1766 $self->leave_link; 1885 $self->leave_link;
1767 } 1886 }
2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2218 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2219 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2101 2220
2102 if (exists $CFG{mlockall}) { 2221 if (exists $CFG{mlockall}) {
2103 eval { 2222 eval {
2104 $CFG{mlockall} ? &mlockall : &munlockall 2223 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2105 and die "WARNING: m(un)lockall failed: $!\n"; 2224 and die "WARNING: m(un)lockall failed: $!\n";
2106 }; 2225 };
2107 warn $@ if $@; 2226 warn $@ if $@;
2108 } 2227 }
2109} 2228}
2120 load_extensions; 2239 load_extensions;
2121 Event::loop; 2240 Event::loop;
2122} 2241}
2123 2242
2124############################################################################# 2243#############################################################################
2125# initialisation 2244# initialisation and cleanup
2245
2246# install some emergency cleanup handlers
2247BEGIN {
2248 for my $signal (qw(INT HUP TERM)) {
2249 Event->signal (
2250 data => WF_AUTOCANCEL,
2251 signal => $signal,
2252 cb => sub {
2253 cf::cleanup "SIG$signal";
2254 },
2255 );
2256 }
2257}
2258
2259sub emergency_save() {
2260 my $freeze_guard = cf::freeze_mainloop;
2261
2262 warn "enter emergency perl save\n";
2263
2264 cf::sync_job {
2265 # use a peculiar iteration method to avoid tripping on perl
2266 # refcount bugs in for. also avoids problems with players
2267 # and maps saved/destroyed asynchronously.
2268 warn "begin emergency player save\n";
2269 for my $login (keys %cf::PLAYER) {
2270 my $pl = $cf::PLAYER{$login} or next;
2271 $pl->valid or next;
2272 $pl->save;
2273 }
2274 warn "end emergency player save\n";
2275
2276 warn "begin emergency map save\n";
2277 for my $path (keys %cf::MAP) {
2278 my $map = $cf::MAP{$path} or next;
2279 $map->valid or next;
2280 $map->save;
2281 }
2282 warn "end emergency map save\n";
2283 };
2284
2285 warn "leave emergency perl save\n";
2286}
2126 2287
2127sub reload() { 2288sub reload() {
2128 # can/must only be called in main 2289 # can/must only be called in main
2129 if ($Coro::current != $Coro::main) { 2290 if ($Coro::current != $Coro::main) {
2130 warn "can only reload from main coroutine\n"; 2291 warn "can only reload from main coroutine\n";
2131 return; 2292 return;
2132 } 2293 }
2133 2294
2134 warn "reloading..."; 2295 warn "reloading...";
2135 2296
2297 warn "freezing server";
2136 my $guard = freeze_mainloop; 2298 my $guard = freeze_mainloop;
2137 cf::emergency_save; 2299 cf::emergency_save;
2138 2300
2301 warn "sync database to disk";
2302 cf::db_sync;
2303 IO::AIO::flush;
2304
2139 eval { 2305 eval {
2140 # if anything goes wrong in here, we should simply crash as we already saved 2306 # if anything goes wrong in here, we should simply crash as we already saved
2141 2307
2142 # cancel all watchers 2308 warn "cancel all watchers";
2143 for (Event::all_watchers) { 2309 for (Event::all_watchers) {
2144 $_->cancel if $_->data & WF_AUTOCANCEL; 2310 $_->cancel if $_->data & WF_AUTOCANCEL;
2145 } 2311 }
2146 2312
2147 # cancel all extension coros 2313 warn "cancel all extension coros";
2148 $_->cancel for values %EXT_CORO; 2314 $_->cancel for values %EXT_CORO;
2149 %EXT_CORO = (); 2315 %EXT_CORO = ();
2150 2316
2317 warn "remove commands";
2318 %COMMAND = ();
2319
2320 warn "remove ext commands";
2321 %EXTCMD = ();
2322
2151 # unload all extensions 2323 warn "unload/nuke all extensions";
2152 for (@exts) { 2324 for my $pkg (@EXTS) {
2153 warn "unloading <$_>"; 2325 warn "... unloading $pkg";
2154 unload_extension $_; 2326
2327 if (my $cb = $pkg->can ("unload")) {
2328 eval {
2329 $cb->($pkg);
2330 1
2331 } or warn "$pkg unloaded, but with errors: $@";
2155 } 2332 }
2156 2333
2334 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg;
2336 }
2337
2157 # unload all modules loaded from $LIBDIR 2338 warn "unload all perl modules loaded from $LIBDIR";
2158 while (my ($k, $v) = each %INC) { 2339 while (my ($k, $v) = each %INC) {
2159 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2160 2341
2161 warn "removing <$k>"; 2342 warn "removing <$k>";
2162 delete $INC{$k}; 2343 delete $INC{$k};
2169 } 2350 }
2170 2351
2171 Symbol::delete_package $k; 2352 Symbol::delete_package $k;
2172 } 2353 }
2173 2354
2174 # sync database to disk
2175 cf::db_sync;
2176 IO::AIO::flush;
2177
2178 # get rid of safe::, as good as possible 2355 warn "get rid of safe::, as good as possible";
2179 Symbol::delete_package "safe::$_" 2356 Symbol::delete_package "safe::$_"
2180 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2357 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2181 2358
2182 # remove register_script_function callbacks
2183 # TODO
2184
2185 # unload cf.pm "a bit" 2359 warn "unload cf.pm \"a bit\"";
2186 delete $INC{"cf.pm"}; 2360 delete $INC{"cf.pm"};
2187 2361
2188 # don't, removes xs symbols, too, 2362 # don't, removes xs symbols, too,
2189 # and global variables created in xs 2363 # and global variables created in xs
2190 #Symbol::delete_package __PACKAGE__; 2364 #Symbol::delete_package __PACKAGE__;
2191 2365
2192 # reload cf.pm
2193 warn "reloading cf.pm"; 2366 warn "reloading cf.pm";
2194 require cf; 2367 require cf;
2195 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2196 2369
2197 # load config and database again 2370 warn "load config and database again";
2198 cf::cfg_load; 2371 cf::cfg_load;
2199 cf::db_load; 2372 cf::db_load;
2200 2373
2201 # load extensions
2202 warn "load extensions"; 2374 warn "load extensions";
2203 cf::load_extensions; 2375 cf::load_extensions;
2204 2376
2205 # reattach attachments to objects 2377 warn "reattach attachments to objects/players";
2206 warn "reattach";
2207 _global_reattach; 2378 _global_reattach;
2379 warn "reattach attachments to maps";
2208 reattach $_ for values %MAP; 2380 reattach $_ for values %MAP;
2209 }; 2381 };
2210 2382
2211 if ($@) { 2383 if ($@) {
2212 warn $@; 2384 warn $@;
2213 warn "error while reloading, exiting."; 2385 warn "error while reloading, exiting.";
2214 exit 1; 2386 exit 1;
2215 } 2387 }
2216 2388
2217 warn "reloaded successfully"; 2389 warn "reloaded";
2218}; 2390};
2219
2220#############################################################################
2221
2222unless ($LINK_MAP) {
2223 $LINK_MAP = cf::map::new;
2224
2225 $LINK_MAP->width (41);
2226 $LINK_MAP->height (41);
2227 $LINK_MAP->alloc;
2228 $LINK_MAP->path ("{link}");
2229 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2230 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2231
2232 # dirty hack because... archetypes are not yet loaded
2233 Event->timer (
2234 after => 10,
2235 cb => sub {
2236 $_[0]->w->cancel;
2237
2238 # provide some exits "home"
2239 my $exit = cf::object::new "exit";
2240
2241 $exit->slaying ($EMERGENCY_POSITION->[0]);
2242 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2243 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2244
2245 $LINK_MAP->insert ($exit->clone, 19, 19);
2246 $LINK_MAP->insert ($exit->clone, 19, 20);
2247 $LINK_MAP->insert ($exit->clone, 19, 21);
2248 $LINK_MAP->insert ($exit->clone, 20, 19);
2249 $LINK_MAP->insert ($exit->clone, 20, 21);
2250 $LINK_MAP->insert ($exit->clone, 21, 19);
2251 $LINK_MAP->insert ($exit->clone, 21, 20);
2252 $LINK_MAP->insert ($exit->clone, 21, 21);
2253
2254 $exit->destroy;
2255 });
2256
2257 $LINK_MAP->{deny_save} = 1;
2258 $LINK_MAP->{deny_reset} = 1;
2259
2260 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2261}
2262
2263register "<global>", __PACKAGE__;
2264 2391
2265register_command "reload" => sub { 2392register_command "reload" => sub {
2266 my ($who, $arg) = @_; 2393 my ($who, $arg) = @_;
2267 2394
2268 if ($who->flag (FLAG_WIZ)) { 2395 if ($who->flag (FLAG_WIZ)) {
2278 reentrant => 0, 2405 reentrant => 0,
2279 prio => 0, 2406 prio => 0,
2280 at => $NEXT_TICK || $TICK, 2407 at => $NEXT_TICK || $TICK,
2281 data => WF_AUTOCANCEL, 2408 data => WF_AUTOCANCEL,
2282 cb => sub { 2409 cb => sub {
2410 $NOW = Event::time;
2411
2283 cf::server_tick; # one server iteration 2412 cf::server_tick; # one server iteration
2284 $RUNTIME += $TICK; 2413 $RUNTIME += $TICK;
2285 $NEXT_TICK += $TICK; 2414 $NEXT_TICK += $TICK;
2415
2416 $WAIT_FOR_TICK->broadcast;
2417 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2286 2418
2287 # if we are delayed by four ticks or more, skip them all 2419 # if we are delayed by four ticks or more, skip them all
2288 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2420 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2289 2421
2290 $TICK_WATCHER->at ($NEXT_TICK); 2422 $TICK_WATCHER->at ($NEXT_TICK);
2292 }, 2424 },
2293); 2425);
2294 2426
2295IO::AIO::max_poll_time $TICK * 0.2; 2427IO::AIO::max_poll_time $TICK * 0.2;
2296 2428
2297Event->io ( 2429$AIO_POLL_WATCHER = Event->io (
2298 fd => IO::AIO::poll_fileno, 2430 fd => IO::AIO::poll_fileno,
2299 poll => 'r', 2431 poll => 'r',
2300 prio => 5, 2432 prio => 5,
2301 data => WF_AUTOCANCEL, 2433 data => WF_AUTOCANCEL,
2302 cb => \&IO::AIO::poll_cb, 2434 cb => \&IO::AIO::poll_cb,
2303); 2435);
2304 2436
2305Event->timer ( 2437$WRITE_RUNTIME_WATCHER = Event->timer (
2306 data => WF_AUTOCANCEL, 2438 data => WF_AUTOCANCEL,
2307 after => 0, 2439 after => 0,
2308 interval => 10, 2440 interval => 10,
2309 cb => sub { 2441 cb => sub {
2310 (Coro::unblock_sub { 2442 (Coro::unblock_sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines