ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.183 by root, Fri Jan 19 19:42:37 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.4 ();
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;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
338 344
339 $coro 345 $coro
340} 346}
341 347
342sub write_runtime { 348sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
345 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
346 350
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 352 or return;
349 353
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 504our @CB_MAP = ();
501 505
502my %attachment; 506my %attachment;
503 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
504sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
506 516
507 use sort 'stable'; 517 use sort 'stable';
508 518
… …
679# object support 689# object support
680 690
681sub reattach { 691sub reattach {
682 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 696
685 my $registry = $obj->registry; 697 my $registry = $obj->registry;
686 698
687 @$registry = (); 699 @$registry = ();
688 700
… …
945 957
946sub exists($) { 958sub exists($) {
947 my ($login) = @_; 959 my ($login) = @_;
948 960
949 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
951} 963}
952 964
953sub find($) { 965sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 967 my $login = $_[0];
… …
1101 1113
1102use Fcntl; 1114use Fcntl;
1103use Coro::AIO; 1115use Coro::AIO;
1104 1116
1105use overload 1117use overload
1106 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1107 1120
1108our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1110 1123
1111sub generate_random_map { 1124sub generate_random_map {
1112 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1127 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138} 1150}
1139 1151
1140# also paths starting with '/' 1152# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142 1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1143sub normalise { 1167sub normalise {
1144 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1145 1169
1146 # map plan: 1170 # map plan:
1147 # 1171 #
… …
1243 1267
1244sub unlink_save { 1268sub unlink_save {
1245 my ($self) = @_; 1269 my ($self) = @_;
1246 1270
1247 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1274}
1251 1275
1252sub load_header_from($) { 1276sub load_header_from($) {
1253 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1254 1278
… …
1315 1339
1316 $map->load_header 1340 $map->load_header
1317 or return; 1341 or return;
1318 1342
1319 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1345 $map->reset;
1321 undef $guard; 1346 undef $guard;
1322 $map = find $path 1347 $map = find $path
1323 or return; 1348 or return;
1324 } 1349 }
… …
1416 1441
1417 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1418} 1443}
1419 1444
1420our %MAP_PREFETCH; 1445our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1446our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1447
1434sub find_async { 1448sub find_async {
1435 my ($path, $origin) = @_; 1449 my ($path, $origin) = @_;
1436 1450
1437 $path = normalise $path, $origin && $origin->{path}; 1451 $path = normalise $path, $origin && $origin->{path};
1438 1452
1439 if (my $map = $cf::MAP{$path}) { 1453 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1454 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1455 }
1442 1456
1443 $MAP_PREFETCH{$path} = 0; 1457 undef $MAP_PREFETCH{$path};
1444 $MAP_PREFETCHER->ready; 1458 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) {
1461 warn "prefetching $path...\n";#d#
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465
1466 delete $MAP_PREFETCH{$path};
1467 }
1468 }
1469 undef $MAP_PREFETCHER;
1470 };
1445 1471
1446 () 1472 ()
1447} 1473}
1448 1474
1449sub save { 1475sub save {
… …
1494 1520
1495sub reset_at { 1521sub reset_at {
1496 my ($self) = @_; 1522 my ($self) = @_;
1497 1523
1498 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1501 1527
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1530
… …
1509 my ($self) = @_; 1535 my ($self) = @_;
1510 1536
1511 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1512} 1538}
1513 1539
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1540sub reset {
1529 my ($self) = @_; 1541 my ($self) = @_;
1530 1542
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1544
… …
1549my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1550 1562
1551sub nuke { 1563sub nuke {
1552 my ($self) = @_; 1564 my ($self) = @_;
1553 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1557 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1558} 1579}
1559 1580
1560=item cf::map::unique_maps 1581=item cf::map::unique_maps
1561 1582
… …
1792 1813
1793sub parse_random_map_params { 1814sub parse_random_map_params {
1794 my ($spec) = @_; 1815 my ($spec) = @_;
1795 1816
1796 my $rmp = { # defaults 1817 my $rmp = { # defaults
1797 xsize => 10, 1818 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1819 ysize => (cf::rndm 15, 40),
1820 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1821 #layout => string,
1799 }; 1822 };
1800 1823
1801 for (split /\n/, $spec) { 1824 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1825 my ($k, $v) = split /\s+/, $_, 2;
1803 1826
… …
1807 $rmp 1830 $rmp
1808} 1831}
1809 1832
1810sub prepare_random_map { 1833sub prepare_random_map {
1811 my ($exit) = @_; 1834 my ($exit) = @_;
1835
1836 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1837
1813 # all this does is basically replace the /! path by 1838 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1839 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1840 # that depends on the exit object
1816 1841
… …
1825 1850
1826 $rmp->{random_seed} ||= $exit->random_seed; 1851 $rmp->{random_seed} ||= $exit->random_seed;
1827 1852
1828 my $data = cf::to_json $rmp; 1853 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 1854 my $md5 = Digest::MD5::md5_hex $data;
1855 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1830 1856
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1857 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 1858 aio_write $fh, 0, (length $data), $data, 0;
1859 undef $fh;
1860 aio_rename "$meta~", $meta;
1833 1861
1834 $exit->slaying ("?random/$md5"); 1862 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 1863 $exit->msg (undef);
1836 } 1864 }
1837} 1865}
… …
2147 sub db_sync() { 2175 sub db_sync() {
2148 db_save if $dirty; 2176 db_save if $dirty;
2149 undef $dirty; 2177 undef $dirty;
2150 } 2178 }
2151 2179
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync; 2181 db_sync;
2154 }); 2182 });
2155 2183
2156 sub db_dirty() { 2184 sub db_dirty() {
2157 $dirty = 1; 2185 $dirty = 1;
… …
2207 2235
2208sub main { 2236sub main {
2209 # we must not ever block the main coroutine 2237 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2238 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2239 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2240 (async {
2212 async { Event::one_event }; 2241 Event::one_event;
2242 })->prio (Coro::PRIO_MAX);
2213 }; 2243 };
2214 2244
2215 cfg_load; 2245 cfg_load;
2216 db_load; 2246 db_load;
2217 load_extensions; 2247 load_extensions;
2248
2249 $TICK_WATCHER->start;
2218 Event::loop; 2250 Event::loop;
2219} 2251}
2220 2252
2221############################################################################# 2253#############################################################################
2222# initialisation and cleanup 2254# initialisation and cleanup
… …
2264} 2296}
2265 2297
2266sub reload() { 2298sub reload() {
2267 # can/must only be called in main 2299 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2300 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2301 warn "can only reload from main coroutine";
2270 return; 2302 return;
2271 } 2303 }
2272 2304
2273 warn "reloading..."; 2305 warn "reloading...";
2274 2306
2275 warn "freezing server"; 2307 warn "cancelling server ticker";
2276 my $guard = freeze_mainloop; 2308 $TICK_WATCHER->cancel;
2309
2277 cf::emergency_save; 2310 cf::emergency_save;
2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2282 2311
2283 eval { 2312 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2313 # if anything goes wrong in here, we should simply crash as we already saved
2285 2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317
2286 warn "cancel all watchers"; 2318 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2319 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2320 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2321 }
2290 2322
2323 warn "flushing outstanding aio requests";
2324 for (;;) {
2325 IO::AIO::flush;
2326 Coro::cede;
2327 last unless IO::AIO::nreqs;
2328 warn "iterate...";
2329 }
2330
2291 warn "cancel all extension coros"; 2331 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2333 %EXT_CORO = ();
2294 2334
2295 warn "remove commands"; 2335 warn "removing commands";
2296 %COMMAND = (); 2336 %COMMAND = ();
2297 2337
2298 warn "remove ext commands"; 2338 warn "removing ext commands";
2299 %EXTCMD = (); 2339 %EXTCMD = ();
2300 2340
2301 warn "unload/nuke all extensions"; 2341 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2342 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2343 warn "... unloading $pkg";
2304 2344
2305 if (my $cb = $pkg->can ("unload")) { 2345 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2346 eval {
… …
2311 2351
2312 warn "... nuking $pkg"; 2352 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2353 Symbol::delete_package $pkg;
2314 } 2354 }
2315 2355
2316 warn "unload all perl modules loaded from $LIBDIR"; 2356 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2359
2320 warn "removing <$k>"; 2360 warn "... unloading $k";
2321 delete $INC{$k}; 2361 delete $INC{$k};
2322 2362
2323 $k =~ s/\.pm$//; 2363 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2364 $k =~ s/\//::/g;
2325 2365
… …
2328 } 2368 }
2329 2369
2330 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2331 } 2371 }
2332 2372
2333 warn "get rid of safe::, as good as possible"; 2373 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 2376
2337 warn "unload cf.pm \"a bit\""; 2377 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2339 2379
2340 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2381 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2343 2383
2384 warn "unload completed, starting to reload now";
2385
2344 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2345 require cf; 2387 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2389
2348 warn "load config and database again"; 2390 warn "loading config and database again";
2349 cf::cfg_load; 2391 cf::cfg_load;
2350 cf::db_load; 2392 cf::db_load;
2351 2393
2352 warn "load extensions"; 2394 warn "loading extensions";
2353 cf::load_extensions; 2395 cf::load_extensions;
2354 2396
2355 warn "reattach attachments to objects/players"; 2397 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2398 _global_reattach;
2357 warn "reattach attachments to maps"; 2399 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2400 reattach $_ for values %MAP;
2401
2402 warn "restarting server ticker";
2403
2404 $TICK_WATCHER->start;
2359 }; 2405 };
2360 2406
2361 if ($@) { 2407 if ($@) {
2362 warn $@; 2408 warn $@;
2363 warn "error while reloading, exiting."; 2409 warn "error while reloading, exiting.";
… …
2365 } 2411 }
2366 2412
2367 warn "reloaded"; 2413 warn "reloaded";
2368}; 2414};
2369 2415
2416our $RELOAD_WATCHER; # used only during reload
2417
2370register_command "reload" => sub { 2418register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2419 my ($who, $arg) = @_;
2372 2420
2373 if ($who->flag (FLAG_WIZ)) { 2421 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload."); 2422 $who->message ("reloading server.");
2423
2424 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here.
2426
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2375 reload; 2428 reload;
2376 $who->message ("end of reload."); 2429 undef $RELOAD_WATCHER;
2430 });
2377 } 2431 }
2378}; 2432};
2379 2433
2380unshift @INC, $LIBDIR; 2434unshift @INC, $LIBDIR;
2435
2436my $bug_warning = 0;
2381 2437
2382$TICK_WATCHER = Event->timer ( 2438$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2439 reentrant => 0,
2440 parked => 1,
2384 prio => 0, 2441 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2442 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2443 data => WF_AUTOCANCEL,
2387 cb => sub { 2444 cb => sub {
2445 if ($Coro::current != $Coro::main) {
2446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2447 unless ++$bug_warning > 10;
2448 return;
2449 }
2450
2388 $NOW = Event::time; 2451 $NOW = Event::time;
2389 2452
2390 cf::server_tick; # one server iteration 2453 cf::server_tick; # one server iteration
2391 $RUNTIME += $TICK; 2454 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2455 $NEXT_TICK += $TICK;
… …
2402 }, 2465 },
2403); 2466);
2404 2467
2405IO::AIO::max_poll_time $TICK * 0.2; 2468IO::AIO::max_poll_time $TICK * 0.2;
2406 2469
2407Event->io ( 2470$AIO_POLL_WATCHER = Event->io (
2408 fd => IO::AIO::poll_fileno, 2471 fd => IO::AIO::poll_fileno,
2409 poll => 'r', 2472 poll => 'r',
2410 prio => 5, 2473 prio => 5,
2411 data => WF_AUTOCANCEL, 2474 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb, 2475 cb => \&IO::AIO::poll_cb,
2413); 2476);
2414 2477
2415Event->timer ( 2478$WRITE_RUNTIME_WATCHER = Event->timer (
2416 data => WF_AUTOCANCEL, 2479 data => WF_AUTOCANCEL,
2417 after => 0, 2480 after => 1,
2418 interval => 10, 2481 interval => 10,
2419 cb => sub { 2482 cb => Coro::unblock_sub {
2420 (Coro::unblock_sub {
2421 write_runtime 2483 write_runtime
2422 or warn "ERROR: unable to write runtime file: $!"; 2484 or warn "ERROR: unable to write runtime file: $!";
2423 })->();
2424 }, 2485 },
2425); 2486);
2426 2487
2427END { cf::emergency_save } 2488END { cf::emergency_save }
2428 2489

Diff Legend

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