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.181 by root, Fri Jan 19 15:29:52 2007 UTC vs.
Revision 1.212 by root, Tue Feb 13 19:25:44 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.4 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
349 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
350 362
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 364 or return;
353 365
366 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 367 # 10 is the runtime save interval, for a monotonic clock
368 # 60 allows for the watchdog to kill the server.
369
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 371 and return;
357 372
373 # always fsync - this file is important
358 aio_fsync $fh 374 aio_fsync $fh
359 and return; 375 and return;
360 376
361 close $fh 377 close $fh
362 or return; 378 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
748 764
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 769 close $fh;
754 770
755 if (@$objs) { 771 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 777 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
763 } 779 }
764 } else { 780 } else {
765 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
771 } 787 }
772 } else { 788 } else {
773 aio_unlink $filename; 789 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
775 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
776 } 798 }
777} 799}
778 800
779sub object_freezer_as_string { 801sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
786 808
787sub object_thawer_load { 809sub object_thawer_load {
788 my ($filename) = @_; 810 my ($filename) = @_;
789 811
790 my ($data, $av); 812 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
791 816
792 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
793 or return; 818 or return;
794 819
795 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
1065=cut 1090=cut
1066 1091
1067sub maps($) { 1092sub maps($) {
1068 my ($pl) = @_; 1093 my ($pl) = @_;
1069 1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1096
1070 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1071 or return; 1098 or return;
1072 1099
1073 my @paths; 1100 my @paths;
1074 1101
1075 for (@$files) { 1102 for (@$files) {
1076 utf8::decode $_; 1103 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1079 1106
1080 s/\.map$//; 1107 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1108 }
1083 1109
1084 \@paths 1110 \@paths
1085} 1111}
1086 1112
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1163 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1164 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1165 )
1140} 1166}
1141 1167
1168=item cf::map->register ($regex, $prio)
1169
1170Register a handler for the map path matching the given regex at the
1171givne priority (higher is better, built-in handlers have priority 0, the
1172default).
1173
1174=cut
1175
1142sub register { 1176sub register {
1143 my (undef, $regex) = @_; 1177 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1178 my $pkg = caller;
1145 1179
1146 no strict; 1180 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1181 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1182
1149 $EXT_MAP{$pkg} = qr<$regex>; 1183 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1184}
1151 1185
1152# also paths starting with '/' 1186# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1187$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1188
1155sub thawer_merge { 1189sub thawer_merge {
1156 my ($self, $merge) = @_; 1190 my ($self, $merge) = @_;
1157 1191
1158 # we have to keep some variables in memory intact 1192 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1198 $self->SUPER::thawer_merge ($merge);
1165} 1199}
1166 1200
1167sub normalise { 1201sub normalise {
1168 my ($path, $base) = @_; 1202 my ($path, $base) = @_;
1203
1204 $path = "$path"; # make sure its a string
1205
1206 $path =~ s/\.map$//;
1169 1207
1170 # map plan: 1208 # map plan:
1171 # 1209 #
1172 # /! non-realised random map exit (special hack!) 1210 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1211 # {... are special paths that are not being touched
… …
1201 1239
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1240 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1241
1204 $path = normalise $path, $base; 1242 $path = normalise $path, $base;
1205 1243
1206 for my $pkg (keys %EXT_MAP) { 1244 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1245 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1246 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1247 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1248 $self->init; # pass $1 etc.
1211 return $self; 1249 return $self;
1212 } 1250 }
1213 } 1251 }
1214 1252
1215 Carp::carp "unable to resolve path '$path'."; 1253 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1254 ()
1217} 1255}
1218 1256
1219sub init { 1257sub init {
1220 my ($self) = @_; 1258 my ($self) = @_;
… …
1235 1273
1236# the original (read-only) location 1274# the original (read-only) location
1237sub load_path { 1275sub load_path {
1238 my ($self) = @_; 1276 my ($self) = @_;
1239 1277
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1279}
1242 1280
1243# the temporary/swap location 1281# the temporary/swap location
1244sub save_path { 1282sub save_path {
1245 my ($self) = @_; 1283 my ($self) = @_;
1246 1284
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1287}
1250 1288
1251# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1252sub uniq_path { 1290sub uniq_path {
1253 my ($self) = @_; 1291 my ($self) = @_;
… …
1269 my ($self) = @_; 1307 my ($self) = @_;
1270 1308
1271 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1274} 1317}
1275 1318
1276sub load_header_from($) { 1319sub load_header_from($) {
1277 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1278 1321
1279 utf8::encode $path; 1322 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1281 or return; 1324 # or return;
1282 1325
1283 $self->_load_header ($path) 1326 $self->_load_header ($path)
1284 or return; 1327 or return;
1285 1328
1286 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
1287 1330
1288 1 1331 1
1289} 1332}
1290 1333
1291sub load_orig { 1334sub load_header_orig {
1292 my ($self) = @_; 1335 my ($self) = @_;
1293 1336
1294 $self->load_header_from ($self->load_path) 1337 $self->load_header_from ($self->load_path)
1295} 1338}
1296 1339
1297sub load_temp { 1340sub load_header_temp {
1298 my ($self) = @_; 1341 my ($self) = @_;
1299 1342
1300 $self->load_header_from ($self->save_path) 1343 $self->load_header_from ($self->save_path)
1344}
1345
1346sub prepare_temp {
1347 my ($self) = @_;
1348
1349 $self->last_access ((delete $self->{last_access})
1350 || $cf::RUNTIME); #d#
1351 # safety
1352 $self->{instantiate_time} = $cf::RUNTIME
1353 if $self->{instantiate_time} > $cf::RUNTIME;
1354}
1355
1356sub prepare_orig {
1357 my ($self) = @_;
1358
1359 $self->{load_original} = 1;
1360 $self->{instantiate_time} = $cf::RUNTIME;
1361 $self->last_access ($cf::RUNTIME);
1362 $self->instantiate;
1301} 1363}
1302 1364
1303sub load_header { 1365sub load_header {
1304 my ($self) = @_; 1366 my ($self) = @_;
1305 1367
1306 if ($self->load_temp) { 1368 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1369 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1370 } else {
1313 $self->load_orig 1371 $self->load_header_orig
1314 or return; 1372 or return;
1315 1373 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1374 }
1321 1375
1322 1 1376 1
1323} 1377}
1324 1378
… …
1338 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1339 1393
1340 $map->load_header 1394 $map->load_header
1341 or return; 1395 or return;
1342 1396
1343 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1400 $map->reset;
1346 undef $guard; 1401 undef $guard;
1347 $map = find $path 1402 return find $path;
1348 or return;
1349 } 1403 }
1350 1404
1351 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1352 } 1406 }
1353} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1354 1411
1355sub load { 1412sub load {
1356 my ($self) = @_; 1413 my ($self) = @_;
1357 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1358 my $path = $self->{path}; 1417 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1360 1419
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1421
1363 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1364 1423
1365 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1366 $self->_load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1429 or return;
1368 1430
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1432 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1454 unless $self->difficulty;
1393 Coro::cede; 1455 Coro::cede;
1394 $self->activate; 1456 $self->activate;
1395 } 1457 }
1396 1458
1459 $self->post_load;
1460
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1462}
1399 1463
1400sub customise_for { 1464sub customise_for {
1401 my ($self, $ob) = @_; 1465 my ($self, $ob) = @_;
… …
1441 1505
1442 cf::sync_job { $map->load }; 1506 cf::sync_job { $map->load };
1443} 1507}
1444 1508
1445our %MAP_PREFETCH; 1509our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1510our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1511
1459sub find_async { 1512sub find_async {
1460 my ($path, $origin) = @_; 1513 my ($path, $origin) = @_;
1461 1514
1462 $path = normalise $path, $origin && $origin->{path}; 1515 $path = normalise $path, $origin && $origin->{path};
1463 1516
1464 if (my $map = $cf::MAP{$path}) { 1517 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1519 }
1467 1520
1468 $MAP_PREFETCH{$path} = 0; 1521 undef $MAP_PREFETCH{$path};
1522 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) {
1525 my $map = find $path
1526 or next;
1527 $map->load;
1528
1529 delete $MAP_PREFETCH{$path};
1530 }
1531 }
1532 undef $MAP_PREFETCHER;
1533 };
1469 $MAP_PREFETCHER->ready; 1534 $MAP_PREFETCHER->prio (6);
1470 1535
1471 () 1536 ()
1472} 1537}
1473 1538
1474sub save { 1539sub save {
… …
1544 return if $self->players; 1609 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1546 1611
1547 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1548 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1549 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1550 1625
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1626 $self->clear;
1553 1627
1554 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1555 1629
1556 $self->unlink_save; 1630 $self->unlink_save;
… …
1593 for (@$files) { 1667 for (@$files) {
1594 utf8::decode $_; 1668 utf8::decode $_;
1595 next if /\.pst$/; 1669 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1597 1671
1598 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1673 }
1601 1674
1602 \@paths 1675 \@paths
1603} 1676}
1604 1677
… …
1698=cut 1771=cut
1699 1772
1700sub link_map { 1773sub link_map {
1701 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1777 $LINK_MAP->load;
1705 } 1778 }
1706 1779
1707 $LINK_MAP 1780 $LINK_MAP
1708} 1781}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1789
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1791 if $self->map;
1719 1792
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1794}
1722 1795
1723sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1725 1798
… …
1792 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1793 1866
1794 $self->enter_link; 1867 $self->enter_link;
1795 1868
1796 (async { 1869 (async {
1870 my $map = eval {
1797 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1799 1873 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1875 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1876
1805 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1878 })->prio (1);
1807} 1879}
1808 1880
… …
1815 1887
1816 my $rmp = { # defaults 1888 my $rmp = { # defaults
1817 xsize => (cf::rndm 15, 40), 1889 xsize => (cf::rndm 15, 40),
1818 ysize => (cf::rndm 15, 40), 1890 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY), 1891 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string 1892 #layout => string,
1821 }; 1893 };
1822 1894
1823 for (split /\n/, $spec) { 1895 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1896 my ($k, $v) = split /\s+/, $_, 2;
1825 1897
… …
1839 # that depends on the exit object 1911 # that depends on the exit object
1840 1912
1841 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1842 1914
1843 if ($exit->map) { 1915 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1848 } 1920 }
1849 1921
… …
1866sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1868 1940
1869 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1870 1942
1943 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job
1945 cf::sync_job { prepare_random_map $exit };
1946 }
1947
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp;
1950 my $sp = $exit->stats->sp;
1951
1871 $self->enter_link; 1952 $self->enter_link;
1872 1953
1873 (async { 1954 (async {
1874 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 1956 unless (eval {
1876 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 1958
1882 1; 1959 1;
1883 }) { 1960 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 1962 . "I'll try to bring you back to the map you were before. "
… …
1946 # get handled first 2023 # get handled first
1947 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2025 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2026
1950 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2029
1952 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1953 2031
1954 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2033 if (@$queue) {
… …
2116The parameter C<$family> should best start with the name of the extension 2194The parameter C<$family> should best start with the name of the extension
2117using it, it should be unique. 2195using it, it should be unique.
2118 2196
2119=over 4 2197=over 4
2120 2198
2121=item $hashref = cf::db_get $family
2122
2123Return a hashref for use by the extension C<$family>, which can be
2124modified. After modifications, you have to call C<cf::db_dirty> or
2125C<cf::db_sync>.
2126
2127=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2128 2200
2129Returns a single value from the database 2201Returns a single value from the database.
2130
2131=item cf::db_put $family => $hashref
2132
2133Stores the given family hashref into the database. Updates are delayed, if
2134you want the data to be synced to disk immediately, use C<cf::db_sync>.
2135 2202
2136=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2137 2204
2138Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2139want the data to be synced to disk immediately, use C<cf::db_sync>.
2140
2141=item cf::db_dirty
2142
2143Marks the database as dirty, to be updated at a later time.
2144
2145=item cf::db_sync
2146
2147Immediately write the database to disk I<if it is dirty>.
2148 2206
2149=cut 2207=cut
2150 2208
2151our $DB; 2209our $DB;
2152 2210
2153{ 2211sub db_init {
2212 unless ($DB) {
2213 $DB = BDB::db_create $DB_ENV;
2214
2215 cf::sync_job {
2216 eval {
2217 $DB->set_flags (BDB::CHKSUM);
2218
2219 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!;
2222 };
2223 cf::cleanup "db_open(db): $@" if $@;
2224 };
2225
2154 my $path = cf::localdir . "/database.pst"; 2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2155 2230
2156 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2157 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2158 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2159 2235
2160 my $pid; 2236 unlink $path;
2161
2162 sub db_save() {
2163 waitpid $pid, 0 if $pid;
2164 if (0 == ($pid = fork)) {
2165 $DB->{_meta}{version} = 1;
2166 Storable::nstore $DB, "$path~";
2167 rename "$path~", $path;
2168 cf::_exit 0 if defined $pid;
2169 } 2237 };
2170 }
2171
2172 my $dirty;
2173
2174 sub db_sync() {
2175 db_save if $dirty;
2176 undef $dirty;
2177 }
2178
2179 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync;
2181 });
2182
2183 sub db_dirty() {
2184 $dirty = 1;
2185 $idle->start;
2186 }
2187
2188 sub db_get($;$) {
2189 @_ >= 2
2190 ? $DB->{$_[0]}{$_[1]}
2191 : ($DB->{$_[0]} ||= { })
2192 }
2193
2194 sub db_put($$;$) {
2195 if (@_ >= 3) {
2196 $DB->{$_[0]}{$_[1]} = $_[2];
2197 } else {
2198 $DB->{$_[0]} = $_[1];
2199 }
2200 db_dirty;
2201 }
2202
2203 cf::global->attach (
2204 prio => 10000,
2205 on_cleanup => sub {
2206 db_sync;
2207 }, 2238 }
2208 ); 2239 }
2240}
2241
2242sub db_get($$) {
2243 my $key = "$_[0]/$_[1]";
2244
2245 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data;
2247
2248 $! ? ()
2249 : Compress::LZF::sthaw $data
2250 }
2251}
2252
2253sub db_put($$$) {
2254 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2209} 2256}
2210 2257
2211############################################################################# 2258#############################################################################
2212# the server's main() 2259# the server's init and main functions
2260
2261sub load_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d#
2264}
2213 2265
2214sub cfg_load { 2266sub cfg_load {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2216 or return; 2268 or return;
2217 2269
… …
2228 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2229 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2230 }; 2282 };
2231 warn $@ if $@; 2283 warn $@ if $@;
2232 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2233} 2289}
2234 2290
2235sub main { 2291sub main {
2236 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2237 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2240 Event::one_event; 2296 Event::one_event;
2241 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2242 }; 2298 };
2243 2299
2244 cfg_load; 2300 cfg_load;
2245 db_load; 2301 db_init;
2246 load_extensions; 2302 load_extensions;
2303
2304 $TICK_WATCHER->start;
2247 Event::loop; 2305 Event::loop;
2248} 2306}
2249 2307
2250############################################################################# 2308#############################################################################
2251# initialisation and cleanup 2309# initialisation and cleanup
2252 2310
2253# install some emergency cleanup handlers 2311# install some emergency cleanup handlers
2254BEGIN { 2312BEGIN {
2255 for my $signal (qw(INT HUP TERM)) { 2313 for my $signal (qw(INT HUP TERM)) {
2256 Event->signal ( 2314 Event->signal (
2315 reentrant => 0,
2257 data => WF_AUTOCANCEL, 2316 data => WF_AUTOCANCEL,
2258 signal => $signal, 2317 signal => $signal,
2318 prio => 0,
2259 cb => sub { 2319 cb => sub {
2260 cf::cleanup "SIG$signal"; 2320 cf::cleanup "SIG$signal";
2261 }, 2321 },
2262 ); 2322 );
2263 } 2323 }
2264} 2324}
… …
2285 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2286 $map->valid or next; 2346 $map->valid or next;
2287 $map->save; 2347 $map->save;
2288 } 2348 }
2289 warn "end emergency map save\n"; 2349 warn "end emergency map save\n";
2350
2351 warn "begin emergency database checkpoint\n";
2352 BDB::db_env_txn_checkpoint $DB_ENV;
2353 warn "end emergency database checkpoint\n";
2290 }; 2354 };
2291 2355
2292 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2357}
2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2293} 2364}
2294 2365
2295sub reload() { 2366sub reload() {
2296 # can/must only be called in main 2367 # can/must only be called in main
2297 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
2298 warn "can only reload from main coroutine\n"; 2369 warn "can only reload from main coroutine";
2299 return; 2370 return;
2300 } 2371 }
2301 2372
2302 warn "reloading..."; 2373 warn "reloading...";
2303 2374
2304 warn "freezing server"; 2375 warn "entering sync_job";
2305 my $guard = freeze_mainloop; 2376
2377 sync_job {
2378 write_runtime;
2306 cf::emergency_save; 2379 cf::emergency_save;
2380 write_runtime;
2307 2381
2308 warn "sync database to disk"; 2382 warn "syncing database to disk";
2309 cf::db_sync; 2383 BDB::db_env_txn_checkpoint $DB_ENV;
2310 IO::AIO::flush;
2311 2384
2312 eval {
2313 # if anything goes wrong in here, we should simply crash as we already saved 2385 # if anything goes wrong in here, we should simply crash as we already saved
2314 2386
2315 warn "cancel all watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2316 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2317 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2318 } 2390 }
2319 2391
2392 warn "flushing outstanding aio requests";
2393 for (;;) {
2394 BDB::flush;
2395 IO::AIO::flush;
2396 Coro::cede;
2397 last unless IO::AIO::nreqs || BDB::nreqs;
2398 warn "iterate...";
2399 }
2400
2320 warn "cancel all extension coros"; 2401 warn "cancelling all extension coros";
2321 $_->cancel for values %EXT_CORO; 2402 $_->cancel for values %EXT_CORO;
2322 %EXT_CORO = (); 2403 %EXT_CORO = ();
2323 2404
2324 warn "remove commands"; 2405 warn "removing commands";
2325 %COMMAND = (); 2406 %COMMAND = ();
2326 2407
2327 warn "remove ext commands"; 2408 warn "removing ext commands";
2328 %EXTCMD = (); 2409 %EXTCMD = ();
2329 2410
2330 warn "unload/nuke all extensions"; 2411 warn "unloading/nuking all extensions";
2331 for my $pkg (@EXTS) { 2412 for my $pkg (@EXTS) {
2332 warn "... unloading $pkg"; 2413 warn "... unloading $pkg";
2333 2414
2334 if (my $cb = $pkg->can ("unload")) { 2415 if (my $cb = $pkg->can ("unload")) {
2335 eval { 2416 eval {
… …
2340 2421
2341 warn "... nuking $pkg"; 2422 warn "... nuking $pkg";
2342 Symbol::delete_package $pkg; 2423 Symbol::delete_package $pkg;
2343 } 2424 }
2344 2425
2345 warn "unload all perl modules loaded from $LIBDIR"; 2426 warn "unloading all perl modules loaded from $LIBDIR";
2346 while (my ($k, $v) = each %INC) { 2427 while (my ($k, $v) = each %INC) {
2347 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2428 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2348 2429
2349 warn "removing <$k>"; 2430 warn "... unloading $k";
2350 delete $INC{$k}; 2431 delete $INC{$k};
2351 2432
2352 $k =~ s/\.pm$//; 2433 $k =~ s/\.pm$//;
2353 $k =~ s/\//::/g; 2434 $k =~ s/\//::/g;
2354 2435
… …
2357 } 2438 }
2358 2439
2359 Symbol::delete_package $k; 2440 Symbol::delete_package $k;
2360 } 2441 }
2361 2442
2362 warn "get rid of safe::, as good as possible"; 2443 warn "getting rid of safe::, as good as possible";
2363 Symbol::delete_package "safe::$_" 2444 Symbol::delete_package "safe::$_"
2364 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2445 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2365 2446
2366 warn "unload cf.pm \"a bit\""; 2447 warn "unloading cf.pm \"a bit\"";
2367 delete $INC{"cf.pm"}; 2448 delete $INC{"cf.pm"};
2368 2449
2369 # don't, removes xs symbols, too, 2450 # don't, removes xs symbols, too,
2370 # and global variables created in xs 2451 # and global variables created in xs
2371 #Symbol::delete_package __PACKAGE__; 2452 #Symbol::delete_package __PACKAGE__;
2372 2453
2454 warn "unload completed, starting to reload now";
2455
2373 warn "reloading cf.pm"; 2456 warn "reloading cf.pm";
2374 require cf; 2457 require cf;
2375 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2458 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2376 2459
2377 warn "load config and database again"; 2460 warn "loading config and database again";
2378 cf::cfg_load; 2461 cf::cfg_load;
2379 cf::db_load;
2380 2462
2381 warn "load extensions"; 2463 warn "loading extensions";
2382 cf::load_extensions; 2464 cf::load_extensions;
2383 2465
2384 warn "reattach attachments to objects/players"; 2466 warn "reattaching attachments to objects/players";
2385 _global_reattach; 2467 _global_reattach;
2386 warn "reattach attachments to maps"; 2468 warn "reattaching attachments to maps";
2387 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2388 };
2389 2470
2390 if ($@) { 2471 warn "loading reloadable resources";
2472 load_resources;
2473
2474 warn "leaving sync_job";
2475
2476 1
2477 } or do {
2391 warn $@; 2478 warn $@;
2392 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2393 exit 1; 2480 exit 1;
2394 } 2481 };
2395 2482
2396 warn "reloaded"; 2483 warn "reloaded";
2397}; 2484};
2398 2485
2399our $RELOAD_WATCHER; # used only during reload 2486our $RELOAD_WATCHER; # used only during reload
… …
2405 $who->message ("reloading server."); 2492 $who->message ("reloading server.");
2406 2493
2407 # doing reload synchronously and two reloads happen back-to-back, 2494 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here. 2495 # coro crashes during coro_state_free->destroy here.
2409 2496
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2497 $RELOAD_WATCHER ||= Event->timer (
2498 reentrant => 0,
2499 after => 0,
2500 data => WF_AUTOCANCEL,
2501 cb => sub {
2411 reload; 2502 reload;
2412 undef $RELOAD_WATCHER; 2503 undef $RELOAD_WATCHER;
2504 },
2413 }); 2505 );
2414 } 2506 }
2415}; 2507};
2416 2508
2417unshift @INC, $LIBDIR; 2509unshift @INC, $LIBDIR;
2510
2511my $bug_warning = 0;
2418 2512
2419$TICK_WATCHER = Event->timer ( 2513$TICK_WATCHER = Event->timer (
2420 reentrant => 0, 2514 reentrant => 0,
2515 parked => 1,
2421 prio => 0, 2516 prio => 0,
2422 at => $NEXT_TICK || $TICK, 2517 at => $NEXT_TICK || $TICK,
2423 data => WF_AUTOCANCEL, 2518 data => WF_AUTOCANCEL,
2424 cb => sub { 2519 cb => sub {
2520 if ($Coro::current != $Coro::main) {
2521 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2522 unless ++$bug_warning > 10;
2523 return;
2524 }
2525
2425 $NOW = Event::time; 2526 $NOW = Event::time;
2426 2527
2427 cf::server_tick; # one server iteration 2528 cf::server_tick; # one server iteration
2428 $RUNTIME += $TICK; 2529 $RUNTIME += $TICK;
2429 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2430 2531
2431 $WAIT_FOR_TICK->broadcast; 2532 $WAIT_FOR_TICK->broadcast;
2432 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2534
2535# my $AFTER = Event::time;
2536# warn $AFTER - $NOW;#d#
2433 2537
2434 # if we are delayed by four ticks or more, skip them all 2538 # if we are delayed by four ticks or more, skip them all
2435 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2539 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2436 2540
2437 $TICK_WATCHER->at ($NEXT_TICK); 2541 $TICK_WATCHER->at ($NEXT_TICK);
2438 $TICK_WATCHER->start; 2542 $TICK_WATCHER->start;
2439 }, 2543 },
2440); 2544);
2441 2545
2546{
2547 BDB::max_poll_time $TICK * 0.1;
2548 $BDB_POLL_WATCHER = Event->io (
2549 reentrant => 0,
2550 fd => BDB::poll_fileno,
2551 poll => 'r',
2552 prio => 0,
2553 data => WF_AUTOCANCEL,
2554 cb => \&BDB::poll_cb,
2555 );
2556 BDB::min_parallel 8;
2557
2558 BDB::set_sync_prepare {
2559 my $status;
2560 my $current = $Coro::current;
2561 (
2562 sub {
2563 $status = $!;
2564 $current->ready; undef $current;
2565 },
2566 sub {
2567 Coro::schedule while defined $current;
2568 $! = $status;
2569 },
2570 )
2571 };
2572
2573 unless ($DB_ENV) {
2574 $DB_ENV = BDB::db_env_create;
2575
2576 cf::sync_job {
2577 eval {
2578 BDB::db_env_open
2579 $DB_ENV,
2580 $BDB_ENV_DIR,
2581 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2582 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2583 0666;
2584
2585 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2586
2587 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2588 $DB_ENV->set_lk_detect;
2589 };
2590
2591 cf::cleanup "db_env_open(db): $@" if $@;
2592 };
2593 }
2594}
2595
2596{
2597 IO::AIO::min_parallel 8;
2598
2599 undef $Coro::AIO::WATCHER;
2442IO::AIO::max_poll_time $TICK * 0.2; 2600 IO::AIO::max_poll_time $TICK * 0.1;
2443
2444$AIO_POLL_WATCHER = Event->io ( 2601 $AIO_POLL_WATCHER = Event->io (
2602 reentrant => 0,
2445 fd => IO::AIO::poll_fileno, 2603 fd => IO::AIO::poll_fileno,
2446 poll => 'r', 2604 poll => 'r',
2447 prio => 5, 2605 prio => 6,
2448 data => WF_AUTOCANCEL, 2606 data => WF_AUTOCANCEL,
2449 cb => \&IO::AIO::poll_cb, 2607 cb => \&IO::AIO::poll_cb,
2450); 2608 );
2609}
2451 2610
2452$WRITE_RUNTIME_WATCHER = Event->timer ( 2611$WRITE_RUNTIME_WATCHER = Event->timer (
2612 reentrant => 0,
2453 data => WF_AUTOCANCEL, 2613 data => WF_AUTOCANCEL,
2614 parked => 1,
2454 after => 0, 2615 after => 1,
2455 interval => 10, 2616 interval => 10,
2617 prio => 6, # keep it lowest so it acts like a watchdog
2456 cb => sub { 2618 cb => sub {
2457 (Coro::unblock_sub { 2619 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2620
2621 Coro::async_pool {
2458 write_runtime 2622 write_runtime
2459 or warn "ERROR: unable to write runtime file: $!"; 2623 or warn "ERROR: unable to write runtime file: $!";
2460 })->(); 2624 };
2461 }, 2625 },
2462); 2626);
2463 2627
2464END { cf::emergency_save } 2628END { cf::emergency_save }
2465 2629

Diff Legend

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