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.186 by root, Sat Jan 20 01:12:39 2007 UTC vs.
Revision 1.224 by root, Mon Mar 12 21:42:12 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.4 (); 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;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
23use IO::AIO 2.32 (); 26use IO::AIO 2.32 ();
24use YAML::Syck (); 27use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 33$Event::Eval = 1; # no idea why this is required, but it is
28 34
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 36
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 38$YAML::Syck::ImplicitUnicode = 1;
… …
39our @EXTS = (); # list of extension package names 45our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 46our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 47our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 48our %EXT_MAP = (); # pluggable maps
43 49
50our $RELOAD; # number of reloads so far
44our @EVENT; 51our @EVENT;
45our $LIBDIR = datadir . "/ext"; 52our $LIBDIR = datadir . "/ext";
46 53
47our $TICK = MAX_TIME * 1e-6; 54our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 55our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 56our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 58our $NEXT_TICK;
52our $NOW; 59our $NOW;
60our $USE_FSYNC = 1; # use fsync to write maps - default off
61
62our $BDB_POLL_WATCHER;
63our $DB_ENV;
53 64
54our %CFG; 65our %CFG;
55 66
56our $UPTIME; $UPTIME ||= time; 67our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 68our $RUNTIME;
58 69
59our %PLAYER; # all users 70our %PLAYER; # all users
60our %MAP; # all maps 71our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 72our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
63 75
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 78
67# used to convert map paths into valid unix filenames by replacing / by ∕ 79# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 92mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 93mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 94mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 95mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
85 98
86our $EMERGENCY_POSITION; 99our $EMERGENCY_POSITION;
100
101sub cf::map::normalise;
87 102
88############################################################################# 103#############################################################################
89 104
90=head2 GLOBAL VARIABLES 105=head2 GLOBAL VARIABLES
91 106
… …
261sub freeze_mainloop { 276sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
263 278
264 my $guard = Coro::guard { 279 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 281 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
270 $guard 283 $guard
271} 284}
272 285
273=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
344 357
345 $coro 358 $coro
346} 359}
347 360
348sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
349 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
350 365
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 367 or return;
353 368
… …
356 # 60 allows for the watchdog to kill the server. 371 # 60 allows for the watchdog to kill the server.
357 372
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 373 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 374 and return;
360 375
376 # always fsync - this file is important
361 aio_fsync $fh 377 aio_fsync $fh
362 and return; 378 and return;
363 379
364 close $fh 380 close $fh
365 or return; 381 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
751 767
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 772 close $fh;
757 773
758 if (@$objs) { 774 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 780 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
766 } 782 }
767 } else { 783 } else {
768 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1017=cut 1033=cut
1018 1034
1019sub quit_character { 1035sub quit_character {
1020 my ($pl) = @_; 1036 my ($pl) = @_;
1021 1037
1038 my $name = $pl->ob->name;
1039
1022 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1042
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1044 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1035 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1036} 1074}
1037 1075
1038=item cf::player::list_logins 1076=item cf::player::list_logins
1039 1077
1040Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1106=cut
1069 1107
1070sub maps($) { 1108sub maps($) {
1071 my ($pl) = @_; 1109 my ($pl) = @_;
1072 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1073 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1074 or return; 1114 or return;
1075 1115
1076 my @paths; 1116 my @paths;
1077 1117
1078 for (@$files) { 1118 for (@$files) {
1079 utf8::decode $_; 1119 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1082 1122
1083 s/\.map$//; 1123 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1124 }
1086 1125
1087 \@paths 1126 \@paths
1088} 1127}
1089 1128
… …
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1179 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1180 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1181 )
1143} 1182}
1144 1183
1184=item cf::map->register ($regex, $prio)
1185
1186Register a handler for the map path matching the given regex at the
1187givne priority (higher is better, built-in handlers have priority 0, the
1188default).
1189
1190=cut
1191
1145sub register { 1192sub register {
1146 my (undef, $regex) = @_; 1193 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1194 my $pkg = caller;
1148 1195
1149 no strict; 1196 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1197 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1198
1152 $EXT_MAP{$pkg} = qr<$regex>; 1199 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1200}
1154 1201
1155# also paths starting with '/' 1202# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1203$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1204
1158sub thawer_merge { 1205sub thawer_merge {
1159 my ($self, $merge) = @_; 1206 my ($self, $merge) = @_;
1160 1207
1161 # we have to keep some variables in memory intact 1208 # we have to keep some variables in memory intact
… …
1167 $self->SUPER::thawer_merge ($merge); 1214 $self->SUPER::thawer_merge ($merge);
1168} 1215}
1169 1216
1170sub normalise { 1217sub normalise {
1171 my ($path, $base) = @_; 1218 my ($path, $base) = @_;
1219
1220 $path = "$path"; # make sure its a string
1221
1222 $path =~ s/\.map$//;
1172 1223
1173 # map plan: 1224 # map plan:
1174 # 1225 #
1175 # /! non-realised random map exit (special hack!) 1226 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1227 # {... are special paths that are not being touched
… …
1204 1255
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1256 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206 1257
1207 $path = normalise $path, $base; 1258 $path = normalise $path, $base;
1208 1259
1209 for my $pkg (keys %EXT_MAP) { 1260 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1261 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1262 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1263 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1264 $self->init; # pass $1 etc.
1214 return $self; 1265 return $self;
1215 } 1266 }
1216 } 1267 }
1217 1268
1218 Carp::carp "unable to resolve path '$path'."; 1269 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1270 ()
1220} 1271}
1221 1272
1222sub init { 1273sub init {
1223 my ($self) = @_; 1274 my ($self) = @_;
… …
1238 1289
1239# the original (read-only) location 1290# the original (read-only) location
1240sub load_path { 1291sub load_path {
1241 my ($self) = @_; 1292 my ($self) = @_;
1242 1293
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1244} 1295}
1245 1296
1246# the temporary/swap location 1297# the temporary/swap location
1247sub save_path { 1298sub save_path {
1248 my ($self) = @_; 1299 my ($self) = @_;
1249 1300
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1252} 1303}
1253 1304
1254# the unique path, undef == no special unique path 1305# the unique path, undef == no special unique path
1255sub uniq_path { 1306sub uniq_path {
1256 my ($self) = @_; 1307 my ($self) = @_;
… …
1278 1329
1279sub load_header_from($) { 1330sub load_header_from($) {
1280 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1281 1332
1282 utf8::encode $path; 1333 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1334 #aio_open $path, O_RDONLY, 0
1284 or return; 1335 # or return;
1285 1336
1286 $self->_load_header ($path) 1337 $self->_load_header ($path)
1287 or return; 1338 or return;
1288 1339
1289 $self->{load_path} = $path; 1340 $self->{load_path} = $path;
1290 1341
1291 1 1342 1
1292} 1343}
1293 1344
1294sub load_orig { 1345sub load_header_orig {
1295 my ($self) = @_; 1346 my ($self) = @_;
1296 1347
1297 $self->load_header_from ($self->load_path) 1348 $self->load_header_from ($self->load_path)
1298} 1349}
1299 1350
1300sub load_temp { 1351sub load_header_temp {
1301 my ($self) = @_; 1352 my ($self) = @_;
1302 1353
1303 $self->load_header_from ($self->save_path) 1354 $self->load_header_from ($self->save_path)
1355}
1356
1357sub prepare_temp {
1358 my ($self) = @_;
1359
1360 $self->last_access ((delete $self->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $self->{instantiate_time} = $cf::RUNTIME
1364 if $self->{instantiate_time} > $cf::RUNTIME;
1365}
1366
1367sub prepare_orig {
1368 my ($self) = @_;
1369
1370 $self->{load_original} = 1;
1371 $self->{instantiate_time} = $cf::RUNTIME;
1372 $self->last_access ($cf::RUNTIME);
1373 $self->instantiate;
1304} 1374}
1305 1375
1306sub load_header { 1376sub load_header {
1307 my ($self) = @_; 1377 my ($self) = @_;
1308 1378
1309 if ($self->load_temp) { 1379 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1380 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1381 } else {
1316 $self->load_orig 1382 $self->load_header_orig
1317 or return; 1383 or return;
1318 1384 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1385 }
1324 1386
1325 1 1387 1
1326} 1388}
1327 1389
… …
1341 $map->{last_save} = $cf::RUNTIME; 1403 $map->{last_save} = $cf::RUNTIME;
1342 1404
1343 $map->load_header 1405 $map->load_header
1344 or return; 1406 or return;
1345 1407
1346 if ($map->should_reset) { 1408 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1409 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1410 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1411 $map->reset;
1350 undef $guard; 1412 undef $guard;
1351 $map = find $path 1413 return find $path;
1352 or return;
1353 } 1414 }
1354 1415
1355 $cf::MAP{$path} = $map 1416 $cf::MAP{$path} = $map
1356 } 1417 }
1357} 1418}
1419
1420sub pre_load { }
1421sub post_load { }
1358 1422
1359sub load { 1423sub load {
1360 my ($self) = @_; 1424 my ($self) = @_;
1361 1425
1426 local $self->{deny_reset} = 1; # loading can take a long time
1427
1362 my $path = $self->{path}; 1428 my $path = $self->{path};
1363 my $guard = cf::lock_acquire "map_load:$path"; 1429 my $guard = cf::lock_acquire "map_load:$path";
1364 1430
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1431 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1432
1367 $self->in_memory (cf::MAP_LOADING); 1433 $self->in_memory (cf::MAP_LOADING);
1368 1434
1369 $self->alloc; 1435 $self->alloc;
1436
1437 $self->pre_load;
1438
1370 $self->_load_objects ($self->{load_path}, 1) 1439 $self->_load_objects ($self->{load_path}, 1)
1371 or return; 1440 or return;
1372 1441
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1443 if delete $self->{load_original};
… …
1396 unless $self->difficulty; 1465 unless $self->difficulty;
1397 Coro::cede; 1466 Coro::cede;
1398 $self->activate; 1467 $self->activate;
1399 } 1468 }
1400 1469
1470 $self->post_load;
1471
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1472 $self->in_memory (cf::MAP_IN_MEMORY);
1402} 1473}
1403 1474
1404sub customise_for { 1475sub customise_for {
1405 my ($self, $ob) = @_; 1476 my ($self, $ob) = @_;
… …
1469 delete $MAP_PREFETCH{$path}; 1540 delete $MAP_PREFETCH{$path};
1470 } 1541 }
1471 } 1542 }
1472 undef $MAP_PREFETCHER; 1543 undef $MAP_PREFETCHER;
1473 }; 1544 };
1545 $MAP_PREFETCHER->prio (6);
1474 1546
1475 () 1547 ()
1476} 1548}
1477 1549
1478sub save { 1550sub save {
… …
1548 return if $self->players; 1620 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1550 1622
1551 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1552 1624
1625 $self->in_memory (cf::MAP_SWAPPED);
1626
1627 # need to save uniques path
1628 unless ($self->{deny_save}) {
1629 my $uniq = $self->uniq_path; utf8::encode $uniq;
1630
1631 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1632 if $uniq;
1633 }
1634
1553 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1554 1636
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear; 1637 $self->clear;
1557 1638
1558 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1559 1640
1560 $self->unlink_save; 1641 $self->unlink_save;
… …
1597 for (@$files) { 1678 for (@$files) {
1598 utf8::decode $_; 1679 utf8::decode $_;
1599 next if /\.pst$/; 1680 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o; 1681 next unless /^$PATH_SEP/o;
1601 1682
1602 s/\.map$//; 1683 push @paths, cf::map::normalise $_;
1603 push @paths, $_;
1604 } 1684 }
1605 1685
1606 \@paths 1686 \@paths
1607} 1687}
1608 1688
… …
1702=cut 1782=cut
1703 1783
1704sub link_map { 1784sub link_map {
1705 unless ($LINK_MAP) { 1785 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 1786 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1787 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 1788 $LINK_MAP->load;
1709 } 1789 }
1710 1790
1711 $LINK_MAP 1791 $LINK_MAP
1712} 1792}
… …
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1799 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1800
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1802 if $self->map;
1723 1803
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1804 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1805}
1726 1806
1727sub cf::object::player::leave_link { 1807sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1808 my ($self, $map, $x, $y) = @_;
1729 1809
… …
1751 $map->load; 1831 $map->load;
1752 $map->load_diag; 1832 $map->load_diag;
1753 1833
1754 return unless $self->contr->active; 1834 return unless $self->contr->active;
1755 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1756 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1757} 1839}
1758 1840
1759cf::player->attach ( 1841cf::player->attach (
1760 on_logout => sub { 1842 on_logout => sub {
… …
1773 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1774 # should happen only on crashes 1856 # should happen only on crashes
1775 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1776 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1777 (async { 1859 (async {
1778 # we need this sleep as the login has a concurrent enter_exit running
1779 # and this sleep increases chances of the player not ending up in scorn
1780 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1781 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1782 . "the server will try to bring you to your intended destination in a second.", 1862 . "the server will try to bring you to your intended destination in a second.",
1783 cf::NDI_RED); 1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1784 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1785 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1786 })->prio (2); 1868 })->prio (2);
1787 } 1869 }
1788 }, 1870 },
… …
1796 my ($self, $path, $x, $y) = @_; 1878 my ($self, $path, $x, $y) = @_;
1797 1879
1798 $self->enter_link; 1880 $self->enter_link;
1799 1881
1800 (async { 1882 (async {
1883 my $map = eval {
1801 my $map = cf::map::find $path; 1884 my $map = cf::map::find $path;
1802 $map = $map->customise_for ($self) if $map; 1885 $map = $map->customise_for ($self) if $map;
1803 1886 $map
1804# warn "entering ", $map->path, " at ($x, $y)\n" 1887 } or
1805# if $map;
1806
1807 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1808 1889
1809 $self->leave_link ($map, $x, $y); 1890 $self->leave_link ($map, $x, $y);
1810 })->prio (1); 1891 })->prio (1);
1811} 1892}
1812 1893
… …
1843 # that depends on the exit object 1924 # that depends on the exit object
1844 1925
1845 my $rmp = parse_random_map_params $exit->msg; 1926 my $rmp = parse_random_map_params $exit->msg;
1846 1927
1847 if ($exit->map) { 1928 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 1929 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 1930 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 1931 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 1932 $rmp->{origin_y} = $exit->y;
1852 } 1933 }
1853 1934
… …
1870sub cf::object::player::enter_exit { 1951sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 1952 my ($self, $exit) = @_;
1872 1953
1873 return unless $self->type == cf::PLAYER; 1954 return unless $self->type == cf::PLAYER;
1874 1955
1956 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job
1958 cf::sync_job { prepare_random_map $exit };
1959 }
1960
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp;
1963 my $sp = $exit->stats->sp;
1964
1875 $self->enter_link; 1965 $self->enter_link;
1876 1966
1877 (async { 1967 (async {
1878 $self->deactivate_recursive; # just to be sure 1968 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 1969 unless (eval {
1880 prepare_random_map $exit 1970 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 1971
1886 1; 1972 1;
1887 }) { 1973 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 1974 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "I'll try to bring you back to the map you were before. " 1975 . "I'll try to bring you back to the map you were before. "
… …
1950 # get handled first 2036 # get handled first
1951 my $queue = delete $ns->{query_queue} 2037 my $queue = delete $ns->{query_queue}
1952 or return; # be conservative, not sure how that can happen, but we saw a crash here 2038 or return; # be conservative, not sure how that can happen, but we saw a crash here
1953 2039
1954 (shift @$queue)->[1]->($msg); 2040 (shift @$queue)->[1]->($msg);
2041 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2042
1956 push @{ $ns->{query_queue} }, @$queue; 2043 push @{ $ns->{query_queue} }, @$queue;
1957 2044
1958 if (@{ $ns->{query_queue} } == @$queue) { 2045 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2046 if (@$queue) {
… …
2120The parameter C<$family> should best start with the name of the extension 2207The parameter C<$family> should best start with the name of the extension
2121using it, it should be unique. 2208using it, it should be unique.
2122 2209
2123=over 4 2210=over 4
2124 2211
2125=item $hashref = cf::db_get $family
2126
2127Return a hashref for use by the extension C<$family>, which can be
2128modified. After modifications, you have to call C<cf::db_dirty> or
2129C<cf::db_sync>.
2130
2131=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2132 2213
2133Returns a single value from the database 2214Returns a single value from the database.
2134
2135=item cf::db_put $family => $hashref
2136
2137Stores the given family hashref into the database. Updates are delayed, if
2138you want the data to be synced to disk immediately, use C<cf::db_sync>.
2139 2215
2140=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2141 2217
2142Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2143want the data to be synced to disk immediately, use C<cf::db_sync>.
2144
2145=item cf::db_dirty
2146
2147Marks the database as dirty, to be updated at a later time.
2148
2149=item cf::db_sync
2150
2151Immediately write the database to disk I<if it is dirty>.
2152 2219
2153=cut 2220=cut
2154 2221
2155our $DB; 2222our $DB;
2156 2223
2157{ 2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2158 my $path = cf::localdir . "/database.pst"; 2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2159 2243
2160 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2161 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2162 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2163 2248
2164 my $pid; 2249 unlink $path;
2165
2166 sub db_save() {
2167 waitpid $pid, 0 if $pid;
2168 if (0 == ($pid = fork)) {
2169 $DB->{_meta}{version} = 1;
2170 Storable::nstore $DB, "$path~";
2171 rename "$path~", $path;
2172 cf::_exit 0 if defined $pid;
2173 } 2250 };
2174 }
2175
2176 my $dirty;
2177
2178 sub db_sync() {
2179 db_save if $dirty;
2180 undef $dirty;
2181 }
2182
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2184 db_sync;
2185 });
2186
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 }
2191
2192 sub db_get($;$) {
2193 @_ >= 2
2194 ? $DB->{$_[0]}{$_[1]}
2195 : ($DB->{$_[0]} ||= { })
2196 }
2197
2198 sub db_put($$;$) {
2199 if (@_ >= 3) {
2200 $DB->{$_[0]}{$_[1]} = $_[2];
2201 } else {
2202 $DB->{$_[0]} = $_[1];
2203 }
2204 db_dirty;
2205 }
2206
2207 cf::global->attach (
2208 prio => 10000,
2209 on_cleanup => sub {
2210 db_sync;
2211 }, 2251 }
2212 ); 2252 }
2253}
2254
2255sub db_get($$) {
2256 my $key = "$_[0]/$_[1]";
2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2266sub db_put($$$) {
2267 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2213} 2269}
2214 2270
2215############################################################################# 2271#############################################################################
2216# the server's main() 2272# the server's init and main functions
2273
2274sub load_faces {
2275 my $path = sprintf "%s/faces", cf::datadir;
2276
2277 warn "loading faces from $path\n";
2278
2279 my $faces;
2280 0 < aio_load $path, $faces
2281 or die "$path: $!";
2282
2283 Coro::cede;
2284 $faces = Storable::thaw $faces;
2285 Coro::cede;
2286
2287 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2291 Coro::cede;
2292 }
2293
2294 1
2295}
2296
2297sub reload_resources {
2298 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2299 or die "unable to load regions file\n";#d#
2300 load_faces
2301 or die "unable to load faces\n";#d#
2302}
2303
2304sub init {
2305 reload_resources;
2306}
2217 2307
2218sub cfg_load { 2308sub cfg_load {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 2309 open my $fh, "<:utf8", cf::confdir . "/config"
2220 or return; 2310 or return;
2221 2311
… …
2244 Event::one_event; 2334 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 2335 })->prio (Coro::PRIO_MAX);
2246 }; 2336 };
2247 2337
2248 cfg_load; 2338 cfg_load;
2249 db_load; 2339 db_init;
2250 load_extensions; 2340 load_extensions;
2251 2341
2252 $TICK_WATCHER->start; 2342 $TICK_WATCHER->start;
2253 Event::loop; 2343 Event::loop;
2254} 2344}
… …
2258 2348
2259# install some emergency cleanup handlers 2349# install some emergency cleanup handlers
2260BEGIN { 2350BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2351 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2352 Event->signal (
2353 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2354 data => WF_AUTOCANCEL,
2264 signal => $signal, 2355 signal => $signal,
2356 prio => 0,
2265 cb => sub { 2357 cb => sub {
2266 cf::cleanup "SIG$signal"; 2358 cf::cleanup "SIG$signal";
2267 }, 2359 },
2268 ); 2360 );
2269 } 2361 }
2270} 2362}
… …
2291 my $map = $cf::MAP{$path} or next; 2383 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 2384 $map->valid or next;
2293 $map->save; 2385 $map->save;
2294 } 2386 }
2295 warn "end emergency map save\n"; 2387 warn "end emergency map save\n";
2388
2389 warn "begin emergency database checkpoint\n";
2390 BDB::db_env_txn_checkpoint $DB_ENV;
2391 warn "end emergency database checkpoint\n";
2296 }; 2392 };
2297 2393
2298 warn "leave emergency perl save\n"; 2394 warn "leave emergency perl save\n";
2395}
2396
2397sub post_cleanup {
2398 my ($make_core) = @_;
2399
2400 warn Carp::longmess "post_cleanup backtrace"
2401 if $make_core;
2299} 2402}
2300 2403
2301sub reload() { 2404sub reload() {
2302 # can/must only be called in main 2405 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 2406 if ($Coro::current != $Coro::main) {
… …
2305 return; 2408 return;
2306 } 2409 }
2307 2410
2308 warn "reloading..."; 2411 warn "reloading...";
2309 2412
2310 warn "cancelling server ticker"; 2413 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 2414
2415 cf::sync_job {
2416 cf::write_runtime; # external watchdog should not bark
2313 cf::emergency_save; 2417 cf::emergency_save;
2418 cf::write_runtime; # external watchdog should not bark
2314 2419
2315 eval { 2420 warn "syncing database to disk";
2421 BDB::db_env_txn_checkpoint $DB_ENV;
2422
2316 # if anything goes wrong in here, we should simply crash as we already saved 2423 # if anything goes wrong in here, we should simply crash as we already saved
2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320 2424
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 2425 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 2426 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 2427 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 2428 }
2325 2429
2326 warn "flushing outstanding aio requests"; 2430 warn "flushing outstanding aio requests";
2327 for (;;) { 2431 for (;;) {
2432 BDB::flush;
2328 IO::AIO::flush; 2433 IO::AIO::flush;
2329 Coro::cede; 2434 Coro::cede;
2330 last unless IO::AIO::nreqs; 2435 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 2436 warn "iterate...";
2332 } 2437 }
2438
2439 ++$RELOAD;
2333 2440
2334 warn "cancelling all extension coros"; 2441 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 2442 $_->cancel for values %EXT_CORO;
2336 %EXT_CORO = (); 2443 %EXT_CORO = ();
2337 2444
… …
2390 require cf; 2497 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2498 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 2499
2393 warn "loading config and database again"; 2500 warn "loading config and database again";
2394 cf::cfg_load; 2501 cf::cfg_load;
2395 cf::db_load;
2396 2502
2397 warn "loading extensions"; 2503 warn "loading extensions";
2398 cf::load_extensions; 2504 cf::load_extensions;
2399 2505
2400 warn "reattaching attachments to objects/players"; 2506 warn "reattaching attachments to objects/players";
2401 _global_reattach; 2507 _global_reattach; # objects, sockets
2402 warn "reattaching attachments to maps"; 2508 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 2509 reattach $_ for values %MAP;
2510 warn "reattaching attachments to players";
2511 reattach $_ for values %PLAYER;
2404 2512
2405 warn "restarting server ticker"; 2513 warn "loading reloadable resources";
2514 reload_resources;
2406 2515
2407 $TICK_WATCHER->start; 2516 warn "leaving sync_job";
2408 };
2409 2517
2410 if ($@) { 2518 1
2519 } or do {
2411 warn $@; 2520 warn $@;
2412 warn "error while reloading, exiting."; 2521 warn "error while reloading, exiting.";
2413 exit 1; 2522 exit 1;
2414 } 2523 };
2415 2524
2416 warn "reloaded"; 2525 warn "reloaded";
2417}; 2526};
2418 2527
2419our $RELOAD_WATCHER; # used only during reload 2528our $RELOAD_WATCHER; # used only during reload
… …
2425 $who->message ("reloading server."); 2534 $who->message ("reloading server.");
2426 2535
2427 # doing reload synchronously and two reloads happen back-to-back, 2536 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here. 2537 # coro crashes during coro_state_free->destroy here.
2429 2538
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2539 $RELOAD_WATCHER ||= Event->timer (
2540 reentrant => 0,
2541 after => 0,
2542 data => WF_AUTOCANCEL,
2543 cb => sub {
2431 reload; 2544 reload;
2432 undef $RELOAD_WATCHER; 2545 undef $RELOAD_WATCHER;
2546 },
2433 }); 2547 );
2434 } 2548 }
2435}; 2549};
2436 2550
2437unshift @INC, $LIBDIR; 2551unshift @INC, $LIBDIR;
2438 2552
… …
2455 2569
2456 cf::server_tick; # one server iteration 2570 cf::server_tick; # one server iteration
2457 $RUNTIME += $TICK; 2571 $RUNTIME += $TICK;
2458 $NEXT_TICK += $TICK; 2572 $NEXT_TICK += $TICK;
2459 2573
2574 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2575 $NEXT_RUNTIME_WRITE = $NOW + 10;
2576 Coro::async_pool {
2577 write_runtime
2578 or warn "ERROR: unable to write runtime file: $!";
2579 };
2580 }
2581
2460 $WAIT_FOR_TICK->broadcast; 2582 $WAIT_FOR_TICK->broadcast;
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2583 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2584
2585# my $AFTER = Event::time;
2586# warn $AFTER - $NOW;#d#
2462 2587
2463 # if we are delayed by four ticks or more, skip them all 2588 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2589 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2465 2590
2466 $TICK_WATCHER->at ($NEXT_TICK); 2591 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2592 $TICK_WATCHER->start;
2468 }, 2593 },
2469); 2594);
2470 2595
2596{
2597 BDB::max_poll_time $TICK * 0.1;
2598 $BDB_POLL_WATCHER = Event->io (
2599 reentrant => 0,
2600 fd => BDB::poll_fileno,
2601 poll => 'r',
2602 prio => 0,
2603 data => WF_AUTOCANCEL,
2604 cb => \&BDB::poll_cb,
2605 );
2606 BDB::min_parallel 8;
2607
2608 BDB::set_sync_prepare {
2609 my $status;
2610 my $current = $Coro::current;
2611 (
2612 sub {
2613 $status = $!;
2614 $current->ready; undef $current;
2615 },
2616 sub {
2617 Coro::schedule while defined $current;
2618 $! = $status;
2619 },
2620 )
2621 };
2622
2623 unless ($DB_ENV) {
2624 $DB_ENV = BDB::db_env_create;
2625
2626 cf::sync_job {
2627 eval {
2628 BDB::db_env_open
2629 $DB_ENV,
2630 $BDB_ENV_DIR,
2631 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2632 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2633 0666;
2634
2635 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2636
2637 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2638 $DB_ENV->set_lk_detect;
2639 };
2640
2641 cf::cleanup "db_env_open(db): $@" if $@;
2642 };
2643 }
2644}
2645
2646{
2647 IO::AIO::min_parallel 8;
2648
2649 undef $Coro::AIO::WATCHER;
2471IO::AIO::max_poll_time $TICK * 0.2; 2650 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 2651 $AIO_POLL_WATCHER = Event->io (
2474 fd => IO::AIO::poll_fileno, 2652 reentrant => 0,
2475 poll => 'r',
2476 prio => 5,
2477 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb,
2479);
2480
2481$WRITE_RUNTIME_WATCHER = Event->timer (
2482 data => WF_AUTOCANCEL, 2653 data => WF_AUTOCANCEL,
2483 after => 1, 2654 fd => IO::AIO::poll_fileno,
2484 interval => 10, 2655 poll => 'r',
2485 prio => 6, # keep it lowest so it acts like a watchdog 2656 prio => 6,
2486 cb => Coro::unblock_sub { 2657 cb => \&IO::AIO::poll_cb,
2487 write_runtime 2658 );
2488 or warn "ERROR: unable to write runtime file: $!"; 2659}
2489 },
2490);
2491 2660
2492END { cf::emergency_save } 2661END { cf::emergency_save }
2493 2662
24941 26631
2495 2664

Diff Legend

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