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.183 by root, Fri Jan 19 19:42:37 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 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;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
85 85
86our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
87 89
88############################################################################# 90#############################################################################
89 91
90=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
91 93
… …
349 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
350 352
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 354 or return;
353 355
356 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 361 and return;
357 362
358 aio_fsync $fh 363 aio_fsync $fh
359 and return; 364 and return;
… …
771 } 776 }
772 } else { 777 } else {
773 aio_unlink $filename; 778 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
775 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
776 } 787 }
777} 788}
778 789
779sub object_freezer_as_string { 790sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
786 797
787sub object_thawer_load { 798sub object_thawer_load {
788 my ($filename) = @_; 799 my ($filename) = @_;
789 800
790 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
791 805
792 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
793 or return; 807 or return;
794 808
795 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1075 for (@$files) { 1089 for (@$files) {
1076 utf8::decode $_; 1090 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1079 1093
1080 s/\.map$//;
1081 push @paths, "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1082 } 1095 }
1083 1096
1084 \@paths 1097 \@paths
1085} 1098}
1086 1099
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1152 )
1140} 1153}
1141 1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1142sub register { 1163sub register {
1143 my (undef, $regex) = @_; 1164 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1165 my $pkg = caller;
1145 1166
1146 no strict; 1167 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1169
1149 $EXT_MAP{$pkg} = qr<$regex>; 1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1171}
1151 1172
1152# also paths starting with '/' 1173# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1175
1155sub thawer_merge { 1176sub thawer_merge {
1156 my ($self, $merge) = @_; 1177 my ($self, $merge) = @_;
1157 1178
1158 # we have to keep some variables in memory intact 1179 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1185 $self->SUPER::thawer_merge ($merge);
1165} 1186}
1166 1187
1167sub normalise { 1188sub normalise {
1168 my ($path, $base) = @_; 1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1169 1194
1170 # map plan: 1195 # map plan:
1171 # 1196 #
1172 # /! non-realised random map exit (special hack!) 1197 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1198 # {... are special paths that are not being touched
… …
1201 1226
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1228
1204 $path = normalise $path, $base; 1229 $path = normalise $path, $base;
1205 1230
1206 for my $pkg (keys %EXT_MAP) { 1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1233 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1234 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1235 $self->init; # pass $1 etc.
1211 return $self; 1236 return $self;
1212 } 1237 }
1213 } 1238 }
1214 1239
1215 Carp::carp "unable to resolve path '$path'."; 1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1241 ()
1217} 1242}
1218 1243
1219sub init { 1244sub init {
1220 my ($self) = @_; 1245 my ($self) = @_;
… …
1235 1260
1236# the original (read-only) location 1261# the original (read-only) location
1237sub load_path { 1262sub load_path {
1238 my ($self) = @_; 1263 my ($self) = @_;
1239 1264
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1266}
1242 1267
1243# the temporary/swap location 1268# the temporary/swap location
1244sub save_path { 1269sub save_path {
1245 my ($self) = @_; 1270 my ($self) = @_;
1246 1271
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1274}
1250 1275
1251# the unique path, undef == no special unique path 1276# the unique path, undef == no special unique path
1252sub uniq_path { 1277sub uniq_path {
1253 my ($self) = @_; 1278 my ($self) = @_;
… …
1269 my ($self) = @_; 1294 my ($self) = @_;
1270 1295
1271 utf8::encode (my $save = $self->save_path); 1296 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1274} 1304}
1275 1305
1276sub load_header_from($) { 1306sub load_header_from($) {
1277 my ($self, $path) = @_; 1307 my ($self, $path) = @_;
1278 1308
1279 utf8::encode $path; 1309 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1281 or return; 1311 # or return;
1282 1312
1283 $self->_load_header ($path) 1313 $self->_load_header ($path)
1284 or return; 1314 or return;
1285 1315
1286 $self->{load_path} = $path; 1316 $self->{load_path} = $path;
1287 1317
1288 1 1318 1
1289} 1319}
1290 1320
1291sub load_orig { 1321sub load_header_orig {
1292 my ($self) = @_; 1322 my ($self) = @_;
1293 1323
1294 $self->load_header_from ($self->load_path) 1324 $self->load_header_from ($self->load_path)
1295} 1325}
1296 1326
1297sub load_temp { 1327sub load_header_temp {
1298 my ($self) = @_; 1328 my ($self) = @_;
1299 1329
1300 $self->load_header_from ($self->save_path) 1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1301} 1350}
1302 1351
1303sub load_header { 1352sub load_header {
1304 my ($self) = @_; 1353 my ($self) = @_;
1305 1354
1306 if ($self->load_temp) { 1355 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1356 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1357 } else {
1313 $self->load_orig 1358 $self->load_header_orig
1314 or return; 1359 or return;
1315 1360 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1361 }
1321 1362
1322 1 1363 1
1323} 1364}
1324 1365
… …
1338 $map->{last_save} = $cf::RUNTIME; 1379 $map->{last_save} = $cf::RUNTIME;
1339 1380
1340 $map->load_header 1381 $map->load_header
1341 or return; 1382 or return;
1342 1383
1343 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1386 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1387 $map->reset;
1346 undef $guard; 1388 undef $guard;
1347 $map = find $path 1389 return find $path;
1348 or return;
1349 } 1390 }
1350 1391
1351 $cf::MAP{$path} = $map 1392 $cf::MAP{$path} = $map
1352 } 1393 }
1353} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1354 1398
1355sub load { 1399sub load {
1356 my ($self) = @_; 1400 my ($self) = @_;
1357 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1358 my $path = $self->{path}; 1404 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1405 my $guard = cf::lock_acquire "map_load:$path";
1360 1406
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1408
1363 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1364 1410
1365 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1366 $self->_load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1416 or return;
1368 1417
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1419 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1441 unless $self->difficulty;
1393 Coro::cede; 1442 Coro::cede;
1394 $self->activate; 1443 $self->activate;
1395 } 1444 }
1396 1445
1446 $self->post_load;
1447
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1449}
1399 1450
1400sub customise_for { 1451sub customise_for {
1401 my ($self, $ob) = @_; 1452 my ($self, $ob) = @_;
… …
1456 1507
1457 undef $MAP_PREFETCH{$path}; 1508 undef $MAP_PREFETCH{$path};
1458 $MAP_PREFETCHER ||= cf::async { 1509 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) { 1510 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) { 1511 for my $path (keys %MAP_PREFETCH) {
1461 warn "prefetching $path...\n";#d#
1462 my $map = find $path 1512 my $map = find $path
1463 or next; 1513 or next;
1464 $map->load; 1514 $map->load;
1465 1515
1466 delete $MAP_PREFETCH{$path}; 1516 delete $MAP_PREFETCH{$path};
1467 } 1517 }
1468 } 1518 }
1469 undef $MAP_PREFETCHER; 1519 undef $MAP_PREFETCHER;
1470 }; 1520 };
1521 $MAP_PREFETCHER->prio (6);
1471 1522
1472 () 1523 ()
1473} 1524}
1474 1525
1475sub save { 1526sub save {
… …
1594 for (@$files) { 1645 for (@$files) {
1595 utf8::decode $_; 1646 utf8::decode $_;
1596 next if /\.pst$/; 1647 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1598 1649
1599 s/\.map$//; 1650 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1651 }
1602 1652
1603 \@paths 1653 \@paths
1604} 1654}
1605 1655
… …
1699=cut 1749=cut
1700 1750
1701sub link_map { 1751sub link_map {
1702 unless ($LINK_MAP) { 1752 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1753 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1755 $LINK_MAP->load;
1706 } 1756 }
1707 1757
1708 $LINK_MAP 1758 $LINK_MAP
1709} 1759}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1767
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1769 if $self->map;
1720 1770
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1772}
1723 1773
1724sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1726 1776
… …
1793 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1794 1844
1795 $self->enter_link; 1845 $self->enter_link;
1796 1846
1797 (async { 1847 (async {
1848 my $map = eval {
1798 my $map = cf::map::find $path; 1849 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1800 1851 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1854
1806 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1856 })->prio (1);
1808} 1857}
1809 1858
… …
1840 # that depends on the exit object 1889 # that depends on the exit object
1841 1890
1842 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1843 1892
1844 if ($exit->map) { 1893 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1849 } 1898 }
1850 1899
… …
1867sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1869 1918
1870 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1871 1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1929
1872 $self->enter_link; 1930 $self->enter_link;
1873 1931
1874 (async { 1932 (async {
1875 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1934 unless (eval {
1877 prepare_random_map $exit 1935 $self->goto ($slaying, $hp, $sp);
1878 if $exit->slaying eq "/!";
1879
1880 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1882 1936
1883 1; 1937 1;
1884 }) { 1938 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
… …
2175 sub db_sync() { 2229 sub db_sync() {
2176 db_save if $dirty; 2230 db_save if $dirty;
2177 undef $dirty; 2231 undef $dirty;
2178 } 2232 }
2179 2233
2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2181 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2182 }); 2241 );
2183 2242
2184 sub db_dirty() { 2243 sub db_dirty() {
2185 $dirty = 1; 2244 $dirty = 1;
2186 $idle->start; 2245 $idle->start;
2187 } 2246 }
… …
2255 2314
2256# install some emergency cleanup handlers 2315# install some emergency cleanup handlers
2257BEGIN { 2316BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2318 Event->signal (
2319 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2261 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2262 cb => sub { 2323 cb => sub {
2263 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2264 }, 2325 },
2265 ); 2326 );
2266 } 2327 }
2267} 2328}
… …
2422 $who->message ("reloading server."); 2483 $who->message ("reloading server.");
2423 2484
2424 # doing reload synchronously and two reloads happen back-to-back, 2485 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2486 # coro crashes during coro_state_free->destroy here.
2426 2487
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2428 reload; 2493 reload;
2429 undef $RELOAD_WATCHER; 2494 undef $RELOAD_WATCHER;
2495 },
2430 }); 2496 );
2431 } 2497 }
2432}; 2498};
2433 2499
2434unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2435 2501
… …
2455 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2456 2522
2457 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2459 2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2531
2460 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2534
2463 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2465 }, 2537 },
2466); 2538);
2467 2539
2468IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2469 2541
2542undef $Coro::AIO::WATCHER;
2470$AIO_POLL_WATCHER = Event->io ( 2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2471 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2472 poll => 'r', 2546 poll => 'r',
2473 prio => 5, 2547 prio => 6,
2474 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2475 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2476); 2550);
2477 2551
2478$WRITE_RUNTIME_WATCHER = Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2479 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2480 after => 1, 2555 after => 1,
2481 interval => 10, 2556 interval => 10,
2557 prio => 6, # keep it lowest so it acts like a watchdog
2482 cb => Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2483 write_runtime 2559 write_runtime
2484 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2485 }, 2561 },
2486); 2562);
2487 2563

Diff Legend

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