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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines