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.178 by root, Thu Jan 18 00:06:55 2007 UTC vs.
Revision 1.213 by root, Tue Feb 13 20:01:04 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") {
… …
957 982
958sub exists($) { 983sub exists($) {
959 my ($login) = @_; 984 my ($login) = @_;
960 985
961 $cf::PLAYER{$login} 986 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 987 or cf::sync_job { !aio_stat path $login }
963} 988}
964 989
965sub find($) { 990sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 991 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 992 my $login = $_[0];
… …
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
… …
1812 1884
1813sub parse_random_map_params { 1885sub parse_random_map_params {
1814 my ($spec) = @_; 1886 my ($spec) = @_;
1815 1887
1816 my $rmp = { # defaults 1888 my $rmp = { # defaults
1817 xsize => -1, 1889 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1890 ysize => (cf::rndm 15, 40),
1891 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1892 #layout => string,
1819 }; 1893 };
1820 1894
1821 for (split /\n/, $spec) { 1895 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1896 my ($k, $v) = split /\s+/, $_, 2;
1823 1897
… …
1827 $rmp 1901 $rmp
1828} 1902}
1829 1903
1830sub prepare_random_map { 1904sub prepare_random_map {
1831 my ($exit) = @_; 1905 my ($exit) = @_;
1906
1907 my $guard = cf::lock_acquire "exit_prepare:$exit";
1832 1908
1833 # all this does is basically replace the /! path by 1909 # all this does is basically replace the /! path by
1834 # a new random map path (?random/...) with a seed 1910 # a new random map path (?random/...) with a seed
1835 # that depends on the exit object 1911 # that depends on the exit object
1836 1912
1837 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1838 1914
1839 if ($exit->map) { 1915 if ($exit->map) {
1840 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1841 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1842 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1843 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1844 } 1920 }
1845 1921
… …
1862sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1863 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1864 1940
1865 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1866 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
1867 $self->enter_link; 1952 $self->enter_link;
1868 1953
1869 (async { 1954 (async {
1870 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1871 unless (eval { 1956 unless (eval {
1872 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1873 if $exit->slaying eq "/!";
1874
1875 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1876 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1877 1958
1878 1; 1959 1;
1879 }) { 1960 }) {
1880 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1881 . "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. "
… …
1942 # get handled first 2023 # get handled first
1943 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1944 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
1945 2026
1946 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1947 2029
1948 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1949 2031
1950 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1951 if (@$queue) { 2033 if (@$queue) {
… …
2112The 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
2113using it, it should be unique. 2195using it, it should be unique.
2114 2196
2115=over 4 2197=over 4
2116 2198
2117=item $hashref = cf::db_get $family
2118
2119Return a hashref for use by the extension C<$family>, which can be
2120modified. After modifications, you have to call C<cf::db_dirty> or
2121C<cf::db_sync>.
2122
2123=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2124 2200
2125Returns a single value from the database 2201Returns a single value from the database.
2126
2127=item cf::db_put $family => $hashref
2128
2129Stores the given family hashref into the database. Updates are delayed, if
2130you want the data to be synced to disk immediately, use C<cf::db_sync>.
2131 2202
2132=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2133 2204
2134Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2135want the data to be synced to disk immediately, use C<cf::db_sync>.
2136
2137=item cf::db_dirty
2138
2139Marks the database as dirty, to be updated at a later time.
2140
2141=item cf::db_sync
2142
2143Immediately write the database to disk I<if it is dirty>.
2144 2206
2145=cut 2207=cut
2146 2208
2147our $DB; 2209our $DB;
2148 2210
2149{ 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
2150 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;
2151 2230
2152 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2153 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2154 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2155 2235
2156 my $pid; 2236 unlink $path;
2157
2158 sub db_save() {
2159 waitpid $pid, 0 if $pid;
2160 if (0 == ($pid = fork)) {
2161 $DB->{_meta}{version} = 1;
2162 Storable::nstore $DB, "$path~";
2163 rename "$path~", $path;
2164 cf::_exit 0 if defined $pid;
2165 } 2237 };
2166 }
2167
2168 my $dirty;
2169
2170 sub db_sync() {
2171 db_save if $dirty;
2172 undef $dirty;
2173 }
2174
2175 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2176 db_sync;
2177 });
2178
2179 sub db_dirty() {
2180 $dirty = 1;
2181 $idle->start;
2182 }
2183
2184 sub db_get($;$) {
2185 @_ >= 2
2186 ? $DB->{$_[0]}{$_[1]}
2187 : ($DB->{$_[0]} ||= { })
2188 }
2189
2190 sub db_put($$;$) {
2191 if (@_ >= 3) {
2192 $DB->{$_[0]}{$_[1]} = $_[2];
2193 } else {
2194 $DB->{$_[0]} = $_[1];
2195 }
2196 db_dirty;
2197 }
2198
2199 cf::global->attach (
2200 prio => 10000,
2201 on_cleanup => sub {
2202 db_sync;
2203 }, 2238 }
2204 ); 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 { };
2205} 2256}
2206 2257
2207############################################################################# 2258#############################################################################
2208# 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}
2209 2265
2210sub cfg_load { 2266sub cfg_load {
2211 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2212 or return; 2268 or return;
2213 2269
… …
2224 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2225 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2226 }; 2282 };
2227 warn $@ if $@; 2283 warn $@ if $@;
2228 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2229} 2289}
2230 2290
2231sub main { 2291sub main {
2232 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2233 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2236 Event::one_event; 2296 Event::one_event;
2237 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2238 }; 2298 };
2239 2299
2240 cfg_load; 2300 cfg_load;
2241 db_load; 2301 db_init;
2242 load_extensions; 2302 load_extensions;
2303
2304 $TICK_WATCHER->start;
2305 $WRITE_RUNTIME_WATCHER->start;
2243 Event::loop; 2306 Event::loop;
2244} 2307}
2245 2308
2246############################################################################# 2309#############################################################################
2247# initialisation and cleanup 2310# initialisation and cleanup
2248 2311
2249# install some emergency cleanup handlers 2312# install some emergency cleanup handlers
2250BEGIN { 2313BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2314 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2315 Event->signal (
2316 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2317 data => WF_AUTOCANCEL,
2254 signal => $signal, 2318 signal => $signal,
2319 prio => 0,
2255 cb => sub { 2320 cb => sub {
2256 cf::cleanup "SIG$signal"; 2321 cf::cleanup "SIG$signal";
2257 }, 2322 },
2258 ); 2323 );
2259 } 2324 }
2260} 2325}
… …
2281 my $map = $cf::MAP{$path} or next; 2346 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next; 2347 $map->valid or next;
2283 $map->save; 2348 $map->save;
2284 } 2349 }
2285 warn "end emergency map save\n"; 2350 warn "end emergency map save\n";
2351
2352 warn "begin emergency database checkpoint\n";
2353 BDB::db_env_txn_checkpoint $DB_ENV;
2354 warn "end emergency database checkpoint\n";
2286 }; 2355 };
2287 2356
2288 warn "leave emergency perl save\n"; 2357 warn "leave emergency perl save\n";
2358}
2359
2360sub post_cleanup {
2361 my ($make_core) = @_;
2362
2363 warn Carp::longmess "post_cleanup backtrace"
2364 if $make_core;
2289} 2365}
2290 2366
2291sub reload() { 2367sub reload() {
2292 # can/must only be called in main 2368 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2369 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2370 warn "can only reload from main coroutine";
2295 return; 2371 return;
2296 } 2372 }
2297 2373
2298 warn "reloading..."; 2374 warn "reloading...";
2299 2375
2300 warn "freezing server"; 2376 warn "entering sync_job";
2301 my $guard = freeze_mainloop; 2377
2378 cf::sync_job {
2379 cf::write_runtime;
2302 cf::emergency_save; 2380 cf::emergency_save;
2381 cf::write_runtime;
2303 2382
2304 warn "sync database to disk"; 2383 warn "syncing database to disk";
2305 cf::db_sync; 2384 BDB::db_env_txn_checkpoint $DB_ENV;
2306 IO::AIO::flush;
2307 2385
2308 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2386 # if anything goes wrong in here, we should simply crash as we already saved
2310 2387
2311 warn "cancel all watchers"; 2388 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2389 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2390 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2391 }
2315 2392
2393 warn "flushing outstanding aio requests";
2394 for (;;) {
2395 BDB::flush;
2396 IO::AIO::flush;
2397 Coro::cede;
2398 last unless IO::AIO::nreqs || BDB::nreqs;
2399 warn "iterate...";
2400 }
2401
2316 warn "cancel all extension coros"; 2402 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2404 %EXT_CORO = ();
2319 2405
2320 warn "remove commands"; 2406 warn "removing commands";
2321 %COMMAND = (); 2407 %COMMAND = ();
2322 2408
2323 warn "remove ext commands"; 2409 warn "removing ext commands";
2324 %EXTCMD = (); 2410 %EXTCMD = ();
2325 2411
2326 warn "unload/nuke all extensions"; 2412 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2413 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2414 warn "... unloading $pkg";
2329 2415
2330 if (my $cb = $pkg->can ("unload")) { 2416 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2417 eval {
… …
2336 2422
2337 warn "... nuking $pkg"; 2423 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2424 Symbol::delete_package $pkg;
2339 } 2425 }
2340 2426
2341 warn "unload all perl modules loaded from $LIBDIR"; 2427 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2428 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2429 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2430
2345 warn "removing <$k>"; 2431 warn "... unloading $k";
2346 delete $INC{$k}; 2432 delete $INC{$k};
2347 2433
2348 $k =~ s/\.pm$//; 2434 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2435 $k =~ s/\//::/g;
2350 2436
… …
2353 } 2439 }
2354 2440
2355 Symbol::delete_package $k; 2441 Symbol::delete_package $k;
2356 } 2442 }
2357 2443
2358 warn "get rid of safe::, as good as possible"; 2444 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2445 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2446 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2447
2362 warn "unload cf.pm \"a bit\""; 2448 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2449 delete $INC{"cf.pm"};
2364 2450
2365 # don't, removes xs symbols, too, 2451 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2452 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2453 #Symbol::delete_package __PACKAGE__;
2368 2454
2455 warn "unload completed, starting to reload now";
2456
2369 warn "reloading cf.pm"; 2457 warn "reloading cf.pm";
2370 require cf; 2458 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2460
2373 warn "load config and database again"; 2461 warn "loading config and database again";
2374 cf::cfg_load; 2462 cf::cfg_load;
2375 cf::db_load;
2376 2463
2377 warn "load extensions"; 2464 warn "loading extensions";
2378 cf::load_extensions; 2465 cf::load_extensions;
2379 2466
2380 warn "reattach attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2468 _global_reattach;
2382 warn "reattach attachments to maps"; 2469 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2384 };
2385 2471
2386 if ($@) { 2472 warn "loading reloadable resources";
2473 load_resources;
2474
2475 warn "leaving sync_job";
2476
2477 1
2478 } or do {
2387 warn $@; 2479 warn $@;
2388 warn "error while reloading, exiting."; 2480 warn "error while reloading, exiting.";
2389 exit 1; 2481 exit 1;
2390 } 2482 };
2391 2483
2392 warn "reloaded"; 2484 warn "reloaded";
2393}; 2485};
2394 2486
2395our $RELOAD_WATCHER; # used only during reload 2487our $RELOAD_WATCHER; # used only during reload
… …
2401 $who->message ("reloading server."); 2493 $who->message ("reloading server.");
2402 2494
2403 # doing reload synchronously and two reloads happen back-to-back, 2495 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here. 2496 # coro crashes during coro_state_free->destroy here.
2405 2497
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2498 $RELOAD_WATCHER ||= Event->timer (
2499 reentrant => 0,
2500 after => 0,
2501 data => WF_AUTOCANCEL,
2502 cb => sub {
2407 reload; 2503 reload;
2408 undef $RELOAD_WATCHER; 2504 undef $RELOAD_WATCHER;
2505 },
2409 }); 2506 );
2410 } 2507 }
2411}; 2508};
2412 2509
2413unshift @INC, $LIBDIR; 2510unshift @INC, $LIBDIR;
2511
2512my $bug_warning = 0;
2414 2513
2415$TICK_WATCHER = Event->timer ( 2514$TICK_WATCHER = Event->timer (
2416 reentrant => 0, 2515 reentrant => 0,
2516 parked => 1,
2417 prio => 0, 2517 prio => 0,
2418 at => $NEXT_TICK || $TICK, 2518 at => $NEXT_TICK || $TICK,
2419 data => WF_AUTOCANCEL, 2519 data => WF_AUTOCANCEL,
2420 cb => sub { 2520 cb => sub {
2521 if ($Coro::current != $Coro::main) {
2522 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2523 unless ++$bug_warning > 10;
2524 return;
2525 }
2526
2421 $NOW = Event::time; 2527 $NOW = Event::time;
2422 2528
2423 cf::server_tick; # one server iteration 2529 cf::server_tick; # one server iteration
2424 $RUNTIME += $TICK; 2530 $RUNTIME += $TICK;
2425 $NEXT_TICK += $TICK; 2531 $NEXT_TICK += $TICK;
2426 2532
2427 $WAIT_FOR_TICK->broadcast; 2533 $WAIT_FOR_TICK->broadcast;
2428 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2534 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2535
2536# my $AFTER = Event::time;
2537# warn $AFTER - $NOW;#d#
2429 2538
2430 # if we are delayed by four ticks or more, skip them all 2539 # if we are delayed by four ticks or more, skip them all
2431 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2540 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2432 2541
2433 $TICK_WATCHER->at ($NEXT_TICK); 2542 $TICK_WATCHER->at ($NEXT_TICK);
2434 $TICK_WATCHER->start; 2543 $TICK_WATCHER->start;
2435 }, 2544 },
2436); 2545);
2437 2546
2547{
2548 BDB::max_poll_time $TICK * 0.1;
2549 $BDB_POLL_WATCHER = Event->io (
2550 reentrant => 0,
2551 fd => BDB::poll_fileno,
2552 poll => 'r',
2553 prio => 0,
2554 data => WF_AUTOCANCEL,
2555 cb => \&BDB::poll_cb,
2556 );
2557 BDB::min_parallel 8;
2558
2559 BDB::set_sync_prepare {
2560 my $status;
2561 my $current = $Coro::current;
2562 (
2563 sub {
2564 $status = $!;
2565 $current->ready; undef $current;
2566 },
2567 sub {
2568 Coro::schedule while defined $current;
2569 $! = $status;
2570 },
2571 )
2572 };
2573
2574 unless ($DB_ENV) {
2575 $DB_ENV = BDB::db_env_create;
2576
2577 cf::sync_job {
2578 eval {
2579 BDB::db_env_open
2580 $DB_ENV,
2581 $BDB_ENV_DIR,
2582 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2583 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2584 0666;
2585
2586 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2587
2588 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2589 $DB_ENV->set_lk_detect;
2590 };
2591
2592 cf::cleanup "db_env_open(db): $@" if $@;
2593 };
2594 }
2595}
2596
2597{
2598 IO::AIO::min_parallel 8;
2599
2600 undef $Coro::AIO::WATCHER;
2438IO::AIO::max_poll_time $TICK * 0.2; 2601 IO::AIO::max_poll_time $TICK * 0.1;
2439
2440$AIO_POLL_WATCHER = Event->io ( 2602 $AIO_POLL_WATCHER = Event->io (
2603 reentrant => 0,
2441 fd => IO::AIO::poll_fileno, 2604 fd => IO::AIO::poll_fileno,
2442 poll => 'r', 2605 poll => 'r',
2443 prio => 5, 2606 prio => 6,
2444 data => WF_AUTOCANCEL, 2607 data => WF_AUTOCANCEL,
2445 cb => \&IO::AIO::poll_cb, 2608 cb => \&IO::AIO::poll_cb,
2446); 2609 );
2610}
2447 2611
2448$WRITE_RUNTIME_WATCHER = Event->timer ( 2612$WRITE_RUNTIME_WATCHER = Event->timer (
2613 reentrant => 0,
2449 data => WF_AUTOCANCEL, 2614 data => WF_AUTOCANCEL,
2615 parked => 1,
2450 after => 0, 2616 after => 1,
2451 interval => 10, 2617 interval => 10,
2618 prio => 6, # keep it lowest so it acts like a watchdog
2452 cb => sub { 2619 cb => sub {
2453 (Coro::unblock_sub { 2620 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2621
2622 Coro::async_pool {
2454 write_runtime 2623 write_runtime
2455 or warn "ERROR: unable to write runtime file: $!"; 2624 or warn "ERROR: unable to write runtime file: $!";
2456 })->(); 2625 };
2457 }, 2626 },
2458); 2627);
2459 2628
2460END { cf::emergency_save } 2629END { cf::emergency_save }
2461 2630

Diff Legend

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