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.170 by root, Sun Jan 14 02:00:37 2007 UTC vs.
Revision 1.206 by root, Sun Feb 11 22:27: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.3 (); 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 ();
… …
48our $TICK_WATCHER; 49our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 50our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 51our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 52our $NEXT_TICK;
52our $NOW; 53our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off
55
56our $BDB_POLL_WATCHER;
57our $DB_ENV;
53 58
54our %CFG; 59our %CFG;
55 60
56our $UPTIME; $UPTIME ||= time; 61our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 62our $RUNTIME;
58 63
59our %PLAYER; # all users 64our %PLAYER; # all users
60our %MAP; # all maps 65our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 66our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 67our $RANDOM_MAPS = cf::localdir . "/random";
68our $BDB_ENV_DIR = cf::localdir . "/db";
63 69
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 70our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 71our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 72
67# used to convert map paths into valid unix filenames by replacing / by ∕ 73# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 86mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 87mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 88mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 89mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 90mkdir $RANDOM_MAPS;
91mkdir $BDB_ENV_DIR;
85 92
86our $EMERGENCY_POSITION; 93our $EMERGENCY_POSITION;
94
95sub cf::map::normalise;
87 96
88############################################################################# 97#############################################################################
89 98
90=head2 GLOBAL VARIABLES 99=head2 GLOBAL VARIABLES
91 100
… …
349 my $runtime = cf::localdir . "/runtime"; 358 my $runtime = cf::localdir . "/runtime";
350 359
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 361 or return;
353 362
363 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 364 # 10 is the runtime save interval, for a monotonic clock
365 # 60 allows for the watchdog to kill the server.
366
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 367 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 368 and return;
357 369
370 # always fsync - this file is important
358 aio_fsync $fh 371 aio_fsync $fh
359 and return; 372 and return;
360 373
361 close $fh 374 close $fh
362 or return; 375 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 760 $filename, length $$rdata, scalar @$objs;
748 761
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 762 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 763 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 764 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 765 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 766 close $fh;
754 767
755 if (@$objs) { 768 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 769 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 770 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 771 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 772 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 774 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 775 aio_rename "$filename.pst~", "$filename.pst";
763 } 776 }
764 } else { 777 } else {
765 aio_unlink "$filename.pst"; 778 aio_unlink "$filename.pst";
… …
771 } 784 }
772 } else { 785 } else {
773 aio_unlink $filename; 786 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 787 aio_unlink "$filename.pst";
775 } 788 }
789
790 #d##TODO# nuke non .map-files if exist
791 if ($filename =~ s/\.map$//) {
792 aio_unlink $filename;
793 aio_unlink "$filename.pst";
794 }
776 } 795 }
777} 796}
778 797
779sub object_freezer_as_string { 798sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
786 805
787sub object_thawer_load { 806sub object_thawer_load {
788 my ($filename) = @_; 807 my ($filename) = @_;
789 808
790 my ($data, $av); 809 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
791 813
792 (aio_load $filename, $data) >= 0 814 (aio_load $filename, $data) >= 0
793 or return; 815 or return;
794 816
795 unless (aio_stat "$filename.pst") { 817 unless (aio_stat "$filename.pst") {
… …
957 979
958sub exists($) { 980sub exists($) {
959 my ($login) = @_; 981 my ($login) = @_;
960 982
961 $cf::PLAYER{$login} 983 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 984 or cf::sync_job { !aio_stat path $login }
963} 985}
964 986
965sub find($) { 987sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 988 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 989 my $login = $_[0];
… …
1065=cut 1087=cut
1066 1088
1067sub maps($) { 1089sub maps($) {
1068 my ($pl) = @_; 1090 my ($pl) = @_;
1069 1091
1092 $pl = ref $pl ? $pl->ob->name : $pl;
1093
1070 my $files = aio_readdir playerdir $pl 1094 my $files = aio_readdir playerdir $pl
1071 or return; 1095 or return;
1072 1096
1073 my @paths; 1097 my @paths;
1074 1098
1075 for (@$files) { 1099 for (@$files) {
1076 utf8::decode $_; 1100 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1101 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1102 next unless /^$PATH_SEP/o;
1079 1103
1080 s/\.map$//; 1104 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1105 }
1083 1106
1084 \@paths 1107 \@paths
1085} 1108}
1086 1109
… …
1113 1136
1114use Fcntl; 1137use Fcntl;
1115use Coro::AIO; 1138use Coro::AIO;
1116 1139
1117use overload 1140use overload
1118 '""' => \&as_string; 1141 '""' => \&as_string,
1142 fallback => 1;
1119 1143
1120our $MAX_RESET = 3600; 1144our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1145our $DEFAULT_RESET = 3000;
1122 1146
1123sub generate_random_map { 1147sub generate_random_map {
1124 my ($self, $rmp) = @_; 1148 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1149 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1150 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1161 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1162 )
1140} 1163}
1141 1164
1165=item cf::map->register ($regex, $prio)
1166
1167Register a handler for the map path matching the given regex at the
1168givne priority (higher is better, built-in handlers have priority 0, the
1169default).
1170
1171=cut
1172
1142sub register { 1173sub register {
1143 my (undef, $regex) = @_; 1174 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1175 my $pkg = caller;
1145 1176
1146 no strict; 1177 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1178 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1179
1149 $EXT_MAP{$pkg} = qr<$regex>; 1180 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1181}
1151 1182
1152# also paths starting with '/' 1183# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1184$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1185
1155sub thawer_merge { 1186sub thawer_merge {
1187 my ($self, $merge) = @_;
1188
1156 # we have to keep some variables in memory intact 1189 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1190 local $self->{path};
1191 local $self->{load_path};
1158 local $_[0]{deny_save}; 1192 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1193 local $self->{deny_reset};
1160 1194
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1195 $self->SUPER::thawer_merge ($merge);
1162} 1196}
1163 1197
1164sub normalise { 1198sub normalise {
1165 my ($path, $base) = @_; 1199 my ($path, $base) = @_;
1200
1201 $path = "$path"; # make sure its a string
1202
1203 $path =~ s/\.map$//;
1166 1204
1167 # map plan: 1205 # map plan:
1168 # 1206 #
1169 # /! non-realised random map exit (special hack!) 1207 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched 1208 # {... are special paths that are not being touched
… …
1198 1236
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1237 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200 1238
1201 $path = normalise $path, $base; 1239 $path = normalise $path, $base;
1202 1240
1203 for my $pkg (keys %EXT_MAP) { 1241 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) { 1242 if ($path =~ $EXT_MAP{$pkg}[1]) {
1205 my $self = bless cf::map::new, $pkg; 1243 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path); 1244 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc. 1245 $self->init; # pass $1 etc.
1208 return $self; 1246 return $self;
1209 } 1247 }
1210 } 1248 }
1211 1249
1212 Carp::carp "unable to resolve path '$path'."; 1250 Carp::carp "unable to resolve path '$path' (base '$base').";
1213 () 1251 ()
1214} 1252}
1215 1253
1216sub init { 1254sub init {
1217 my ($self) = @_; 1255 my ($self) = @_;
… …
1232 1270
1233# the original (read-only) location 1271# the original (read-only) location
1234sub load_path { 1272sub load_path {
1235 my ($self) = @_; 1273 my ($self) = @_;
1236 1274
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1275 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1238} 1276}
1239 1277
1240# the temporary/swap location 1278# the temporary/swap location
1241sub save_path { 1279sub save_path {
1242 my ($self) = @_; 1280 my ($self) = @_;
1243 1281
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1283 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1246} 1284}
1247 1285
1248# the unique path, undef == no special unique path 1286# the unique path, undef == no special unique path
1249sub uniq_path { 1287sub uniq_path {
1250 my ($self) = @_; 1288 my ($self) = @_;
… …
1266 my ($self) = @_; 1304 my ($self) = @_;
1267 1305
1268 utf8::encode (my $save = $self->save_path); 1306 utf8::encode (my $save = $self->save_path);
1269 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1270 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1309
1310 #d#TODO remove .map and also nuke
1311 $save =~ s/\.map// or return;#d#
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1271} 1314}
1272 1315
1273sub load_header_from($) { 1316sub load_header_from($) {
1274 my ($self, $path) = @_; 1317 my ($self, $path) = @_;
1275 1318
1276 utf8::encode $path; 1319 utf8::encode $path;
1277 aio_open $path, O_RDONLY, 0 1320 #aio_open $path, O_RDONLY, 0
1278 or return; 1321 # or return;
1279 1322
1280 $self->_load_header ($path) 1323 $self->_load_header ($path)
1281 or return; 1324 or return;
1282 1325
1283 $self->{load_path} = $path; 1326 $self->{load_path} = $path;
1284 1327
1285 1 1328 1
1286} 1329}
1287 1330
1288sub load_orig { 1331sub load_header_orig {
1289 my ($self) = @_; 1332 my ($self) = @_;
1290 1333
1291 $self->load_header_from ($self->load_path) 1334 $self->load_header_from ($self->load_path)
1292} 1335}
1293 1336
1294sub load_temp { 1337sub load_header_temp {
1295 my ($self) = @_; 1338 my ($self) = @_;
1296 1339
1297 $self->load_header_from ($self->save_path) 1340 $self->load_header_from ($self->save_path)
1341}
1342
1343sub prepare_temp {
1344 my ($self) = @_;
1345
1346 $self->last_access ((delete $self->{last_access})
1347 || $cf::RUNTIME); #d#
1348 # safety
1349 $self->{instantiate_time} = $cf::RUNTIME
1350 if $self->{instantiate_time} > $cf::RUNTIME;
1351}
1352
1353sub prepare_orig {
1354 my ($self) = @_;
1355
1356 $self->{load_original} = 1;
1357 $self->{instantiate_time} = $cf::RUNTIME;
1358 $self->last_access ($cf::RUNTIME);
1359 $self->instantiate;
1298} 1360}
1299 1361
1300sub load_header { 1362sub load_header {
1301 my ($self) = @_; 1363 my ($self) = @_;
1302 1364
1303 if ($self->load_temp) { 1365 if ($self->load_header_temp) {
1304 $self->last_access ((delete $self->{last_access}) 1366 $self->prepare_temp;
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else { 1367 } else {
1310 $self->load_orig 1368 $self->load_header_orig
1311 or return; 1369 or return;
1312 1370 $self->prepare_orig;
1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 } 1371 }
1318 1372
1319 1 1373 1
1320} 1374}
1321 1375
… …
1335 $map->{last_save} = $cf::RUNTIME; 1389 $map->{last_save} = $cf::RUNTIME;
1336 1390
1337 $map->load_header 1391 $map->load_header
1338 or return; 1392 or return;
1339 1393
1340 if ($map->should_reset) { 1394 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1395 # doing this can freeze the server in a sync job, obviously
1396 #$cf::WAIT_FOR_TICK->wait;
1341 $map->reset; 1397 $map->reset;
1342 undef $guard; 1398 undef $guard;
1343 $map = find $path 1399 return find $path;
1344 or return;
1345 } 1400 }
1346 1401
1347 $cf::MAP{$path} = $map 1402 $cf::MAP{$path} = $map
1348 } 1403 }
1349} 1404}
1405
1406sub pre_load { }
1407sub post_load { }
1350 1408
1351sub load { 1409sub load {
1352 my ($self) = @_; 1410 my ($self) = @_;
1353 1411
1412 local $self->{deny_reset} = 1; # loading can take a long time
1413
1354 my $path = $self->{path}; 1414 my $path = $self->{path};
1355 my $guard = cf::lock_acquire "map_load:$path"; 1415 my $guard = cf::lock_acquire "map_load:$path";
1356 1416
1357 return if $self->in_memory != cf::MAP_SWAPPED; 1417 return if $self->in_memory != cf::MAP_SWAPPED;
1358 1418
1359 $self->in_memory (cf::MAP_LOADING); 1419 $self->in_memory (cf::MAP_LOADING);
1360 1420
1361 $self->alloc; 1421 $self->alloc;
1422
1423 $self->pre_load;
1424
1362 $self->_load_objects ($self->{load_path}, 1) 1425 $self->_load_objects ($self->{load_path}, 1)
1363 or return; 1426 or return;
1364 1427
1365 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1428 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1366 if delete $self->{load_original}; 1429 if delete $self->{load_original};
… …
1388 unless $self->difficulty; 1451 unless $self->difficulty;
1389 Coro::cede; 1452 Coro::cede;
1390 $self->activate; 1453 $self->activate;
1391 } 1454 }
1392 1455
1456 $self->post_load;
1457
1393 $self->in_memory (cf::MAP_IN_MEMORY); 1458 $self->in_memory (cf::MAP_IN_MEMORY);
1394} 1459}
1395 1460
1396sub customise_for { 1461sub customise_for {
1397 my ($self, $ob) = @_; 1462 my ($self, $ob) = @_;
… …
1437 1502
1438 cf::sync_job { $map->load }; 1503 cf::sync_job { $map->load };
1439} 1504}
1440 1505
1441our %MAP_PREFETCH; 1506our %MAP_PREFETCH;
1442our $MAP_PREFETCHER = Coro::async { 1507our $MAP_PREFETCHER = undef;
1443 while () {
1444 for my $path (keys %MAP_PREFETCH) {
1445 my $map = find $path
1446 or next;
1447 $map->load;
1448
1449 delete $MAP_PREFETCH{$path};
1450 }
1451 Coro::schedule;
1452 }
1453};
1454 1508
1455sub find_async { 1509sub find_async {
1456 my ($path, $origin) = @_; 1510 my ($path, $origin) = @_;
1457 1511
1458 $path = normalise $path, $origin && $origin->{path}; 1512 $path = normalise $path, $origin && $origin->{path};
1459 1513
1460 if (my $map = $cf::MAP{$path}) { 1514 if (my $map = $cf::MAP{$path}) {
1461 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1515 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1462 } 1516 }
1463 1517
1464 $MAP_PREFETCH{$path} = 0; 1518 undef $MAP_PREFETCH{$path};
1519 $MAP_PREFETCHER ||= cf::async {
1520 while (%MAP_PREFETCH) {
1521 for my $path (keys %MAP_PREFETCH) {
1522 my $map = find $path
1523 or next;
1524 $map->load;
1525
1526 delete $MAP_PREFETCH{$path};
1527 }
1528 }
1529 undef $MAP_PREFETCHER;
1530 };
1465 $MAP_PREFETCHER->ready; 1531 $MAP_PREFETCHER->prio (6);
1466 1532
1467 () 1533 ()
1468} 1534}
1469 1535
1470sub save { 1536sub save {
… …
1530 my ($self) = @_; 1596 my ($self) = @_;
1531 1597
1532 $self->reset_at <= $cf::RUNTIME 1598 $self->reset_at <= $cf::RUNTIME
1533} 1599}
1534 1600
1535sub rename {
1536 my ($self, $new_path) = @_;
1537
1538 normalise $new_path;
1539
1540 $self->unlink_save;
1541
1542 delete $cf::MAP{$self->path};
1543 $self->{path} = $new_path; $self->path ($self->{path});
1544 $cf::MAP{$self->path} = $self;
1545
1546 $self->save;
1547}
1548
1549sub reset { 1601sub reset {
1550 my ($self) = @_; 1602 my ($self) = @_;
1551 1603
1552 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1604 my $lock = cf::lock_acquire "map_data:$self->{path}";
1553 1605
… …
1570my $nuke_counter = "aaaa"; 1622my $nuke_counter = "aaaa";
1571 1623
1572sub nuke { 1624sub nuke {
1573 my ($self) = @_; 1625 my ($self) = @_;
1574 1626
1627 delete $cf::MAP{$self->path};
1628
1629 $self->unlink_save;
1630
1631 bless $self, "cf::map";
1632 delete $self->{deny_reset};
1575 $self->{deny_save} = 1; 1633 $self->{deny_save} = 1;
1576 $self->reset_timeout (1); 1634 $self->reset_timeout (1);
1577 $self->rename ("{nuke}/" . ($nuke_counter++)); 1635 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1636
1637 $cf::MAP{$self->path} = $self;
1638
1578 $self->reset; # polite request, might not happen 1639 $self->reset; # polite request, might not happen
1579} 1640}
1580 1641
1581=item cf::map::unique_maps 1642=item cf::map::unique_maps
1582 1643
… …
1594 for (@$files) { 1655 for (@$files) {
1595 utf8::decode $_; 1656 utf8::decode $_;
1596 next if /\.pst$/; 1657 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1658 next unless /^$PATH_SEP/o;
1598 1659
1599 s/\.map$//; 1660 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1661 }
1602 1662
1603 \@paths 1663 \@paths
1604} 1664}
1605 1665
… …
1699=cut 1759=cut
1700 1760
1701sub link_map { 1761sub link_map {
1702 unless ($LINK_MAP) { 1762 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1763 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1764 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1765 $LINK_MAP->load;
1706 } 1766 }
1707 1767
1708 $LINK_MAP 1768 $LINK_MAP
1709} 1769}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1776 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1777
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1779 if $self->map;
1720 1780
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1781 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1782}
1723 1783
1724sub cf::object::player::leave_link { 1784sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1785 my ($self, $map, $x, $y) = @_;
1726 1786
… …
1793 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1794 1854
1795 $self->enter_link; 1855 $self->enter_link;
1796 1856
1797 (async { 1857 (async {
1858 my $map = eval {
1798 my $map = cf::map::find $path; 1859 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1800 1861 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1802# if $map;
1803
1804 $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);
1805 1864
1806 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1866 })->prio (1);
1808} 1867}
1809 1868
… …
1813 1872
1814sub parse_random_map_params { 1873sub parse_random_map_params {
1815 my ($spec) = @_; 1874 my ($spec) = @_;
1816 1875
1817 my $rmp = { # defaults 1876 my $rmp = { # defaults
1818 xsize => 10, 1877 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 1878 ysize => (cf::rndm 15, 40),
1879 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1880 #layout => string,
1820 }; 1881 };
1821 1882
1822 for (split /\n/, $spec) { 1883 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 1884 my ($k, $v) = split /\s+/, $_, 2;
1824 1885
… …
1828 $rmp 1889 $rmp
1829} 1890}
1830 1891
1831sub prepare_random_map { 1892sub prepare_random_map {
1832 my ($exit) = @_; 1893 my ($exit) = @_;
1894
1895 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 1896
1834 # all this does is basically replace the /! path by 1897 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 1898 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 1899 # that depends on the exit object
1837 1900
1838 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1839 1902
1840 if ($exit->map) { 1903 if ($exit->map) {
1841 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1842 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1843 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1844 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1845 } 1908 }
1846 1909
1847 $rmp->{random_seed} ||= $exit->random_seed; 1910 $rmp->{random_seed} ||= $exit->random_seed;
1848 1911
1849 my $data = cf::to_json $rmp; 1912 my $data = cf::to_json $rmp;
1850 my $md5 = Digest::MD5::md5_hex $data; 1913 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1851 1915
1852 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1916 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1853 aio_write $fh, 0, (length $data), $data, 0; 1917 aio_write $fh, 0, (length $data), $data, 0;
1918 undef $fh;
1919 aio_rename "$meta~", $meta;
1854 1920
1855 $exit->slaying ("?random/$md5"); 1921 $exit->slaying ("?random/$md5");
1856 $exit->msg (undef); 1922 $exit->msg (undef);
1857 } 1923 }
1858} 1924}
1859 1925
1860sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1861 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1862 1928
1863 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
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;
1864 1939
1865 $self->enter_link; 1940 $self->enter_link;
1866 1941
1867 (async { 1942 (async {
1868 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1869 unless (eval { 1944 unless (eval {
1870 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1871 if $exit->slaying eq "/!";
1872
1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1875 1946
1876 1; 1947 1;
1877 }) { 1948 }) {
1878 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1879 . "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. "
… …
1940 # get handled first 2011 # get handled first
1941 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1942 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
1943 2014
1944 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1945 2017
1946 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1947 2019
1948 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1949 if (@$queue) { 2021 if (@$queue) {
… …
2168 sub db_sync() { 2240 sub db_sync() {
2169 db_save if $dirty; 2241 db_save if $dirty;
2170 undef $dirty; 2242 undef $dirty;
2171 } 2243 }
2172 2244
2173 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2245 my $idle = Event->idle (
2174 db_sync; 2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2175 }); 2252 );
2176 2253
2177 sub db_dirty() { 2254 sub db_dirty() {
2178 $dirty = 1; 2255 $dirty = 1;
2179 $idle->start; 2256 $idle->start;
2180 } 2257 }
… …
2201 }, 2278 },
2202 ); 2279 );
2203} 2280}
2204 2281
2205############################################################################# 2282#############################################################################
2206# the server's main() 2283# the server's init and main functions
2284
2285sub load_resources {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2287 or die "unable to load regions file\n";#d#
2288}
2207 2289
2208sub cfg_load { 2290sub cfg_load {
2209 open my $fh, "<:utf8", cf::confdir . "/config" 2291 open my $fh, "<:utf8", cf::confdir . "/config"
2210 or return; 2292 or return;
2211 2293
… …
2224 }; 2306 };
2225 warn $@ if $@; 2307 warn $@ if $@;
2226 } 2308 }
2227} 2309}
2228 2310
2311sub init {
2312 load_resources;
2313}
2314
2229sub main { 2315sub main {
2230 # we must not ever block the main coroutine 2316 # we must not ever block the main coroutine
2231 local $Coro::idle = sub { 2317 local $Coro::idle = sub {
2232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2318 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2319 (async {
2233 async { Event::one_event }; 2320 Event::one_event;
2321 })->prio (Coro::PRIO_MAX);
2234 }; 2322 };
2235 2323
2236 cfg_load; 2324 cfg_load;
2237 db_load; 2325 db_load;
2238 load_extensions; 2326 load_extensions;
2327
2328 $TICK_WATCHER->start;
2239 Event::loop; 2329 Event::loop;
2240} 2330}
2241 2331
2242############################################################################# 2332#############################################################################
2243# initialisation and cleanup 2333# initialisation and cleanup
2244 2334
2245# install some emergency cleanup handlers 2335# install some emergency cleanup handlers
2246BEGIN { 2336BEGIN {
2247 for my $signal (qw(INT HUP TERM)) { 2337 for my $signal (qw(INT HUP TERM)) {
2248 Event->signal ( 2338 Event->signal (
2339 reentrant => 0,
2249 data => WF_AUTOCANCEL, 2340 data => WF_AUTOCANCEL,
2250 signal => $signal, 2341 signal => $signal,
2342 prio => 0,
2251 cb => sub { 2343 cb => sub {
2252 cf::cleanup "SIG$signal"; 2344 cf::cleanup "SIG$signal";
2253 }, 2345 },
2254 ); 2346 );
2255 } 2347 }
2256} 2348}
… …
2285} 2377}
2286 2378
2287sub reload() { 2379sub reload() {
2288 # can/must only be called in main 2380 # can/must only be called in main
2289 if ($Coro::current != $Coro::main) { 2381 if ($Coro::current != $Coro::main) {
2290 warn "can only reload from main coroutine\n"; 2382 warn "can only reload from main coroutine";
2291 return; 2383 return;
2292 } 2384 }
2293 2385
2294 warn "reloading..."; 2386 warn "reloading...";
2295 2387
2296 warn "freezing server"; 2388 warn "cancelling server ticker";
2297 my $guard = freeze_mainloop; 2389 $TICK_WATCHER->cancel;
2390
2298 cf::emergency_save; 2391 cf::emergency_save;
2299
2300 warn "sync database to disk";
2301 cf::db_sync;
2302 IO::AIO::flush;
2303 2392
2304 eval { 2393 eval {
2305 # if anything goes wrong in here, we should simply crash as we already saved 2394 # if anything goes wrong in here, we should simply crash as we already saved
2306 2395
2396 warn "syncing database to disk";
2397 cf::db_sync;
2398
2307 warn "cancel all watchers"; 2399 warn "cancelling all WF_AUTOCANCEL watchers";
2308 for (Event::all_watchers) { 2400 for (Event::all_watchers) {
2309 $_->cancel if $_->data & WF_AUTOCANCEL; 2401 $_->cancel if $_->data & WF_AUTOCANCEL;
2310 } 2402 }
2311 2403
2404 warn "flushing outstanding aio requests";
2405 for (;;) {
2406 IO::AIO::flush;
2407 Coro::cede;
2408 last unless IO::AIO::nreqs;
2409 warn "iterate...";
2410 }
2411
2312 warn "cancel all extension coros"; 2412 warn "cancelling all extension coros";
2313 $_->cancel for values %EXT_CORO; 2413 $_->cancel for values %EXT_CORO;
2314 %EXT_CORO = (); 2414 %EXT_CORO = ();
2315 2415
2316 warn "remove commands"; 2416 warn "removing commands";
2317 %COMMAND = (); 2417 %COMMAND = ();
2318 2418
2319 warn "remove ext commands"; 2419 warn "removing ext commands";
2320 %EXTCMD = (); 2420 %EXTCMD = ();
2321 2421
2322 warn "unload/nuke all extensions"; 2422 warn "unloading/nuking all extensions";
2323 for my $pkg (@EXTS) { 2423 for my $pkg (@EXTS) {
2324 warn "... unloading $pkg"; 2424 warn "... unloading $pkg";
2325 2425
2326 if (my $cb = $pkg->can ("unload")) { 2426 if (my $cb = $pkg->can ("unload")) {
2327 eval { 2427 eval {
… …
2332 2432
2333 warn "... nuking $pkg"; 2433 warn "... nuking $pkg";
2334 Symbol::delete_package $pkg; 2434 Symbol::delete_package $pkg;
2335 } 2435 }
2336 2436
2337 warn "unload all perl modules loaded from $LIBDIR"; 2437 warn "unloading all perl modules loaded from $LIBDIR";
2338 while (my ($k, $v) = each %INC) { 2438 while (my ($k, $v) = each %INC) {
2339 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2439 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2340 2440
2341 warn "removing <$k>"; 2441 warn "... unloading $k";
2342 delete $INC{$k}; 2442 delete $INC{$k};
2343 2443
2344 $k =~ s/\.pm$//; 2444 $k =~ s/\.pm$//;
2345 $k =~ s/\//::/g; 2445 $k =~ s/\//::/g;
2346 2446
… …
2349 } 2449 }
2350 2450
2351 Symbol::delete_package $k; 2451 Symbol::delete_package $k;
2352 } 2452 }
2353 2453
2354 warn "get rid of safe::, as good as possible"; 2454 warn "getting rid of safe::, as good as possible";
2355 Symbol::delete_package "safe::$_" 2455 Symbol::delete_package "safe::$_"
2356 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2456 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2357 2457
2358 warn "unload cf.pm \"a bit\""; 2458 warn "unloading cf.pm \"a bit\"";
2359 delete $INC{"cf.pm"}; 2459 delete $INC{"cf.pm"};
2360 2460
2361 # don't, removes xs symbols, too, 2461 # don't, removes xs symbols, too,
2362 # and global variables created in xs 2462 # and global variables created in xs
2363 #Symbol::delete_package __PACKAGE__; 2463 #Symbol::delete_package __PACKAGE__;
2364 2464
2465 warn "unload completed, starting to reload now";
2466
2365 warn "reloading cf.pm"; 2467 warn "reloading cf.pm";
2366 require cf; 2468 require cf;
2367 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2368 2470
2369 warn "load config and database again"; 2471 warn "loading config and database again";
2370 cf::cfg_load; 2472 cf::cfg_load;
2371 cf::db_load; 2473 cf::db_load;
2372 2474
2373 warn "load extensions"; 2475 warn "loading extensions";
2374 cf::load_extensions; 2476 cf::load_extensions;
2375 2477
2376 warn "reattach attachments to objects/players"; 2478 warn "reattaching attachments to objects/players";
2377 _global_reattach; 2479 _global_reattach;
2378 warn "reattach attachments to maps"; 2480 warn "reattaching attachments to maps";
2379 reattach $_ for values %MAP; 2481 reattach $_ for values %MAP;
2482
2483 warn "loading reloadable resources";
2484 load_resources;
2485
2486 warn "restarting server ticker";
2487
2488 $TICK_WATCHER->start;
2380 }; 2489 };
2381 2490
2382 if ($@) { 2491 if ($@) {
2383 warn $@; 2492 warn $@;
2384 warn "error while reloading, exiting."; 2493 warn "error while reloading, exiting.";
… …
2386 } 2495 }
2387 2496
2388 warn "reloaded"; 2497 warn "reloaded";
2389}; 2498};
2390 2499
2500our $RELOAD_WATCHER; # used only during reload
2501
2391register_command "reload" => sub { 2502register_command "reload" => sub {
2392 my ($who, $arg) = @_; 2503 my ($who, $arg) = @_;
2393 2504
2394 if ($who->flag (FLAG_WIZ)) { 2505 if ($who->flag (FLAG_WIZ)) {
2395 $who->message ("start of reload."); 2506 $who->message ("reloading server.");
2507
2508 # doing reload synchronously and two reloads happen back-to-back,
2509 # coro crashes during coro_state_free->destroy here.
2510
2511 $RELOAD_WATCHER ||= Event->timer (
2512 reentrant => 0,
2513 after => 0,
2514 data => WF_AUTOCANCEL,
2515 cb => sub {
2396 reload; 2516 reload;
2397 $who->message ("end of reload."); 2517 undef $RELOAD_WATCHER;
2518 },
2519 );
2398 } 2520 }
2399}; 2521};
2400 2522
2401unshift @INC, $LIBDIR; 2523unshift @INC, $LIBDIR;
2524
2525my $bug_warning = 0;
2402 2526
2403$TICK_WATCHER = Event->timer ( 2527$TICK_WATCHER = Event->timer (
2404 reentrant => 0, 2528 reentrant => 0,
2529 parked => 1,
2405 prio => 0, 2530 prio => 0,
2406 at => $NEXT_TICK || $TICK, 2531 at => $NEXT_TICK || $TICK,
2407 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2408 cb => sub { 2533 cb => sub {
2534 if ($Coro::current != $Coro::main) {
2535 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2536 unless ++$bug_warning > 10;
2537 return;
2538 }
2539
2409 $NOW = Event::time; 2540 $NOW = Event::time;
2410 2541
2411 cf::server_tick; # one server iteration 2542 cf::server_tick; # one server iteration
2412 $RUNTIME += $TICK; 2543 $RUNTIME += $TICK;
2413 $NEXT_TICK += $TICK; 2544 $NEXT_TICK += $TICK;
2414 2545
2415 $WAIT_FOR_TICK->broadcast; 2546 $WAIT_FOR_TICK->broadcast;
2416 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2548
2549 Event::sweep;
2550 Coro::cede_notself;
2551
2552# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d#
2417 2554
2418 # if we are delayed by four ticks or more, skip them all 2555 # if we are delayed by four ticks or more, skip them all
2419 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2420 2557
2421 $TICK_WATCHER->at ($NEXT_TICK); 2558 $TICK_WATCHER->at ($NEXT_TICK);
2422 $TICK_WATCHER->start; 2559 $TICK_WATCHER->start;
2423 }, 2560 },
2424); 2561);
2425 2562
2563{
2564 BDB::max_poll_time $TICK * 0.1;
2565 $BDB_POLL_WATCHER = Event->io (
2566 reentrant => 0,
2567 fd => BDB::poll_fileno,
2568 poll => 'r',
2569 prio => 0,
2570 data => WF_AUTOCANCEL,
2571 cb => \&BDB::poll_cb,
2572 );
2573 BDB::min_parallel 8;
2574
2575 BDB::set_sync_prepare {
2576 my $status;
2577 my $current = $Coro::current;
2578 (
2579 sub {
2580 $status = $!;
2581 $current->ready; undef $current;
2582 },
2583 sub {
2584 Coro::schedule while defined $current;
2585 $! = $status;
2586 },
2587 )
2588 };
2589
2590 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create;
2592
2593 cf::sync_job {
2594 BDB::db_env_open
2595 $DB_ENV,
2596 $BDB_ENV_DIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666;
2600
2601 cf::cleanup "$!" if $!;
2602
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2604 };
2605 }
2606}
2607
2608{
2609 IO::AIO::min_parallel 8;
2610
2611 undef $Coro::AIO::WATCHER;
2426IO::AIO::max_poll_time $TICK * 0.2; 2612 IO::AIO::max_poll_time $TICK * 0.1;
2427
2428$AIO_POLL_WATCHER = Event->io ( 2613 $AIO_POLL_WATCHER = Event->io (
2614 reentrant => 0,
2429 fd => IO::AIO::poll_fileno, 2615 fd => IO::AIO::poll_fileno,
2430 poll => 'r', 2616 poll => 'r',
2431 prio => 5, 2617 prio => 6,
2432 data => WF_AUTOCANCEL, 2618 data => WF_AUTOCANCEL,
2433 cb => \&IO::AIO::poll_cb, 2619 cb => \&IO::AIO::poll_cb,
2434); 2620 );
2621}
2435 2622
2436$WRITE_RUNTIME_WATCHER = Event->timer ( 2623$WRITE_RUNTIME_WATCHER = Event->timer (
2624 reentrant => 0,
2437 data => WF_AUTOCANCEL, 2625 data => WF_AUTOCANCEL,
2438 after => 0, 2626 after => 1,
2439 interval => 10, 2627 interval => 10,
2440 cb => sub { 2628 prio => 6, # keep it lowest so it acts like a watchdog
2441 (Coro::unblock_sub { 2629 cb => Coro::unblock_sub {
2442 write_runtime 2630 write_runtime
2443 or warn "ERROR: unable to write runtime file: $!"; 2631 or warn "ERROR: unable to write runtime file: $!";
2444 })->();
2445 }, 2632 },
2446); 2633);
2447 2634
2448END { cf::emergency_save } 2635END { cf::emergency_save }
2449 2636

Diff Legend

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