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.141 by root, Fri Jan 5 20:08:53 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 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;
43our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
44our $NEXT_TICK; 51our $NEXT_TICK;
45our $NOW; 52our $NOW;
46 53
47our %CFG; 54our %CFG;
48 55
49our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 57our $RUNTIME;
51 58
59our %PLAYER; # all users
52our %MAP; # all maps 60our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
54our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
56 69
57binmode STDOUT; 70binmode STDOUT;
58binmode STDERR; 71binmode STDERR;
59 72
60# read virtual server time, if available 73# read virtual server time, if available
… …
68mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
69mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
70mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
71mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
72 85
73# a special map that is always available
74our $LINK_MAP;
75our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
76 87
77############################################################################# 88#############################################################################
78 89
79=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
104 115
105=item %cf::CFG 116=item %cf::CFG
106 117
107Configuration for the server, loaded from C</etc/crossfire/config>, or 118Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 119from wherever your confdir points to.
120
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
122
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
125processing has been done. Call C<< ->wait >> on them to maximise the
126window of cpu time available, or simply to synchronise to the server tick.
109 127
110=back 128=back
111 129
112=cut 130=cut
113 131
… …
117 utf8::encode $msg; 135 utf8::encode $msg;
118 136
119 $msg .= "\n" 137 $msg .= "\n"
120 unless $msg =~ /\n$/; 138 unless $msg =~ /\n$/;
121 139
122 LOG llevError, "cfperl: $msg"; 140 LOG llevError, $msg;
123 }; 141 };
124} 142}
125 143
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
145 163
146$Event::DIED = sub { 164$Event::DIED = sub {
147 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
148}; 166};
149 167
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
155 169
156=over 4 170=over 4
157 171
172=item dumpval $ref
173
158=cut 174=cut
175
176sub dumpval {
177 eval {
178 local $SIG{__DIE__};
179 my $d;
180 if (1) {
181 $d = new Data::Dumper([$_[0]], ["*var"]);
182 $d->Terse(1);
183 $d->Indent(2);
184 $d->Quotekeys(0);
185 $d->Useqq(1);
186 #$d->Bless(...);
187 $d->Seen($_[1]) if @_ > 1;
188 $d = $d->Dump();
189 }
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d
192 } || "[unable to dump $_[0]: '$@']";
193}
159 194
160use JSON::Syck (); # TODO# replace by JSON::PC once working 195use JSON::Syck (); # TODO# replace by JSON::PC once working
161 196
162=item $ref = cf::from_json $json 197=item $ref = cf::from_json $json
163 198
… …
224} 259}
225 260
226sub freeze_mainloop { 261sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
228 263
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
230 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
231 $guard 270 $guard
232} 271}
233 272
234=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
286 } 325 }
287} 326}
288 327
289=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
290 329
291Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
292extension calling this is being unloaded. 331extension calling this is being unloaded.
293 332
294=cut 333=cut
295 334
296sub async_ext(&) { 335sub async_ext(&) {
… …
329} 368}
330 369
331=back 370=back
332 371
333=cut 372=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 373
455############################################################################# 374#############################################################################
456 375
457=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
458 377
… …
905=cut 824=cut
906 825
907sub register_extcmd { 826sub register_extcmd {
908 my ($name, $cb) = @_; 827 my ($name, $cb) = @_;
909 828
910 my $caller = caller;
911 #warn "registering extcmd '$name' to '$caller'";
912
913 $EXTCMD{$name} = [$cb, $caller]; 829 $EXTCMD{$name} = $cb;
914} 830}
915 831
916cf::player->attach ( 832cf::player->attach (
917 on_command => sub { 833 on_command => sub {
918 my ($pl, $name, $params) = @_; 834 my ($pl, $name, $params) = @_;
… …
931 847
932 my $msg = eval { from_json $buf }; 848 my $msg = eval { from_json $buf };
933 849
934 if (ref $msg) { 850 if (ref $msg) {
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 851 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
936 if (my %reply = $cb->[0]->($pl, $msg)) { 852 if (my %reply = $cb->($pl, $msg)) {
937 $pl->ext_reply ($msg->{msgid}, %reply); 853 $pl->ext_reply ($msg->{msgid}, %reply);
938 } 854 }
939 } 855 }
940 } else { 856 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 857 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
943 859
944 cf::override; 860 cf::override;
945 }, 861 },
946); 862);
947 863
948sub register {
949 my ($base, $pkg) = @_;
950
951 #TODO
952}
953
954sub load_extension { 864sub load_extension {
955 my ($path) = @_; 865 my ($path) = @_;
956 866
957 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 867 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
958 my $base = $1; 868 my $base = $1;
959 my $pkg = $1; 869 my $pkg = $1;
960 $pkg =~ s/[^[:word:]]/_/g; 870 $pkg =~ s/[^[:word:]]/_/g;
961 $pkg = "ext::$pkg"; 871 $pkg = "ext::$pkg";
962 872
963 warn "loading '$path' into '$pkg'\n"; 873 warn "... loading '$path' into '$pkg'\n";
964 874
965 open my $fh, "<:utf8", $path 875 open my $fh, "<:utf8", $path
966 or die "$path: $!"; 876 or die "$path: $!";
967 877
968 my $source = 878 my $source =
969 "package $pkg; use strict; use utf8;\n" 879 "package $pkg; use strict; use utf8;\n"
970 . "#line 1 \"$path\"\n{\n" 880 . "#line 1 \"$path\"\n{\n"
971 . (do { local $/; <$fh> }) 881 . (do { local $/; <$fh> })
972 . "\n};\n1"; 882 . "\n};\n1";
973 883
974 eval $source 884 unless (eval $source) {
975 or die $@ ? "$path: $@\n" 885 my $msg = $@ ? "$path: $@\n"
976 : "extension disabled.\n"; 886 : "extension disabled.\n";
977 887 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
978 push @exts, $pkg; 888 warn $@;
979 $ext_pkg{$base} = $pkg; 889 warn "mandatory extension failed to load, exiting.\n";
980 890 exit 1;
981# no strict 'refs'; 891 }
982# @{"$pkg\::ISA"} = ext::; 892 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# } 893 }
997 894
998 # remove commands 895 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} 896}
1023 897
1024sub load_extensions { 898sub load_extensions {
1025 for my $ext (<$LIBDIR/*.ext>) { 899 for my $ext (<$LIBDIR/*.ext>) {
1026 next unless -r $ext; 900 next unless -r $ext;
… …
1030 } or warn "$ext not loaded: $@"; 904 } or warn "$ext not loaded: $@";
1031 } 905 }
1032} 906}
1033 907
1034############################################################################# 908#############################################################################
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 909
1072=head2 CORE EXTENSIONS 910=head2 CORE EXTENSIONS
1073 911
1074Functions and methods that extend core crossfire objects. 912Functions and methods that extend core crossfire objects.
1075 913
914=cut
915
916package cf::player;
917
918use Coro::AIO;
919
1076=head3 cf::player 920=head3 cf::player
1077 921
1078=over 4 922=over 4
1079 923
1080=item cf::player::exists $login 924=item cf::player::find $login
1081 925
1082Returns true when the given account exists. 926Returns the given player object, loading it if necessary (might block).
1083 927
1084=cut 928=cut
1085 929
1086sub cf::player::exists($) { 930sub playerdir($) {
1087 cf::player::find $_[0] 931 cf::localdir
1088 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 932 . "/"
933 . cf::playerdir
934 . "/"
935 . (ref $_[0] ? $_[0]->ob->name : $_[0])
936}
937
938sub path($) {
939 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
940
941 (playerdir $login) . "/$login.pl"
942}
943
944sub find_active($) {
945 $cf::PLAYER{$_[0]}
946 and $cf::PLAYER{$_[0]}->active
947 and $cf::PLAYER{$_[0]}
948}
949
950sub exists($) {
951 my ($login) = @_;
952
953 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login }
955}
956
957sub find($) {
958 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0];
960
961 my $guard = cf::lock_acquire "user_find:$login";
962
963 $cf::PLAYER{$_[0]} || do {
964 my $pl = load_pl path $login
965 or return;
966 $cf::PLAYER{$login} = $pl
967 }
968 }
969}
970
971sub save($) {
972 my ($pl) = @_;
973
974 return if $pl->{deny_save};
975
976 my $path = path $pl;
977 my $guard = cf::lock_acquire "user_save:$path";
978
979 return if $pl->{deny_save};
980
981 aio_mkdir playerdir $pl, 0770;
982 $pl->{last_save} = $cf::RUNTIME;
983
984 $pl->save_pl ($path);
985 Coro::cede;
986}
987
988sub new($) {
989 my ($login) = @_;
990
991 my $self = create;
992
993 $self->ob->name ($login);
994 $self->{deny_save} = 1;
995
996 $cf::PLAYER{$login} = $self;
997
998 $self
999}
1000
1001=item $pl->quit_character
1002
1003Nukes the player without looking back. If logged in, the connection will
1004be destroyed. May block for a long time.
1005
1006=cut
1007
1008sub quit_character {
1009 my ($pl) = @_;
1010
1011 $pl->{deny_save} = 1;
1012 $pl->password ("*"); # this should lock out the player until we nuked the dir
1013
1014 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1015 $pl->deactivate;
1016 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1017 $pl->ns->destroy if $pl->ns;
1018
1019 my $path = playerdir $pl;
1020 my $temp = "$path~$cf::RUNTIME~deleting~";
1021 aio_rename $path, $temp;
1022 delete $cf::PLAYER{$pl->ob->name};
1023 $pl->destroy;
1024 IO::AIO::aio_rmtree $temp;
1025}
1026
1027=item cf::player::list_logins
1028
1029Returns am arrayref of all valid playernames in the system, can take a
1030while and may block, so not sync_job-capable, ever.
1031
1032=cut
1033
1034sub list_logins {
1035 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1036 or return [];
1037
1038 my @logins;
1039
1040 for my $login (@$dirs) {
1041 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1042 aio_read $fh, 0, 512, my $buf, 0 or next;
1043 $buf !~ /^password -------------$/m or next; # official not-valid tag
1044
1045 utf8::decode $login;
1046 push @logins, $login;
1047 }
1048
1049 \@logins
1050}
1051
1052=item $player->maps
1053
1054Returns an arrayref of map paths that are private for this
1055player. May block.
1056
1057=cut
1058
1059sub maps($) {
1060 my ($pl) = @_;
1061
1062 my $files = aio_readdir playerdir $pl
1063 or return;
1064
1065 my @paths;
1066
1067 for (@$files) {
1068 utf8::decode $_;
1069 next if /\.(?:pl|pst)$/;
1070 next unless /^$PATH_SEP/o;
1071
1072 s/\.map$//;
1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1074 }
1075
1076 \@paths
1089} 1077}
1090 1078
1091=item $player->ext_reply ($msgid, $msgtype, %msg) 1079=item $player->ext_reply ($msgid, $msgtype, %msg)
1092 1080
1093Sends an ext reply to the player. 1081Sends an ext reply to the player.
1094 1082
1095=cut 1083=cut
1096 1084
1097sub cf::player::ext_reply($$$%) { 1085sub ext_reply($$$%) {
1098 my ($self, $id, %msg) = @_; 1086 my ($self, $id, %msg) = @_;
1099 1087
1100 $msg{msgid} = $id; 1088 $msg{msgid} = $id;
1101 1089
1102 $self->send ("ext " . to_json \%msg); 1090 $self->send ("ext " . cf::to_json \%msg);
1103} 1091}
1092
1093package cf;
1104 1094
1105=back 1095=back
1106 1096
1107 1097
1108=head3 cf::map 1098=head3 cf::map
… …
1114package cf::map; 1104package cf::map;
1115 1105
1116use Fcntl; 1106use Fcntl;
1117use Coro::AIO; 1107use Coro::AIO;
1118 1108
1109use overload
1110 '""' => \&as_string;
1111
1119our $MAX_RESET = 3600; 1112our $MAX_RESET = 3600;
1120our $DEFAULT_RESET = 3000; 1113our $DEFAULT_RESET = 3000;
1121 1114
1122sub generate_random_map { 1115sub generate_random_map {
1123 my ($path, $rmp) = @_; 1116 my ($self, $rmp) = @_;
1124 1117
1125 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
1126 cf::map::_create_random_map 1119 $self->_create_random_map (
1127 $path,
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1131 $rmp->{exit_on_final_map}, 1123 $rmp->{exit_on_final_map},
1132 $rmp->{xsize}, $rmp->{ysize}, 1124 $rmp->{xsize}, $rmp->{ysize},
1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1125 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1126 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1127 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1128 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}) 1130 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 )
1132}
1133
1134sub register {
1135 my (undef, $regex) = @_;
1136 my $pkg = caller;
1137
1138 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__;
1140
1141 $EXT_MAP{$pkg} = qr<$regex>;
1142}
1143
1144# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146
1147sub normalise {
1148 my ($path, $base) = @_;
1149
1150 # map plan:
1151 #
1152 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched
1154 # ?xxx/... are special absolute paths
1155 # ?random/... random maps
1156 # /... normal maps
1157 # ~user/... per-player map of a specific user
1158
1159 $path =~ s/$PATH_SEP/\//go;
1160
1161 # treat it as relative path if it starts with
1162 # something that looks reasonable
1163 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1164 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1165
1166 $base =~ s{[^/]+/?$}{};
1167 $path = "$base/$path";
1168 }
1169
1170 for ($path) {
1171 redo if s{//}{/};
1172 redo if s{/\.?/}{/};
1173 redo if s{/[^/]+/\.\./}{/};
1174 }
1175
1176 $path
1177}
1178
1179sub new_from_path {
1180 my (undef, $path, $base) = @_;
1181
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183
1184 $path = normalise $path, $base;
1185
1186 for my $pkg (keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) {
1188 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc.
1191 return $self;
1192 }
1193 }
1194
1195 Carp::carp "unable to resolve path '$path'.";
1196 ()
1197}
1198
1199sub init {
1200 my ($self) = @_;
1201
1202 $self
1203}
1204
1205sub as_string {
1206 my ($self) = @_;
1207
1208 "$self->{path}"
1209}
1210
1211# the displayed name, this is a one way mapping
1212sub visible_name {
1213 &as_string
1214}
1215
1216# the original (read-only) location
1217sub load_path {
1218 my ($self) = @_;
1219
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1221}
1222
1223# the temporary/swap location
1224sub save_path {
1225 my ($self) = @_;
1226
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1229}
1230
1231# the unique path, undef == no special unique path
1232sub uniq_path {
1233 my ($self) = @_;
1234
1235 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1236 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1139} 1237}
1140 1238
1141# and all this just because we cannot iterate over 1239# and all this just because we cannot iterate over
1142# all maps in C++... 1240# all maps in C++...
1143sub change_all_map_light { 1241sub change_all_map_light {
… …
1145 1243
1146 $_->change_map_light ($change) 1244 $_->change_map_light ($change)
1147 for grep $_->outdoor, values %cf::MAP; 1245 for grep $_->outdoor, values %cf::MAP;
1148} 1246}
1149 1247
1248sub unlink_save {
1249 my ($self) = @_;
1250
1251 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1254}
1255
1150sub try_load_header($) { 1256sub load_header_from($) {
1151 my ($path) = @_; 1257 my ($self, $path) = @_;
1152 1258
1153 utf8::encode $path; 1259 utf8::encode $path;
1154 aio_open $path, O_RDONLY, 0 1260 aio_open $path, O_RDONLY, 0
1155 or return; 1261 or return;
1156 1262
1157 my $map = cf::map::new 1263 $self->_load_header ($path)
1158 or return; 1264 or return;
1159 1265
1160 # for better error messages only, will be overwritten 1266 $self->{load_path} = $path;
1161 $map->path ($path);
1162 1267
1163 $map->load_header ($path) 1268 1
1269}
1270
1271sub load_orig {
1272 my ($self) = @_;
1273
1274 $self->load_header_from ($self->load_path)
1275}
1276
1277sub load_temp {
1278 my ($self) = @_;
1279
1280 $self->load_header_from ($self->save_path)
1281}
1282
1283sub load_header {
1284 my ($self) = @_;
1285
1286 if ($self->load_temp) {
1287 $self->last_access ((delete $self->{last_access})
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else {
1293 $self->load_orig
1164 or return; 1294 or return;
1165 1295
1166 $map->{load_path} = $path; 1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 }
1167 1301
1168 $map 1302 1
1169} 1303}
1170 1304
1171sub find; 1305sub find;
1172sub find { 1306sub find {
1173 my ($path, $origin) = @_; 1307 my ($path, $origin) = @_;
1174 1308
1175 #warn "find<$path,$origin>\n";#d#
1176
1177 $path = new cf::path $path, $origin && $origin->path; 1309 $path = normalise $path, $origin && $origin->path;
1178 my $key = $path->as_string;
1179 1310
1180 cf::lock_wait "map_find:$key"; 1311 cf::lock_wait "map_find:$path";
1181 1312
1182 $cf::MAP{$key} || do { 1313 $cf::MAP{$path} || do {
1183 my $guard = cf::lock_acquire "map_find:$key"; 1314 my $guard = cf::lock_acquire "map_find:$path";
1184 1315 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; 1316 or return;
1204 1317
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; 1318 $map->{last_save} = $cf::RUNTIME;
1217 1319
1218 Coro::cede; 1320 $map->load_header
1321 or return;
1219 1322
1220 if ($map->should_reset) { 1323 if ($map->should_reset) {
1221 $map->reset; 1324 $map->reset;
1222 undef $guard; 1325 undef $guard;
1223 $map = find $path 1326 $map = find $path
1224 or return; 1327 or return;
1225 } 1328 }
1226 1329
1227 $cf::MAP{$key} = $map 1330 $cf::MAP{$path} = $map
1228 } 1331 }
1229} 1332}
1230 1333
1231sub load { 1334sub load {
1232 my ($self) = @_; 1335 my ($self) = @_;
1233 1336
1234 my $path = $self->{path}; 1337 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1338 my $guard = cf::lock_acquire "map_load:$path";
1236 1339
1237 return if $self->in_memory != cf::MAP_SWAPPED; 1340 return if $self->in_memory != cf::MAP_SWAPPED;
1238 1341
1239 $self->in_memory (cf::MAP_LOADING); 1342 $self->in_memory (cf::MAP_LOADING);
1240 1343
1241 $self->alloc; 1344 $self->alloc;
1242 $self->load_objects ($self->{load_path}, 1) 1345 $self->_load_objects ($self->{load_path}, 1)
1243 or return; 1346 or return;
1244 1347
1245 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1246 if delete $self->{load_original}; 1349 if delete $self->{load_original};
1247 1350
1248 if (my $uniq = $path->uniq_path) { 1351 if (my $uniq = $self->uniq_path) {
1249 utf8::encode $uniq; 1352 utf8::encode $uniq;
1250 if (aio_open $uniq, O_RDONLY, 0) { 1353 if (aio_open $uniq, O_RDONLY, 0) {
1251 $self->clear_unique_items; 1354 $self->clear_unique_items;
1252 $self->load_objects ($uniq, 0); 1355 $self->_load_objects ($uniq, 0);
1253 } 1356 }
1254 } 1357 }
1255 1358
1256 Coro::cede; 1359 Coro::cede;
1257 1360
1258 # now do the right thing for maps 1361 # now do the right thing for maps
1259 $self->link_multipart_objects; 1362 $self->link_multipart_objects;
1260 1363
1261 if ($self->{path}->is_style_map) { 1364 unless ($self->{deny_activate}) {
1262 $self->{deny_save} = 1; 1365 $self->decay_objects;
1263 $self->{deny_reset} = 1;
1264 } else {
1265 $self->fix_auto_apply; 1366 $self->fix_auto_apply;
1266 $self->decay_objects;
1267 $self->update_buttons; 1367 $self->update_buttons;
1368 Coro::cede;
1268 $self->set_darkness_map; 1369 $self->set_darkness_map;
1269 $self->difficulty ($self->estimate_difficulty) 1370 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1371 unless $self->difficulty;
1372 Coro::cede;
1271 $self->activate; 1373 $self->activate;
1272 } 1374 }
1273 1375
1274 Coro::cede;
1275
1276 $self->in_memory (cf::MAP_IN_MEMORY); 1376 $self->in_memory (cf::MAP_IN_MEMORY);
1377}
1378
1379sub customise_for {
1380 my ($self, $ob) = @_;
1381
1382 return find "~" . $ob->name . "/" . $self->{path}
1383 if $self->per_player;
1384
1385 $self
1386}
1387
1388# find and load all maps in the 3x3 area around a map
1389sub load_diag {
1390 my ($map) = @_;
1391
1392 my @diag; # diagonal neighbours
1393
1394 for (0 .. 3) {
1395 my $neigh = $map->tile_path ($_)
1396 or next;
1397 $neigh = find $neigh, $map
1398 or next;
1399 $neigh->load;
1400
1401 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1402 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1403 }
1404
1405 for (@diag) {
1406 my $neigh = find @$_
1407 or next;
1408 $neigh->load;
1409 }
1277} 1410}
1278 1411
1279sub find_sync { 1412sub find_sync {
1280 my ($path, $origin) = @_; 1413 my ($path, $origin) = @_;
1281 1414
1282 cf::sync_job { cf::map::find $path, $origin } 1415 cf::sync_job { find $path, $origin }
1283} 1416}
1284 1417
1285sub do_load_sync { 1418sub do_load_sync {
1286 my ($map) = @_; 1419 my ($map) = @_;
1287 1420
1288 cf::sync_job { $map->load }; 1421 cf::sync_job { $map->load };
1289} 1422}
1290 1423
1424our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async {
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437
1438sub find_async {
1439 my ($path, $origin) = @_;
1440
1441 $path = normalise $path, $origin && $origin->{path};
1442
1443 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 }
1446
1447 $MAP_PREFETCH{$path} = 0;
1448 $MAP_PREFETCHER->ready;
1449
1450 ()
1451}
1452
1291sub save { 1453sub save {
1292 my ($self) = @_; 1454 my ($self) = @_;
1293 1455
1294 my $lock = cf::lock_acquire "map_data:" . $self->path; 1456 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295 1457
1296 $self->{last_save} = $cf::RUNTIME; 1458 $self->{last_save} = $cf::RUNTIME;
1297 1459
1298 return unless $self->dirty; 1460 return unless $self->dirty;
1299 1461
1300 my $save = $self->{path}->save_path; utf8::encode $save; 1462 my $save = $self->save_path; utf8::encode $save;
1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1463 my $uniq = $self->uniq_path; utf8::encode $uniq;
1302 1464
1303 $self->{load_path} = $save; 1465 $self->{load_path} = $save;
1304 1466
1305 return if $self->{deny_save}; 1467 return if $self->{deny_save};
1306 1468
1307 local $self->{last_access} = $self->last_access;#d# 1469 local $self->{last_access} = $self->last_access;#d#
1308 1470
1471 cf::async {
1472 $_->contr->save for $self->players;
1473 };
1474
1309 if ($uniq) { 1475 if ($uniq) {
1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1476 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1311 $self->save_objects ($uniq, cf::IO_UNIQUES); 1477 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1312 } else { 1478 } else {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1479 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1314 } 1480 }
1315} 1481}
1316 1482
1317sub swap_out { 1483sub swap_out {
1318 my ($self) = @_; 1484 my ($self) = @_;
… …
1332 1498
1333sub reset_at { 1499sub reset_at {
1334 my ($self) = @_; 1500 my ($self) = @_;
1335 1501
1336 # TODO: safety, remove and allow resettable per-player maps 1502 # TODO: safety, remove and allow resettable per-player maps
1337 return 1e99 if $self->{path}{user_rel}; 1503 return 1e99 if $self->isa ("ext::map_per_player");
1338 return 1e99 if $self->{deny_reset}; 1504 return 1e99 if $self->{deny_reset};
1339 1505
1340 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1341 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1342 1508
… …
1347 my ($self) = @_; 1513 my ($self) = @_;
1348 1514
1349 $self->reset_at <= $cf::RUNTIME 1515 $self->reset_at <= $cf::RUNTIME
1350} 1516}
1351 1517
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 { 1518sub rename {
1361 my ($self, $new_path) = @_; 1519 my ($self, $new_path) = @_;
1362 1520
1521 normalise $new_path;
1522
1363 $self->unlink_save; 1523 $self->unlink_save;
1364 1524
1365 delete $cf::MAP{$self->path}; 1525 delete $cf::MAP{$self->path};
1366 $self->{path} = new cf::path $new_path; 1526 $self->{path} = $new_path; $self->path ($self->{path});
1367 $self->path ($self->{path}->as_string);
1368 $cf::MAP{$self->path} = $self; 1527 $cf::MAP{$self->path} = $self;
1369 1528
1370 $self->save; 1529 $self->save;
1371} 1530}
1372 1531
1373sub reset { 1532sub reset {
1374 my ($self) = @_; 1533 my ($self) = @_;
1375 1534
1376 my $lock = cf::lock_acquire "map_data:" . $self->path; 1535 my $lock = cf::lock_acquire "map_data:$self->{path}";
1377 1536
1378 return if $self->players; 1537 return if $self->players;
1379 return if $self->{path}{user_rel};#d# 1538 return if $self->isa ("ext::map_per_player");#d#
1380 1539
1381 warn "resetting map ", $self->path;#d# 1540 warn "resetting map ", $self->path;#d#
1382 1541
1383 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1543
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear;
1384 1546
1385 $_->clear_links_to ($self) for values %cf::MAP; 1547 $_->clear_links_to ($self) for values %cf::MAP;
1386 1548
1387 $self->unlink_save; 1549 $self->unlink_save;
1388 $self->destroy; 1550 $self->destroy;
… …
1397 $self->reset_timeout (1); 1559 $self->reset_timeout (1);
1398 $self->rename ("{nuke}/" . ($nuke_counter++)); 1560 $self->rename ("{nuke}/" . ($nuke_counter++));
1399 $self->reset; # polite request, might not happen 1561 $self->reset; # polite request, might not happen
1400} 1562}
1401 1563
1402sub customise_for { 1564=item cf::map::unique_maps
1403 my ($map, $ob) = @_;
1404 1565
1405 if ($map->per_player) { 1566Returns an arrayref of paths of all shared maps that have
1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1567instantiated unique items. May block.
1407 }
1408 1568
1409 $map 1569=cut
1410}
1411 1570
1412sub emergency_save { 1571sub unique_maps() {
1413 my $freeze_guard = cf::freeze_mainloop; 1572 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1573 or return;
1414 1574
1415 warn "enter emergency map save\n"; 1575 my @paths;
1416 1576
1417 cf::sync_job { 1577 for (@$files) {
1418 warn "begin emergency map save\n"; 1578 utf8::decode $_;
1419 $_->save for values %cf::MAP; 1579 next if /\.pst$/;
1580 next unless /^$PATH_SEP/o;
1581
1582 s/\.map$//;
1583 push @paths, $_;
1420 }; 1584 }
1421 1585
1422 warn "end emergency map save\n"; 1586 \@paths
1423} 1587}
1424 1588
1425package cf; 1589package cf;
1426 1590
1427=back 1591=back
1428 1592
1593=head3 cf::object
1594
1595=cut
1596
1597package cf::object;
1598
1599=over 4
1600
1601=item $ob->inv_recursive
1602
1603Returns the inventory of the object _and_ their inventories, recursively.
1604
1605=cut
1606
1607sub inv_recursive_;
1608sub inv_recursive_ {
1609 map { $_, inv_recursive_ $_->inv } @_
1610}
1611
1612sub inv_recursive {
1613 inv_recursive_ inv $_[0]
1614}
1615
1616package cf;
1617
1618=back
1429 1619
1430=head3 cf::object::player 1620=head3 cf::object::player
1431 1621
1432=over 4 1622=over 4
1433 1623
… …
1473 1663
1474=item $player_object->enter_link 1664=item $player_object->enter_link
1475 1665
1476Freezes the player and moves him/her to a special map (C<{link}>). 1666Freezes the player and moves him/her to a special map (C<{link}>).
1477 1667
1478The player should be reaosnably safe there for short amounts of time. You 1668The player should be reasonably safe there for short amounts of time. You
1479I<MUST> call C<leave_link> as soon as possible, though. 1669I<MUST> call C<leave_link> as soon as possible, though.
1480 1670
1671Will never block.
1672
1481=item $player_object->leave_link ($map, $x, $y) 1673=item $player_object->leave_link ($map, $x, $y)
1482 1674
1483Moves the player out of the specila link map onto the given map. If the 1675Moves 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 1676map. 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, 1677to the location he/she was before the call to C<enter_link>, or, if that
1486to the emergency map position. 1678fails, to the emergency map position.
1487 1679
1488Might block. 1680Might block.
1489 1681
1490=cut 1682=cut
1683
1684sub link_map {
1685 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1688 $LINK_MAP->load;
1689 }
1690
1691 $LINK_MAP
1692}
1491 1693
1492sub cf::object::player::enter_link { 1694sub cf::object::player::enter_link {
1493 my ($self) = @_; 1695 my ($self) = @_;
1494 1696
1495 $self->deactivate_recursive; 1697 $self->deactivate_recursive;
1496 1698
1497 return if $self->map == $LINK_MAP; 1699 return if UNIVERSAL::isa $self->map, "ext::map_link";
1498 1700
1499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1500 if $self->map; 1702 if $self->map;
1501 1703
1502 $self->enter_map ($LINK_MAP, 20, 20); 1704 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1503} 1705}
1504 1706
1505sub cf::object::player::leave_link { 1707sub cf::object::player::leave_link {
1506 my ($self, $map, $x, $y) = @_; 1708 my ($self, $map, $x, $y) = @_;
1507 1709
… …
1525 # use -1 or undef as default coordinates, not 0, 0 1727 # use -1 or undef as default coordinates, not 0, 0
1526 ($x, $y) = ($map->enter_x, $map->enter_y) 1728 ($x, $y) = ($map->enter_x, $map->enter_y)
1527 if $x <=0 && $y <= 0; 1729 if $x <=0 && $y <= 0;
1528 1730
1529 $map->load; 1731 $map->load;
1732 $map->load_diag;
1530 1733
1734 return unless $self->contr->active;
1531 $self->activate_recursive; 1735 $self->activate_recursive;
1532 $self->enter_map ($map, $x, $y); 1736 $self->enter_map ($map, $x, $y);
1533} 1737}
1534 1738
1535cf::player->attach ( 1739cf::player->attach (
… …
1547 my ($pl) = @_; 1751 my ($pl) = @_;
1548 1752
1549 # try to abort aborted map switching on player login :) 1753 # try to abort aborted map switching on player login :)
1550 # should happen only on crashes 1754 # should happen only on crashes
1551 if ($pl->ob->{_link_pos}) { 1755 if ($pl->ob->{_link_pos}) {
1552
1553 $pl->ob->enter_link; 1756 $pl->ob->enter_link;
1554 (async { 1757 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1758 # 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 1759 # and this sleep increases chances of the player not ending up in scorn
1557 $pl->ob->reply (undef, 1760 $pl->ob->reply (undef,
… …
1573 my ($self, $path, $x, $y) = @_; 1776 my ($self, $path, $x, $y) = @_;
1574 1777
1575 $self->enter_link; 1778 $self->enter_link;
1576 1779
1577 (async { 1780 (async {
1578 $path = new cf::path $path;
1579
1580 my $map = cf::map::find $path->as_string; 1781 my $map = cf::map::find $path;
1581 $map = $map->customise_for ($self) if $map; 1782 $map = $map->customise_for ($self) if $map;
1582 1783
1583# warn "entering ", $map->path, " at ($x, $y)\n" 1784# warn "entering ", $map->path, " at ($x, $y)\n"
1584# if $map; 1785# if $map;
1585 1786
1586 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1787 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1587 1788
1588 $self->leave_link ($map, $x, $y); 1789 $self->leave_link ($map, $x, $y);
1589 })->prio (1); 1790 })->prio (1);
1590} 1791}
1591 1792
… …
1650 $self->deactivate_recursive; # just to be sure 1851 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1852 unless (eval {
1652 prepare_random_map $exit 1853 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1854 if $exit->slaying eq "/!";
1654 1855
1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1858
1658 1; 1859 1;
1659 }) { 1860 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1861 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "I'll try to bring you back to the map you were before. " 1862 . "I'll try to bring you back to the map you were before. "
1662 . "Please report this to the dungeon master", 1863 . "Please report this to the dungeon master!",
1663 cf::NDI_UNIQUE | cf::NDI_RED); 1864 cf::NDI_UNIQUE | cf::NDI_RED);
1664 1865
1665 warn "ERROR in enter_exit: $@"; 1866 warn "ERROR in enter_exit: $@";
1666 $self->leave_link; 1867 $self->leave_link;
1667 } 1868 }
… …
1999 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2200 $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}; 2201 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001 2202
2002 if (exists $CFG{mlockall}) { 2203 if (exists $CFG{mlockall}) {
2003 eval { 2204 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall 2205 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2005 and die "WARNING: m(un)lockall failed: $!\n"; 2206 and die "WARNING: m(un)lockall failed: $!\n";
2006 }; 2207 };
2007 warn $@ if $@; 2208 warn $@ if $@;
2008 } 2209 }
2009} 2210}
… …
2020 load_extensions; 2221 load_extensions;
2021 Event::loop; 2222 Event::loop;
2022} 2223}
2023 2224
2024############################################################################# 2225#############################################################################
2025# initialisation 2226# initialisation and cleanup
2227
2228# install some emergency cleanup handlers
2229BEGIN {
2230 for my $signal (qw(INT HUP TERM)) {
2231 Event->signal (
2232 data => WF_AUTOCANCEL,
2233 signal => $signal,
2234 cb => sub {
2235 cf::cleanup "SIG$signal";
2236 },
2237 );
2238 }
2239}
2240
2241sub emergency_save() {
2242 my $freeze_guard = cf::freeze_mainloop;
2243
2244 warn "enter emergency perl save\n";
2245
2246 cf::sync_job {
2247 # use a peculiar iteration method to avoid tripping on perl
2248 # refcount bugs in for. also avoids problems with players
2249 # and maps saved/destroyed asynchronously.
2250 warn "begin emergency player save\n";
2251 for my $login (keys %cf::PLAYER) {
2252 my $pl = $cf::PLAYER{$login} or next;
2253 $pl->valid or next;
2254 $pl->save;
2255 }
2256 warn "end emergency player save\n";
2257
2258 warn "begin emergency map save\n";
2259 for my $path (keys %cf::MAP) {
2260 my $map = $cf::MAP{$path} or next;
2261 $map->valid or next;
2262 $map->save;
2263 }
2264 warn "end emergency map save\n";
2265 };
2266
2267 warn "leave emergency perl save\n";
2268}
2026 2269
2027sub reload() { 2270sub reload() {
2028 # can/must only be called in main 2271 # can/must only be called in main
2029 if ($Coro::current != $Coro::main) { 2272 if ($Coro::current != $Coro::main) {
2030 warn "can only reload from main coroutine\n"; 2273 warn "can only reload from main coroutine\n";
2031 return; 2274 return;
2032 } 2275 }
2033 2276
2034 warn "reloading..."; 2277 warn "reloading...";
2035 2278
2279 warn "freezing server";
2036 my $guard = freeze_mainloop; 2280 my $guard = freeze_mainloop;
2037 cf::emergency_save; 2281 cf::emergency_save;
2038 2282
2283 warn "sync database to disk";
2284 cf::db_sync;
2285 IO::AIO::flush;
2286
2039 eval { 2287 eval {
2040 # if anything goes wrong in here, we should simply crash as we already saved 2288 # if anything goes wrong in here, we should simply crash as we already saved
2041 2289
2042 # cancel all watchers 2290 warn "cancel all watchers";
2043 for (Event::all_watchers) { 2291 for (Event::all_watchers) {
2044 $_->cancel if $_->data & WF_AUTOCANCEL; 2292 $_->cancel if $_->data & WF_AUTOCANCEL;
2045 } 2293 }
2046 2294
2047 # cancel all extension coros 2295 warn "cancel all extension coros";
2048 $_->cancel for values %EXT_CORO; 2296 $_->cancel for values %EXT_CORO;
2049 %EXT_CORO = (); 2297 %EXT_CORO = ();
2050 2298
2299 warn "remove commands";
2300 %COMMAND = ();
2301
2302 warn "remove ext commands";
2303 %EXTCMD = ();
2304
2051 # unload all extensions 2305 warn "unload/nuke all extensions";
2052 for (@exts) { 2306 for my $pkg (@EXTS) {
2053 warn "unloading <$_>"; 2307 warn "... unloading $pkg";
2054 unload_extension $_; 2308
2309 if (my $cb = $pkg->can ("unload")) {
2310 eval {
2311 $cb->($pkg);
2312 1
2313 } or warn "$pkg unloaded, but with errors: $@";
2055 } 2314 }
2056 2315
2316 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg;
2318 }
2319
2057 # unload all modules loaded from $LIBDIR 2320 warn "unload all perl modules loaded from $LIBDIR";
2058 while (my ($k, $v) = each %INC) { 2321 while (my ($k, $v) = each %INC) {
2059 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2060 2323
2061 warn "removing <$k>"; 2324 warn "removing <$k>";
2062 delete $INC{$k}; 2325 delete $INC{$k};
… …
2069 } 2332 }
2070 2333
2071 Symbol::delete_package $k; 2334 Symbol::delete_package $k;
2072 } 2335 }
2073 2336
2074 # sync database to disk
2075 cf::db_sync;
2076 IO::AIO::flush;
2077
2078 # get rid of safe::, as good as possible 2337 warn "get rid of safe::, as good as possible";
2079 Symbol::delete_package "safe::$_" 2338 Symbol::delete_package "safe::$_"
2080 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2339 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2081 2340
2082 # remove register_script_function callbacks
2083 # TODO
2084
2085 # unload cf.pm "a bit" 2341 warn "unload cf.pm \"a bit\"";
2086 delete $INC{"cf.pm"}; 2342 delete $INC{"cf.pm"};
2087 2343
2088 # don't, removes xs symbols, too, 2344 # don't, removes xs symbols, too,
2089 # and global variables created in xs 2345 # and global variables created in xs
2090 #Symbol::delete_package __PACKAGE__; 2346 #Symbol::delete_package __PACKAGE__;
2091 2347
2092 # reload cf.pm
2093 warn "reloading cf.pm"; 2348 warn "reloading cf.pm";
2094 require cf; 2349 require cf;
2095 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2096 2351
2097 # load config and database again 2352 warn "load config and database again";
2098 cf::cfg_load; 2353 cf::cfg_load;
2099 cf::db_load; 2354 cf::db_load;
2100 2355
2101 # load extensions
2102 warn "load extensions"; 2356 warn "load extensions";
2103 cf::load_extensions; 2357 cf::load_extensions;
2104 2358
2105 # reattach attachments to objects 2359 warn "reattach attachments to objects/players";
2106 warn "reattach";
2107 _global_reattach; 2360 _global_reattach;
2361 warn "reattach attachments to maps";
2362 reattach $_ for values %MAP;
2108 }; 2363 };
2109 2364
2110 if ($@) { 2365 if ($@) {
2111 warn $@; 2366 warn $@;
2112 warn "error while reloading, exiting."; 2367 warn "error while reloading, exiting.";
2113 exit 1; 2368 exit 1;
2114 } 2369 }
2115 2370
2116 warn "reloaded successfully"; 2371 warn "reloaded";
2117}; 2372};
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 2373
2164register_command "reload" => sub { 2374register_command "reload" => sub {
2165 my ($who, $arg) = @_; 2375 my ($who, $arg) = @_;
2166 2376
2167 if ($who->flag (FLAG_WIZ)) { 2377 if ($who->flag (FLAG_WIZ)) {
… …
2177 reentrant => 0, 2387 reentrant => 0,
2178 prio => 0, 2388 prio => 0,
2179 at => $NEXT_TICK || $TICK, 2389 at => $NEXT_TICK || $TICK,
2180 data => WF_AUTOCANCEL, 2390 data => WF_AUTOCANCEL,
2181 cb => sub { 2391 cb => sub {
2392 $NOW = Event::time;
2393
2182 cf::server_tick; # one server iteration 2394 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2395 $RUNTIME += $TICK;
2184 $NEXT_TICK += $TICK; 2396 $NEXT_TICK += $TICK;
2397
2398 $WAIT_FOR_TICK->broadcast;
2399 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2185 2400
2186 # if we are delayed by four ticks or more, skip them all 2401 # if we are delayed by four ticks or more, skip them all
2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2402 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2188 2403
2189 $TICK_WATCHER->at ($NEXT_TICK); 2404 $TICK_WATCHER->at ($NEXT_TICK);
… …
2191 }, 2406 },
2192); 2407);
2193 2408
2194IO::AIO::max_poll_time $TICK * 0.2; 2409IO::AIO::max_poll_time $TICK * 0.2;
2195 2410
2196Event->io ( 2411$AIO_POLL_WATCHER = Event->io (
2197 fd => IO::AIO::poll_fileno, 2412 fd => IO::AIO::poll_fileno,
2198 poll => 'r', 2413 poll => 'r',
2199 prio => 5, 2414 prio => 5,
2200 data => WF_AUTOCANCEL, 2415 data => WF_AUTOCANCEL,
2201 cb => \&IO::AIO::poll_cb, 2416 cb => \&IO::AIO::poll_cb,
2202); 2417);
2203 2418
2204Event->timer ( 2419$WRITE_RUNTIME_WATCHER = Event->timer (
2205 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2206 after => 0, 2421 after => 0,
2207 interval => 10, 2422 interval => 10,
2208 cb => sub { 2423 cb => sub {
2209 (Coro::unblock_sub { 2424 (Coro::unblock_sub {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines