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.208 by root, Mon Feb 12 00:27:20 2007 UTC vs.
Revision 1.227 by root, Fri Mar 23 18:32:48 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
20use BDB (); 22use BDB ();
21use Data::Dumper; 23use Data::Dumper;
22use Digest::MD5; 24use Digest::MD5;
23use Fcntl; 25use Fcntl;
26use YAML::Syck ();
24use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 28use Time::HiRes;
27use Compress::LZF; 29use Compress::LZF;
28 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 35
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 37
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
37 40
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 44
40our %COMMAND = (); 45our %COMMAND = ();
41our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
42 47
43our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 49our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
47 52
53our $RELOAD; # number of reloads so far
48our @EVENT; 54our @EVENT;
49our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
50 56
51our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 58our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 61our $NEXT_TICK;
56our $NOW; 62our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 63our $USE_FSYNC = 1; # use fsync to write maps - default off
58 64
59our $BDB_POLL_WATCHER; 65our $BDB_POLL_WATCHER;
… …
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 209 $d
204 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
205} 211}
206 212
207use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 214
209=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
210 216
211Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
212 218
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
221 220
222Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 222
231=item cf::lock_wait $string 223=item cf::lock_wait $string
232 224
233Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
234 226
… …
273sub freeze_mainloop { 265sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
275 267
276 my $guard = Coro::guard { 268 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 270 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
282 $guard 272 $guard
283} 273}
284 274
285=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
356 346
357 $coro 347 $coro
358} 348}
359 349
360sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
361 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
362 354
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 356 or return;
365 357
… …
787 } 779 }
788 } else { 780 } else {
789 aio_unlink $filename; 781 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
791 } 783 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
798 } 784 }
799} 785}
800 786
801sub object_freezer_as_string { 787sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 788 my ($rdata, $objs) = @_;
… …
808 794
809sub object_thawer_load { 795sub object_thawer_load {
810 my ($filename) = @_; 796 my ($filename) = @_;
811 797
812 my ($data, $av); 798 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 799
817 (aio_load $filename, $data) >= 0 800 (aio_load $filename, $data) >= 0
818 or return; 801 or return;
819 802
820 unless (aio_stat "$filename.pst") { 803 unless (aio_stat "$filename.pst") {
… …
1039=cut 1022=cut
1040 1023
1041sub quit_character { 1024sub quit_character {
1042 my ($pl) = @_; 1025 my ($pl) = @_;
1043 1026
1027 my $name = $pl->ob->name;
1028
1044 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1045 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1046 1031
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1048 $pl->deactivate; 1033 $pl->deactivate;
… …
1052 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1056 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1057 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1058} 1063}
1059 1064
1060=item cf::player::list_logins 1065=item cf::player::list_logins
1061 1066
1062Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1307 my ($self) = @_; 1312 my ($self) = @_;
1308 1313
1309 utf8::encode (my $save = $self->save_path); 1314 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1317} 1317}
1318 1318
1319sub load_header_from($) { 1319sub load_header_from($) {
1320 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1321 1321
… …
1609 return if $self->players; 1609 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1611 1611
1612 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1613 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1614 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1615 1625
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear; 1626 $self->clear;
1618 1627
1619 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1620 1629
1621 $self->unlink_save; 1630 $self->unlink_save;
… …
1811 $map->load; 1820 $map->load;
1812 $map->load_diag; 1821 $map->load_diag;
1813 1822
1814 return unless $self->contr->active; 1823 return unless $self->contr->active;
1815 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1816 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1817} 1828}
1818 1829
1819cf::player->attach ( 1830cf::player->attach (
1820 on_logout => sub { 1831 on_logout => sub {
… …
1833 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1834 # should happen only on crashes 1845 # should happen only on crashes
1835 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1836 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1837 (async { 1848 (async {
1838 # we need this sleep as the login has a concurrent enter_exit running
1839 # and this sleep increases chances of the player not ending up in scorn
1840 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1841 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1842 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1843 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1844 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1845 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1846 })->prio (2); 1857 })->prio (2);
1847 } 1858 }
1848 }, 1859 },
… …
1973 1984
1974sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1975 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1976 1987
1977 utf8::encode $text; 1988 utf8::encode $text;
1978 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1979} 1990}
1980 1991
1981 1992
1982=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1983 1994
… …
2197 2208
2198=cut 2209=cut
2199 2210
2200our $DB; 2211our $DB;
2201 2212
2202sub db_load() { 2213sub db_init {
2203 unless ($DB) { 2214 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV; 2215 $DB = BDB::db_create $DB_ENV;
2205 2216
2206 cf::sync_job { 2217 cf::sync_job {
2207 eval { 2218 eval {
… …
2247} 2258}
2248 2259
2249############################################################################# 2260#############################################################################
2250# the server's init and main functions 2261# the server's init and main functions
2251 2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2293 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 }
2296 Coro::cede;
2297 }
2298
2299 1
2300}
2301
2252sub load_resources { 2302sub reload_resources {
2253 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2254 or die "unable to load regions file\n";#d# 2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2255} 2311}
2256 2312
2257sub cfg_load { 2313sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2259 or return; 2315 or return;
… …
2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2272 and die "WARNING: m(un)lockall failed: $!\n"; 2328 and die "WARNING: m(un)lockall failed: $!\n";
2273 }; 2329 };
2274 warn $@ if $@; 2330 warn $@ if $@;
2275 } 2331 }
2276}
2277
2278sub init {
2279 load_resources;
2280} 2332}
2281 2333
2282sub main { 2334sub main {
2283 # we must not ever block the main coroutine 2335 # we must not ever block the main coroutine
2284 local $Coro::idle = sub { 2336 local $Coro::idle = sub {
… …
2287 Event::one_event; 2339 Event::one_event;
2288 })->prio (Coro::PRIO_MAX); 2340 })->prio (Coro::PRIO_MAX);
2289 }; 2341 };
2290 2342
2291 cfg_load; 2343 cfg_load;
2292 db_load; 2344 db_init;
2293 load_extensions; 2345 load_extensions;
2294 2346
2295 $TICK_WATCHER->start; 2347 $TICK_WATCHER->start;
2296 Event::loop; 2348 Event::loop;
2297} 2349}
… …
2345 }; 2397 };
2346 2398
2347 warn "leave emergency perl save\n"; 2399 warn "leave emergency perl save\n";
2348} 2400}
2349 2401
2402sub post_cleanup {
2403 my ($make_core) = @_;
2404
2405 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core;
2407}
2408
2350sub reload() { 2409sub reload() {
2351 # can/must only be called in main 2410 # can/must only be called in main
2352 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
2353 warn "can only reload from main coroutine"; 2412 warn "can only reload from main coroutine";
2354 return; 2413 return;
2355 } 2414 }
2356 2415
2357 warn "reloading..."; 2416 warn "reloading...";
2358 2417
2359 warn "cancelling server ticker"; 2418 warn "entering sync_job";
2360 $TICK_WATCHER->cancel;
2361 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2362 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2363 2424
2364 eval { 2425 warn "syncing database to disk";
2426 BDB::db_env_txn_checkpoint $DB_ENV;
2427
2365 # if anything goes wrong in here, we should simply crash as we already saved 2428 # if anything goes wrong in here, we should simply crash as we already saved
2366 2429
2367 warn "cancelling all WF_AUTOCANCEL watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2368 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2369 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2370 } 2433 }
2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374 2434
2375 warn "flushing outstanding aio requests"; 2435 warn "flushing outstanding aio requests";
2376 for (;;) { 2436 for (;;) {
2377 BDB::flush; 2437 BDB::flush;
2378 IO::AIO::flush; 2438 IO::AIO::flush;
2379 Coro::cede; 2439 Coro::cede;
2380 last unless IO::AIO::nreqs || BDB::nreqs; 2440 last unless IO::AIO::nreqs || BDB::nreqs;
2381 warn "iterate..."; 2441 warn "iterate...";
2382 } 2442 }
2383 2443
2444 ++$RELOAD;
2445
2384 warn "cancelling all extension coros"; 2446 warn "cancelling all extension coros";
2385 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2386 %EXT_CORO = (); 2448 %EXT_CORO = ();
2387 2449
2388 warn "removing commands"; 2450 warn "removing commands";
… …
2440 require cf; 2502 require cf;
2441 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2442 2504
2443 warn "loading config and database again"; 2505 warn "loading config and database again";
2444 cf::cfg_load; 2506 cf::cfg_load;
2445 cf::db_load;
2446 2507
2447 warn "loading extensions"; 2508 warn "loading extensions";
2448 cf::load_extensions; 2509 cf::load_extensions;
2449 2510
2450 warn "reattaching attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2451 _global_reattach; 2512 _global_reattach; # objects, sockets
2452 warn "reattaching attachments to maps"; 2513 warn "reattaching attachments to maps";
2453 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2454 2517
2455 warn "loading reloadable resources"; 2518 warn "loading reloadable resources";
2456 load_resources; 2519 reload_resources;
2457 2520
2458 warn "restarting server ticker"; 2521 warn "leaving sync_job";
2459 2522
2460 $TICK_WATCHER->start; 2523 1
2461 }; 2524 } or do {
2462
2463 if ($@) {
2464 warn $@; 2525 warn $@;
2465 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2466 exit 1; 2527 exit 1;
2467 } 2528 };
2468 2529
2469 warn "reloaded"; 2530 warn "reloaded";
2470}; 2531};
2471 2532
2472our $RELOAD_WATCHER; # used only during reload 2533our $RELOAD_WATCHER; # used only during reload
… …
2513 2574
2514 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2515 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2516 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2517 2578
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10;
2581 Coro::async_pool {
2582 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!";
2584 };
2585 }
2586
2518 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2520 2589
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time; 2590# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d# 2591# warn $AFTER - $NOW;#d#
2526 2592
2527 # if we are delayed by four ticks or more, skip them all 2593 # if we are delayed by four ticks or more, skip them all
2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2587 2653
2588 undef $Coro::AIO::WATCHER; 2654 undef $Coro::AIO::WATCHER;
2589 IO::AIO::max_poll_time $TICK * 0.1; 2655 IO::AIO::max_poll_time $TICK * 0.1;
2590 $AIO_POLL_WATCHER = Event->io ( 2656 $AIO_POLL_WATCHER = Event->io (
2591 reentrant => 0, 2657 reentrant => 0,
2658 data => WF_AUTOCANCEL,
2592 fd => IO::AIO::poll_fileno, 2659 fd => IO::AIO::poll_fileno,
2593 poll => 'r', 2660 poll => 'r',
2594 prio => 6, 2661 prio => 6,
2595 data => WF_AUTOCANCEL,
2596 cb => \&IO::AIO::poll_cb, 2662 cb => \&IO::AIO::poll_cb,
2597 ); 2663 );
2598} 2664}
2599 2665
2600$WRITE_RUNTIME_WATCHER = Event->timer (
2601 reentrant => 0,
2602 data => WF_AUTOCANCEL,
2603 after => 1,
2604 interval => 10,
2605 prio => 6, # keep it lowest so it acts like a watchdog
2606 cb => Coro::unblock_sub {
2607 write_runtime
2608 or warn "ERROR: unable to write runtime file: $!";
2609 },
2610);
2611
2612END { cf::emergency_save } 2666END { cf::emergency_save }
2613 2667
26141 26681
2615 2669

Diff Legend

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