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.145 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.180 by root, Fri Jan 19 00:38:02 2007 UTC

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

Diff Legend

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