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.153 by root, Mon Jan 8 23:36:16 2007 UTC vs.
Revision 1.172 by root, Sun Jan 14 13:32:48 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.32 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
43our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
44our $NEXT_TICK; 51our $NEXT_TICK;
45our $NOW; 52our $NOW;
46 53
47our %CFG; 54our %CFG;
48 55
49our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 57our $RUNTIME;
51 58
52our %PLAYER; # all users 59our %PLAYER; # all users
53our %MAP; # all maps 60our %MAP; # all maps
54our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
55our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; # coroutines bound to extensions 63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 69
58binmode STDOUT; 70binmode STDOUT;
59binmode STDERR; 71binmode STDERR;
60 72
61# read virtual server time, if available 73# read virtual server time, if available
… …
69mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
73 85
74# a special map that is always available
75our $LINK_MAP;
76our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
77 87
78############################################################################# 88#############################################################################
79 89
80=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
105 115
106=item %cf::CFG 116=item %cf::CFG
107 117
108Configuration for the server, loaded from C</etc/crossfire/config>, or 118Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 119from wherever your confdir points to.
120
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
122
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
125processing has been done. Call C<< ->wait >> on them to maximise the
126window of cpu time available, or simply to synchronise to the server tick.
110 127
111=back 128=back
112 129
113=cut 130=cut
114 131
… …
146 163
147$Event::DIED = sub { 164$Event::DIED = sub {
148 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
149}; 166};
150 167
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
156 169
157=over 4 170=over 4
158 171
172=item dumpval $ref
173
159=cut 174=cut
175
176sub dumpval {
177 eval {
178 local $SIG{__DIE__};
179 my $d;
180 if (1) {
181 $d = new Data::Dumper([$_[0]], ["*var"]);
182 $d->Terse(1);
183 $d->Indent(2);
184 $d->Quotekeys(0);
185 $d->Useqq(1);
186 #$d->Bless(...);
187 $d->Seen($_[1]) if @_ > 1;
188 $d = $d->Dump();
189 }
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d
192 } || "[unable to dump $_[0]: '$@']";
193}
160 194
161use JSON::Syck (); # TODO# replace by JSON::PC once working 195use JSON::Syck (); # TODO# replace by JSON::PC once working
162 196
163=item $ref = cf::from_json $json 197=item $ref = cf::from_json $json
164 198
… …
225} 259}
226 260
227sub freeze_mainloop { 261sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
229 263
230 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
231 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
232 $guard 270 $guard
233} 271}
234 272
235=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
287 } 325 }
288} 326}
289 327
290=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
291 329
292Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
293extension calling this is being unloaded. 331extension calling this is being unloaded.
294 332
295=cut 333=cut
296 334
297sub async_ext(&) { 335sub async_ext(&) {
… …
330} 368}
331 369
332=back 370=back
333 371
334=cut 372=cut
335
336#############################################################################
337
338package cf::path;
339
340sub new {
341 my ($class, $path, $base) = @_;
342
343 $path = $path->as_string if ref $path;
344
345 my $self = bless { }, $class;
346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
357 } elsif ($path =~ s{^\?random/}{}) {
358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
359 $self->{random} = cf::from_json $data;
360 } else {
361 if ($path =~ s{^~([^/]+)?}{}) {
362 $self->{user_rel} = 1;
363
364 if (defined $1) {
365 $self->{user} = $1;
366 } elsif ($base =~ m{^~([^/]+)/}) {
367 $self->{user} = $1;
368 } else {
369 warn "cannot resolve user-relative path without user <$path,$base>\n";
370 }
371 } elsif ($path =~ /^\//) {
372 # already absolute
373 } else {
374 $base =~ s{[^/]+/?$}{};
375 return $class->new ("$base/$path");
376 }
377
378 for ($path) {
379 redo if s{/\.?/}{/};
380 redo if s{/[^/]+/\.\./}{/};
381 }
382 }
383
384 $self->{path} = $path;
385
386 $self
387}
388
389# the name / primary key / in-game path
390sub as_string {
391 my ($self) = @_;
392
393 $self->{user_rel} ? "~$self->{user}$self->{path}"
394 : $self->{random} ? "?random/$self->{path}"
395 : $self->{path}
396}
397
398# the displayed name, this is a one way mapping
399sub visible_name {
400 my ($self) = @_;
401
402# if (my $rmp = $self->{random}) {
403# # todo: be more intelligent about this
404# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
405# } else {
406 $self->as_string
407# }
408}
409
410# escape the /'s in the path
411sub _escaped_path {
412 # ∕ is U+2215
413 (my $path = $_[0]{path}) =~ s/\//∕/g;
414 $path
415}
416
417# the original (read-only) location
418sub load_path {
419 my ($self) = @_;
420
421 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
422}
423
424# the temporary/swap location
425sub save_path {
426 my ($self) = @_;
427
428 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
429 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
430 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
431}
432
433# the unique path, might be eq to save_path
434sub uniq_path {
435 my ($self) = @_;
436
437 $self->{user_rel} || $self->{random}
438 ? undef
439 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
440}
441
442# return random map parameters, or undef
443sub random_map_params {
444 my ($self) = @_;
445
446 $self->{random}
447}
448
449# this is somewhat ugly, but style maps do need special treatment
450sub is_style_map {
451 $_[0]{path} =~ m{^/styles/}
452}
453
454package cf;
455 373
456############################################################################# 374#############################################################################
457 375
458=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
459 377
… …
585our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
586our @CB_MAP = (); 504our @CB_MAP = ();
587 505
588my %attachment; 506my %attachment;
589 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
590sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
591 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
592 516
593 use sort 'stable'; 517 use sort 'stable';
594 518
… …
765# object support 689# object support
766 690
767sub reattach { 691sub reattach {
768 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770 696
771 my $registry = $obj->registry; 697 my $registry = $obj->registry;
772 698
773 @$registry = (); 699 @$registry = ();
774 700
… …
906=cut 832=cut
907 833
908sub register_extcmd { 834sub register_extcmd {
909 my ($name, $cb) = @_; 835 my ($name, $cb) = @_;
910 836
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 837 $EXTCMD{$name} = $cb;
915} 838}
916 839
917cf::player->attach ( 840cf::player->attach (
918 on_command => sub { 841 on_command => sub {
919 my ($pl, $name, $params) = @_; 842 my ($pl, $name, $params) = @_;
… …
932 855
933 my $msg = eval { from_json $buf }; 856 my $msg = eval { from_json $buf };
934 857
935 if (ref $msg) { 858 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 859 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 860 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 861 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 862 }
940 } 863 }
941 } else { 864 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
944 867
945 cf::override; 868 cf::override;
946 }, 869 },
947); 870);
948 871
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 872sub load_extension {
956 my ($path) = @_; 873 my ($path) = @_;
957 874
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 876 my $base = $1;
960 my $pkg = $1; 877 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 878 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 879 $pkg = "ext::$pkg";
963 880
964 warn "loading '$path' into '$pkg'\n"; 881 warn "... loading '$path' into '$pkg'\n";
965 882
966 open my $fh, "<:utf8", $path 883 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 884 or die "$path: $!";
968 885
969 my $source = 886 my $source =
970 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
973 . "\n};\n1"; 890 . "\n};\n1";
974 891
975 eval $source 892 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 894 : "extension disabled.\n";
978 895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 896 warn $@;
980 $ext_pkg{$base} = $pkg; 897 warn "mandatory extension failed to load, exiting.\n";
981 898 exit 1;
982# no strict 'refs'; 899 }
983# @{"$pkg\::ISA"} = ext::; 900 die $@;
984
985 register $base, $pkg;
986}
987
988sub unload_extension {
989 my ($pkg) = @_;
990
991 warn "removing extension $pkg\n";
992
993 # remove hooks
994 #TODO
995# for my $idx (0 .. $#PLUGIN_EVENT) {
996# delete $hook[$idx]{$pkg};
997# } 901 }
998 902
999 # remove commands 903 push @EXTS, $pkg;
1000 for my $name (keys %COMMAND) {
1001 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1002
1003 if (@cb) {
1004 $COMMAND{$name} = \@cb;
1005 } else {
1006 delete $COMMAND{$name};
1007 }
1008 }
1009
1010 # remove extcmds
1011 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1012 delete $EXTCMD{$name};
1013 }
1014
1015 if (my $cb = $pkg->can ("unload")) {
1016 eval {
1017 $cb->($pkg);
1018 1
1019 } or warn "$pkg unloaded, but with errors: $@";
1020 }
1021
1022 Symbol::delete_package $pkg;
1023} 904}
1024 905
1025sub load_extensions { 906sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 907 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 908 next unless -r $ext;
… …
1031 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1032 } 913 }
1033} 914}
1034 915
1035############################################################################# 916#############################################################################
1036# load/save/clean perl data associated with a map
1037
1038*cf::mapsupport::on_clean = sub {
1039 my ($map) = @_;
1040
1041 my $path = $map->tmpname;
1042 defined $path or return;
1043
1044 unlink "$path.pst";
1045};
1046
1047cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048
1049#############################################################################
1050# load/save perl data associated with player->ob objects
1051
1052sub all_objects(@) {
1053 @_, map all_objects ($_->inv), @_
1054}
1055
1056# TODO: compatibility cruft, remove when no longer needed
1057cf::player->attach (
1058 on_load => sub {
1059 my ($pl, $path) = @_;
1060
1061 for my $o (all_objects $pl->ob) {
1062 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063 $o->set_ob_key_value ("_perl_data");
1064
1065 %$o = %{ Storable::thaw pack "H*", $value };
1066 }
1067 }
1068 },
1069);
1070
1071#############################################################################
1072 917
1073=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1074 919
1075Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1076 921
1077=cut 922=cut
1078 923
1079package cf::player; 924package cf::player;
925
926use Coro::AIO;
1080 927
1081=head3 cf::player 928=head3 cf::player
1082 929
1083=over 4 930=over 4
1084 931
… …
1137 my $path = path $pl; 984 my $path = path $pl;
1138 my $guard = cf::lock_acquire "user_save:$path"; 985 my $guard = cf::lock_acquire "user_save:$path";
1139 986
1140 return if $pl->{deny_save}; 987 return if $pl->{deny_save};
1141 988
1142 Coro::AIO::aio_mkdir playerdir $pl, 0770; 989 aio_mkdir playerdir $pl, 0770;
1143 $pl->{last_save} = $cf::RUNTIME; 990 $pl->{last_save} = $cf::RUNTIME;
1144 991
1145 $pl->save_pl ($path); 992 $pl->save_pl ($path);
1146 Coro::cede; 993 Coro::cede;
1147} 994}
… …
1156 1003
1157 $cf::PLAYER{$login} = $self; 1004 $cf::PLAYER{$login} = $self;
1158 1005
1159 $self 1006 $self
1160} 1007}
1008
1009=item $pl->quit_character
1010
1011Nukes the player without looking back. If logged in, the connection will
1012be destroyed. May block for a long time.
1013
1014=cut
1161 1015
1162sub quit_character { 1016sub quit_character {
1163 my ($pl) = @_; 1017 my ($pl) = @_;
1164 1018
1165 $pl->{deny_save} = 1; 1019 $pl->{deny_save} = 1;
… …
1170 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1024 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1171 $pl->ns->destroy if $pl->ns; 1025 $pl->ns->destroy if $pl->ns;
1172 1026
1173 my $path = playerdir $pl; 1027 my $path = playerdir $pl;
1174 my $temp = "$path~$cf::RUNTIME~deleting~"; 1028 my $temp = "$path~$cf::RUNTIME~deleting~";
1175 Coro::AIO::aio_rename $path, $temp; 1029 aio_rename $path, $temp;
1176 delete $cf::PLAYER{$pl->ob->name}; 1030 delete $cf::PLAYER{$pl->ob->name};
1177 $pl->destroy; 1031 $pl->destroy;
1178 IO::AIO::aio_rmtree $temp; 1032 IO::AIO::aio_rmtree $temp;
1179} 1033}
1180 1034
1035=item cf::player::list_logins
1036
1037Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever.
1039
1040=cut
1041
1042sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1044 or return [];
1045
1046 my @logins;
1047
1048 for my $login (@$dirs) {
1049 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1050 aio_read $fh, 0, 512, my $buf, 0 or next;
1051 $buf !~ /^password -------------$/m or next; # official not-valid tag
1052
1053 utf8::decode $login;
1054 push @logins, $login;
1055 }
1056
1057 \@logins
1058}
1059
1060=item $player->maps
1061
1062Returns an arrayref of map paths that are private for this
1063player. May block.
1064
1065=cut
1066
1067sub maps($) {
1068 my ($pl) = @_;
1069
1070 my $files = aio_readdir playerdir $pl
1071 or return;
1072
1073 my @paths;
1074
1075 for (@$files) {
1076 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o;
1079
1080 s/\.map$//;
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 }
1083
1084 \@paths
1085}
1086
1181=item $player->ext_reply ($msgid, $msgtype, %msg) 1087=item $player->ext_reply ($msgid, $msgtype, %msg)
1182 1088
1183Sends an ext reply to the player. 1089Sends an ext reply to the player.
1184 1090
1185=cut 1091=cut
… …
1206package cf::map; 1112package cf::map;
1207 1113
1208use Fcntl; 1114use Fcntl;
1209use Coro::AIO; 1115use Coro::AIO;
1210 1116
1117use overload
1118 '""' => \&as_string;
1119
1211our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1212our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1213 1122
1214sub generate_random_map { 1123sub generate_random_map {
1215 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1216 1125
1217 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1218 cf::map::_create_random_map 1127 $self->_create_random_map (
1219 $path,
1220 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1221 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1222 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1223 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1224 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1225 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1226 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1227 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1228 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1229 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1230 (cf::region::find $rmp->{region}) 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 )
1140}
1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1167sub normalise {
1168 my ($path, $base) = @_;
1169
1170 # map plan:
1171 #
1172 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched
1174 # ?xxx/... are special absolute paths
1175 # ?random/... random maps
1176 # /... normal maps
1177 # ~user/... per-player map of a specific user
1178
1179 $path =~ s/$PATH_SEP/\//go;
1180
1181 # treat it as relative path if it starts with
1182 # something that looks reasonable
1183 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1184 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1185
1186 $base =~ s{[^/]+/?$}{};
1187 $path = "$base/$path";
1188 }
1189
1190 for ($path) {
1191 redo if s{//}{/};
1192 redo if s{/\.?/}{/};
1193 redo if s{/[^/]+/\.\./}{/};
1194 }
1195
1196 $path
1197}
1198
1199sub new_from_path {
1200 my (undef, $path, $base) = @_;
1201
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203
1204 $path = normalise $path, $base;
1205
1206 for my $pkg (keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) {
1208 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc.
1211 return $self;
1212 }
1213 }
1214
1215 Carp::carp "unable to resolve path '$path'.";
1216 ()
1217}
1218
1219sub init {
1220 my ($self) = @_;
1221
1222 $self
1223}
1224
1225sub as_string {
1226 my ($self) = @_;
1227
1228 "$self->{path}"
1229}
1230
1231# the displayed name, this is a one way mapping
1232sub visible_name {
1233 &as_string
1234}
1235
1236# the original (read-only) location
1237sub load_path {
1238 my ($self) = @_;
1239
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1241}
1242
1243# the temporary/swap location
1244sub save_path {
1245 my ($self) = @_;
1246
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1249}
1250
1251# the unique path, undef == no special unique path
1252sub uniq_path {
1253 my ($self) = @_;
1254
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1231} 1257}
1232 1258
1233# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1234# all maps in C++... 1260# all maps in C++...
1235sub change_all_map_light { 1261sub change_all_map_light {
… …
1237 1263
1238 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1239 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1240} 1266}
1241 1267
1268sub unlink_save {
1269 my ($self) = @_;
1270
1271 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1274}
1275
1242sub try_load_header($) { 1276sub load_header_from($) {
1243 my ($path) = @_; 1277 my ($self, $path) = @_;
1244 1278
1245 utf8::encode $path; 1279 utf8::encode $path;
1246 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1247 or return; 1281 or return;
1248 1282
1249 my $map = cf::map::new 1283 $self->_load_header ($path)
1250 or return; 1284 or return;
1251 1285
1252 # for better error messages only, will be overwritten 1286 $self->{load_path} = $path;
1253 $map->path ($path);
1254 1287
1255 $map->load_header ($path) 1288 1
1289}
1290
1291sub load_orig {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->load_path)
1295}
1296
1297sub load_temp {
1298 my ($self) = @_;
1299
1300 $self->load_header_from ($self->save_path)
1301}
1302
1303sub load_header {
1304 my ($self) = @_;
1305
1306 if ($self->load_temp) {
1307 $self->last_access ((delete $self->{last_access})
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else {
1313 $self->load_orig
1256 or return; 1314 or return;
1257 1315
1258 $map->{load_path} = $path; 1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 }
1259 1321
1260 $map 1322 1
1261} 1323}
1262 1324
1263sub find; 1325sub find;
1264sub find { 1326sub find {
1265 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1266 1328
1267 #warn "find<$path,$origin>\n";#d#
1268
1269 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1270 my $key = $path->as_string;
1271 1330
1272 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1273 1332
1274 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1275 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1276 1335 my $map = new_from_path cf::map $path
1277 # do it the slow way
1278 my $map = try_load_header $path->save_path;
1279
1280 Coro::cede;
1281
1282 if ($map) {
1283 $map->last_access ((delete $map->{last_access})
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $map->{instantiate_time} = $cf::RUNTIME
1287 if $map->{instantiate_time} > $cf::RUNTIME;
1288 } else {
1289 if (my $rmp = $path->random_map_params) {
1290 $map = generate_random_map $key, $rmp;
1291 } else {
1292 $map = try_load_header $path->load_path;
1293 }
1294
1295 $map or return; 1336 or return;
1296 1337
1297 $map->{load_original} = 1;
1298 $map->{instantiate_time} = $cf::RUNTIME;
1299 $map->last_access ($cf::RUNTIME);
1300 $map->instantiate;
1301
1302 # per-player maps become, after loading, normal maps
1303 $map->per_player (0) if $path->{user_rel};
1304 }
1305
1306 $map->path ($key);
1307 $map->{path} = $path;
1308 $map->{last_save} = $cf::RUNTIME; 1338 $map->{last_save} = $cf::RUNTIME;
1309 1339
1310 Coro::cede; 1340 $map->load_header
1341 or return;
1311 1342
1312 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1313 $map->reset; 1345 $map->reset;
1314 undef $guard; 1346 undef $guard;
1315 $map = find $path 1347 $map = find $path
1316 or return; 1348 or return;
1317 } 1349 }
1318 1350
1319 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1320 } 1352 }
1321} 1353}
1322 1354
1323sub load { 1355sub load {
1324 my ($self) = @_; 1356 my ($self) = @_;
1325 1357
1326 my $path = $self->{path}; 1358 my $path = $self->{path};
1327 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1328 1360
1329 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1330 1362
1331 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1332 1364
1333 $self->alloc; 1365 $self->alloc;
1334 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1335 or return; 1367 or return;
1336 1368
1337 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1338 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1339 1371
1340 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1341 utf8::encode $uniq; 1373 utf8::encode $uniq;
1342 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1343 $self->clear_unique_items; 1375 $self->clear_unique_items;
1344 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1345 } 1377 }
1346 } 1378 }
1347 1379
1348 Coro::cede; 1380 Coro::cede;
1349 1381
1350 # now do the right thing for maps 1382 # now do the right thing for maps
1351 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1352 1384
1353 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1354 $self->{deny_save} = 1; 1386 $self->decay_objects;
1355 $self->{deny_reset} = 1;
1356 } else {
1357 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1358 $self->decay_objects;
1359 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1360 $self->set_darkness_map; 1390 $self->set_darkness_map;
1361 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1362 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1363 $self->activate; 1394 $self->activate;
1364 } 1395 }
1365 1396
1366 Coro::cede;
1367
1368 $self->in_memory (cf::MAP_IN_MEMORY); 1397 $self->in_memory (cf::MAP_IN_MEMORY);
1398}
1399
1400sub customise_for {
1401 my ($self, $ob) = @_;
1402
1403 return find "~" . $ob->name . "/" . $self->{path}
1404 if $self->per_player;
1405
1406 $self
1407}
1408
1409# find and load all maps in the 3x3 area around a map
1410sub load_diag {
1411 my ($map) = @_;
1412
1413 my @diag; # diagonal neighbours
1414
1415 for (0 .. 3) {
1416 my $neigh = $map->tile_path ($_)
1417 or next;
1418 $neigh = find $neigh, $map
1419 or next;
1420 $neigh->load;
1421
1422 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1423 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1424 }
1425
1426 for (@diag) {
1427 my $neigh = find @$_
1428 or next;
1429 $neigh->load;
1430 }
1369} 1431}
1370 1432
1371sub find_sync { 1433sub find_sync {
1372 my ($path, $origin) = @_; 1434 my ($path, $origin) = @_;
1373 1435
1374 cf::sync_job { cf::map::find $path, $origin } 1436 cf::sync_job { find $path, $origin }
1375} 1437}
1376 1438
1377sub do_load_sync { 1439sub do_load_sync {
1378 my ($map) = @_; 1440 my ($map) = @_;
1379 1441
1380 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1381} 1443}
1382 1444
1445our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async {
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458
1459sub find_async {
1460 my ($path, $origin) = @_;
1461
1462 $path = normalise $path, $origin && $origin->{path};
1463
1464 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 }
1467
1468 $MAP_PREFETCH{$path} = 0;
1469 $MAP_PREFETCHER->ready;
1470
1471 ()
1472}
1473
1383sub save { 1474sub save {
1384 my ($self) = @_; 1475 my ($self) = @_;
1385 1476
1386 my $lock = cf::lock_acquire "map_data:" . $self->path; 1477 my $lock = cf::lock_acquire "map_data:" . $self->path;
1387 1478
1388 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1389 1480
1390 return unless $self->dirty; 1481 return unless $self->dirty;
1391 1482
1392 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1393 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1394 1485
1395 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1396 1487
1397 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1398 1489
… …
1401 cf::async { 1492 cf::async {
1402 $_->contr->save for $self->players; 1493 $_->contr->save for $self->players;
1403 }; 1494 };
1404 1495
1405 if ($uniq) { 1496 if ($uniq) {
1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1407 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1408 } else { 1499 } else {
1409 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1500 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1410 } 1501 }
1411} 1502}
1412 1503
1413sub swap_out { 1504sub swap_out {
1414 my ($self) = @_; 1505 my ($self) = @_;
… …
1428 1519
1429sub reset_at { 1520sub reset_at {
1430 my ($self) = @_; 1521 my ($self) = @_;
1431 1522
1432 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1433 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1434 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1435 1526
1436 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1437 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1438 1529
… …
1443 my ($self) = @_; 1534 my ($self) = @_;
1444 1535
1445 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1446} 1537}
1447 1538
1448sub unlink_save {
1449 my ($self) = @_;
1450
1451 utf8::encode (my $save = $self->{path}->save_path);
1452 aioreq_pri 3; IO::AIO::aio_unlink $save;
1453 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1454}
1455
1456sub rename { 1539sub rename {
1457 my ($self, $new_path) = @_; 1540 my ($self, $new_path) = @_;
1458 1541
1542 normalise $new_path;
1543
1459 $self->unlink_save; 1544 $self->unlink_save;
1460 1545
1461 delete $cf::MAP{$self->path}; 1546 delete $cf::MAP{$self->path};
1462 $self->{path} = new cf::path $new_path; 1547 $self->{path} = $new_path; $self->path ($self->{path});
1463 $self->path ($self->{path}->as_string);
1464 $cf::MAP{$self->path} = $self; 1548 $cf::MAP{$self->path} = $self;
1465 1549
1466 $self->save; 1550 $self->save;
1467} 1551}
1468 1552
1469sub reset { 1553sub reset {
1470 my ($self) = @_; 1554 my ($self) = @_;
1471 1555
1472 my $lock = cf::lock_acquire "map_data:" . $self->path; 1556 my $lock = cf::lock_acquire "map_data:$self->{path}";
1473 1557
1474 return if $self->players; 1558 return if $self->players;
1475 return if $self->{path}{user_rel};#d# 1559 return if $self->isa ("ext::map_per_player");#d#
1476 1560
1477 warn "resetting map ", $self->path;#d# 1561 warn "resetting map ", $self->path;#d#
1478 1562
1479 delete $cf::MAP{$self->path}; 1563 delete $cf::MAP{$self->path};
1564
1565 $self->in_memory (cf::MAP_SWAPPED);
1566 $self->clear;
1480 1567
1481 $_->clear_links_to ($self) for values %cf::MAP; 1568 $_->clear_links_to ($self) for values %cf::MAP;
1482 1569
1483 $self->unlink_save; 1570 $self->unlink_save;
1484 $self->destroy; 1571 $self->destroy;
… …
1493 $self->reset_timeout (1); 1580 $self->reset_timeout (1);
1494 $self->rename ("{nuke}/" . ($nuke_counter++)); 1581 $self->rename ("{nuke}/" . ($nuke_counter++));
1495 $self->reset; # polite request, might not happen 1582 $self->reset; # polite request, might not happen
1496} 1583}
1497 1584
1498sub customise_for { 1585=item cf::map::unique_maps
1499 my ($map, $ob) = @_;
1500 1586
1501 if ($map->per_player) { 1587Returns an arrayref of paths of all shared maps that have
1502 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1588instantiated unique items. May block.
1503 }
1504 1589
1505 $map 1590=cut
1506}
1507 1591
1508sub emergency_save { 1592sub unique_maps() {
1509 my $freeze_guard = cf::freeze_mainloop; 1593 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1594 or return;
1510 1595
1511 warn "enter emergency perl save\n"; 1596 my @paths;
1512 1597
1513 cf::sync_job { 1598 for (@$files) {
1514 warn "begin emergency player save\n"; 1599 utf8::decode $_;
1515 $_->save for values %cf::PLAYER; 1600 next if /\.pst$/;
1516 warn "end emergency player save\n"; 1601 next unless /^$PATH_SEP/o;
1517 1602
1518 warn "begin emergency map save\n"; 1603 s/\.map$//;
1519 $_->save for values %cf::MAP; 1604 push @paths, $_;
1520 warn "end emergency map save\n";
1521 }; 1605 }
1522 1606
1523 warn "leave emergency perl save\n"; 1607 \@paths
1524} 1608}
1525 1609
1526package cf; 1610package cf;
1527 1611
1528=back 1612=back
1529 1613
1614=head3 cf::object
1615
1616=cut
1617
1618package cf::object;
1619
1620=over 4
1621
1622=item $ob->inv_recursive
1623
1624Returns the inventory of the object _and_ their inventories, recursively.
1625
1626=cut
1627
1628sub inv_recursive_;
1629sub inv_recursive_ {
1630 map { $_, inv_recursive_ $_->inv } @_
1631}
1632
1633sub inv_recursive {
1634 inv_recursive_ inv $_[0]
1635}
1636
1637package cf;
1638
1639=back
1530 1640
1531=head3 cf::object::player 1641=head3 cf::object::player
1532 1642
1533=over 4 1643=over 4
1534 1644
… …
1574 1684
1575=item $player_object->enter_link 1685=item $player_object->enter_link
1576 1686
1577Freezes the player and moves him/her to a special map (C<{link}>). 1687Freezes the player and moves him/her to a special map (C<{link}>).
1578 1688
1579The player should be reaosnably safe there for short amounts of time. You 1689The player should be reasonably safe there for short amounts of time. You
1580I<MUST> call C<leave_link> as soon as possible, though. 1690I<MUST> call C<leave_link> as soon as possible, though.
1581 1691
1692Will never block.
1693
1582=item $player_object->leave_link ($map, $x, $y) 1694=item $player_object->leave_link ($map, $x, $y)
1583 1695
1584Moves the player out of the specila link map onto the given map. If the 1696Moves the player out of the special C<{link}> map onto the specified
1585map is not valid (or omitted), the player will be moved back to the 1697map. If the map is not valid (or omitted), the player will be moved back
1586location he/she was before the call to C<enter_link>, or, if that fails, 1698to the location he/she was before the call to C<enter_link>, or, if that
1587to the emergency map position. 1699fails, to the emergency map position.
1588 1700
1589Might block. 1701Might block.
1590 1702
1591=cut 1703=cut
1704
1705sub link_map {
1706 unless ($LINK_MAP) {
1707 $LINK_MAP = cf::map::find "{link}"
1708 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1709 $LINK_MAP->load;
1710 }
1711
1712 $LINK_MAP
1713}
1592 1714
1593sub cf::object::player::enter_link { 1715sub cf::object::player::enter_link {
1594 my ($self) = @_; 1716 my ($self) = @_;
1595 1717
1596 $self->deactivate_recursive; 1718 $self->deactivate_recursive;
1597 1719
1598 return if $self->map == $LINK_MAP; 1720 return if UNIVERSAL::isa $self->map, "ext::map_link";
1599 1721
1600 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1722 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1601 if $self->map; 1723 if $self->map;
1602 1724
1603 $self->enter_map ($LINK_MAP, 20, 20); 1725 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1604} 1726}
1605 1727
1606sub cf::object::player::leave_link { 1728sub cf::object::player::leave_link {
1607 my ($self, $map, $x, $y) = @_; 1729 my ($self, $map, $x, $y) = @_;
1608 1730
… …
1626 # use -1 or undef as default coordinates, not 0, 0 1748 # use -1 or undef as default coordinates, not 0, 0
1627 ($x, $y) = ($map->enter_x, $map->enter_y) 1749 ($x, $y) = ($map->enter_x, $map->enter_y)
1628 if $x <=0 && $y <= 0; 1750 if $x <=0 && $y <= 0;
1629 1751
1630 $map->load; 1752 $map->load;
1753 $map->load_diag;
1631 1754
1632 return unless $self->contr->active; 1755 return unless $self->contr->active;
1633 $self->activate_recursive; 1756 $self->activate_recursive;
1634 $self->enter_map ($map, $x, $y); 1757 $self->enter_map ($map, $x, $y);
1635} 1758}
… …
1671=cut 1794=cut
1672 1795
1673sub cf::object::player::goto { 1796sub cf::object::player::goto {
1674 my ($self, $path, $x, $y) = @_; 1797 my ($self, $path, $x, $y) = @_;
1675 1798
1676 $path = new cf::path $path;
1677 $path ne "/" or Carp::cluck ("oy");#d#
1678
1679 $self->enter_link; 1799 $self->enter_link;
1680 1800
1681 (async { 1801 (async {
1682 my $map = cf::map::find $path->as_string; 1802 my $map = cf::map::find $path;
1683 $map = $map->customise_for ($self) if $map; 1803 $map = $map->customise_for ($self) if $map;
1684 1804
1685# warn "entering ", $map->path, " at ($x, $y)\n" 1805# warn "entering ", $map->path, " at ($x, $y)\n"
1686# if $map; 1806# if $map;
1687 1807
… …
1752 $self->deactivate_recursive; # just to be sure 1872 $self->deactivate_recursive; # just to be sure
1753 unless (eval { 1873 unless (eval {
1754 prepare_random_map $exit 1874 prepare_random_map $exit
1755 if $exit->slaying eq "/!"; 1875 if $exit->slaying eq "/!";
1756 1876
1757 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1877 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1758 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1878 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1759 1879
1760 1; 1880 1;
1761 }) { 1881 }) {
1762 $self->message ("Something went wrong deep within the crossfire server. " 1882 $self->message ("Something went wrong deep within the crossfire server. "
1763 . "I'll try to bring you back to the map you were before. " 1883 . "I'll try to bring you back to the map you were before. "
1764 . "Please report this to the dungeon master", 1884 . "Please report this to the dungeon master!",
1765 cf::NDI_UNIQUE | cf::NDI_RED); 1885 cf::NDI_UNIQUE | cf::NDI_RED);
1766 1886
1767 warn "ERROR in enter_exit: $@"; 1887 warn "ERROR in enter_exit: $@";
1768 $self->leave_link; 1888 $self->leave_link;
1769 } 1889 }
… …
2122 load_extensions; 2242 load_extensions;
2123 Event::loop; 2243 Event::loop;
2124} 2244}
2125 2245
2126############################################################################# 2246#############################################################################
2127# initialisation 2247# initialisation and cleanup
2248
2249# install some emergency cleanup handlers
2250BEGIN {
2251 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal (
2253 data => WF_AUTOCANCEL,
2254 signal => $signal,
2255 cb => sub {
2256 cf::cleanup "SIG$signal";
2257 },
2258 );
2259 }
2260}
2261
2262sub emergency_save() {
2263 my $freeze_guard = cf::freeze_mainloop;
2264
2265 warn "enter emergency perl save\n";
2266
2267 cf::sync_job {
2268 # use a peculiar iteration method to avoid tripping on perl
2269 # refcount bugs in for. also avoids problems with players
2270 # and maps saved/destroyed asynchronously.
2271 warn "begin emergency player save\n";
2272 for my $login (keys %cf::PLAYER) {
2273 my $pl = $cf::PLAYER{$login} or next;
2274 $pl->valid or next;
2275 $pl->save;
2276 }
2277 warn "end emergency player save\n";
2278
2279 warn "begin emergency map save\n";
2280 for my $path (keys %cf::MAP) {
2281 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next;
2283 $map->save;
2284 }
2285 warn "end emergency map save\n";
2286 };
2287
2288 warn "leave emergency perl save\n";
2289}
2128 2290
2129sub reload() { 2291sub reload() {
2130 # can/must only be called in main 2292 # can/must only be called in main
2131 if ($Coro::current != $Coro::main) { 2293 if ($Coro::current != $Coro::main) {
2132 warn "can only reload from main coroutine\n"; 2294 warn "can only reload from main coroutine\n";
2133 return; 2295 return;
2134 } 2296 }
2135 2297
2136 warn "reloading..."; 2298 warn "reloading...";
2137 2299
2300 warn "freezing server";
2138 my $guard = freeze_mainloop; 2301 my $guard = freeze_mainloop;
2139 cf::emergency_save; 2302 cf::emergency_save;
2140 2303
2304 warn "sync database to disk";
2305 cf::db_sync;
2306 IO::AIO::flush;
2307
2141 eval { 2308 eval {
2142 # if anything goes wrong in here, we should simply crash as we already saved 2309 # if anything goes wrong in here, we should simply crash as we already saved
2143 2310
2144 # cancel all watchers 2311 warn "cancel all watchers";
2145 for (Event::all_watchers) { 2312 for (Event::all_watchers) {
2146 $_->cancel if $_->data & WF_AUTOCANCEL; 2313 $_->cancel if $_->data & WF_AUTOCANCEL;
2147 } 2314 }
2148 2315
2149 # cancel all extension coros 2316 warn "cancel all extension coros";
2150 $_->cancel for values %EXT_CORO; 2317 $_->cancel for values %EXT_CORO;
2151 %EXT_CORO = (); 2318 %EXT_CORO = ();
2152 2319
2320 warn "remove commands";
2321 %COMMAND = ();
2322
2323 warn "remove ext commands";
2324 %EXTCMD = ();
2325
2153 # unload all extensions 2326 warn "unload/nuke all extensions";
2154 for (@exts) { 2327 for my $pkg (@EXTS) {
2155 warn "unloading <$_>"; 2328 warn "... unloading $pkg";
2156 unload_extension $_; 2329
2330 if (my $cb = $pkg->can ("unload")) {
2331 eval {
2332 $cb->($pkg);
2333 1
2334 } or warn "$pkg unloaded, but with errors: $@";
2157 } 2335 }
2158 2336
2337 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg;
2339 }
2340
2159 # unload all modules loaded from $LIBDIR 2341 warn "unload all perl modules loaded from $LIBDIR";
2160 while (my ($k, $v) = each %INC) { 2342 while (my ($k, $v) = each %INC) {
2161 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2162 2344
2163 warn "removing <$k>"; 2345 warn "removing <$k>";
2164 delete $INC{$k}; 2346 delete $INC{$k};
… …
2171 } 2353 }
2172 2354
2173 Symbol::delete_package $k; 2355 Symbol::delete_package $k;
2174 } 2356 }
2175 2357
2176 # sync database to disk
2177 cf::db_sync;
2178 IO::AIO::flush;
2179
2180 # get rid of safe::, as good as possible 2358 warn "get rid of safe::, as good as possible";
2181 Symbol::delete_package "safe::$_" 2359 Symbol::delete_package "safe::$_"
2182 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2183 2361
2184 # remove register_script_function callbacks
2185 # TODO
2186
2187 # unload cf.pm "a bit" 2362 warn "unload cf.pm \"a bit\"";
2188 delete $INC{"cf.pm"}; 2363 delete $INC{"cf.pm"};
2189 2364
2190 # don't, removes xs symbols, too, 2365 # don't, removes xs symbols, too,
2191 # and global variables created in xs 2366 # and global variables created in xs
2192 #Symbol::delete_package __PACKAGE__; 2367 #Symbol::delete_package __PACKAGE__;
2193 2368
2194 # reload cf.pm
2195 warn "reloading cf.pm"; 2369 warn "reloading cf.pm";
2196 require cf; 2370 require cf;
2197 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2198 2372
2199 # load config and database again 2373 warn "load config and database again";
2200 cf::cfg_load; 2374 cf::cfg_load;
2201 cf::db_load; 2375 cf::db_load;
2202 2376
2203 # load extensions
2204 warn "load extensions"; 2377 warn "load extensions";
2205 cf::load_extensions; 2378 cf::load_extensions;
2206 2379
2207 # reattach attachments to objects 2380 warn "reattach attachments to objects/players";
2208 warn "reattach";
2209 _global_reattach; 2381 _global_reattach;
2382 warn "reattach attachments to maps";
2210 reattach $_ for values %MAP; 2383 reattach $_ for values %MAP;
2211 }; 2384 };
2212 2385
2213 if ($@) { 2386 if ($@) {
2214 warn $@; 2387 warn $@;
2215 warn "error while reloading, exiting."; 2388 warn "error while reloading, exiting.";
2216 exit 1; 2389 exit 1;
2217 } 2390 }
2218 2391
2219 warn "reloaded successfully"; 2392 warn "reloaded";
2220}; 2393};
2221
2222#############################################################################
2223
2224unless ($LINK_MAP) {
2225 $LINK_MAP = cf::map::new;
2226
2227 $LINK_MAP->width (41);
2228 $LINK_MAP->height (41);
2229 $LINK_MAP->alloc;
2230 $LINK_MAP->path ("{link}");
2231 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2232 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2233
2234 # dirty hack because... archetypes are not yet loaded
2235 Event->timer (
2236 after => 10,
2237 cb => sub {
2238 $_[0]->w->cancel;
2239
2240 # provide some exits "home"
2241 my $exit = cf::object::new "exit";
2242
2243 $exit->slaying ($EMERGENCY_POSITION->[0]);
2244 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2245 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2246
2247 $LINK_MAP->insert ($exit->clone, 19, 19);
2248 $LINK_MAP->insert ($exit->clone, 19, 20);
2249 $LINK_MAP->insert ($exit->clone, 19, 21);
2250 $LINK_MAP->insert ($exit->clone, 20, 19);
2251 $LINK_MAP->insert ($exit->clone, 20, 21);
2252 $LINK_MAP->insert ($exit->clone, 21, 19);
2253 $LINK_MAP->insert ($exit->clone, 21, 20);
2254 $LINK_MAP->insert ($exit->clone, 21, 21);
2255
2256 $exit->destroy;
2257 });
2258
2259 $LINK_MAP->{deny_save} = 1;
2260 $LINK_MAP->{deny_reset} = 1;
2261
2262 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2263}
2264
2265register "<global>", __PACKAGE__;
2266 2394
2267register_command "reload" => sub { 2395register_command "reload" => sub {
2268 my ($who, $arg) = @_; 2396 my ($who, $arg) = @_;
2269 2397
2270 if ($who->flag (FLAG_WIZ)) { 2398 if ($who->flag (FLAG_WIZ)) {
… …
2280 reentrant => 0, 2408 reentrant => 0,
2281 prio => 0, 2409 prio => 0,
2282 at => $NEXT_TICK || $TICK, 2410 at => $NEXT_TICK || $TICK,
2283 data => WF_AUTOCANCEL, 2411 data => WF_AUTOCANCEL,
2284 cb => sub { 2412 cb => sub {
2413 $NOW = Event::time;
2414
2285 cf::server_tick; # one server iteration 2415 cf::server_tick; # one server iteration
2286 $RUNTIME += $TICK; 2416 $RUNTIME += $TICK;
2287 $NEXT_TICK += $TICK; 2417 $NEXT_TICK += $TICK;
2418
2419 $WAIT_FOR_TICK->broadcast;
2420 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2288 2421
2289 # if we are delayed by four ticks or more, skip them all 2422 # if we are delayed by four ticks or more, skip them all
2290 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2423 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2291 2424
2292 $TICK_WATCHER->at ($NEXT_TICK); 2425 $TICK_WATCHER->at ($NEXT_TICK);
… …
2294 }, 2427 },
2295); 2428);
2296 2429
2297IO::AIO::max_poll_time $TICK * 0.2; 2430IO::AIO::max_poll_time $TICK * 0.2;
2298 2431
2299Event->io ( 2432$AIO_POLL_WATCHER = Event->io (
2300 fd => IO::AIO::poll_fileno, 2433 fd => IO::AIO::poll_fileno,
2301 poll => 'r', 2434 poll => 'r',
2302 prio => 5, 2435 prio => 5,
2303 data => WF_AUTOCANCEL, 2436 data => WF_AUTOCANCEL,
2304 cb => \&IO::AIO::poll_cb, 2437 cb => \&IO::AIO::poll_cb,
2305); 2438);
2306 2439
2307Event->timer ( 2440$WRITE_RUNTIME_WATCHER = Event->timer (
2308 data => WF_AUTOCANCEL, 2441 data => WF_AUTOCANCEL,
2309 after => 0, 2442 after => 0,
2310 interval => 10, 2443 interval => 10,
2311 cb => sub { 2444 cb => sub {
2312 (Coro::unblock_sub { 2445 (Coro::unblock_sub {

Diff Legend

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