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.180 by root, Fri Jan 19 00:38:02 2007 UTC vs.
Revision 1.219 by root, Sat Feb 17 03:19: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
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
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
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
344 354
345 $coro 355 $coro
346} 356}
347 357
348sub write_runtime { 358sub write_runtime {
359 my $guard = cf::lock_acquire "write_runtime";
360
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";
… …
1065=cut 1081=cut
1066 1082
1067sub maps($) { 1083sub maps($) {
1068 my ($pl) = @_; 1084 my ($pl) = @_;
1069 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1070 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1071 or return; 1089 or return;
1072 1090
1073 my @paths; 1091 my @paths;
1074 1092
1075 for (@$files) { 1093 for (@$files) {
1076 utf8::decode $_; 1094 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1079 1097
1080 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1099 }
1083 1100
1084 \@paths 1101 \@paths
1085} 1102}
1086 1103
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1154 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1155 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1156 )
1140} 1157}
1141 1158
1159=item cf::map->register ($regex, $prio)
1160
1161Register a handler for the map path matching the given regex at the
1162givne priority (higher is better, built-in handlers have priority 0, the
1163default).
1164
1165=cut
1166
1142sub register { 1167sub register {
1143 my (undef, $regex) = @_; 1168 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1169 my $pkg = caller;
1145 1170
1146 no strict; 1171 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1172 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1173
1149 $EXT_MAP{$pkg} = qr<$regex>; 1174 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1175}
1151 1176
1152# also paths starting with '/' 1177# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1178$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1179
1155sub thawer_merge { 1180sub thawer_merge {
1156 my ($self, $merge) = @_; 1181 my ($self, $merge) = @_;
1157 1182
1158 # we have to keep some variables in memory intact 1183 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1189 $self->SUPER::thawer_merge ($merge);
1165} 1190}
1166 1191
1167sub normalise { 1192sub normalise {
1168 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1169 1198
1170 # map plan: 1199 # map plan:
1171 # 1200 #
1172 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
… …
1201 1230
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1231 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1232
1204 $path = normalise $path, $base; 1233 $path = normalise $path, $base;
1205 1234
1206 for my $pkg (keys %EXT_MAP) { 1235 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1236 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1237 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1238 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1239 $self->init; # pass $1 etc.
1211 return $self; 1240 return $self;
1212 } 1241 }
1213 } 1242 }
1214 1243
1215 Carp::carp "unable to resolve path '$path'."; 1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1245 ()
1217} 1246}
1218 1247
1219sub init { 1248sub init {
1220 my ($self) = @_; 1249 my ($self) = @_;
… …
1235 1264
1236# the original (read-only) location 1265# the original (read-only) location
1237sub load_path { 1266sub load_path {
1238 my ($self) = @_; 1267 my ($self) = @_;
1239 1268
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1270}
1242 1271
1243# the temporary/swap location 1272# the temporary/swap location
1244sub save_path { 1273sub save_path {
1245 my ($self) = @_; 1274 my ($self) = @_;
1246 1275
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1278}
1250 1279
1251# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1252sub uniq_path { 1281sub uniq_path {
1253 my ($self) = @_; 1282 my ($self) = @_;
… …
1275 1304
1276sub load_header_from($) { 1305sub load_header_from($) {
1277 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1278 1307
1279 utf8::encode $path; 1308 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1309 #aio_open $path, O_RDONLY, 0
1281 or return; 1310 # or return;
1282 1311
1283 $self->_load_header ($path) 1312 $self->_load_header ($path)
1284 or return; 1313 or return;
1285 1314
1286 $self->{load_path} = $path; 1315 $self->{load_path} = $path;
1287 1316
1288 1 1317 1
1289} 1318}
1290 1319
1291sub load_orig { 1320sub load_header_orig {
1292 my ($self) = @_; 1321 my ($self) = @_;
1293 1322
1294 $self->load_header_from ($self->load_path) 1323 $self->load_header_from ($self->load_path)
1295} 1324}
1296 1325
1297sub load_temp { 1326sub load_header_temp {
1298 my ($self) = @_; 1327 my ($self) = @_;
1299 1328
1300 $self->load_header_from ($self->save_path) 1329 $self->load_header_from ($self->save_path)
1330}
1331
1332sub prepare_temp {
1333 my ($self) = @_;
1334
1335 $self->last_access ((delete $self->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $self->{instantiate_time} = $cf::RUNTIME
1339 if $self->{instantiate_time} > $cf::RUNTIME;
1340}
1341
1342sub prepare_orig {
1343 my ($self) = @_;
1344
1345 $self->{load_original} = 1;
1346 $self->{instantiate_time} = $cf::RUNTIME;
1347 $self->last_access ($cf::RUNTIME);
1348 $self->instantiate;
1301} 1349}
1302 1350
1303sub load_header { 1351sub load_header {
1304 my ($self) = @_; 1352 my ($self) = @_;
1305 1353
1306 if ($self->load_temp) { 1354 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1355 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1356 } else {
1313 $self->load_orig 1357 $self->load_header_orig
1314 or return; 1358 or return;
1315 1359 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1360 }
1321 1361
1322 1 1362 1
1323} 1363}
1324 1364
… …
1338 $map->{last_save} = $cf::RUNTIME; 1378 $map->{last_save} = $cf::RUNTIME;
1339 1379
1340 $map->load_header 1380 $map->load_header
1341 or return; 1381 or return;
1342 1382
1343 if ($map->should_reset) { 1383 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1384 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1385 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1386 $map->reset;
1346 undef $guard; 1387 undef $guard;
1347 $map = find $path 1388 return find $path;
1348 or return;
1349 } 1389 }
1350 1390
1351 $cf::MAP{$path} = $map 1391 $cf::MAP{$path} = $map
1352 } 1392 }
1353} 1393}
1394
1395sub pre_load { }
1396sub post_load { }
1354 1397
1355sub load { 1398sub load {
1356 my ($self) = @_; 1399 my ($self) = @_;
1357 1400
1401 local $self->{deny_reset} = 1; # loading can take a long time
1402
1358 my $path = $self->{path}; 1403 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1404 my $guard = cf::lock_acquire "map_load:$path";
1360 1405
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1406 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1407
1363 $self->in_memory (cf::MAP_LOADING); 1408 $self->in_memory (cf::MAP_LOADING);
1364 1409
1365 $self->alloc; 1410 $self->alloc;
1411
1412 $self->pre_load;
1413
1366 $self->_load_objects ($self->{load_path}, 1) 1414 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1415 or return;
1368 1416
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1417 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1418 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1440 unless $self->difficulty;
1393 Coro::cede; 1441 Coro::cede;
1394 $self->activate; 1442 $self->activate;
1395 } 1443 }
1396 1444
1445 $self->post_load;
1446
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1447 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1448}
1399 1449
1400sub customise_for { 1450sub customise_for {
1401 my ($self, $ob) = @_; 1451 my ($self, $ob) = @_;
… …
1441 1491
1442 cf::sync_job { $map->load }; 1492 cf::sync_job { $map->load };
1443} 1493}
1444 1494
1445our %MAP_PREFETCH; 1495our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1496our $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 1497
1459sub find_async { 1498sub find_async {
1460 my ($path, $origin) = @_; 1499 my ($path, $origin) = @_;
1461 1500
1462 $path = normalise $path, $origin && $origin->{path}; 1501 $path = normalise $path, $origin && $origin->{path};
1463 1502
1464 if (my $map = $cf::MAP{$path}) { 1503 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1504 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1505 }
1467 1506
1468 $MAP_PREFETCH{$path} = 0; 1507 undef $MAP_PREFETCH{$path};
1508 $MAP_PREFETCHER ||= cf::async {
1509 while (%MAP_PREFETCH) {
1510 for my $path (keys %MAP_PREFETCH) {
1511 my $map = find $path
1512 or next;
1513 $map->load;
1514
1515 delete $MAP_PREFETCH{$path};
1516 }
1517 }
1518 undef $MAP_PREFETCHER;
1519 };
1469 $MAP_PREFETCHER->ready; 1520 $MAP_PREFETCHER->prio (6);
1470 1521
1471 () 1522 ()
1472} 1523}
1473 1524
1474sub save { 1525sub save {
… …
1544 return if $self->players; 1595 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d# 1596 return if $self->isa ("ext::map_per_player");#d#
1546 1597
1547 warn "resetting map ", $self->path;#d# 1598 warn "resetting map ", $self->path;#d#
1548 1599
1600 $self->in_memory (cf::MAP_SWAPPED);
1601
1602 # need to save uniques path
1603 unless ($self->{deny_save}) {
1604 my $uniq = $self->uniq_path; utf8::encode $uniq;
1605
1606 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1607 if $uniq;
1608 }
1609
1549 delete $cf::MAP{$self->path}; 1610 delete $cf::MAP{$self->path};
1550 1611
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 1612 $self->clear;
1553 1613
1554 $_->clear_links_to ($self) for values %cf::MAP; 1614 $_->clear_links_to ($self) for values %cf::MAP;
1555 1615
1556 $self->unlink_save; 1616 $self->unlink_save;
… …
1593 for (@$files) { 1653 for (@$files) {
1594 utf8::decode $_; 1654 utf8::decode $_;
1595 next if /\.pst$/; 1655 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1656 next unless /^$PATH_SEP/o;
1597 1657
1598 s/\.map$//; 1658 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1659 }
1601 1660
1602 \@paths 1661 \@paths
1603} 1662}
1604 1663
… …
1698=cut 1757=cut
1699 1758
1700sub link_map { 1759sub link_map {
1701 unless ($LINK_MAP) { 1760 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1761 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1762 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1763 $LINK_MAP->load;
1705 } 1764 }
1706 1765
1707 $LINK_MAP 1766 $LINK_MAP
1708} 1767}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1774 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1775
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1776 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1777 if $self->map;
1719 1778
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1779 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1780}
1722 1781
1723sub cf::object::player::leave_link { 1782sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1783 my ($self, $map, $x, $y) = @_;
1725 1784
… …
1747 $map->load; 1806 $map->load;
1748 $map->load_diag; 1807 $map->load_diag;
1749 1808
1750 return unless $self->contr->active; 1809 return unless $self->contr->active;
1751 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1753} 1814}
1754 1815
1755cf::player->attach ( 1816cf::player->attach (
1756 on_logout => sub { 1817 on_logout => sub {
… …
1769 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes 1831 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1773 (async { 1834 (async {
1774 # we need this sleep as the login has a concurrent enter_exit running
1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef, 1835 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.", 1837 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED); 1838 cf::NDI_RED);
1839 # we need this sleep as the login has a concurrent enter_exit running
1840 # and this sleep increases chances of the player not ending up in scorn
1780 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1782 })->prio (2); 1843 })->prio (2);
1783 } 1844 }
1784 }, 1845 },
… …
1792 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1793 1854
1794 $self->enter_link; 1855 $self->enter_link;
1795 1856
1796 (async { 1857 (async {
1858 my $map = eval {
1797 my $map = cf::map::find $path; 1859 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1799 1861 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1864
1805 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1866 })->prio (1);
1807} 1867}
1808 1868
… …
1812 1872
1813sub parse_random_map_params { 1873sub parse_random_map_params {
1814 my ($spec) = @_; 1874 my ($spec) = @_;
1815 1875
1816 my $rmp = { # defaults 1876 my $rmp = { # defaults
1817 xsize => -1, 1877 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1878 ysize => (cf::rndm 15, 40),
1879 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1880 #layout => string,
1819 }; 1881 };
1820 1882
1821 for (split /\n/, $spec) { 1883 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1884 my ($k, $v) = split /\s+/, $_, 2;
1823 1885
… …
1837 # that depends on the exit object 1899 # that depends on the exit object
1838 1900
1839 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1840 1902
1841 if ($exit->map) { 1903 if ($exit->map) {
1842 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1843 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1844 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1845 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1846 } 1908 }
1847 1909
… …
1864sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1865 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1866 1928
1867 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1868 1930
1931 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job
1933 cf::sync_job { prepare_random_map $exit };
1934 }
1935
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp;
1939
1869 $self->enter_link; 1940 $self->enter_link;
1870 1941
1871 (async { 1942 (async {
1872 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1873 unless (eval { 1944 unless (eval {
1874 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1875 if $exit->slaying eq "/!";
1876
1877 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1878 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1879 1946
1880 1; 1947 1;
1881 }) { 1948 }) {
1882 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1883 . "I'll try to bring you back to the map you were before. " 1950 . "I'll try to bring you back to the map you were before. "
… …
1944 # get handled first 2011 # get handled first
1945 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1946 or return; # be conservative, not sure how that can happen, but we saw a crash here 2013 or return; # be conservative, not sure how that can happen, but we saw a crash here
1947 2014
1948 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1949 2017
1950 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1951 2019
1952 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1953 if (@$queue) { 2021 if (@$queue) {
… …
2114The parameter C<$family> should best start with the name of the extension 2182The parameter C<$family> should best start with the name of the extension
2115using it, it should be unique. 2183using it, it should be unique.
2116 2184
2117=over 4 2185=over 4
2118 2186
2119=item $hashref = cf::db_get $family
2120
2121Return a hashref for use by the extension C<$family>, which can be
2122modified. After modifications, you have to call C<cf::db_dirty> or
2123C<cf::db_sync>.
2124
2125=item $value = cf::db_get $family => $key 2187=item $value = cf::db_get $family => $key
2126 2188
2127Returns a single value from the database 2189Returns a single value from the database.
2128
2129=item cf::db_put $family => $hashref
2130
2131Stores the given family hashref into the database. Updates are delayed, if
2132you want the data to be synced to disk immediately, use C<cf::db_sync>.
2133 2190
2134=item cf::db_put $family => $key => $value 2191=item cf::db_put $family => $key => $value
2135 2192
2136Stores the given C<$value> in the family hash. Updates are delayed, if you 2193Stores the given C<$value> in the family.
2137want the data to be synced to disk immediately, use C<cf::db_sync>.
2138
2139=item cf::db_dirty
2140
2141Marks the database as dirty, to be updated at a later time.
2142
2143=item cf::db_sync
2144
2145Immediately write the database to disk I<if it is dirty>.
2146 2194
2147=cut 2195=cut
2148 2196
2149our $DB; 2197our $DB;
2150 2198
2151{ 2199sub db_init {
2200 unless ($DB) {
2201 $DB = BDB::db_create $DB_ENV;
2202
2203 cf::sync_job {
2204 eval {
2205 $DB->set_flags (BDB::CHKSUM);
2206
2207 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2208 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2209 cf::cleanup "db_open(db): $!" if $!;
2210 };
2211 cf::cleanup "db_open(db): $@" if $@;
2212 };
2213
2152 my $path = cf::localdir . "/database.pst"; 2214 my $path = cf::localdir . "/database.pst";
2215 if (stat $path) {
2216 cf::sync_job {
2217 my $pst = Storable::retrieve $path;
2153 2218
2154 sub db_load() { 2219 cf::db_put (board => data => $pst->{board});
2155 $DB = stat $path ? Storable::retrieve $path : { }; 2220 cf::db_put (guildrules => data => $pst->{guildrules});
2156 } 2221 cf::db_put (rent => balance => $pst->{rent}{balance});
2222 BDB::db_env_txn_checkpoint $DB_ENV;
2157 2223
2158 my $pid; 2224 unlink $path;
2159
2160 sub db_save() {
2161 waitpid $pid, 0 if $pid;
2162 if (0 == ($pid = fork)) {
2163 $DB->{_meta}{version} = 1;
2164 Storable::nstore $DB, "$path~";
2165 rename "$path~", $path;
2166 cf::_exit 0 if defined $pid;
2167 } 2225 };
2168 }
2169
2170 my $dirty;
2171
2172 sub db_sync() {
2173 db_save if $dirty;
2174 undef $dirty;
2175 }
2176
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2178 db_sync;
2179 });
2180
2181 sub db_dirty() {
2182 $dirty = 1;
2183 $idle->start;
2184 }
2185
2186 sub db_get($;$) {
2187 @_ >= 2
2188 ? $DB->{$_[0]}{$_[1]}
2189 : ($DB->{$_[0]} ||= { })
2190 }
2191
2192 sub db_put($$;$) {
2193 if (@_ >= 3) {
2194 $DB->{$_[0]}{$_[1]} = $_[2];
2195 } else {
2196 $DB->{$_[0]} = $_[1];
2197 }
2198 db_dirty;
2199 }
2200
2201 cf::global->attach (
2202 prio => 10000,
2203 on_cleanup => sub {
2204 db_sync;
2205 }, 2226 }
2206 ); 2227 }
2228}
2229
2230sub db_get($$) {
2231 my $key = "$_[0]/$_[1]";
2232
2233 cf::sync_job {
2234 BDB::db_get $DB, undef, $key, my $data;
2235
2236 $! ? ()
2237 : Compress::LZF::sthaw $data
2238 }
2239}
2240
2241sub db_put($$$) {
2242 BDB::dbreq_pri 4;
2243 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2207} 2244}
2208 2245
2209############################################################################# 2246#############################################################################
2210# the server's main() 2247# the server's init and main functions
2248
2249sub init_resources {
2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2251 or die "unable to load regions file\n";#d#
2252}
2211 2253
2212sub cfg_load { 2254sub cfg_load {
2213 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
2214 or return; 2256 or return;
2215 2257
… …
2226 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2268 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2227 and die "WARNING: m(un)lockall failed: $!\n"; 2269 and die "WARNING: m(un)lockall failed: $!\n";
2228 }; 2270 };
2229 warn $@ if $@; 2271 warn $@ if $@;
2230 } 2272 }
2273}
2274
2275sub init {
2276 init_resources;
2231} 2277}
2232 2278
2233sub main { 2279sub main {
2234 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2235 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2238 Event::one_event; 2284 Event::one_event;
2239 })->prio (Coro::PRIO_MAX); 2285 })->prio (Coro::PRIO_MAX);
2240 }; 2286 };
2241 2287
2242 cfg_load; 2288 cfg_load;
2243 db_load; 2289 db_init;
2244 load_extensions; 2290 load_extensions;
2291
2292 $TICK_WATCHER->start;
2245 Event::loop; 2293 Event::loop;
2246} 2294}
2247 2295
2248############################################################################# 2296#############################################################################
2249# initialisation and cleanup 2297# initialisation and cleanup
2250 2298
2251# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2252BEGIN { 2300BEGIN {
2253 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2254 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2255 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2256 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2257 cb => sub { 2307 cb => sub {
2258 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2259 }, 2309 },
2260 ); 2310 );
2261 } 2311 }
2262} 2312}
… …
2283 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2284 $map->valid or next; 2334 $map->valid or next;
2285 $map->save; 2335 $map->save;
2286 } 2336 }
2287 warn "end emergency map save\n"; 2337 warn "end emergency map save\n";
2338
2339 warn "begin emergency database checkpoint\n";
2340 BDB::db_env_txn_checkpoint $DB_ENV;
2341 warn "end emergency database checkpoint\n";
2288 }; 2342 };
2289 2343
2290 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2345}
2346
2347sub post_cleanup {
2348 my ($make_core) = @_;
2349
2350 warn Carp::longmess "post_cleanup backtrace"
2351 if $make_core;
2291} 2352}
2292 2353
2293sub reload() { 2354sub reload() {
2294 # can/must only be called in main 2355 # can/must only be called in main
2295 if ($Coro::current != $Coro::main) { 2356 if ($Coro::current != $Coro::main) {
2296 warn "can only reload from main coroutine\n"; 2357 warn "can only reload from main coroutine";
2297 return; 2358 return;
2298 } 2359 }
2299 2360
2300 warn "reloading..."; 2361 warn "reloading...";
2301 2362
2302 warn "freezing server"; 2363 warn "entering sync_job";
2303 my $guard = freeze_mainloop; 2364
2365 cf::sync_job {
2366 cf::write_runtime; # external watchdog should not bark
2304 cf::emergency_save; 2367 cf::emergency_save;
2368 cf::write_runtime; # external watchdog should not bark
2305 2369
2306 warn "sync database to disk"; 2370 warn "syncing database to disk";
2307 cf::db_sync; 2371 BDB::db_env_txn_checkpoint $DB_ENV;
2308 IO::AIO::flush;
2309 2372
2310 eval {
2311 # if anything goes wrong in here, we should simply crash as we already saved 2373 # if anything goes wrong in here, we should simply crash as we already saved
2312 2374
2313 warn "cancel all watchers"; 2375 warn "cancelling all WF_AUTOCANCEL watchers";
2314 for (Event::all_watchers) { 2376 for (Event::all_watchers) {
2315 $_->cancel if $_->data & WF_AUTOCANCEL; 2377 $_->cancel if $_->data & WF_AUTOCANCEL;
2316 } 2378 }
2317 2379
2380 warn "flushing outstanding aio requests";
2381 for (;;) {
2382 BDB::flush;
2383 IO::AIO::flush;
2384 Coro::cede;
2385 last unless IO::AIO::nreqs || BDB::nreqs;
2386 warn "iterate...";
2387 }
2388
2318 warn "cancel all extension coros"; 2389 warn "cancelling all extension coros";
2319 $_->cancel for values %EXT_CORO; 2390 $_->cancel for values %EXT_CORO;
2320 %EXT_CORO = (); 2391 %EXT_CORO = ();
2321 2392
2322 warn "remove commands"; 2393 warn "removing commands";
2323 %COMMAND = (); 2394 %COMMAND = ();
2324 2395
2325 warn "remove ext commands"; 2396 warn "removing ext commands";
2326 %EXTCMD = (); 2397 %EXTCMD = ();
2327 2398
2328 warn "unload/nuke all extensions"; 2399 warn "unloading/nuking all extensions";
2329 for my $pkg (@EXTS) { 2400 for my $pkg (@EXTS) {
2330 warn "... unloading $pkg"; 2401 warn "... unloading $pkg";
2331 2402
2332 if (my $cb = $pkg->can ("unload")) { 2403 if (my $cb = $pkg->can ("unload")) {
2333 eval { 2404 eval {
… …
2338 2409
2339 warn "... nuking $pkg"; 2410 warn "... nuking $pkg";
2340 Symbol::delete_package $pkg; 2411 Symbol::delete_package $pkg;
2341 } 2412 }
2342 2413
2343 warn "unload all perl modules loaded from $LIBDIR"; 2414 warn "unloading all perl modules loaded from $LIBDIR";
2344 while (my ($k, $v) = each %INC) { 2415 while (my ($k, $v) = each %INC) {
2345 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2416 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2346 2417
2347 warn "removing <$k>"; 2418 warn "... unloading $k";
2348 delete $INC{$k}; 2419 delete $INC{$k};
2349 2420
2350 $k =~ s/\.pm$//; 2421 $k =~ s/\.pm$//;
2351 $k =~ s/\//::/g; 2422 $k =~ s/\//::/g;
2352 2423
… …
2355 } 2426 }
2356 2427
2357 Symbol::delete_package $k; 2428 Symbol::delete_package $k;
2358 } 2429 }
2359 2430
2360 warn "get rid of safe::, as good as possible"; 2431 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2432 Symbol::delete_package "safe::$_"
2362 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2433 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363 2434
2364 warn "unload cf.pm \"a bit\""; 2435 warn "unloading cf.pm \"a bit\"";
2365 delete $INC{"cf.pm"}; 2436 delete $INC{"cf.pm"};
2366 2437
2367 # don't, removes xs symbols, too, 2438 # don't, removes xs symbols, too,
2368 # and global variables created in xs 2439 # and global variables created in xs
2369 #Symbol::delete_package __PACKAGE__; 2440 #Symbol::delete_package __PACKAGE__;
2370 2441
2442 warn "unload completed, starting to reload now";
2443
2371 warn "reloading cf.pm"; 2444 warn "reloading cf.pm";
2372 require cf; 2445 require cf;
2373 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2446 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2374 2447
2375 warn "load config and database again"; 2448 warn "loading config and database again";
2376 cf::cfg_load; 2449 cf::cfg_load;
2377 cf::db_load;
2378 2450
2379 warn "load extensions"; 2451 warn "loading extensions";
2380 cf::load_extensions; 2452 cf::load_extensions;
2381 2453
2382 warn "reattach attachments to objects/players"; 2454 warn "reattaching attachments to objects/players";
2383 _global_reattach; 2455 _global_reattach;
2384 warn "reattach attachments to maps"; 2456 warn "reattaching attachments to maps";
2385 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2386 };
2387 2458
2388 if ($@) { 2459 warn "loading reloadable resources";
2460 init_resources;
2461
2462 warn "leaving sync_job";
2463
2464 1
2465 } or do {
2389 warn $@; 2466 warn $@;
2390 warn "error while reloading, exiting."; 2467 warn "error while reloading, exiting.";
2391 exit 1; 2468 exit 1;
2392 } 2469 };
2393 2470
2394 warn "reloaded"; 2471 warn "reloaded";
2395}; 2472};
2396 2473
2397our $RELOAD_WATCHER; # used only during reload 2474our $RELOAD_WATCHER; # used only during reload
… …
2403 $who->message ("reloading server."); 2480 $who->message ("reloading server.");
2404 2481
2405 # doing reload synchronously and two reloads happen back-to-back, 2482 # doing reload synchronously and two reloads happen back-to-back,
2406 # coro crashes during coro_state_free->destroy here. 2483 # coro crashes during coro_state_free->destroy here.
2407 2484
2408 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2485 $RELOAD_WATCHER ||= Event->timer (
2486 reentrant => 0,
2487 after => 0,
2488 data => WF_AUTOCANCEL,
2489 cb => sub {
2409 reload; 2490 reload;
2410 undef $RELOAD_WATCHER; 2491 undef $RELOAD_WATCHER;
2492 },
2411 }); 2493 );
2412 } 2494 }
2413}; 2495};
2414 2496
2415unshift @INC, $LIBDIR; 2497unshift @INC, $LIBDIR;
2498
2499my $bug_warning = 0;
2416 2500
2417$TICK_WATCHER = Event->timer ( 2501$TICK_WATCHER = Event->timer (
2418 reentrant => 0, 2502 reentrant => 0,
2503 parked => 1,
2419 prio => 0, 2504 prio => 0,
2420 at => $NEXT_TICK || $TICK, 2505 at => $NEXT_TICK || $TICK,
2421 data => WF_AUTOCANCEL, 2506 data => WF_AUTOCANCEL,
2422 cb => sub { 2507 cb => sub {
2508 if ($Coro::current != $Coro::main) {
2509 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2510 unless ++$bug_warning > 10;
2511 return;
2512 }
2513
2423 $NOW = Event::time; 2514 $NOW = Event::time;
2424 2515
2425 cf::server_tick; # one server iteration 2516 cf::server_tick; # one server iteration
2426 $RUNTIME += $TICK; 2517 $RUNTIME += $TICK;
2427 $NEXT_TICK += $TICK; 2518 $NEXT_TICK += $TICK;
2428 2519
2520 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2521 $NEXT_RUNTIME_WRITE = $NOW + 10;
2522 Coro::async_pool {
2523 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!";
2525 };
2526 }
2527
2429 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2430 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2530
2531# my $AFTER = Event::time;
2532# warn $AFTER - $NOW;#d#
2431 2533
2432 # if we are delayed by four ticks or more, skip them all 2534 # if we are delayed by four ticks or more, skip them all
2433 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2434 2536
2435 $TICK_WATCHER->at ($NEXT_TICK); 2537 $TICK_WATCHER->at ($NEXT_TICK);
2436 $TICK_WATCHER->start; 2538 $TICK_WATCHER->start;
2437 }, 2539 },
2438); 2540);
2439 2541
2542{
2543 BDB::max_poll_time $TICK * 0.1;
2544 $BDB_POLL_WATCHER = Event->io (
2545 reentrant => 0,
2546 fd => BDB::poll_fileno,
2547 poll => 'r',
2548 prio => 0,
2549 data => WF_AUTOCANCEL,
2550 cb => \&BDB::poll_cb,
2551 );
2552 BDB::min_parallel 8;
2553
2554 BDB::set_sync_prepare {
2555 my $status;
2556 my $current = $Coro::current;
2557 (
2558 sub {
2559 $status = $!;
2560 $current->ready; undef $current;
2561 },
2562 sub {
2563 Coro::schedule while defined $current;
2564 $! = $status;
2565 },
2566 )
2567 };
2568
2569 unless ($DB_ENV) {
2570 $DB_ENV = BDB::db_env_create;
2571
2572 cf::sync_job {
2573 eval {
2574 BDB::db_env_open
2575 $DB_ENV,
2576 $BDB_ENV_DIR,
2577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2579 0666;
2580
2581 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2582
2583 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2584 $DB_ENV->set_lk_detect;
2585 };
2586
2587 cf::cleanup "db_env_open(db): $@" if $@;
2588 };
2589 }
2590}
2591
2592{
2593 IO::AIO::min_parallel 8;
2594
2595 undef $Coro::AIO::WATCHER;
2440IO::AIO::max_poll_time $TICK * 0.2; 2596 IO::AIO::max_poll_time $TICK * 0.1;
2441
2442$AIO_POLL_WATCHER = Event->io ( 2597 $AIO_POLL_WATCHER = Event->io (
2443 fd => IO::AIO::poll_fileno, 2598 reentrant => 0,
2444 poll => 'r',
2445 prio => 5,
2446 data => WF_AUTOCANCEL,
2447 cb => \&IO::AIO::poll_cb,
2448);
2449
2450$WRITE_RUNTIME_WATCHER = Event->timer (
2451 data => WF_AUTOCANCEL, 2599 data => WF_AUTOCANCEL,
2452 after => 0, 2600 fd => IO::AIO::poll_fileno,
2453 interval => 10, 2601 poll => 'r',
2454 cb => sub { 2602 prio => 6,
2455 (Coro::unblock_sub { 2603 cb => \&IO::AIO::poll_cb,
2456 write_runtime 2604 );
2457 or warn "ERROR: unable to write runtime file: $!"; 2605}
2458 })->();
2459 },
2460);
2461 2606
2462END { cf::emergency_save } 2607END { cf::emergency_save }
2463 2608
24641 26091
2465 2610

Diff Legend

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