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.185 by root, Fri Jan 19 23:32:52 2007 UTC vs.
Revision 1.202 by root, Mon Jan 29 20:16:28 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") {
… …
1065=cut 1079=cut
1066 1080
1067sub maps($) { 1081sub maps($) {
1068 my ($pl) = @_; 1082 my ($pl) = @_;
1069 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1070 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1071 or return; 1087 or return;
1072 1088
1073 my @paths; 1089 my @paths;
1074 1090
1075 for (@$files) { 1091 for (@$files) {
1076 utf8::decode $_; 1092 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1079 1095
1080 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1097 }
1083 1098
1084 \@paths 1099 \@paths
1085} 1100}
1086 1101
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1154 )
1140} 1155}
1141 1156
1157=item cf::map->register ($regex, $prio)
1158
1159Register a handler for the map path matching the given regex at the
1160givne priority (higher is better, built-in handlers have priority 0, the
1161default).
1162
1163=cut
1164
1142sub register { 1165sub register {
1143 my (undef, $regex) = @_; 1166 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1167 my $pkg = caller;
1145 1168
1146 no strict; 1169 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1171
1149 $EXT_MAP{$pkg} = qr<$regex>; 1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1173}
1151 1174
1152# also paths starting with '/' 1175# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1177
1155sub thawer_merge { 1178sub thawer_merge {
1156 my ($self, $merge) = @_; 1179 my ($self, $merge) = @_;
1157 1180
1158 # we have to keep some variables in memory intact 1181 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1187 $self->SUPER::thawer_merge ($merge);
1165} 1188}
1166 1189
1167sub normalise { 1190sub normalise {
1168 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1169 1196
1170 # map plan: 1197 # map plan:
1171 # 1198 #
1172 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
… …
1201 1228
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1229 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1230
1204 $path = normalise $path, $base; 1231 $path = normalise $path, $base;
1205 1232
1206 for my $pkg (keys %EXT_MAP) { 1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1235 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1236 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1237 $self->init; # pass $1 etc.
1211 return $self; 1238 return $self;
1212 } 1239 }
1213 } 1240 }
1214 1241
1215 Carp::carp "unable to resolve path '$path'."; 1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1243 ()
1217} 1244}
1218 1245
1219sub init { 1246sub init {
1220 my ($self) = @_; 1247 my ($self) = @_;
… …
1235 1262
1236# the original (read-only) location 1263# the original (read-only) location
1237sub load_path { 1264sub load_path {
1238 my ($self) = @_; 1265 my ($self) = @_;
1239 1266
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1268}
1242 1269
1243# the temporary/swap location 1270# the temporary/swap location
1244sub save_path { 1271sub save_path {
1245 my ($self) = @_; 1272 my ($self) = @_;
1246 1273
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1276}
1250 1277
1251# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1252sub uniq_path { 1279sub uniq_path {
1253 my ($self) = @_; 1280 my ($self) = @_;
… …
1269 my ($self) = @_; 1296 my ($self) = @_;
1270 1297
1271 utf8::encode (my $save = $self->save_path); 1298 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1274} 1306}
1275 1307
1276sub load_header_from($) { 1308sub load_header_from($) {
1277 my ($self, $path) = @_; 1309 my ($self, $path) = @_;
1278 1310
1279 utf8::encode $path; 1311 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1281 or return; 1313 # or return;
1282 1314
1283 $self->_load_header ($path) 1315 $self->_load_header ($path)
1284 or return; 1316 or return;
1285 1317
1286 $self->{load_path} = $path; 1318 $self->{load_path} = $path;
1287 1319
1288 1 1320 1
1289} 1321}
1290 1322
1291sub load_orig { 1323sub load_header_orig {
1292 my ($self) = @_; 1324 my ($self) = @_;
1293 1325
1294 $self->load_header_from ($self->load_path) 1326 $self->load_header_from ($self->load_path)
1295} 1327}
1296 1328
1297sub load_temp { 1329sub load_header_temp {
1298 my ($self) = @_; 1330 my ($self) = @_;
1299 1331
1300 $self->load_header_from ($self->save_path) 1332 $self->load_header_from ($self->save_path)
1333}
1334
1335sub prepare_temp {
1336 my ($self) = @_;
1337
1338 $self->last_access ((delete $self->{last_access})
1339 || $cf::RUNTIME); #d#
1340 # safety
1341 $self->{instantiate_time} = $cf::RUNTIME
1342 if $self->{instantiate_time} > $cf::RUNTIME;
1343}
1344
1345sub prepare_orig {
1346 my ($self) = @_;
1347
1348 $self->{load_original} = 1;
1349 $self->{instantiate_time} = $cf::RUNTIME;
1350 $self->last_access ($cf::RUNTIME);
1351 $self->instantiate;
1301} 1352}
1302 1353
1303sub load_header { 1354sub load_header {
1304 my ($self) = @_; 1355 my ($self) = @_;
1305 1356
1306 if ($self->load_temp) { 1357 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1358 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1359 } else {
1313 $self->load_orig 1360 $self->load_header_orig
1314 or return; 1361 or return;
1315 1362 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1363 }
1321 1364
1322 1 1365 1
1323} 1366}
1324 1367
… …
1338 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1339 1382
1340 $map->load_header 1383 $map->load_header
1341 or return; 1384 or return;
1342 1385
1343 if ($map->should_reset) { 1386 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1344 # doing this can freeze the server in a sync job, obviously 1387 # doing this can freeze the server in a sync job, obviously
1345 #$cf::WAIT_FOR_TICK->wait; 1388 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1389 $map->reset;
1347 undef $guard; 1390 undef $guard;
1348 $map = find $path 1391 return find $path;
1349 or return;
1350 } 1392 }
1351 1393
1352 $cf::MAP{$path} = $map 1394 $cf::MAP{$path} = $map
1353 } 1395 }
1354} 1396}
1397
1398sub pre_load { }
1399sub post_load { }
1355 1400
1356sub load { 1401sub load {
1357 my ($self) = @_; 1402 my ($self) = @_;
1358 1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1405
1359 my $path = $self->{path}; 1406 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1407 my $guard = cf::lock_acquire "map_load:$path";
1361 1408
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1410
1364 $self->in_memory (cf::MAP_LOADING); 1411 $self->in_memory (cf::MAP_LOADING);
1365 1412
1366 $self->alloc; 1413 $self->alloc;
1414
1415 $self->pre_load;
1416
1367 $self->_load_objects ($self->{load_path}, 1) 1417 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1418 or return;
1369 1419
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1421 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1443 unless $self->difficulty;
1394 Coro::cede; 1444 Coro::cede;
1395 $self->activate; 1445 $self->activate;
1396 } 1446 }
1397 1447
1448 $self->post_load;
1449
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1450 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1451}
1400 1452
1401sub customise_for { 1453sub customise_for {
1402 my ($self, $ob) = @_; 1454 my ($self, $ob) = @_;
… …
1466 delete $MAP_PREFETCH{$path}; 1518 delete $MAP_PREFETCH{$path};
1467 } 1519 }
1468 } 1520 }
1469 undef $MAP_PREFETCHER; 1521 undef $MAP_PREFETCHER;
1470 }; 1522 };
1523 $MAP_PREFETCHER->prio (6);
1471 1524
1472 () 1525 ()
1473} 1526}
1474 1527
1475sub save { 1528sub save {
… …
1594 for (@$files) { 1647 for (@$files) {
1595 utf8::decode $_; 1648 utf8::decode $_;
1596 next if /\.pst$/; 1649 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1598 1651
1599 s/\.map$//; 1652 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1653 }
1602 1654
1603 \@paths 1655 \@paths
1604} 1656}
1605 1657
… …
1699=cut 1751=cut
1700 1752
1701sub link_map { 1753sub link_map {
1702 unless ($LINK_MAP) { 1754 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1755 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1757 $LINK_MAP->load;
1706 } 1758 }
1707 1759
1708 $LINK_MAP 1760 $LINK_MAP
1709} 1761}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1769
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1771 if $self->map;
1720 1772
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1774}
1723 1775
1724sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1726 1778
… …
1793 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1794 1846
1795 $self->enter_link; 1847 $self->enter_link;
1796 1848
1797 (async { 1849 (async {
1850 my $map = eval {
1798 my $map = cf::map::find $path; 1851 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1800 1853 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1856
1806 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1858 })->prio (1);
1808} 1859}
1809 1860
… …
1840 # that depends on the exit object 1891 # that depends on the exit object
1841 1892
1842 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1843 1894
1844 if ($exit->map) { 1895 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1849 } 1900 }
1850 1901
… …
1867sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1869 1920
1870 return unless $self->type == cf::PLAYER; 1921 return unless $self->type == cf::PLAYER;
1871 1922
1923 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job
1925 cf::sync_job { prepare_random_map $exit };
1926 }
1927
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp;
1930 my $sp = $exit->stats->sp;
1931
1872 $self->enter_link; 1932 $self->enter_link;
1873 1933
1874 (async { 1934 (async {
1875 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1936 unless (eval {
1877 prepare_random_map $exit 1937 $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 1938
1883 1; 1939 1;
1884 }) { 1940 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 1942 . "I'll try to bring you back to the map you were before. "
… …
1947 # get handled first 2003 # get handled first
1948 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1949 or return; # be conservative, not sure how that can happen, but we saw a crash here 2005 or return; # be conservative, not sure how that can happen, but we saw a crash here
1950 2006
1951 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1952 2009
1953 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1954 2011
1955 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1956 if (@$queue) { 2013 if (@$queue) {
… …
2175 sub db_sync() { 2232 sub db_sync() {
2176 db_save if $dirty; 2233 db_save if $dirty;
2177 undef $dirty; 2234 undef $dirty;
2178 } 2235 }
2179 2236
2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2181 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2182 }); 2244 );
2183 2245
2184 sub db_dirty() { 2246 sub db_dirty() {
2185 $dirty = 1; 2247 $dirty = 1;
2186 $idle->start; 2248 $idle->start;
2187 } 2249 }
… …
2255 2317
2256# install some emergency cleanup handlers 2318# install some emergency cleanup handlers
2257BEGIN { 2319BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2320 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2321 Event->signal (
2322 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2323 data => WF_AUTOCANCEL,
2261 signal => $signal, 2324 signal => $signal,
2325 prio => 0,
2262 cb => sub { 2326 cb => sub {
2263 cf::cleanup "SIG$signal"; 2327 cf::cleanup "SIG$signal";
2264 }, 2328 },
2265 ); 2329 );
2266 } 2330 }
2267} 2331}
… …
2422 $who->message ("reloading server."); 2486 $who->message ("reloading server.");
2423 2487
2424 # doing reload synchronously and two reloads happen back-to-back, 2488 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2489 # coro crashes during coro_state_free->destroy here.
2426 2490
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2491 $RELOAD_WATCHER ||= Event->timer (
2492 reentrant => 0,
2493 after => 0,
2494 data => WF_AUTOCANCEL,
2495 cb => sub {
2428 reload; 2496 reload;
2429 undef $RELOAD_WATCHER; 2497 undef $RELOAD_WATCHER;
2498 },
2430 }); 2499 );
2431 } 2500 }
2432}; 2501};
2433 2502
2434unshift @INC, $LIBDIR; 2503unshift @INC, $LIBDIR;
2435 2504
… …
2455 $NEXT_TICK += $TICK; 2524 $NEXT_TICK += $TICK;
2456 2525
2457 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2459 2528
2529 Event::sweep;
2530 Coro::cede_notself;
2531
2532# my $AFTER = Event::time;
2533# warn $AFTER - $NOW;#d#
2534
2460 # if we are delayed by four ticks or more, skip them all 2535 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2537
2463 $TICK_WATCHER->at ($NEXT_TICK); 2538 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2539 $TICK_WATCHER->start;
2465 }, 2540 },
2466); 2541);
2467 2542
2468IO::AIO::max_poll_time $TICK * 0.2; 2543IO::AIO::max_poll_time $TICK * 0.1;
2469 2544
2545undef $Coro::AIO::WATCHER;
2470$AIO_POLL_WATCHER = Event->io ( 2546$AIO_POLL_WATCHER = Event->io (
2547 reentrant => 0,
2471 fd => IO::AIO::poll_fileno, 2548 fd => IO::AIO::poll_fileno,
2472 poll => 'r', 2549 poll => 'r',
2473 prio => 5, 2550 prio => 6,
2474 data => WF_AUTOCANCEL, 2551 data => WF_AUTOCANCEL,
2475 cb => \&IO::AIO::poll_cb, 2552 cb => \&IO::AIO::poll_cb,
2476); 2553);
2477 2554
2478$WRITE_RUNTIME_WATCHER = Event->timer ( 2555$WRITE_RUNTIME_WATCHER = Event->timer (
2556 reentrant => 0,
2479 data => WF_AUTOCANCEL, 2557 data => WF_AUTOCANCEL,
2480 after => 1, 2558 after => 1,
2481 interval => 10, 2559 interval => 10,
2560 prio => 6, # keep it lowest so it acts like a watchdog
2482 cb => Coro::unblock_sub { 2561 cb => Coro::unblock_sub {
2483 write_runtime 2562 write_runtime
2484 or warn "ERROR: unable to write runtime file: $!"; 2563 or warn "ERROR: unable to write runtime file: $!";
2485 }, 2564 },
2486); 2565);
2487 2566

Diff Legend

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