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.140 by root, Fri Jan 5 20:04:02 2007 UTC vs.
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines