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

Diff Legend

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