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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.237 by root, Fri Apr 13 05:08:51 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.3 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
19 22
23use BDB ();
20use Data::Dumper; 24use Data::Dumper;
21use Digest::MD5; 25use Digest::MD5;
22use Fcntl; 26use Fcntl;
27use YAML::Syck ();
23use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 29use Time::HiRes;
30use Compress::LZF;
26 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
37
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 39
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
33 42
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 46
36our %COMMAND = (); 47our %COMMAND = ();
37our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
38 49
39our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 51our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
43 54
55our $RELOAD; # number of reloads so far
44our @EVENT; 56our @EVENT;
45our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
46 58
47our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 60our $TICK_WATCHER;
61our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 63our $NEXT_TICK;
50our $NOW; 64our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off
66
67our $BDB_POLL_WATCHER;
68our $DB_ENV;
51 69
52our %CFG; 70our %CFG;
53 71
54our $UPTIME; $UPTIME ||= time; 72our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 73our $RUNTIME;
56 74
57our %PLAYER; # all users 75our %PLAYER; # all users
58our %MAP; # all maps 76our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
61 80
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 83
65# used to convert map paths into valid unix filenames by replacing / by ∕ 84# used to convert map paths into valid unix filenames by replacing / by ∕
78mkdir cf::localdir; 97mkdir cf::localdir;
79mkdir cf::localdir . "/" . cf::playerdir; 98mkdir cf::localdir . "/" . cf::playerdir;
80mkdir cf::localdir . "/" . cf::tmpdir; 99mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir; 100mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS; 101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
83 103
84our $EMERGENCY_POSITION; 104our $EMERGENCY_POSITION;
105
106sub cf::map::normalise;
85 107
86############################################################################# 108#############################################################################
87 109
88=head2 GLOBAL VARIABLES 110=head2 GLOBAL VARIABLES
89 111
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 211 $d
190 } || "[unable to dump $_[0]: '$@']"; 212 } || "[unable to dump $_[0]: '$@']";
191} 213}
192 214
193use JSON::Syck (); # TODO# replace by JSON::PC once working 215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194 216
195=item $ref = cf::from_json $json 217=item $ref = cf::from_json $json
196 218
197Converts a JSON string into the corresponding perl data structure. 219Converts a JSON string into the corresponding perl data structure.
198 220
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 221=item $json = cf::to_json $ref
207 222
208Converts a perl data structure into its JSON representation. 223Converts a perl data structure into its JSON representation.
209
210=cut
211
212sub to_json($) {
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214 JSON::Syck::Dump $_[0]
215}
216 224
217=item cf::lock_wait $string 225=item cf::lock_wait $string
218 226
219Wait until the given lock is available. See cf::lock_acquire. 227Wait until the given lock is available. See cf::lock_acquire.
220 228
257} 265}
258 266
259sub freeze_mainloop { 267sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 268 return unless $TICK_WATCHER->is_active;
261 269
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 270 my $guard = Coro::guard {
271 $TICK_WATCHER->start;
272 };
263 $TICK_WATCHER->stop; 273 $TICK_WATCHER->stop;
264 $guard 274 $guard
265} 275}
266 276
267=item cf::async { BLOCK } 277=item cf::async { BLOCK }
338 348
339 $coro 349 $coro
340} 350}
341 351
342sub write_runtime { 352sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 353 my $guard = cf::lock_acquire "write_runtime";
344 354
345 my $runtime = cf::localdir . "/runtime"; 355 my $runtime = cf::localdir . "/runtime";
346 356
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 358 or return;
349 359
360 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 361 # 10 is the runtime save interval, for a monotonic clock
362 # 60 allows for the watchdog to kill the server.
363
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 364 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 365 and return;
353 366
367 # always fsync - this file is important
354 aio_fsync $fh 368 aio_fsync $fh
355 and return; 369 and return;
356 370
357 close $fh 371 close $fh
358 or return; 372 or return;
359 373
360 aio_rename "$runtime~", $runtime 374 aio_rename "$runtime~", $runtime
361 and return; 375 and return;
362 376
363 1 377 1
378}
379
380=item cf::datalog type => key => value, ...
381
382Log a datalog packet of the given type with the given key-value pairs.
383
384=cut
385
386sub datalog($@) {
387 my ($type, %kv) = @_;
388 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 389}
365 390
366=back 391=back
367 392
368=cut 393=cut
499our @CB_TYPE = (); # registry for type (cf-object class) based events 524our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 525our @CB_MAP = ();
501 526
502my %attachment; 527my %attachment;
503 528
529sub cf::attachable::thawer_merge {
530 # simply override everything except _meta
531 local $_[0]{_meta};
532 %{$_[0]} = %{$_[1]};
533}
534
504sub _attach_cb($$$$) { 535sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 536 my ($registry, $event, $prio, $cb) = @_;
506 537
507 use sort 'stable'; 538 use sort 'stable';
508 539
679# object support 710# object support
680 711
681sub reattach { 712sub reattach {
682 # basically do the same as instantiate, without calling instantiate 713 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 714 my ($obj) = @_;
715
716 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 717
685 my $registry = $obj->registry; 718 my $registry = $obj->registry;
686 719
687 @$registry = (); 720 @$registry = ();
688 721
735 $filename, length $$rdata, scalar @$objs; 768 $filename, length $$rdata, scalar @$objs;
736 769
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 772 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 774 close $fh;
742 775
743 if (@$objs) { 776 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 777 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 778 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 779 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 780 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 781 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 782 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 783 aio_rename "$filename.pst~", "$filename.pst";
751 } 784 }
752 } else { 785 } else {
753 aio_unlink "$filename.pst"; 786 aio_unlink "$filename.pst";
900 } or warn "$ext not loaded: $@"; 933 } or warn "$ext not loaded: $@";
901 } 934 }
902} 935}
903 936
904############################################################################# 937#############################################################################
905# load/save/clean perl data associated with a map
906
907*cf::mapsupport::on_clean = sub {
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 938
920=head2 CORE EXTENSIONS 939=head2 CORE EXTENSIONS
921 940
922Functions and methods that extend core crossfire objects. 941Functions and methods that extend core crossfire objects.
923 942
946} 965}
947 966
948sub path($) { 967sub path($) {
949 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
950 969
951 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
952} 971}
953 972
954sub find_active($) { 973sub find_active($) {
955 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
956 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
959 978
960sub exists($) { 979sub exists($) {
961 my ($login) = @_; 980 my ($login) = @_;
962 981
963 $cf::PLAYER{$login} 982 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 983 or cf::sync_job { !aio_stat path $login }
965} 984}
966 985
967sub find($) { 986sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 987 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 988 my $login = $_[0];
970 989
971 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
972 991
973 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
974 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
975 or return; 1001 or return;
976 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
977 } 1003 }
978 } 1004 }
1015 1041
1016=cut 1042=cut
1017 1043
1018sub quit_character { 1044sub quit_character {
1019 my ($pl) = @_; 1045 my ($pl) = @_;
1046
1047 my $name = $pl->ob->name;
1020 1048
1021 $pl->{deny_save} = 1; 1049 $pl->{deny_save} = 1;
1022 $pl->password ("*"); # this should lock out the player until we nuked the dir 1050 $pl->password ("*"); # this should lock out the player until we nuked the dir
1023 1051
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1052 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1029 my $path = playerdir $pl; 1057 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~"; 1058 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp; 1059 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name}; 1060 delete $cf::PLAYER{$pl->ob->name};
1033 $pl->destroy; 1061 $pl->destroy;
1062
1063 my $prefix = qr<^~\Q$name\E/>;
1064
1065 # nuke player maps
1066 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1067
1034 IO::AIO::aio_rmtree $temp; 1068 IO::AIO::aio_rmtree $temp;
1069}
1070
1071=item $pl->kick
1072
1073Kicks a player out of the game. This destroys the connection.
1074
1075=cut
1076
1077sub kick {
1078 my ($pl, $kicker) = @_;
1079
1080 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1081 $pl->killer ("kicked");
1082 $pl->ns->destroy;
1035} 1083}
1036 1084
1037=item cf::player::list_logins 1085=item cf::player::list_logins
1038 1086
1039Returns am arrayref of all valid playernames in the system, can take a 1087Returns am arrayref of all valid playernames in the system, can take a
1067=cut 1115=cut
1068 1116
1069sub maps($) { 1117sub maps($) {
1070 my ($pl) = @_; 1118 my ($pl) = @_;
1071 1119
1120 $pl = ref $pl ? $pl->ob->name : $pl;
1121
1072 my $files = aio_readdir playerdir $pl 1122 my $files = aio_readdir playerdir $pl
1073 or return; 1123 or return;
1074 1124
1075 my @paths; 1125 my @paths;
1076 1126
1077 for (@$files) { 1127 for (@$files) {
1078 utf8::decode $_; 1128 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1129 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1130 next unless /^$PATH_SEP/o;
1081 1131
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1132 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1133 }
1084 1134
1085 \@paths 1135 \@paths
1086} 1136}
1087 1137
1088=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1089 1139
1090Sends an ext reply to the player. 1140Sends an ext reply to the player.
1091 1141
1092=cut 1142=cut
1093 1143
1094sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1095 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1096 1146
1097 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1098 1148
1099 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1150}
1151
1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1100} 1162}
1101 1163
1102package cf; 1164package cf;
1103 1165
1104=back 1166=back
1114 1176
1115use Fcntl; 1177use Fcntl;
1116use Coro::AIO; 1178use Coro::AIO;
1117 1179
1118use overload 1180use overload
1119 '""' => \&as_string; 1181 '""' => \&as_string,
1182 fallback => 1;
1120 1183
1121our $MAX_RESET = 3600; 1184our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1185our $DEFAULT_RESET = 3000;
1123 1186
1124sub generate_random_map { 1187sub generate_random_map {
1125 my ($self, $rmp) = @_; 1188 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1189 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1190 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1191 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1192 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1193 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1200 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1201 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1202 )
1141} 1203}
1142 1204
1205=item cf::map->register ($regex, $prio)
1206
1207Register a handler for the map path matching the given regex at the
1208givne priority (higher is better, built-in handlers have priority 0, the
1209default).
1210
1211=cut
1212
1143sub register { 1213sub register {
1144 my (undef, $regex) = @_; 1214 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1215 my $pkg = caller;
1146 1216
1147 no strict; 1217 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1218 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1219
1150 $EXT_MAP{$pkg} = qr<$regex>; 1220 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1221}
1152 1222
1153# also paths starting with '/' 1223# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1224$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1225
1226sub thawer_merge {
1227 my ($self, $merge) = @_;
1228
1229 # we have to keep some variables in memory intact
1230 local $self->{path};
1231 local $self->{load_path};
1232 local $self->{deny_save};
1233 local $self->{deny_reset};
1234
1235 $self->SUPER::thawer_merge ($merge);
1236}
1155 1237
1156sub normalise { 1238sub normalise {
1157 my ($path, $base) = @_; 1239 my ($path, $base) = @_;
1240
1241 $path = "$path"; # make sure its a string
1242
1243 $path =~ s/\.map$//;
1158 1244
1159 # map plan: 1245 # map plan:
1160 # 1246 #
1161 # /! non-realised random map exit (special hack!) 1247 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1248 # {... are special paths that are not being touched
1190 1276
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1277 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1278
1193 $path = normalise $path, $base; 1279 $path = normalise $path, $base;
1194 1280
1195 for my $pkg (keys %EXT_MAP) { 1281 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1282 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1283 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1284 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1285 $self->init; # pass $1 etc.
1200 return $self; 1286 return $self;
1201 } 1287 }
1202 } 1288 }
1203 1289
1204 Carp::carp "unable to resolve path '$path'."; 1290 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1291 ()
1206} 1292}
1207 1293
1208sub init { 1294sub init {
1209 my ($self) = @_; 1295 my ($self) = @_;
1220# the displayed name, this is a one way mapping 1306# the displayed name, this is a one way mapping
1221sub visible_name { 1307sub visible_name {
1222 &as_string 1308 &as_string
1223} 1309}
1224 1310
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1311# the original (read-only) location
1233sub load_path { 1312sub load_path {
1234 my ($self) = @_; 1313 my ($self) = @_;
1235 1314
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1315 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1237} 1316}
1238 1317
1239# the temporary/swap location 1318# the temporary/swap location
1240sub save_path { 1319sub save_path {
1241 my ($self) = @_; 1320 my ($self) = @_;
1242 1321
1322 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1323 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1244} 1324}
1245 1325
1246# the unique path, undef == no special unique path 1326# the unique path, undef == no special unique path
1247sub uniq_path { 1327sub uniq_path {
1248 my ($self) = @_; 1328 my ($self) = @_;
1249 1329
1330 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1331 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1332}
1252 1333
1253# and all this just because we cannot iterate over 1334# and all this just because we cannot iterate over
1254# all maps in C++... 1335# all maps in C++...
1255sub change_all_map_light { 1336sub change_all_map_light {
1261 1342
1262sub unlink_save { 1343sub unlink_save {
1263 my ($self) = @_; 1344 my ($self) = @_;
1264 1345
1265 utf8::encode (my $save = $self->save_path); 1346 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1347 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1348 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1349}
1269 1350
1270sub load_header_from($) { 1351sub load_header_from($) {
1271 my ($self, $path) = @_; 1352 my ($self, $path) = @_;
1272 1353
1273 utf8::encode $path; 1354 utf8::encode $path;
1274 aio_open $path, O_RDONLY, 0 1355 #aio_open $path, O_RDONLY, 0
1275 or return; 1356 # or return;
1276 1357
1277 $self->_load_header ($path) 1358 $self->_load_header ($path)
1278 or return; 1359 or return;
1279 1360
1280 $self->{load_path} = $path; 1361 $self->{load_path} = $path;
1281 1362
1282 1 1363 1
1283} 1364}
1284 1365
1285sub load_orig { 1366sub load_header_orig {
1286 my ($self) = @_; 1367 my ($self) = @_;
1287 1368
1288 $self->load_header_from ($self->load_path) 1369 $self->load_header_from ($self->load_path)
1289} 1370}
1290 1371
1291sub load_temp { 1372sub load_header_temp {
1292 my ($self) = @_; 1373 my ($self) = @_;
1293 1374
1294 $self->load_header_from ($self->save_path) 1375 $self->load_header_from ($self->save_path)
1376}
1377
1378sub prepare_temp {
1379 my ($self) = @_;
1380
1381 $self->last_access ((delete $self->{last_access})
1382 || $cf::RUNTIME); #d#
1383 # safety
1384 $self->{instantiate_time} = $cf::RUNTIME
1385 if $self->{instantiate_time} > $cf::RUNTIME;
1386}
1387
1388sub prepare_orig {
1389 my ($self) = @_;
1390
1391 $self->{load_original} = 1;
1392 $self->{instantiate_time} = $cf::RUNTIME;
1393 $self->last_access ($cf::RUNTIME);
1394 $self->instantiate;
1295} 1395}
1296 1396
1297sub load_header { 1397sub load_header {
1298 my ($self) = @_; 1398 my ($self) = @_;
1299 1399
1300 if ($self->load_temp) { 1400 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1401 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1402 } else {
1307 $self->load_orig 1403 $self->load_header_orig
1308 or return; 1404 or return;
1309 1405 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 1406 }
1315 1407
1316 1 1408 1
1317} 1409}
1318 1410
1332 $map->{last_save} = $cf::RUNTIME; 1424 $map->{last_save} = $cf::RUNTIME;
1333 1425
1334 $map->load_header 1426 $map->load_header
1335 or return; 1427 or return;
1336 1428
1337 if ($map->should_reset) { 1429 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1430 # doing this can freeze the server in a sync job, obviously
1431 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1432 $map->reset;
1339 undef $guard; 1433 undef $guard;
1340 $map = find $path 1434 return find $path;
1341 or return;
1342 } 1435 }
1343 1436
1344 $cf::MAP{$path} = $map 1437 $cf::MAP{$path} = $map
1345 } 1438 }
1346} 1439}
1440
1441sub pre_load { }
1442sub post_load { }
1347 1443
1348sub load { 1444sub load {
1349 my ($self) = @_; 1445 my ($self) = @_;
1350 1446
1447 local $self->{deny_reset} = 1; # loading can take a long time
1448
1351 my $path = $self->{path}; 1449 my $path = $self->{path};
1352 my $guard = cf::lock_acquire "map_load:$path"; 1450 my $guard = cf::lock_acquire "map_load:$path";
1353 1451
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1452 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1453
1356 $self->in_memory (cf::MAP_LOADING); 1454 $self->in_memory (cf::MAP_LOADING);
1357 1455
1358 $self->alloc; 1456 $self->alloc;
1457
1458 $self->pre_load;
1459
1359 $self->_load_objects ($self->{load_path}, 1) 1460 $self->_load_objects ($self->{load_path}, 1)
1360 or return; 1461 or return;
1361 1462
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363 if delete $self->{load_original}; 1464 if delete $self->{load_original};
1385 unless $self->difficulty; 1486 unless $self->difficulty;
1386 Coro::cede; 1487 Coro::cede;
1387 $self->activate; 1488 $self->activate;
1388 } 1489 }
1389 1490
1491 $self->post_load;
1492
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1493 $self->in_memory (cf::MAP_IN_MEMORY);
1391} 1494}
1392 1495
1393sub customise_for { 1496sub customise_for {
1394 my ($self, $ob) = @_; 1497 my ($self, $ob) = @_;
1434 1537
1435 cf::sync_job { $map->load }; 1538 cf::sync_job { $map->load };
1436} 1539}
1437 1540
1438our %MAP_PREFETCH; 1541our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1542our $MAP_PREFETCHER = undef;
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1443 or next;
1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1449 }
1450};
1451 1543
1452sub find_async { 1544sub find_async {
1453 my ($path, $origin) = @_; 1545 my ($path, $origin) = @_;
1454 1546
1455 $path = normalise $path, $origin && $origin->{path}; 1547 $path = normalise $path, $origin && $origin->{path};
1456 1548
1457 if (my $map = $cf::MAP{$path}) { 1549 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1550 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1551 }
1460 1552
1461 $MAP_PREFETCH{$path} = 0; 1553 undef $MAP_PREFETCH{$path};
1554 $MAP_PREFETCHER ||= cf::async {
1555 while (%MAP_PREFETCH) {
1556 for my $path (keys %MAP_PREFETCH) {
1557 my $map = find $path
1558 or next;
1559 $map->load;
1560
1561 delete $MAP_PREFETCH{$path};
1562 }
1563 }
1564 undef $MAP_PREFETCHER;
1565 };
1462 $MAP_PREFETCHER->ready; 1566 $MAP_PREFETCHER->prio (6);
1463 1567
1464 () 1568 ()
1465} 1569}
1466 1570
1467sub save { 1571sub save {
1512 1616
1513sub reset_at { 1617sub reset_at {
1514 my ($self) = @_; 1618 my ($self) = @_;
1515 1619
1516 # TODO: safety, remove and allow resettable per-player maps 1620 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1621 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1622 return 1e99 if $self->{deny_reset};
1519 1623
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1624 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1625 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1626
1527 my ($self) = @_; 1631 my ($self) = @_;
1528 1632
1529 $self->reset_at <= $cf::RUNTIME 1633 $self->reset_at <= $cf::RUNTIME
1530} 1634}
1531 1635
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 1636sub reset {
1547 my ($self) = @_; 1637 my ($self) = @_;
1548 1638
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1639 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1640
1551 return if $self->players; 1641 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1642 return if $self->isa ("ext::map_per_player");#d#
1553 1643
1554 warn "resetting map ", $self->path;#d# 1644 warn "resetting map ", $self->path;#d#
1555 1645
1646 $self->in_memory (cf::MAP_SWAPPED);
1647
1648 # need to save uniques path
1649 unless ($self->{deny_save}) {
1650 my $uniq = $self->uniq_path; utf8::encode $uniq;
1651
1652 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1653 if $uniq;
1654 }
1655
1556 delete $cf::MAP{$self->path}; 1656 delete $cf::MAP{$self->path};
1657
1658 $self->clear;
1557 1659
1558 $_->clear_links_to ($self) for values %cf::MAP; 1660 $_->clear_links_to ($self) for values %cf::MAP;
1559 1661
1560 $self->unlink_save; 1662 $self->unlink_save;
1561 $self->destroy; 1663 $self->destroy;
1564my $nuke_counter = "aaaa"; 1666my $nuke_counter = "aaaa";
1565 1667
1566sub nuke { 1668sub nuke {
1567 my ($self) = @_; 1669 my ($self) = @_;
1568 1670
1671 delete $cf::MAP{$self->path};
1672
1673 $self->unlink_save;
1674
1675 bless $self, "cf::map";
1676 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1677 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1678 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1679 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1680
1681 $cf::MAP{$self->path} = $self;
1682
1572 $self->reset; # polite request, might not happen 1683 $self->reset; # polite request, might not happen
1573} 1684}
1574 1685
1575=item cf::map::unique_maps 1686=item cf::map::unique_maps
1576 1687
1588 for (@$files) { 1699 for (@$files) {
1589 utf8::decode $_; 1700 utf8::decode $_;
1590 next if /\.pst$/; 1701 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1702 next unless /^$PATH_SEP/o;
1592 1703
1593 push @paths, $_; 1704 push @paths, cf::map::normalise $_;
1594 } 1705 }
1595 1706
1596 \@paths 1707 \@paths
1597} 1708}
1598 1709
1692=cut 1803=cut
1693 1804
1694sub link_map { 1805sub link_map {
1695 unless ($LINK_MAP) { 1806 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 1807 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1808 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 1809 $LINK_MAP->load;
1699 } 1810 }
1700 1811
1701 $LINK_MAP 1812 $LINK_MAP
1702} 1813}
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1820 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1821
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1822 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1823 if $self->map;
1713 1824
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1825 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1826}
1716 1827
1717sub cf::object::player::leave_link { 1828sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1829 my ($self, $map, $x, $y) = @_;
1719 1830
1741 $map->load; 1852 $map->load;
1742 $map->load_diag; 1853 $map->load_diag;
1743 1854
1744 return unless $self->contr->active; 1855 return unless $self->contr->active;
1745 $self->activate_recursive; 1856 $self->activate_recursive;
1857
1858 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1859 $self->enter_map ($map, $x, $y);
1747} 1860}
1748 1861
1749cf::player->attach ( 1862cf::player->attach (
1750 on_logout => sub { 1863 on_logout => sub {
1763 # try to abort aborted map switching on player login :) 1876 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1877 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1878 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1879 $pl->ob->enter_link;
1767 (async { 1880 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef, 1881 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1882 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.", 1883 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED); 1884 cf::NDI_RED);
1885 # we need this sleep as the login has a concurrent enter_exit running
1886 # and this sleep increases chances of the player not ending up in scorn
1774 Coro::Timer::sleep 1; 1887 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1888 $pl->ob->leave_link;
1776 })->prio (2); 1889 })->prio (2);
1777 } 1890 }
1778 }, 1891 },
1786 my ($self, $path, $x, $y) = @_; 1899 my ($self, $path, $x, $y) = @_;
1787 1900
1788 $self->enter_link; 1901 $self->enter_link;
1789 1902
1790 (async { 1903 (async {
1904 my $map = eval {
1791 my $map = cf::map::find $path; 1905 my $map = cf::map::find $path;
1792 $map = $map->customise_for ($self) if $map; 1906 $map = $map->customise_for ($self) if $map;
1793 1907 $map
1794# warn "entering ", $map->path, " at ($x, $y)\n" 1908 } or
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1909 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798 1910
1799 $self->leave_link ($map, $x, $y); 1911 $self->leave_link ($map, $x, $y);
1800 })->prio (1); 1912 })->prio (1);
1801} 1913}
1802 1914
1806 1918
1807sub parse_random_map_params { 1919sub parse_random_map_params {
1808 my ($spec) = @_; 1920 my ($spec) = @_;
1809 1921
1810 my $rmp = { # defaults 1922 my $rmp = { # defaults
1811 xsize => 10, 1923 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1924 ysize => (cf::rndm 15, 40),
1925 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1926 #layout => string,
1813 }; 1927 };
1814 1928
1815 for (split /\n/, $spec) { 1929 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1930 my ($k, $v) = split /\s+/, $_, 2;
1817 1931
1821 $rmp 1935 $rmp
1822} 1936}
1823 1937
1824sub prepare_random_map { 1938sub prepare_random_map {
1825 my ($exit) = @_; 1939 my ($exit) = @_;
1940
1941 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1942
1827 # all this does is basically replace the /! path by 1943 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1944 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1945 # that depends on the exit object
1830 1946
1831 my $rmp = parse_random_map_params $exit->msg; 1947 my $rmp = parse_random_map_params $exit->msg;
1832 1948
1833 if ($exit->map) { 1949 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 1950 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 1951 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 1952 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 1953 $rmp->{origin_y} = $exit->y;
1838 } 1954 }
1839 1955
1840 $rmp->{random_seed} ||= $exit->random_seed; 1956 $rmp->{random_seed} ||= $exit->random_seed;
1841 1957
1842 my $data = cf::to_json $rmp; 1958 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1959 my $md5 = Digest::MD5::md5_hex $data;
1960 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1961
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1962 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1963 aio_write $fh, 0, (length $data), $data, 0;
1964 undef $fh;
1965 aio_rename "$meta~", $meta;
1847 1966
1848 $exit->slaying ("?random/$md5"); 1967 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1968 $exit->msg (undef);
1850 } 1969 }
1851} 1970}
1852 1971
1853sub cf::object::player::enter_exit { 1972sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 1973 my ($self, $exit) = @_;
1855 1974
1856 return unless $self->type == cf::PLAYER; 1975 return unless $self->type == cf::PLAYER;
1976
1977 if ($exit->slaying eq "/!") {
1978 #TODO: this should de-fi-ni-te-ly not be a sync-job
1979 # the problem is that $exit might not survive long enough
1980 # so it needs to be done right now, right here
1981 cf::sync_job { prepare_random_map $exit };
1982 }
1983
1984 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1985 my $hp = $exit->stats->hp;
1986 my $sp = $exit->stats->sp;
1857 1987
1858 $self->enter_link; 1988 $self->enter_link;
1859 1989
1860 (async { 1990 (async {
1861 $self->deactivate_recursive; # just to be sure 1991 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 1992 unless (eval {
1863 prepare_random_map $exit 1993 $self->goto ($slaying, $hp, $sp);
1864 if $exit->slaying eq "/!";
1865
1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1868 1994
1869 1; 1995 1;
1870 }) { 1996 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 1997 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 1998 . "I'll try to bring you back to the map you were before. "
1873 . "Please report this to the dungeon master!", 1999 . "Please report this to the dungeon master!",
1874 cf::NDI_UNIQUE | cf::NDI_RED); 2000 cf::NDI_UNIQUE | cf::NDI_RED);
1875 2001
1876 warn "ERROR in enter_exit: $@"; 2002 warn "ERROR in enter_exit: $@";
1877 $self->leave_link; 2003 $self->leave_link;
1878 } 2004 }
1879 })->prio (1); 2005 })->prio (1);
1892 2018
1893sub cf::client::send_drawinfo { 2019sub cf::client::send_drawinfo {
1894 my ($self, $text, $flags) = @_; 2020 my ($self, $text, $flags) = @_;
1895 2021
1896 utf8::encode $text; 2022 utf8::encode $text;
1897 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2023 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1898} 2024}
1899 2025
2026=item $client->ext_event ($type, %msg)
2027
2028Sends an exti event to the client.
2029
2030=cut
2031
2032sub cf::client::ext_event($$%) {
2033 my ($self, $type, %msg) = @_;
2034
2035 $msg{msgtype} = "event_$type";
2036 $self->send_packet ("ext " . cf::to_json \%msg);
2037}
1900 2038
1901=item $success = $client->query ($flags, "text", \&cb) 2039=item $success = $client->query ($flags, "text", \&cb)
1902 2040
1903Queues a query to the client, calling the given callback with 2041Queues a query to the client, calling the given callback with
1904the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2042the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1933 # get handled first 2071 # get handled first
1934 my $queue = delete $ns->{query_queue} 2072 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2073 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2074
1937 (shift @$queue)->[1]->($msg); 2075 (shift @$queue)->[1]->($msg);
2076 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2077
1939 push @{ $ns->{query_queue} }, @$queue; 2078 push @{ $ns->{query_queue} }, @$queue;
1940 2079
1941 if (@{ $ns->{query_queue} } == @$queue) { 2080 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2081 if (@$queue) {
2000 2139
2001# here we export the classes and methods available to script code 2140# here we export the classes and methods available to script code
2002 2141
2003=pod 2142=pod
2004 2143
2005The following fucntions and emthods are available within a safe environment: 2144The following functions and methods are available within a safe environment:
2006 2145
2007 cf::object contr pay_amount pay_player map 2146 cf::object contr pay_amount pay_player map
2008 cf::object::player player 2147 cf::object::player player
2009 cf::player peaceful 2148 cf::player peaceful
2010 cf::map trigger 2149 cf::map trigger
2103The parameter C<$family> should best start with the name of the extension 2242The parameter C<$family> should best start with the name of the extension
2104using it, it should be unique. 2243using it, it should be unique.
2105 2244
2106=over 4 2245=over 4
2107 2246
2108=item $hashref = cf::db_get $family
2109
2110Return a hashref for use by the extension C<$family>, which can be
2111modified. After modifications, you have to call C<cf::db_dirty> or
2112C<cf::db_sync>.
2113
2114=item $value = cf::db_get $family => $key 2247=item $value = cf::db_get $family => $key
2115 2248
2116Returns a single value from the database 2249Returns a single value from the database.
2117
2118=item cf::db_put $family => $hashref
2119
2120Stores the given family hashref into the database. Updates are delayed, if
2121you want the data to be synced to disk immediately, use C<cf::db_sync>.
2122 2250
2123=item cf::db_put $family => $key => $value 2251=item cf::db_put $family => $key => $value
2124 2252
2125Stores the given C<$value> in the family hash. Updates are delayed, if you 2253Stores the given C<$value> in the family.
2126want the data to be synced to disk immediately, use C<cf::db_sync>.
2127
2128=item cf::db_dirty
2129
2130Marks the database as dirty, to be updated at a later time.
2131
2132=item cf::db_sync
2133
2134Immediately write the database to disk I<if it is dirty>.
2135 2254
2136=cut 2255=cut
2137 2256
2138our $DB; 2257our $DB;
2139 2258
2140{ 2259sub db_init {
2260 unless ($DB) {
2261 $DB = BDB::db_create $DB_ENV;
2262
2263 cf::sync_job {
2264 eval {
2265 $DB->set_flags (BDB::CHKSUM);
2266
2267 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!;
2270 };
2271 cf::cleanup "db_open(db): $@" if $@;
2272 };
2273
2141 my $path = cf::localdir . "/database.pst"; 2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2142 2278
2143 sub db_load() { 2279 cf::db_put (board => data => $pst->{board});
2144 $DB = stat $path ? Storable::retrieve $path : { }; 2280 cf::db_put (guildrules => data => $pst->{guildrules});
2145 } 2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2146 2283
2147 my $pid; 2284 unlink $path;
2148
2149 sub db_save() {
2150 waitpid $pid, 0 if $pid;
2151 if (0 == ($pid = fork)) {
2152 $DB->{_meta}{version} = 1;
2153 Storable::nstore $DB, "$path~";
2154 rename "$path~", $path;
2155 cf::_exit 0 if defined $pid;
2156 } 2285 };
2157 }
2158
2159 my $dirty;
2160
2161 sub db_sync() {
2162 db_save if $dirty;
2163 undef $dirty;
2164 }
2165
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167 db_sync;
2168 });
2169
2170 sub db_dirty() {
2171 $dirty = 1;
2172 $idle->start;
2173 }
2174
2175 sub db_get($;$) {
2176 @_ >= 2
2177 ? $DB->{$_[0]}{$_[1]}
2178 : ($DB->{$_[0]} ||= { })
2179 }
2180
2181 sub db_put($$;$) {
2182 if (@_ >= 3) {
2183 $DB->{$_[0]}{$_[1]} = $_[2];
2184 } else {
2185 $DB->{$_[0]} = $_[1];
2186 }
2187 db_dirty;
2188 }
2189
2190 cf::global->attach (
2191 prio => 10000,
2192 on_cleanup => sub {
2193 db_sync;
2194 }, 2286 }
2195 ); 2287 }
2288}
2289
2290sub db_get($$) {
2291 my $key = "$_[0]/$_[1]";
2292
2293 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data;
2295
2296 $! ? ()
2297 : Compress::LZF::sthaw $data
2298 }
2299}
2300
2301sub db_put($$$) {
2302 BDB::dbreq_pri 4;
2303 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2196} 2304}
2197 2305
2198############################################################################# 2306#############################################################################
2199# the server's main() 2307# the server's init and main functions
2308
2309sub load_facedata {
2310 my $path = sprintf "%s/facedata", cf::datadir;
2311
2312 warn "loading facedata from $path\n";
2313
2314 my $facedata;
2315 0 < aio_load $path, $facedata
2316 or die "$path: $!";
2317
2318 $facedata = Coro::Storable::thaw $facedata;
2319
2320 $facedata->{version} == 2
2321 or cf::cleanup "$path: version mismatch, cannot proceed.";
2322
2323 {
2324 my $faces = $facedata->{faceinfo};
2325
2326 while (my ($face, $info) = each %$faces) {
2327 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2331 Coro::cede;
2332 }
2333
2334 while (my ($face, $info) = each %$faces) {
2335 next unless $info->{smooth};
2336 my $idx = cf::face::find $face
2337 or next;
2338 if (my $smooth = cf::face::find $info->{smooth}) {
2339 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2340 } else {
2341 warn "smooth face '$info->{smooth}' not found for face '$face'";
2342 }
2343 Coro::cede;
2344 }
2345 }
2346
2347 {
2348 my $anims = $facedata->{animinfo};
2349
2350 while (my ($anim, $info) = each %$anims) {
2351 cf::anim::set $anim, $info->{frames}, $info->{facings};
2352 Coro::cede;
2353 }
2354
2355 cf::anim::invalidate_all; # d'oh
2356 }
2357
2358 1
2359}
2360
2361sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2363 or die "unable to load regions file\n";#d#
2364 load_facedata
2365 or die "unable to load facedata\n";#d#
2366}
2367
2368sub init {
2369 reload_resources;
2370}
2200 2371
2201sub cfg_load { 2372sub cfg_load {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 2373 open my $fh, "<:utf8", cf::confdir . "/config"
2203 or return; 2374 or return;
2204 2375
2221 2392
2222sub main { 2393sub main {
2223 # we must not ever block the main coroutine 2394 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2395 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2396 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2397 (async {
2226 async { Event::one_event }; 2398 Event::one_event;
2399 })->prio (Coro::PRIO_MAX);
2227 }; 2400 };
2228 2401
2229 cfg_load; 2402 cfg_load;
2230 db_load; 2403 db_init;
2231 load_extensions; 2404 load_extensions;
2405
2406 $TICK_WATCHER->start;
2232 Event::loop; 2407 Event::loop;
2233} 2408}
2234 2409
2235############################################################################# 2410#############################################################################
2236# initialisation and cleanup 2411# initialisation and cleanup
2237 2412
2238# install some emergency cleanup handlers 2413# install some emergency cleanup handlers
2239BEGIN { 2414BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2415 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2416 Event->signal (
2417 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2418 data => WF_AUTOCANCEL,
2243 signal => $signal, 2419 signal => $signal,
2420 prio => 0,
2244 cb => sub { 2421 cb => sub {
2245 cf::cleanup "SIG$signal"; 2422 cf::cleanup "SIG$signal";
2246 }, 2423 },
2247 ); 2424 );
2248 } 2425 }
2249} 2426}
2254 warn "enter emergency perl save\n"; 2431 warn "enter emergency perl save\n";
2255 2432
2256 cf::sync_job { 2433 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2434 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2435 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2436 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2437 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2438 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2439 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2440 $pl->valid or next;
2264 $pl->save; 2441 $pl->save;
2270 my $map = $cf::MAP{$path} or next; 2447 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 2448 $map->valid or next;
2272 $map->save; 2449 $map->save;
2273 } 2450 }
2274 warn "end emergency map save\n"; 2451 warn "end emergency map save\n";
2452
2453 warn "begin emergency database checkpoint\n";
2454 BDB::db_env_txn_checkpoint $DB_ENV;
2455 warn "end emergency database checkpoint\n";
2275 }; 2456 };
2276 2457
2277 warn "leave emergency perl save\n"; 2458 warn "leave emergency perl save\n";
2459}
2460
2461sub post_cleanup {
2462 my ($make_core) = @_;
2463
2464 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core;
2278} 2466}
2279 2467
2280sub reload() { 2468sub reload() {
2281 # can/must only be called in main 2469 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2470 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2471 warn "can only reload from main coroutine";
2284 return; 2472 return;
2285 } 2473 }
2286 2474
2287 warn "reloading..."; 2475 warn "reloading...";
2288 2476
2289 warn "freezing server"; 2477 warn "entering sync_job";
2290 my $guard = freeze_mainloop; 2478
2479 cf::sync_job {
2480 cf::write_runtime; # external watchdog should not bark
2291 cf::emergency_save; 2481 cf::emergency_save;
2482 cf::write_runtime; # external watchdog should not bark
2292 2483
2293 warn "sync database to disk"; 2484 warn "syncing database to disk";
2294 cf::db_sync; 2485 BDB::db_env_txn_checkpoint $DB_ENV;
2295 IO::AIO::flush;
2296 2486
2297 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2487 # if anything goes wrong in here, we should simply crash as we already saved
2299 2488
2300 warn "cancel all watchers"; 2489 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2490 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2491 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2492 }
2304 2493
2494 warn "flushing outstanding aio requests";
2495 for (;;) {
2496 BDB::flush;
2497 IO::AIO::flush;
2498 Coro::cede;
2499 last unless IO::AIO::nreqs || BDB::nreqs;
2500 warn "iterate...";
2501 }
2502
2503 ++$RELOAD;
2504
2305 warn "cancel all extension coros"; 2505 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2506 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2507 %EXT_CORO = ();
2308 2508
2309 warn "remove commands"; 2509 warn "removing commands";
2310 %COMMAND = (); 2510 %COMMAND = ();
2311 2511
2312 warn "remove ext commands"; 2512 warn "removing ext commands";
2313 %EXTCMD = (); 2513 %EXTCMD = ();
2314 2514
2315 warn "unload/nuke all extensions"; 2515 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2516 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2517 warn "... unloading $pkg";
2318 2518
2319 if (my $cb = $pkg->can ("unload")) { 2519 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2520 eval {
2325 2525
2326 warn "... nuking $pkg"; 2526 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2527 Symbol::delete_package $pkg;
2328 } 2528 }
2329 2529
2330 warn "unload all perl modules loaded from $LIBDIR"; 2530 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2531 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2532 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2533
2334 warn "removing <$k>"; 2534 warn "... unloading $k";
2335 delete $INC{$k}; 2535 delete $INC{$k};
2336 2536
2337 $k =~ s/\.pm$//; 2537 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2538 $k =~ s/\//::/g;
2339 2539
2342 } 2542 }
2343 2543
2344 Symbol::delete_package $k; 2544 Symbol::delete_package $k;
2345 } 2545 }
2346 2546
2347 warn "get rid of safe::, as good as possible"; 2547 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2548 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2550
2351 warn "unload cf.pm \"a bit\""; 2551 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2552 delete $INC{"cf.pm"};
2353 2553
2354 # don't, removes xs symbols, too, 2554 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2555 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2556 #Symbol::delete_package __PACKAGE__;
2357 2557
2558 warn "unload completed, starting to reload now";
2559
2358 warn "reloading cf.pm"; 2560 warn "reloading cf.pm";
2359 require cf; 2561 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2562 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2563
2362 warn "load config and database again"; 2564 warn "loading config and database again";
2363 cf::cfg_load; 2565 cf::cfg_load;
2364 cf::db_load;
2365 2566
2366 warn "load extensions"; 2567 warn "loading extensions";
2367 cf::load_extensions; 2568 cf::load_extensions;
2368 2569
2369 warn "reattach attachments to objects/players"; 2570 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2571 _global_reattach; # objects, sockets
2371 warn "reattach attachments to maps"; 2572 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2573 reattach $_ for values %MAP;
2373 }; 2574 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER;
2374 2576
2375 if ($@) { 2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job";
2581
2582 1
2583 } or do {
2376 warn $@; 2584 warn $@;
2377 warn "error while reloading, exiting."; 2585 warn "error while reloading, exiting.";
2378 exit 1; 2586 exit 1;
2379 } 2587 };
2380 2588
2381 warn "reloaded"; 2589 warn "reloaded";
2382}; 2590};
2383 2591
2592our $RELOAD_WATCHER; # used only during reload
2593
2384register_command "reload" => sub { 2594register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2595 my ($who, $arg) = @_;
2386 2596
2387 if ($who->flag (FLAG_WIZ)) { 2597 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2598 $who->message ("reloading server.");
2599
2600 # doing reload synchronously and two reloads happen back-to-back,
2601 # coro crashes during coro_state_free->destroy here.
2602
2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2389 reload; 2608 reload;
2390 $who->message ("end of reload."); 2609 undef $RELOAD_WATCHER;
2610 },
2611 );
2391 } 2612 }
2392}; 2613};
2393 2614
2394unshift @INC, $LIBDIR; 2615unshift @INC, $LIBDIR;
2616
2617my $bug_warning = 0;
2395 2618
2396$TICK_WATCHER = Event->timer ( 2619$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2620 reentrant => 0,
2621 parked => 1,
2398 prio => 0, 2622 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2623 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2624 data => WF_AUTOCANCEL,
2401 cb => sub { 2625 cb => sub {
2626 if ($Coro::current != $Coro::main) {
2627 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2628 unless ++$bug_warning > 10;
2629 return;
2630 }
2631
2402 $NOW = Event::time; 2632 $NOW = Event::time;
2403 2633
2404 cf::server_tick; # one server iteration 2634 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2635 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2636 $NEXT_TICK += $TICK;
2407 2637
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10;
2640 Coro::async_pool {
2641 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!";
2643 };
2644 }
2645
2408 $WAIT_FOR_TICK->broadcast; 2646 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d#
2410 2651
2411 # if we are delayed by four ticks or more, skip them all 2652 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2654
2414 $TICK_WATCHER->at ($NEXT_TICK); 2655 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2656 $TICK_WATCHER->start;
2416 }, 2657 },
2417); 2658);
2418 2659
2660{
2419IO::AIO::max_poll_time $TICK * 0.2; 2661 BDB::max_poll_time $TICK * 0.1;
2420 2662 $BDB_POLL_WATCHER = Event->io (
2421Event->io ( 2663 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2664 fd => BDB::poll_fileno,
2423 poll => 'r', 2665 poll => 'r',
2424 prio => 5, 2666 prio => 0,
2425 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb,
2427);
2428
2429Event->timer (
2430 data => WF_AUTOCANCEL, 2667 data => WF_AUTOCANCEL,
2431 after => 0, 2668 cb => \&BDB::poll_cb,
2432 interval => 10, 2669 );
2433 cb => sub { 2670 BDB::min_parallel 8;
2434 (Coro::unblock_sub { 2671
2435 write_runtime 2672 BDB::set_sync_prepare {
2436 or warn "ERROR: unable to write runtime file: $!"; 2673 my $status;
2674 my $current = $Coro::current;
2675 (
2676 sub {
2677 $status = $!;
2678 $current->ready; undef $current;
2679 },
2680 sub {
2681 Coro::schedule while defined $current;
2682 $! = $status;
2683 },
2684 )
2685 };
2686
2687 unless ($DB_ENV) {
2688 $DB_ENV = BDB::db_env_create;
2689
2690 cf::sync_job {
2691 eval {
2692 BDB::db_env_open
2693 $DB_ENV,
2694 $BDB_ENV_DIR,
2695 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666;
2698
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2700
2701 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2702 $DB_ENV->set_lk_detect;
2703 };
2704
2705 cf::cleanup "db_env_open(db): $@" if $@;
2437 })->(); 2706 };
2438 }, 2707 }
2439); 2708}
2709
2710{
2711 IO::AIO::min_parallel 8;
2712
2713 undef $Coro::AIO::WATCHER;
2714 IO::AIO::max_poll_time $TICK * 0.1;
2715 $AIO_POLL_WATCHER = Event->io (
2716 reentrant => 0,
2717 data => WF_AUTOCANCEL,
2718 fd => IO::AIO::poll_fileno,
2719 poll => 'r',
2720 prio => 6,
2721 cb => \&IO::AIO::poll_cb,
2722 );
2723}
2440 2724
2441END { cf::emergency_save } 2725END { cf::emergency_save }
2442 2726
24431 27271
2444 2728

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines