ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.141 by root, Fri Jan 5 20:08:53 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 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
286 } 319 }
287} 320}
288 321
289=item $coro = cf::async_ext { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
290 323
291Like async, but this coro is automcatially being canceled when the 324Like async, but this coro is automatically being canceled when the
292extension calling this is being unloaded. 325extension calling this is being unloaded.
293 326
294=cut 327=cut
295 328
296sub async_ext(&) { 329sub async_ext(&) {
305 338
306 $coro 339 $coro
307} 340}
308 341
309sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
310 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
311 346
312 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
313 or return; 348 or return;
314 349
329} 364}
330 365
331=back 366=back
332 367
333=cut 368=cut
334
335#############################################################################
336
337package cf::path;
338
339sub new {
340 my ($class, $path, $base) = @_;
341
342 $path = $path->as_string if ref $path;
343
344 my $self = bless { }, $class;
345
346 # {... are special paths that are not touched
347 # ?xxx/... are special absolute paths
348 # ?random/... random maps
349 # /! non-realised random map exit
350 # /... normal maps
351 # ~/... per-player maps without a specific player (DO NOT USE)
352 # ~user/... per-player map of a specific user
353
354 if ($path =~ /^{/) {
355 # fine as it is
356 } elsif ($path =~ s{^\?random/}{}) {
357 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
358 $self->{random} = cf::from_json $data;
359 } else {
360 if ($path =~ s{^~([^/]+)?}{}) {
361 $self->{user_rel} = 1;
362
363 if (defined $1) {
364 $self->{user} = $1;
365 } elsif ($base =~ m{^~([^/]+)/}) {
366 $self->{user} = $1;
367 } else {
368 warn "cannot resolve user-relative path without user <$path,$base>\n";
369 }
370 } elsif ($path =~ /^\//) {
371 # already absolute
372 } else {
373 $base =~ s{[^/]+/?$}{};
374 return $class->new ("$base/$path");
375 }
376
377 for ($path) {
378 redo if s{/\.?/}{/};
379 redo if s{/[^/]+/\.\./}{/};
380 }
381 }
382
383 $self->{path} = $path;
384
385 $self
386}
387
388# the name / primary key / in-game path
389sub as_string {
390 my ($self) = @_;
391
392 $self->{user_rel} ? "~$self->{user}$self->{path}"
393 : $self->{random} ? "?random/$self->{path}"
394 : $self->{path}
395}
396
397# the displayed name, this is a one way mapping
398sub visible_name {
399 my ($self) = @_;
400
401# if (my $rmp = $self->{random}) {
402# # todo: be more intelligent about this
403# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
404# } else {
405 $self->as_string
406# }
407}
408
409# escape the /'s in the path
410sub _escaped_path {
411 # ∕ is U+2215
412 (my $path = $_[0]{path}) =~ s/\//∕/g;
413 $path
414}
415
416# the original (read-only) location
417sub load_path {
418 my ($self) = @_;
419
420 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
421}
422
423# the temporary/swap location
424sub save_path {
425 my ($self) = @_;
426
427 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
428 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
429 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
430}
431
432# the unique path, might be eq to save_path
433sub uniq_path {
434 my ($self) = @_;
435
436 $self->{user_rel} || $self->{random}
437 ? undef
438 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
439}
440
441# return random map parameters, or undef
442sub random_map_params {
443 my ($self) = @_;
444
445 $self->{random}
446}
447
448# this is somewhat ugly, but style maps do need special treatment
449sub is_style_map {
450 $_[0]{path} =~ m{^/styles/}
451}
452
453package cf;
454 369
455############################################################################# 370#############################################################################
456 371
457=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
458 373
905=cut 820=cut
906 821
907sub register_extcmd { 822sub register_extcmd {
908 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
909 824
910 my $caller = caller;
911 #warn "registering extcmd '$name' to '$caller'";
912
913 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
914} 826}
915 827
916cf::player->attach ( 828cf::player->attach (
917 on_command => sub { 829 on_command => sub {
918 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
931 843
932 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
933 845
934 if (ref $msg) { 846 if (ref $msg) {
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
936 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
937 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
938 } 850 }
939 } 851 }
940 } else { 852 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 855
944 cf::override; 856 cf::override;
945 }, 857 },
946); 858);
947 859
948sub register {
949 my ($base, $pkg) = @_;
950
951 #TODO
952}
953
954sub load_extension { 860sub load_extension {
955 my ($path) = @_; 861 my ($path) = @_;
956 862
957 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
958 my $base = $1; 864 my $base = $1;
959 my $pkg = $1; 865 my $pkg = $1;
960 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
961 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
962 868
963 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
964 870
965 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
966 or die "$path: $!"; 872 or die "$path: $!";
967 873
968 my $source = 874 my $source =
969 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
970 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
971 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
972 . "\n};\n1"; 878 . "\n};\n1";
973 879
974 eval $source 880 unless (eval $source) {
975 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
976 : "extension disabled.\n"; 882 : "extension disabled.\n";
977 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
978 push @exts, $pkg; 884 warn $@;
979 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
980 886 exit 1;
981# no strict 'refs'; 887 }
982# @{"$pkg\::ISA"} = ext::; 888 die $@;
983
984 register $base, $pkg;
985}
986
987sub unload_extension {
988 my ($pkg) = @_;
989
990 warn "removing extension $pkg\n";
991
992 # remove hooks
993 #TODO
994# for my $idx (0 .. $#PLUGIN_EVENT) {
995# delete $hook[$idx]{$pkg};
996# } 889 }
997 890
998 # remove commands 891 push @EXTS, $pkg;
999 for my $name (keys %COMMAND) {
1000 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1001
1002 if (@cb) {
1003 $COMMAND{$name} = \@cb;
1004 } else {
1005 delete $COMMAND{$name};
1006 }
1007 }
1008
1009 # remove extcmds
1010 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1011 delete $EXTCMD{$name};
1012 }
1013
1014 if (my $cb = $pkg->can ("unload")) {
1015 eval {
1016 $cb->($pkg);
1017 1
1018 } or warn "$pkg unloaded, but with errors: $@";
1019 }
1020
1021 Symbol::delete_package $pkg;
1022} 892}
1023 893
1024sub load_extensions { 894sub load_extensions {
1025 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
1026 next unless -r $ext; 896 next unless -r $ext;
1030 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1031 } 901 }
1032} 902}
1033 903
1034############################################################################# 904#############################################################################
1035# load/save/clean perl data associated with a map
1036
1037*cf::mapsupport::on_clean = sub {
1038 my ($map) = @_;
1039
1040 my $path = $map->tmpname;
1041 defined $path or return;
1042
1043 unlink "$path.pst";
1044};
1045
1046cf::map->attach (prio => -10000, package => cf::mapsupport::);
1047
1048#############################################################################
1049# load/save perl data associated with player->ob objects
1050
1051sub all_objects(@) {
1052 @_, map all_objects ($_->inv), @_
1053}
1054
1055# TODO: compatibility cruft, remove when no longer needed
1056cf::player->attach (
1057 on_load => sub {
1058 my ($pl, $path) = @_;
1059
1060 for my $o (all_objects $pl->ob) {
1061 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1062 $o->set_ob_key_value ("_perl_data");
1063
1064 %$o = %{ Storable::thaw pack "H*", $value };
1065 }
1066 }
1067 },
1068);
1069
1070#############################################################################
1071 905
1072=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1073 907
1074Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1075 909
910=cut
911
912package cf::player;
913
914use Coro::AIO;
915
1076=head3 cf::player 916=head3 cf::player
1077 917
1078=over 4 918=over 4
1079 919
1080=item cf::player::exists $login 920=item cf::player::find $login
1081 921
1082Returns true when the given account exists. 922Returns the given player object, loading it if necessary (might block).
1083 923
1084=cut 924=cut
1085 925
1086sub cf::player::exists($) { 926sub playerdir($) {
1087 cf::player::find $_[0] 927 cf::localdir
1088 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932}
933
934sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936
937 (playerdir $login) . "/$login.pl"
938}
939
940sub find_active($) {
941 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active
943 and $cf::PLAYER{$_[0]}
944}
945
946sub exists($) {
947 my ($login) = @_;
948
949 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login }
951}
952
953sub find($) {
954 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0];
956
957 my $guard = cf::lock_acquire "user_find:$login";
958
959 $cf::PLAYER{$_[0]} || do {
960 my $pl = load_pl path $login
961 or return;
962 $cf::PLAYER{$login} = $pl
963 }
964 }
965}
966
967sub save($) {
968 my ($pl) = @_;
969
970 return if $pl->{deny_save};
971
972 my $path = path $pl;
973 my $guard = cf::lock_acquire "user_save:$path";
974
975 return if $pl->{deny_save};
976
977 aio_mkdir playerdir $pl, 0770;
978 $pl->{last_save} = $cf::RUNTIME;
979
980 $pl->save_pl ($path);
981 Coro::cede;
982}
983
984sub new($) {
985 my ($login) = @_;
986
987 my $self = create;
988
989 $self->ob->name ($login);
990 $self->{deny_save} = 1;
991
992 $cf::PLAYER{$login} = $self;
993
994 $self
995}
996
997=item $pl->quit_character
998
999Nukes the player without looking back. If logged in, the connection will
1000be destroyed. May block for a long time.
1001
1002=cut
1003
1004sub quit_character {
1005 my ($pl) = @_;
1006
1007 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1011 $pl->deactivate;
1012 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1013 $pl->ns->destroy if $pl->ns;
1014
1015 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy;
1020 IO::AIO::aio_rmtree $temp;
1021}
1022
1023=item cf::player::list_logins
1024
1025Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever.
1027
1028=cut
1029
1030sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1032 or return [];
1033
1034 my @logins;
1035
1036 for my $login (@$dirs) {
1037 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1038 aio_read $fh, 0, 512, my $buf, 0 or next;
1039 $buf !~ /^password -------------$/m or next; # official not-valid tag
1040
1041 utf8::decode $login;
1042 push @logins, $login;
1043 }
1044
1045 \@logins
1046}
1047
1048=item $player->maps
1049
1050Returns an arrayref of map paths that are private for this
1051player. May block.
1052
1053=cut
1054
1055sub maps($) {
1056 my ($pl) = @_;
1057
1058 my $files = aio_readdir playerdir $pl
1059 or return;
1060
1061 my @paths;
1062
1063 for (@$files) {
1064 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o;
1067
1068 s/\.map$//;
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 }
1071
1072 \@paths
1089} 1073}
1090 1074
1091=item $player->ext_reply ($msgid, $msgtype, %msg) 1075=item $player->ext_reply ($msgid, $msgtype, %msg)
1092 1076
1093Sends an ext reply to the player. 1077Sends an ext reply to the player.
1094 1078
1095=cut 1079=cut
1096 1080
1097sub cf::player::ext_reply($$$%) { 1081sub ext_reply($$$%) {
1098 my ($self, $id, %msg) = @_; 1082 my ($self, $id, %msg) = @_;
1099 1083
1100 $msg{msgid} = $id; 1084 $msg{msgid} = $id;
1101 1085
1102 $self->send ("ext " . to_json \%msg); 1086 $self->send ("ext " . cf::to_json \%msg);
1103} 1087}
1088
1089package cf;
1104 1090
1105=back 1091=back
1106 1092
1107 1093
1108=head3 cf::map 1094=head3 cf::map
1114package cf::map; 1100package cf::map;
1115 1101
1116use Fcntl; 1102use Fcntl;
1117use Coro::AIO; 1103use Coro::AIO;
1118 1104
1105use overload
1106 '""' => \&as_string;
1107
1119our $MAX_RESET = 3600; 1108our $MAX_RESET = 3600;
1120our $DEFAULT_RESET = 3000; 1109our $DEFAULT_RESET = 3000;
1121 1110
1122sub generate_random_map { 1111sub generate_random_map {
1123 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1124 1113
1125 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1126 cf::map::_create_random_map 1115 $self->_create_random_map (
1127 $path,
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1131 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1132 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1121 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1122 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1123 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1124 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}) 1126 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 )
1128}
1129
1130sub register {
1131 my (undef, $regex) = @_;
1132 my $pkg = caller;
1133
1134 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__;
1136
1137 $EXT_MAP{$pkg} = qr<$regex>;
1138}
1139
1140# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142
1143sub normalise {
1144 my ($path, $base) = @_;
1145
1146 # map plan:
1147 #
1148 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched
1150 # ?xxx/... are special absolute paths
1151 # ?random/... random maps
1152 # /... normal maps
1153 # ~user/... per-player map of a specific user
1154
1155 $path =~ s/$PATH_SEP/\//go;
1156
1157 # treat it as relative path if it starts with
1158 # something that looks reasonable
1159 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1160 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1161
1162 $base =~ s{[^/]+/?$}{};
1163 $path = "$base/$path";
1164 }
1165
1166 for ($path) {
1167 redo if s{//}{/};
1168 redo if s{/\.?/}{/};
1169 redo if s{/[^/]+/\.\./}{/};
1170 }
1171
1172 $path
1173}
1174
1175sub new_from_path {
1176 my (undef, $path, $base) = @_;
1177
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179
1180 $path = normalise $path, $base;
1181
1182 for my $pkg (keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) {
1184 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc.
1187 return $self;
1188 }
1189 }
1190
1191 Carp::carp "unable to resolve path '$path'.";
1192 ()
1193}
1194
1195sub init {
1196 my ($self) = @_;
1197
1198 $self
1199}
1200
1201sub as_string {
1202 my ($self) = @_;
1203
1204 "$self->{path}"
1205}
1206
1207# the displayed name, this is a one way mapping
1208sub visible_name {
1209 &as_string
1210}
1211
1212# the original (read-only) location
1213sub load_path {
1214 my ($self) = @_;
1215
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1217}
1218
1219# the temporary/swap location
1220sub save_path {
1221 my ($self) = @_;
1222
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1225}
1226
1227# the unique path, undef == no special unique path
1228sub uniq_path {
1229 my ($self) = @_;
1230
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1139} 1233}
1140 1234
1141# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1142# all maps in C++... 1236# all maps in C++...
1143sub change_all_map_light { 1237sub change_all_map_light {
1145 1239
1146 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1147 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1148} 1242}
1149 1243
1244sub unlink_save {
1245 my ($self) = @_;
1246
1247 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1250}
1251
1150sub try_load_header($) { 1252sub load_header_from($) {
1151 my ($path) = @_; 1253 my ($self, $path) = @_;
1152 1254
1153 utf8::encode $path; 1255 utf8::encode $path;
1154 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1155 or return; 1257 or return;
1156 1258
1157 my $map = cf::map::new 1259 $self->_load_header ($path)
1158 or return; 1260 or return;
1159 1261
1160 # for better error messages only, will be overwritten 1262 $self->{load_path} = $path;
1161 $map->path ($path);
1162 1263
1163 $map->load_header ($path) 1264 1
1265}
1266
1267sub load_orig {
1268 my ($self) = @_;
1269
1270 $self->load_header_from ($self->load_path)
1271}
1272
1273sub load_temp {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->save_path)
1277}
1278
1279sub load_header {
1280 my ($self) = @_;
1281
1282 if ($self->load_temp) {
1283 $self->last_access ((delete $self->{last_access})
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else {
1289 $self->load_orig
1164 or return; 1290 or return;
1165 1291
1166 $map->{load_path} = $path; 1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 }
1167 1297
1168 $map 1298 1
1169} 1299}
1170 1300
1171sub find; 1301sub find;
1172sub find { 1302sub find {
1173 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1174 1304
1175 #warn "find<$path,$origin>\n";#d#
1176
1177 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1178 my $key = $path->as_string;
1179 1306
1180 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1181 1308
1182 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1183 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1184 1311 my $map = new_from_path cf::map $path
1185 # do it the slow way
1186 my $map = try_load_header $path->save_path;
1187
1188 Coro::cede;
1189
1190 if ($map) {
1191 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d#
1193 # safety
1194 $map->{instantiate_time} = $cf::RUNTIME
1195 if $map->{instantiate_time} > $cf::RUNTIME;
1196 } else {
1197 if (my $rmp = $path->random_map_params) {
1198 $map = generate_random_map $key, $rmp;
1199 } else {
1200 $map = try_load_header $path->load_path;
1201 }
1202
1203 $map or return; 1312 or return;
1204 1313
1205 $map->{load_original} = 1;
1206 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME);
1208 $map->instantiate;
1209
1210 # per-player maps become, after loading, normal maps
1211 $map->per_player (0) if $path->{user_rel};
1212 }
1213
1214 $map->path ($key);
1215 $map->{path} = $path;
1216 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1217 1315
1218 Coro::cede; 1316 $map->load_header
1317 or return;
1219 1318
1220 if ($map->should_reset) { 1319 if ($map->should_reset) {
1221 $map->reset; 1320 $map->reset;
1222 undef $guard; 1321 undef $guard;
1223 $map = find $path 1322 $map = find $path
1224 or return; 1323 or return;
1225 } 1324 }
1226 1325
1227 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1228 } 1327 }
1229} 1328}
1230 1329
1231sub load { 1330sub load {
1232 my ($self) = @_; 1331 my ($self) = @_;
1233 1332
1234 my $path = $self->{path}; 1333 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1236 1335
1237 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1238 1337
1239 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1240 1339
1241 $self->alloc; 1340 $self->alloc;
1242 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1243 or return; 1342 or return;
1244 1343
1245 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1246 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1247 1346
1248 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1249 utf8::encode $uniq; 1348 utf8::encode $uniq;
1250 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1251 $self->clear_unique_items; 1350 $self->clear_unique_items;
1252 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1253 } 1352 }
1254 } 1353 }
1255 1354
1256 Coro::cede; 1355 Coro::cede;
1257 1356
1258 # now do the right thing for maps 1357 # now do the right thing for maps
1259 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1260 1359
1261 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1262 $self->{deny_save} = 1; 1361 $self->decay_objects;
1263 $self->{deny_reset} = 1;
1264 } else {
1265 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1266 $self->decay_objects;
1267 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1268 $self->set_darkness_map; 1365 $self->set_darkness_map;
1269 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1271 $self->activate; 1369 $self->activate;
1272 } 1370 }
1273 1371
1274 Coro::cede;
1275
1276 $self->in_memory (cf::MAP_IN_MEMORY); 1372 $self->in_memory (cf::MAP_IN_MEMORY);
1373}
1374
1375sub customise_for {
1376 my ($self, $ob) = @_;
1377
1378 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player;
1380
1381 $self
1382}
1383
1384# find and load all maps in the 3x3 area around a map
1385sub load_diag {
1386 my ($map) = @_;
1387
1388 my @diag; # diagonal neighbours
1389
1390 for (0 .. 3) {
1391 my $neigh = $map->tile_path ($_)
1392 or next;
1393 $neigh = find $neigh, $map
1394 or next;
1395 $neigh->load;
1396
1397 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1398 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1399 }
1400
1401 for (@diag) {
1402 my $neigh = find @$_
1403 or next;
1404 $neigh->load;
1405 }
1277} 1406}
1278 1407
1279sub find_sync { 1408sub find_sync {
1280 my ($path, $origin) = @_; 1409 my ($path, $origin) = @_;
1281 1410
1282 cf::sync_job { cf::map::find $path, $origin } 1411 cf::sync_job { find $path, $origin }
1283} 1412}
1284 1413
1285sub do_load_sync { 1414sub do_load_sync {
1286 my ($map) = @_; 1415 my ($map) = @_;
1287 1416
1288 cf::sync_job { $map->load }; 1417 cf::sync_job { $map->load };
1289} 1418}
1290 1419
1420our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async {
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433
1434sub find_async {
1435 my ($path, $origin) = @_;
1436
1437 $path = normalise $path, $origin && $origin->{path};
1438
1439 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 }
1442
1443 $MAP_PREFETCH{$path} = 0;
1444 $MAP_PREFETCHER->ready;
1445
1446 ()
1447}
1448
1291sub save { 1449sub save {
1292 my ($self) = @_; 1450 my ($self) = @_;
1293 1451
1294 my $lock = cf::lock_acquire "map_data:" . $self->path; 1452 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295 1453
1296 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1297 1455
1298 return unless $self->dirty; 1456 return unless $self->dirty;
1299 1457
1300 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1302 1460
1303 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1304 1462
1305 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1306 1464
1307 local $self->{last_access} = $self->last_access;#d# 1465 local $self->{last_access} = $self->last_access;#d#
1308 1466
1467 cf::async {
1468 $_->contr->save for $self->players;
1469 };
1470
1309 if ($uniq) { 1471 if ($uniq) {
1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1311 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1312 } else { 1474 } else {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1475 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1314 } 1476 }
1315} 1477}
1316 1478
1317sub swap_out { 1479sub swap_out {
1318 my ($self) = @_; 1480 my ($self) = @_;
1332 1494
1333sub reset_at { 1495sub reset_at {
1334 my ($self) = @_; 1496 my ($self) = @_;
1335 1497
1336 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1337 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1338 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1339 1501
1340 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1341 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1342 1504
1347 my ($self) = @_; 1509 my ($self) = @_;
1348 1510
1349 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1350} 1512}
1351 1513
1352sub unlink_save {
1353 my ($self) = @_;
1354
1355 utf8::encode (my $save = $self->{path}->save_path);
1356 aioreq_pri 3; IO::AIO::aio_unlink $save;
1357 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1358}
1359
1360sub rename { 1514sub rename {
1361 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1362 1516
1517 normalise $new_path;
1518
1363 $self->unlink_save; 1519 $self->unlink_save;
1364 1520
1365 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1366 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1367 $self->path ($self->{path}->as_string);
1368 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1369 1524
1370 $self->save; 1525 $self->save;
1371} 1526}
1372 1527
1373sub reset { 1528sub reset {
1374 my ($self) = @_; 1529 my ($self) = @_;
1375 1530
1376 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1377 1532
1378 return if $self->players; 1533 return if $self->players;
1379 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1380 1535
1381 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1382 1537
1383 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1384 1542
1385 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1386 1544
1387 $self->unlink_save; 1545 $self->unlink_save;
1388 $self->destroy; 1546 $self->destroy;
1397 $self->reset_timeout (1); 1555 $self->reset_timeout (1);
1398 $self->rename ("{nuke}/" . ($nuke_counter++)); 1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1399 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1400} 1558}
1401 1559
1402sub customise_for { 1560=item cf::map::unique_maps
1403 my ($map, $ob) = @_;
1404 1561
1405 if ($map->per_player) { 1562Returns an arrayref of paths of all shared maps that have
1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1563instantiated unique items. May block.
1407 }
1408 1564
1409 $map 1565=cut
1410}
1411 1566
1412sub emergency_save { 1567sub unique_maps() {
1413 my $freeze_guard = cf::freeze_mainloop; 1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1569 or return;
1414 1570
1415 warn "enter emergency map save\n"; 1571 my @paths;
1416 1572
1417 cf::sync_job { 1573 for (@$files) {
1418 warn "begin emergency map save\n"; 1574 utf8::decode $_;
1419 $_->save for values %cf::MAP; 1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//;
1579 push @paths, $_;
1420 }; 1580 }
1421 1581
1422 warn "end emergency map save\n"; 1582 \@paths
1423} 1583}
1424 1584
1425package cf; 1585package cf;
1426 1586
1427=back 1587=back
1428 1588
1589=head3 cf::object
1590
1591=cut
1592
1593package cf::object;
1594
1595=over 4
1596
1597=item $ob->inv_recursive
1598
1599Returns the inventory of the object _and_ their inventories, recursively.
1600
1601=cut
1602
1603sub inv_recursive_;
1604sub inv_recursive_ {
1605 map { $_, inv_recursive_ $_->inv } @_
1606}
1607
1608sub inv_recursive {
1609 inv_recursive_ inv $_[0]
1610}
1611
1612package cf;
1613
1614=back
1429 1615
1430=head3 cf::object::player 1616=head3 cf::object::player
1431 1617
1432=over 4 1618=over 4
1433 1619
1473 1659
1474=item $player_object->enter_link 1660=item $player_object->enter_link
1475 1661
1476Freezes the player and moves him/her to a special map (C<{link}>). 1662Freezes the player and moves him/her to a special map (C<{link}>).
1477 1663
1478The player should be reaosnably safe there for short amounts of time. You 1664The player should be reasonably safe there for short amounts of time. You
1479I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1480 1666
1667Will never block.
1668
1481=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1482 1670
1483Moves the player out of the specila link map onto the given map. If the 1671Moves the player out of the special C<{link}> map onto the specified
1484map is not valid (or omitted), the player will be moved back to the 1672map. If the map is not valid (or omitted), the player will be moved back
1485location he/she was before the call to C<enter_link>, or, if that fails, 1673to the location he/she was before the call to C<enter_link>, or, if that
1486to the emergency map position. 1674fails, to the emergency map position.
1487 1675
1488Might block. 1676Might block.
1489 1677
1490=cut 1678=cut
1679
1680sub link_map {
1681 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1684 $LINK_MAP->load;
1685 }
1686
1687 $LINK_MAP
1688}
1491 1689
1492sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1493 my ($self) = @_; 1691 my ($self) = @_;
1494 1692
1495 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1496 1694
1497 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1498 1696
1499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1500 if $self->map; 1698 if $self->map;
1501 1699
1502 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1503} 1701}
1504 1702
1505sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1506 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1507 1705
1525 # use -1 or undef as default coordinates, not 0, 0 1723 # use -1 or undef as default coordinates, not 0, 0
1526 ($x, $y) = ($map->enter_x, $map->enter_y) 1724 ($x, $y) = ($map->enter_x, $map->enter_y)
1527 if $x <=0 && $y <= 0; 1725 if $x <=0 && $y <= 0;
1528 1726
1529 $map->load; 1727 $map->load;
1728 $map->load_diag;
1530 1729
1730 return unless $self->contr->active;
1531 $self->activate_recursive; 1731 $self->activate_recursive;
1532 $self->enter_map ($map, $x, $y); 1732 $self->enter_map ($map, $x, $y);
1533} 1733}
1534 1734
1535cf::player->attach ( 1735cf::player->attach (
1547 my ($pl) = @_; 1747 my ($pl) = @_;
1548 1748
1549 # try to abort aborted map switching on player login :) 1749 # try to abort aborted map switching on player login :)
1550 # should happen only on crashes 1750 # should happen only on crashes
1551 if ($pl->ob->{_link_pos}) { 1751 if ($pl->ob->{_link_pos}) {
1552
1553 $pl->ob->enter_link; 1752 $pl->ob->enter_link;
1554 (async { 1753 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1754 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1755 # and this sleep increases chances of the player not ending up in scorn
1557 $pl->ob->reply (undef, 1756 $pl->ob->reply (undef,
1573 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1574 1773
1575 $self->enter_link; 1774 $self->enter_link;
1576 1775
1577 (async { 1776 (async {
1578 $path = new cf::path $path;
1579
1580 my $map = cf::map::find $path->as_string; 1777 my $map = cf::map::find $path;
1581 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1582 1779
1583# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1584# if $map; 1781# if $map;
1585 1782
1586 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1587 1784
1588 $self->leave_link ($map, $x, $y); 1785 $self->leave_link ($map, $x, $y);
1589 })->prio (1); 1786 })->prio (1);
1590} 1787}
1591 1788
1650 $self->deactivate_recursive; # just to be sure 1847 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1848 unless (eval {
1652 prepare_random_map $exit 1849 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1654 1851
1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1854
1658 1; 1855 1;
1659 }) { 1856 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "I'll try to bring you back to the map you were before. " 1858 . "I'll try to bring you back to the map you were before. "
1662 . "Please report this to the dungeon master", 1859 . "Please report this to the dungeon master!",
1663 cf::NDI_UNIQUE | cf::NDI_RED); 1860 cf::NDI_UNIQUE | cf::NDI_RED);
1664 1861
1665 warn "ERROR in enter_exit: $@"; 1862 warn "ERROR in enter_exit: $@";
1666 $self->leave_link; 1863 $self->leave_link;
1667 } 1864 }
1999 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2196 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2000 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2197 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001 2198
2002 if (exists $CFG{mlockall}) { 2199 if (exists $CFG{mlockall}) {
2003 eval { 2200 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall 2201 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2005 and die "WARNING: m(un)lockall failed: $!\n"; 2202 and die "WARNING: m(un)lockall failed: $!\n";
2006 }; 2203 };
2007 warn $@ if $@; 2204 warn $@ if $@;
2008 } 2205 }
2009} 2206}
2020 load_extensions; 2217 load_extensions;
2021 Event::loop; 2218 Event::loop;
2022} 2219}
2023 2220
2024############################################################################# 2221#############################################################################
2025# initialisation 2222# initialisation and cleanup
2223
2224# install some emergency cleanup handlers
2225BEGIN {
2226 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal (
2228 data => WF_AUTOCANCEL,
2229 signal => $signal,
2230 cb => sub {
2231 cf::cleanup "SIG$signal";
2232 },
2233 );
2234 }
2235}
2236
2237sub emergency_save() {
2238 my $freeze_guard = cf::freeze_mainloop;
2239
2240 warn "enter emergency perl save\n";
2241
2242 cf::sync_job {
2243 # use a peculiar iteration method to avoid tripping on perl
2244 # refcount bugs in for. also avoids problems with players
2245 # and maps saved/destroyed asynchronously.
2246 warn "begin emergency player save\n";
2247 for my $login (keys %cf::PLAYER) {
2248 my $pl = $cf::PLAYER{$login} or next;
2249 $pl->valid or next;
2250 $pl->save;
2251 }
2252 warn "end emergency player save\n";
2253
2254 warn "begin emergency map save\n";
2255 for my $path (keys %cf::MAP) {
2256 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next;
2258 $map->save;
2259 }
2260 warn "end emergency map save\n";
2261 };
2262
2263 warn "leave emergency perl save\n";
2264}
2026 2265
2027sub reload() { 2266sub reload() {
2028 # can/must only be called in main 2267 # can/must only be called in main
2029 if ($Coro::current != $Coro::main) { 2268 if ($Coro::current != $Coro::main) {
2030 warn "can only reload from main coroutine\n"; 2269 warn "can only reload from main coroutine\n";
2031 return; 2270 return;
2032 } 2271 }
2033 2272
2034 warn "reloading..."; 2273 warn "reloading...";
2035 2274
2275 warn "freezing server";
2036 my $guard = freeze_mainloop; 2276 my $guard = freeze_mainloop;
2037 cf::emergency_save; 2277 cf::emergency_save;
2038 2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2282
2039 eval { 2283 eval {
2040 # if anything goes wrong in here, we should simply crash as we already saved 2284 # if anything goes wrong in here, we should simply crash as we already saved
2041 2285
2042 # cancel all watchers 2286 warn "cancel all watchers";
2043 for (Event::all_watchers) { 2287 for (Event::all_watchers) {
2044 $_->cancel if $_->data & WF_AUTOCANCEL; 2288 $_->cancel if $_->data & WF_AUTOCANCEL;
2045 } 2289 }
2046 2290
2047 # cancel all extension coros 2291 warn "cancel all extension coros";
2048 $_->cancel for values %EXT_CORO; 2292 $_->cancel for values %EXT_CORO;
2049 %EXT_CORO = (); 2293 %EXT_CORO = ();
2050 2294
2295 warn "remove commands";
2296 %COMMAND = ();
2297
2298 warn "remove ext commands";
2299 %EXTCMD = ();
2300
2051 # unload all extensions 2301 warn "unload/nuke all extensions";
2052 for (@exts) { 2302 for my $pkg (@EXTS) {
2053 warn "unloading <$_>"; 2303 warn "... unloading $pkg";
2054 unload_extension $_; 2304
2305 if (my $cb = $pkg->can ("unload")) {
2306 eval {
2307 $cb->($pkg);
2308 1
2309 } or warn "$pkg unloaded, but with errors: $@";
2055 } 2310 }
2056 2311
2312 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg;
2314 }
2315
2057 # unload all modules loaded from $LIBDIR 2316 warn "unload all perl modules loaded from $LIBDIR";
2058 while (my ($k, $v) = each %INC) { 2317 while (my ($k, $v) = each %INC) {
2059 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2060 2319
2061 warn "removing <$k>"; 2320 warn "removing <$k>";
2062 delete $INC{$k}; 2321 delete $INC{$k};
2069 } 2328 }
2070 2329
2071 Symbol::delete_package $k; 2330 Symbol::delete_package $k;
2072 } 2331 }
2073 2332
2074 # sync database to disk
2075 cf::db_sync;
2076 IO::AIO::flush;
2077
2078 # get rid of safe::, as good as possible 2333 warn "get rid of safe::, as good as possible";
2079 Symbol::delete_package "safe::$_" 2334 Symbol::delete_package "safe::$_"
2080 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2081 2336
2082 # remove register_script_function callbacks
2083 # TODO
2084
2085 # unload cf.pm "a bit" 2337 warn "unload cf.pm \"a bit\"";
2086 delete $INC{"cf.pm"}; 2338 delete $INC{"cf.pm"};
2087 2339
2088 # don't, removes xs symbols, too, 2340 # don't, removes xs symbols, too,
2089 # and global variables created in xs 2341 # and global variables created in xs
2090 #Symbol::delete_package __PACKAGE__; 2342 #Symbol::delete_package __PACKAGE__;
2091 2343
2092 # reload cf.pm
2093 warn "reloading cf.pm"; 2344 warn "reloading cf.pm";
2094 require cf; 2345 require cf;
2095 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2096 2347
2097 # load config and database again 2348 warn "load config and database again";
2098 cf::cfg_load; 2349 cf::cfg_load;
2099 cf::db_load; 2350 cf::db_load;
2100 2351
2101 # load extensions
2102 warn "load extensions"; 2352 warn "load extensions";
2103 cf::load_extensions; 2353 cf::load_extensions;
2104 2354
2105 # reattach attachments to objects 2355 warn "reattach attachments to objects/players";
2106 warn "reattach";
2107 _global_reattach; 2356 _global_reattach;
2357 warn "reattach attachments to maps";
2358 reattach $_ for values %MAP;
2108 }; 2359 };
2109 2360
2110 if ($@) { 2361 if ($@) {
2111 warn $@; 2362 warn $@;
2112 warn "error while reloading, exiting."; 2363 warn "error while reloading, exiting.";
2113 exit 1; 2364 exit 1;
2114 } 2365 }
2115 2366
2116 warn "reloaded successfully"; 2367 warn "reloaded";
2117}; 2368};
2118
2119#############################################################################
2120
2121unless ($LINK_MAP) {
2122 $LINK_MAP = cf::map::new;
2123
2124 $LINK_MAP->width (41);
2125 $LINK_MAP->height (41);
2126 $LINK_MAP->alloc;
2127 $LINK_MAP->path ("{link}");
2128 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2129 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2130
2131 # dirty hack because... archetypes are not yet loaded
2132 Event->timer (
2133 after => 2,
2134 cb => sub {
2135 $_[0]->w->cancel;
2136
2137 # provide some exits "home"
2138 my $exit = cf::object::new "exit";
2139
2140 $exit->slaying ($EMERGENCY_POSITION->[0]);
2141 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2142 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2143
2144 $LINK_MAP->insert ($exit->clone, 19, 19);
2145 $LINK_MAP->insert ($exit->clone, 19, 20);
2146 $LINK_MAP->insert ($exit->clone, 19, 21);
2147 $LINK_MAP->insert ($exit->clone, 20, 19);
2148 $LINK_MAP->insert ($exit->clone, 20, 21);
2149 $LINK_MAP->insert ($exit->clone, 21, 19);
2150 $LINK_MAP->insert ($exit->clone, 21, 20);
2151 $LINK_MAP->insert ($exit->clone, 21, 21);
2152
2153 $exit->destroy;
2154 });
2155
2156 $LINK_MAP->{deny_save} = 1;
2157 $LINK_MAP->{deny_reset} = 1;
2158
2159 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2160}
2161
2162register "<global>", __PACKAGE__;
2163 2369
2164register_command "reload" => sub { 2370register_command "reload" => sub {
2165 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2166 2372
2167 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {
2177 reentrant => 0, 2383 reentrant => 0,
2178 prio => 0, 2384 prio => 0,
2179 at => $NEXT_TICK || $TICK, 2385 at => $NEXT_TICK || $TICK,
2180 data => WF_AUTOCANCEL, 2386 data => WF_AUTOCANCEL,
2181 cb => sub { 2387 cb => sub {
2388 $NOW = Event::time;
2389
2182 cf::server_tick; # one server iteration 2390 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2391 $RUNTIME += $TICK;
2184 $NEXT_TICK += $TICK; 2392 $NEXT_TICK += $TICK;
2393
2394 $WAIT_FOR_TICK->broadcast;
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2185 2396
2186 # if we are delayed by four ticks or more, skip them all 2397 # if we are delayed by four ticks or more, skip them all
2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2188 2399
2189 $TICK_WATCHER->at ($NEXT_TICK); 2400 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines