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.143 by root, Sun Jan 7 02:39:14 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
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;
1080 925
926use Coro::AIO;
927
1081=head3 cf::player 928=head3 cf::player
1082 929
1083=over 4 930=over 4
1084 931
1085=item cf::player::find $login 932=item cf::player::find $login
1086 933
1087Returns the given player object, loading it if necessary (might block). 934Returns the given player object, loading it if necessary (might block).
1088 935
1089=cut 936=cut
1090 937
938sub playerdir($) {
939 cf::localdir
940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944}
945
1091sub path($) { 946sub path($) {
1092 sprintf "%s/%s/%s/%s.pl", 947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1093 cf::localdir, cf::playerdir, 948
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2 949 (playerdir $login) . "/$login.pl"
1095} 950}
1096 951
1097sub find_active($) { 952sub find_active($) {
1098 $cf::PLAYER{$_[0]} 953 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active 954 and $cf::PLAYER{$_[0]}->active
… …
1102 957
1103sub exists($) { 958sub exists($) {
1104 my ($login) = @_; 959 my ($login) = @_;
1105 960
1106 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
1108} 963}
1109 964
1110sub find($) { 965sub find($) {
1111 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0]; 967 my $login = $_[0];
1113 968
1114 my $guard = cf::lock_acquire "user_find:$login"; 969 my $guard = cf::lock_acquire "user_find:$login";
1115 970
1116 $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 }
1117 }; 976 }
1118} 977}
1119 978
1120sub save($) { 979sub save($) {
1121 my ($pl) = @_; 980 my ($pl) = @_;
1122 981
… …
1124 983
1125 my $path = path $pl; 984 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path"; 985 my $guard = cf::lock_acquire "user_save:$path";
1127 986
1128 return if $pl->{deny_save}; 987 return if $pl->{deny_save};
988
989 aio_mkdir playerdir $pl, 0770;
1129 $pl->{last_save} = $cf::RUNTIME; 990 $pl->{last_save} = $cf::RUNTIME;
1130 991
1131 Coro::cede;
1132 $pl->save_pl ($path); 992 $pl->save_pl ($path);
1133 Coro::cede; 993 Coro::cede;
1134} 994}
1135 995
1136sub new($) { 996sub new($) {
… …
1144 $cf::PLAYER{$login} = $self; 1004 $cf::PLAYER{$login} = $self;
1145 1005
1146 $self 1006 $self
1147} 1007}
1148 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
1085}
1086
1149=item $player->ext_reply ($msgid, $msgtype, %msg) 1087=item $player->ext_reply ($msgid, $msgtype, %msg)
1150 1088
1151Sends an ext reply to the player. 1089Sends an ext reply to the player.
1152 1090
1153=cut 1091=cut
… …
1174package cf::map; 1112package cf::map;
1175 1113
1176use Fcntl; 1114use Fcntl;
1177use Coro::AIO; 1115use Coro::AIO;
1178 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1179our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1180our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1181 1123
1182sub generate_random_map { 1124sub generate_random_map {
1183 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1184
1185 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1186 cf::map::_create_random_map 1127 $self->_create_random_map (
1187 $path,
1188 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1189 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1190 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1191 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1192 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1193 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1194 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1195 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1196 $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},
1197 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1198 (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
1199} 1257}
1200 1258
1201# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1202# all maps in C++... 1260# all maps in C++...
1203sub change_all_map_light { 1261sub change_all_map_light {
… …
1205 1263
1206 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1208} 1266}
1209 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
1210sub try_load_header($) { 1276sub load_header_from($) {
1211 my ($path) = @_; 1277 my ($self, $path) = @_;
1212 1278
1213 utf8::encode $path; 1279 utf8::encode $path;
1214 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1215 or return; 1281 or return;
1216 1282
1217 my $map = cf::map::new 1283 $self->_load_header ($path)
1218 or return; 1284 or return;
1219 1285
1220 # for better error messages only, will be overwritten 1286 $self->{load_path} = $path;
1221 $map->path ($path);
1222 1287
1223 $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
1224 or return; 1314 or return;
1225 1315
1226 $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 }
1227 1321
1228 $map 1322 1
1229} 1323}
1230 1324
1231sub find; 1325sub find;
1232sub find { 1326sub find {
1233 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1234 1328
1235 #warn "find<$path,$origin>\n";#d#
1236
1237 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1238 my $key = $path->as_string;
1239 1330
1240 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1241 1332
1242 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1243 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1244 1335 my $map = new_from_path cf::map $path
1245 # do it the slow way
1246 my $map = try_load_header $path->save_path;
1247
1248 Coro::cede;
1249
1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1253 # safety
1254 $map->{instantiate_time} = $cf::RUNTIME
1255 if $map->{instantiate_time} > $cf::RUNTIME;
1256 } else {
1257 if (my $rmp = $path->random_map_params) {
1258 $map = generate_random_map $key, $rmp;
1259 } else {
1260 $map = try_load_header $path->load_path;
1261 }
1262
1263 $map or return; 1336 or return;
1264 1337
1265 $map->{load_original} = 1;
1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1268 $map->instantiate;
1269
1270 # per-player maps become, after loading, normal maps
1271 $map->per_player (0) if $path->{user_rel};
1272 }
1273
1274 $map->path ($key);
1275 $map->{path} = $path;
1276 $map->{last_save} = $cf::RUNTIME; 1338 $map->{last_save} = $cf::RUNTIME;
1277 1339
1278 Coro::cede; 1340 $map->load_header
1341 or return;
1279 1342
1280 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1281 $map->reset; 1345 $map->reset;
1282 undef $guard; 1346 undef $guard;
1283 $map = find $path 1347 $map = find $path
1284 or return; 1348 or return;
1285 } 1349 }
1286 1350
1287 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1288 } 1352 }
1289} 1353}
1290 1354
1291sub load { 1355sub load {
1292 my ($self) = @_; 1356 my ($self) = @_;
1293 1357
1294 my $path = $self->{path}; 1358 my $path = $self->{path};
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1296 1360
1297 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1298 1362
1299 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1300 1364
1301 $self->alloc; 1365 $self->alloc;
1302 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1303 or return; 1367 or return;
1304 1368
1305 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1306 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1307 1371
1308 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1309 utf8::encode $uniq; 1373 utf8::encode $uniq;
1310 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1311 $self->clear_unique_items; 1375 $self->clear_unique_items;
1312 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1313 } 1377 }
1314 } 1378 }
1315 1379
1316 Coro::cede; 1380 Coro::cede;
1317 1381
1318 # now do the right thing for maps 1382 # now do the right thing for maps
1319 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1320 1384
1321 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1322 $self->{deny_save} = 1; 1386 $self->decay_objects;
1323 $self->{deny_reset} = 1;
1324 } else {
1325 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1326 $self->decay_objects;
1327 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1328 $self->set_darkness_map; 1390 $self->set_darkness_map;
1329 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1330 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1331 $self->activate; 1394 $self->activate;
1332 } 1395 }
1333 1396
1334 Coro::cede;
1335
1336 $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 }
1337} 1431}
1338 1432
1339sub find_sync { 1433sub find_sync {
1340 my ($path, $origin) = @_; 1434 my ($path, $origin) = @_;
1341 1435
1342 cf::sync_job { cf::map::find $path, $origin } 1436 cf::sync_job { find $path, $origin }
1343} 1437}
1344 1438
1345sub do_load_sync { 1439sub do_load_sync {
1346 my ($map) = @_; 1440 my ($map) = @_;
1347 1441
1348 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1349} 1443}
1350 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
1351sub save { 1475sub save {
1352 my ($self) = @_; 1476 my ($self) = @_;
1353 1477
1354 my $lock = cf::lock_acquire "map_data:" . $self->path; 1478 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355 1479
1356 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1357 1481
1358 return unless $self->dirty; 1482 return unless $self->dirty;
1359 1483
1360 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1362 1486
1363 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1364 1488
1365 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1366 1490
… …
1369 cf::async { 1493 cf::async {
1370 $_->contr->save for $self->players; 1494 $_->contr->save for $self->players;
1371 }; 1495 };
1372 1496
1373 if ($uniq) { 1497 if ($uniq) {
1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1375 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1376 } else { 1500 } else {
1377 $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);
1378 } 1502 }
1379} 1503}
1380 1504
1381sub swap_out { 1505sub swap_out {
1382 my ($self) = @_; 1506 my ($self) = @_;
… …
1396 1520
1397sub reset_at { 1521sub reset_at {
1398 my ($self) = @_; 1522 my ($self) = @_;
1399 1523
1400 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1401 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1402 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1403 1527
1404 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1405 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;
1406 1530
… …
1411 my ($self) = @_; 1535 my ($self) = @_;
1412 1536
1413 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1414} 1538}
1415 1539
1416sub unlink_save {
1417 my ($self) = @_;
1418
1419 utf8::encode (my $save = $self->{path}->save_path);
1420 aioreq_pri 3; IO::AIO::aio_unlink $save;
1421 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1422}
1423
1424sub rename {
1425 my ($self, $new_path) = @_;
1426
1427 $self->unlink_save;
1428
1429 delete $cf::MAP{$self->path};
1430 $self->{path} = new cf::path $new_path;
1431 $self->path ($self->{path}->as_string);
1432 $cf::MAP{$self->path} = $self;
1433
1434 $self->save;
1435}
1436
1437sub reset { 1540sub reset {
1438 my ($self) = @_; 1541 my ($self) = @_;
1439 1542
1440 my $lock = cf::lock_acquire "map_data:" . $self->path; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1441 1544
1442 return if $self->players; 1545 return if $self->players;
1443 return if $self->{path}{user_rel};#d# 1546 return if $self->isa ("ext::map_per_player");#d#
1444 1547
1445 warn "resetting map ", $self->path;#d# 1548 warn "resetting map ", $self->path;#d#
1446 1549
1447 delete $cf::MAP{$self->path}; 1550 delete $cf::MAP{$self->path};
1551
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear;
1448 1554
1449 $_->clear_links_to ($self) for values %cf::MAP; 1555 $_->clear_links_to ($self) for values %cf::MAP;
1450 1556
1451 $self->unlink_save; 1557 $self->unlink_save;
1452 $self->destroy; 1558 $self->destroy;
… …
1455my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1456 1562
1457sub nuke { 1563sub nuke {
1458 my ($self) = @_; 1564 my ($self) = @_;
1459 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1460 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1461 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1462 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1463 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1464} 1579}
1465 1580
1466sub customise_for { 1581=item cf::map::unique_maps
1467 my ($map, $ob) = @_;
1468 1582
1469 if ($map->per_player) { 1583Returns an arrayref of paths of all shared maps that have
1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1584instantiated unique items. May block.
1471 }
1472 1585
1473 $map 1586=cut
1474}
1475 1587
1476sub emergency_save { 1588sub unique_maps() {
1477 my $freeze_guard = cf::freeze_mainloop; 1589 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1590 or return;
1478 1591
1479 warn "enter emergency map save\n"; 1592 my @paths;
1480 1593
1481 cf::sync_job { 1594 for (@$files) {
1482 warn "begin emergency map save\n"; 1595 utf8::decode $_;
1483 $_->save for values %cf::MAP; 1596 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o;
1598
1599 s/\.map$//;
1600 push @paths, $_;
1484 }; 1601 }
1485 1602
1486 warn "end emergency map save\n"; 1603 \@paths
1487} 1604}
1488 1605
1489package cf; 1606package cf;
1490 1607
1491=back 1608=back
1492 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
1493 1636
1494=head3 cf::object::player 1637=head3 cf::object::player
1495 1638
1496=over 4 1639=over 4
1497 1640
… …
1537 1680
1538=item $player_object->enter_link 1681=item $player_object->enter_link
1539 1682
1540Freezes 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}>).
1541 1684
1542The 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
1543I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1544 1687
1688Will never block.
1689
1545=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1546 1691
1547Moves 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
1548map 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
1549location 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
1550to the emergency map position. 1695fails, to the emergency map position.
1551 1696
1552Might block. 1697Might block.
1553 1698
1554=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}
1555 1710
1556sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1557 my ($self) = @_; 1712 my ($self) = @_;
1558 1713
1559 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1560 1715
1561 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1562 1717
1563 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1564 if $self->map; 1719 if $self->map;
1565 1720
1566 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1567} 1722}
1568 1723
1569sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1570 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1571 1726
… …
1589 # use -1 or undef as default coordinates, not 0, 0 1744 # use -1 or undef as default coordinates, not 0, 0
1590 ($x, $y) = ($map->enter_x, $map->enter_y) 1745 ($x, $y) = ($map->enter_x, $map->enter_y)
1591 if $x <=0 && $y <= 0; 1746 if $x <=0 && $y <= 0;
1592 1747
1593 $map->load; 1748 $map->load;
1749 $map->load_diag;
1594 1750
1595 return unless $self->contr->active; 1751 return unless $self->contr->active;
1596 $self->activate_recursive; 1752 $self->activate_recursive;
1597 $self->enter_map ($map, $x, $y); 1753 $self->enter_map ($map, $x, $y);
1598} 1754}
… …
1637 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1638 1794
1639 $self->enter_link; 1795 $self->enter_link;
1640 1796
1641 (async { 1797 (async {
1642 $path = new cf::path $path;
1643
1644 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1645 $map = $map->customise_for ($self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1646 1800
1647# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1648# if $map; 1802# if $map;
1649 1803
1650 $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);
1651 1805
1652 $self->leave_link ($map, $x, $y); 1806 $self->leave_link ($map, $x, $y);
1653 })->prio (1); 1807 })->prio (1);
1654} 1808}
1655 1809
… …
1659 1813
1660sub parse_random_map_params { 1814sub parse_random_map_params {
1661 my ($spec) = @_; 1815 my ($spec) = @_;
1662 1816
1663 my $rmp = { # defaults 1817 my $rmp = { # defaults
1664 xsize => 10, 1818 xsize => (cf::rndm 15, 40),
1665 ysize => 10, 1819 ysize => (cf::rndm 15, 40),
1820 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1821 #layout => string,
1666 }; 1822 };
1667 1823
1668 for (split /\n/, $spec) { 1824 for (split /\n/, $spec) {
1669 my ($k, $v) = split /\s+/, $_, 2; 1825 my ($k, $v) = split /\s+/, $_, 2;
1670 1826
… …
1674 $rmp 1830 $rmp
1675} 1831}
1676 1832
1677sub prepare_random_map { 1833sub prepare_random_map {
1678 my ($exit) = @_; 1834 my ($exit) = @_;
1835
1836 my $guard = cf::lock_acquire "exit_prepare:$exit";
1679 1837
1680 # all this does is basically replace the /! path by 1838 # all this does is basically replace the /! path by
1681 # a new random map path (?random/...) with a seed 1839 # a new random map path (?random/...) with a seed
1682 # that depends on the exit object 1840 # that depends on the exit object
1683 1841
… …
1692 1850
1693 $rmp->{random_seed} ||= $exit->random_seed; 1851 $rmp->{random_seed} ||= $exit->random_seed;
1694 1852
1695 my $data = cf::to_json $rmp; 1853 my $data = cf::to_json $rmp;
1696 my $md5 = Digest::MD5::md5_hex $data; 1854 my $md5 = Digest::MD5::md5_hex $data;
1855 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1697 1856
1698 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) {
1699 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;
1700 1861
1701 $exit->slaying ("?random/$md5"); 1862 $exit->slaying ("?random/$md5");
1702 $exit->msg (undef); 1863 $exit->msg (undef);
1703 } 1864 }
1704} 1865}
… …
1714 $self->deactivate_recursive; # just to be sure 1875 $self->deactivate_recursive; # just to be sure
1715 unless (eval { 1876 unless (eval {
1716 prepare_random_map $exit 1877 prepare_random_map $exit
1717 if $exit->slaying eq "/!"; 1878 if $exit->slaying eq "/!";
1718 1879
1719 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;
1720 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1721 1882
1722 1; 1883 1;
1723 }) { 1884 }) {
1724 $self->message ("Something went wrong deep within the crossfire server. " 1885 $self->message ("Something went wrong deep within the crossfire server. "
1725 . "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. "
1726 . "Please report this to the dungeon master", 1887 . "Please report this to the dungeon master!",
1727 cf::NDI_UNIQUE | cf::NDI_RED); 1888 cf::NDI_UNIQUE | cf::NDI_RED);
1728 1889
1729 warn "ERROR in enter_exit: $@"; 1890 warn "ERROR in enter_exit: $@";
1730 $self->leave_link; 1891 $self->leave_link;
1731 } 1892 }
… …
2014 sub db_sync() { 2175 sub db_sync() {
2015 db_save if $dirty; 2176 db_save if $dirty;
2016 undef $dirty; 2177 undef $dirty;
2017 } 2178 }
2018 2179
2019 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 {
2020 db_sync; 2181 db_sync;
2021 }); 2182 });
2022 2183
2023 sub db_dirty() { 2184 sub db_dirty() {
2024 $dirty = 1; 2185 $dirty = 1;
… …
2063 $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};
2064 $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};
2065 2226
2066 if (exists $CFG{mlockall}) { 2227 if (exists $CFG{mlockall}) {
2067 eval { 2228 eval {
2068 $CFG{mlockall} ? &mlockall : &munlockall 2229 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2069 and die "WARNING: m(un)lockall failed: $!\n"; 2230 and die "WARNING: m(un)lockall failed: $!\n";
2070 }; 2231 };
2071 warn $@ if $@; 2232 warn $@ if $@;
2072 } 2233 }
2073} 2234}
2074 2235
2075sub main { 2236sub main {
2076 # we must not ever block the main coroutine 2237 # we must not ever block the main coroutine
2077 local $Coro::idle = sub { 2238 local $Coro::idle = sub {
2078 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 {
2079 async { Event::one_event }; 2241 Event::one_event;
2242 })->prio (Coro::PRIO_MAX);
2080 }; 2243 };
2081 2244
2082 cfg_load; 2245 cfg_load;
2083 db_load; 2246 db_load;
2084 load_extensions; 2247 load_extensions;
2248
2249 $TICK_WATCHER->start;
2085 Event::loop; 2250 Event::loop;
2086} 2251}
2087 2252
2088############################################################################# 2253#############################################################################
2089# 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}
2090 2297
2091sub reload() { 2298sub reload() {
2092 # can/must only be called in main 2299 # can/must only be called in main
2093 if ($Coro::current != $Coro::main) { 2300 if ($Coro::current != $Coro::main) {
2094 warn "can only reload from main coroutine\n"; 2301 warn "can only reload from main coroutine";
2095 return; 2302 return;
2096 } 2303 }
2097 2304
2098 warn "reloading..."; 2305 warn "reloading...";
2099 2306
2100 my $guard = freeze_mainloop; 2307 warn "cancelling server ticker";
2308 $TICK_WATCHER->cancel;
2309
2101 cf::emergency_save; 2310 cf::emergency_save;
2102 2311
2103 eval { 2312 eval {
2104 # 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
2105 2314
2106 # cancel all watchers 2315 warn "syncing database to disk";
2316 cf::db_sync;
2317
2318 warn "cancelling all WF_AUTOCANCEL watchers";
2107 for (Event::all_watchers) { 2319 for (Event::all_watchers) {
2108 $_->cancel if $_->data & WF_AUTOCANCEL; 2320 $_->cancel if $_->data & WF_AUTOCANCEL;
2109 } 2321 }
2110 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
2111 # cancel all extension coros 2331 warn "cancelling all extension coros";
2112 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2113 %EXT_CORO = (); 2333 %EXT_CORO = ();
2114 2334
2115 # unload all extensions 2335 warn "removing commands";
2116 for (@exts) { 2336 %COMMAND = ();
2337
2338 warn "removing ext commands";
2339 %EXTCMD = ();
2340
2341 warn "unloading/nuking all extensions";
2342 for my $pkg (@EXTS) {
2117 warn "unloading <$_>"; 2343 warn "... unloading $pkg";
2118 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: $@";
2119 } 2350 }
2120 2351
2352 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg;
2354 }
2355
2121 # unload all modules loaded from $LIBDIR 2356 warn "unloading all perl modules loaded from $LIBDIR";
2122 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2123 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2124 2359
2125 warn "removing <$k>"; 2360 warn "... unloading $k";
2126 delete $INC{$k}; 2361 delete $INC{$k};
2127 2362
2128 $k =~ s/\.pm$//; 2363 $k =~ s/\.pm$//;
2129 $k =~ s/\//::/g; 2364 $k =~ s/\//::/g;
2130 2365
… …
2133 } 2368 }
2134 2369
2135 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2136 } 2371 }
2137 2372
2138 # sync database to disk
2139 cf::db_sync;
2140 IO::AIO::flush;
2141
2142 # get rid of safe::, as good as possible 2373 warn "getting rid of safe::, as good as possible";
2143 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2144 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);
2145 2376
2146 # remove register_script_function callbacks
2147 # TODO
2148
2149 # unload cf.pm "a bit" 2377 warn "unloading cf.pm \"a bit\"";
2150 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2151 2379
2152 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2153 # and global variables created in xs 2381 # and global variables created in xs
2154 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2155 2383
2156 # reload cf.pm 2384 warn "unload completed, starting to reload now";
2385
2157 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2158 require cf; 2387 require cf;
2159 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2160 2389
2161 # load config and database again 2390 warn "loading config and database again";
2162 cf::cfg_load; 2391 cf::cfg_load;
2163 cf::db_load; 2392 cf::db_load;
2164 2393
2165 # load extensions
2166 warn "load extensions"; 2394 warn "loading extensions";
2167 cf::load_extensions; 2395 cf::load_extensions;
2168 2396
2169 # reattach attachments to objects 2397 warn "reattaching attachments to objects/players";
2170 warn "reattach";
2171 _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;
2172 }; 2405 };
2173 2406
2174 if ($@) { 2407 if ($@) {
2175 warn $@; 2408 warn $@;
2176 warn "error while reloading, exiting."; 2409 warn "error while reloading, exiting.";
2177 exit 1; 2410 exit 1;
2178 } 2411 }
2179 2412
2180 warn "reloaded successfully"; 2413 warn "reloaded";
2181}; 2414};
2182 2415
2183############################################################################# 2416our $RELOAD_WATCHER; # used only during reload
2184
2185unless ($LINK_MAP) {
2186 $LINK_MAP = cf::map::new;
2187
2188 $LINK_MAP->width (41);
2189 $LINK_MAP->height (41);
2190 $LINK_MAP->alloc;
2191 $LINK_MAP->path ("{link}");
2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2194
2195 # dirty hack because... archetypes are not yet loaded
2196 Event->timer (
2197 after => 10,
2198 cb => sub {
2199 $_[0]->w->cancel;
2200
2201 # provide some exits "home"
2202 my $exit = cf::object::new "exit";
2203
2204 $exit->slaying ($EMERGENCY_POSITION->[0]);
2205 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2206 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2207
2208 $LINK_MAP->insert ($exit->clone, 19, 19);
2209 $LINK_MAP->insert ($exit->clone, 19, 20);
2210 $LINK_MAP->insert ($exit->clone, 19, 21);
2211 $LINK_MAP->insert ($exit->clone, 20, 19);
2212 $LINK_MAP->insert ($exit->clone, 20, 21);
2213 $LINK_MAP->insert ($exit->clone, 21, 19);
2214 $LINK_MAP->insert ($exit->clone, 21, 20);
2215 $LINK_MAP->insert ($exit->clone, 21, 21);
2216
2217 $exit->destroy;
2218 });
2219
2220 $LINK_MAP->{deny_save} = 1;
2221 $LINK_MAP->{deny_reset} = 1;
2222
2223 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2224}
2225
2226register "<global>", __PACKAGE__;
2227 2417
2228register_command "reload" => sub { 2418register_command "reload" => sub {
2229 my ($who, $arg) = @_; 2419 my ($who, $arg) = @_;
2230 2420
2231 if ($who->flag (FLAG_WIZ)) { 2421 if ($who->flag (FLAG_WIZ)) {
2232 $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 {
2233 reload; 2428 reload;
2234 $who->message ("end of reload."); 2429 undef $RELOAD_WATCHER;
2430 });
2235 } 2431 }
2236}; 2432};
2237 2433
2238unshift @INC, $LIBDIR; 2434unshift @INC, $LIBDIR;
2435
2436my $bug_warning = 0;
2239 2437
2240$TICK_WATCHER = Event->timer ( 2438$TICK_WATCHER = Event->timer (
2241 reentrant => 0, 2439 reentrant => 0,
2440 parked => 1,
2242 prio => 0, 2441 prio => 0,
2243 at => $NEXT_TICK || $TICK, 2442 at => $NEXT_TICK || $TICK,
2244 data => WF_AUTOCANCEL, 2443 data => WF_AUTOCANCEL,
2245 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
2246 cf::server_tick; # one server iteration 2453 cf::server_tick; # one server iteration
2247 $RUNTIME += $TICK; 2454 $RUNTIME += $TICK;
2248 $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;
2249 2459
2250 # 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
2251 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2252 2462
2253 $TICK_WATCHER->at ($NEXT_TICK); 2463 $TICK_WATCHER->at ($NEXT_TICK);
… …
2255 }, 2465 },
2256); 2466);
2257 2467
2258IO::AIO::max_poll_time $TICK * 0.2; 2468IO::AIO::max_poll_time $TICK * 0.2;
2259 2469
2260Event->io ( 2470$AIO_POLL_WATCHER = Event->io (
2261 fd => IO::AIO::poll_fileno, 2471 fd => IO::AIO::poll_fileno,
2262 poll => 'r', 2472 poll => 'r',
2263 prio => 5, 2473 prio => 5,
2264 data => WF_AUTOCANCEL, 2474 data => WF_AUTOCANCEL,
2265 cb => \&IO::AIO::poll_cb, 2475 cb => \&IO::AIO::poll_cb,
2266); 2476);
2267 2477
2268Event->timer ( 2478$WRITE_RUNTIME_WATCHER = Event->timer (
2269 data => WF_AUTOCANCEL, 2479 data => WF_AUTOCANCEL,
2270 after => 0, 2480 after => 1,
2271 interval => 10, 2481 interval => 10,
2272 cb => sub { 2482 cb => Coro::unblock_sub {
2273 (Coro::unblock_sub {
2274 write_runtime 2483 write_runtime
2275 or warn "ERROR: unable to write runtime file: $!"; 2484 or warn "ERROR: unable to write runtime file: $!";
2276 })->();
2277 }, 2485 },
2278); 2486);
2279 2487
2280END { cf::emergency_save } 2488END { cf::emergency_save }
2281 2489

Diff Legend

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