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.168 by root, Sun Jan 14 00:37:14 2007 UTC vs.
Revision 1.187 by root, Sat Jan 20 21:06:52 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;
… …
349 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
350 350
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 352 or return;
353 353
354 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 359 and return;
357 360
358 aio_fsync $fh 361 aio_fsync $fh
359 and return; 362 and return;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 507our @CB_MAP = ();
505 508
506my %attachment; 509my %attachment;
507 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
508sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
510 519
511 use sort 'stable'; 520 use sort 'stable';
512 521
… …
683# object support 692# object support
684 693
685sub reattach { 694sub reattach {
686 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 699
689 my $registry = $obj->registry; 700 my $registry = $obj->registry;
690 701
691 @$registry = (); 702 @$registry = ();
692 703
… …
949 960
950sub exists($) { 961sub exists($) {
951 my ($login) = @_; 962 my ($login) = @_;
952 963
953 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
955} 966}
956 967
957sub find($) { 968sub find($) {
958 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0]; 970 my $login = $_[0];
… …
1105 1116
1106use Fcntl; 1117use Fcntl;
1107use Coro::AIO; 1118use Coro::AIO;
1108 1119
1109use overload 1120use overload
1110 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1111 1123
1112our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1114 1126
1115sub generate_random_map { 1127sub generate_random_map {
1116 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1117
1118 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1119 $self->_create_random_map ( 1130 $self->_create_random_map (
1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1130 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 ) 1142 )
1132} 1143}
1133 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1134sub register { 1153sub register {
1135 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1136 my $pkg = caller; 1155 my $pkg = caller;
1137 1156
1138 no strict; 1157 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1140 1159
1141 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1142} 1161}
1143 1162
1144# also paths starting with '/' 1163# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1146 1177
1147sub normalise { 1178sub normalise {
1148 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1149 1180
1150 # map plan: 1181 # map plan:
… …
1181 1212
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183 1214
1184 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1185 1216
1186 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1188 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1191 return $self; 1222 return $self;
1192 } 1223 }
… …
1247 1278
1248sub unlink_save { 1279sub unlink_save {
1249 my ($self) = @_; 1280 my ($self) = @_;
1250 1281
1251 utf8::encode (my $save = $self->save_path); 1282 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1285}
1255 1286
1256sub load_header_from($) { 1287sub load_header_from($) {
1257 my ($self, $path) = @_; 1288 my ($self, $path) = @_;
1258 1289
… …
1319 1350
1320 $map->load_header 1351 $map->load_header
1321 or return; 1352 or return;
1322 1353
1323 if ($map->should_reset) { 1354 if ($map->should_reset) {
1355 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait;
1324 $map->reset; 1357 $map->reset;
1325 undef $guard; 1358 undef $guard;
1326 $map = find $path 1359 $map = find $path
1327 or return; 1360 or return;
1328 } 1361 }
… …
1420 1453
1421 cf::sync_job { $map->load }; 1454 cf::sync_job { $map->load };
1422} 1455}
1423 1456
1424our %MAP_PREFETCH; 1457our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async { 1458our $MAP_PREFETCHER = undef;
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437 1459
1438sub find_async { 1460sub find_async {
1439 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1440 1462
1441 $path = normalise $path, $origin && $origin->{path}; 1463 $path = normalise $path, $origin && $origin->{path};
1442 1464
1443 if (my $map = $cf::MAP{$path}) { 1465 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 } 1467 }
1446 1468
1447 $MAP_PREFETCH{$path} = 0; 1469 undef $MAP_PREFETCH{$path};
1448 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER ||= cf::async {
1471 while (%MAP_PREFETCH) {
1472 for my $path (keys %MAP_PREFETCH) {
1473 my $map = find $path
1474 or next;
1475 $map->load;
1476
1477 delete $MAP_PREFETCH{$path};
1478 }
1479 }
1480 undef $MAP_PREFETCHER;
1481 };
1449 1482
1450 () 1483 ()
1451} 1484}
1452 1485
1453sub save { 1486sub save {
… …
1498 1531
1499sub reset_at { 1532sub reset_at {
1500 my ($self) = @_; 1533 my ($self) = @_;
1501 1534
1502 # TODO: safety, remove and allow resettable per-player maps 1535 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1536 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1537 return 1e99 if $self->{deny_reset};
1505 1538
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508 1541
… …
1513 my ($self) = @_; 1546 my ($self) = @_;
1514 1547
1515 $self->reset_at <= $cf::RUNTIME 1548 $self->reset_at <= $cf::RUNTIME
1516} 1549}
1517 1550
1518sub rename {
1519 my ($self, $new_path) = @_;
1520
1521 normalise $new_path;
1522
1523 $self->unlink_save;
1524
1525 delete $cf::MAP{$self->path};
1526 $self->{path} = $new_path; $self->path ($self->{path});
1527 $cf::MAP{$self->path} = $self;
1528
1529 $self->save;
1530}
1531
1532sub reset { 1551sub reset {
1533 my ($self) = @_; 1552 my ($self) = @_;
1534 1553
1535 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1554 my $lock = cf::lock_acquire "map_data:$self->{path}";
1536 1555
… …
1553my $nuke_counter = "aaaa"; 1572my $nuke_counter = "aaaa";
1554 1573
1555sub nuke { 1574sub nuke {
1556 my ($self) = @_; 1575 my ($self) = @_;
1557 1576
1577 delete $cf::MAP{$self->path};
1578
1579 $self->unlink_save;
1580
1581 bless $self, "cf::map";
1582 delete $self->{deny_reset};
1558 $self->{deny_save} = 1; 1583 $self->{deny_save} = 1;
1559 $self->reset_timeout (1); 1584 $self->reset_timeout (1);
1560 $self->rename ("{nuke}/" . ($nuke_counter++)); 1585 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1586
1587 $cf::MAP{$self->path} = $self;
1588
1561 $self->reset; # polite request, might not happen 1589 $self->reset; # polite request, might not happen
1562} 1590}
1563 1591
1564=item cf::map::unique_maps 1592=item cf::map::unique_maps
1565 1593
… …
1796 1824
1797sub parse_random_map_params { 1825sub parse_random_map_params {
1798 my ($spec) = @_; 1826 my ($spec) = @_;
1799 1827
1800 my $rmp = { # defaults 1828 my $rmp = { # defaults
1801 xsize => 10, 1829 xsize => (cf::rndm 15, 40),
1802 ysize => 10, 1830 ysize => (cf::rndm 15, 40),
1831 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1832 #layout => string,
1803 }; 1833 };
1804 1834
1805 for (split /\n/, $spec) { 1835 for (split /\n/, $spec) {
1806 my ($k, $v) = split /\s+/, $_, 2; 1836 my ($k, $v) = split /\s+/, $_, 2;
1807 1837
… …
1811 $rmp 1841 $rmp
1812} 1842}
1813 1843
1814sub prepare_random_map { 1844sub prepare_random_map {
1815 my ($exit) = @_; 1845 my ($exit) = @_;
1846
1847 my $guard = cf::lock_acquire "exit_prepare:$exit";
1816 1848
1817 # all this does is basically replace the /! path by 1849 # all this does is basically replace the /! path by
1818 # a new random map path (?random/...) with a seed 1850 # a new random map path (?random/...) with a seed
1819 # that depends on the exit object 1851 # that depends on the exit object
1820 1852
… …
1829 1861
1830 $rmp->{random_seed} ||= $exit->random_seed; 1862 $rmp->{random_seed} ||= $exit->random_seed;
1831 1863
1832 my $data = cf::to_json $rmp; 1864 my $data = cf::to_json $rmp;
1833 my $md5 = Digest::MD5::md5_hex $data; 1865 my $md5 = Digest::MD5::md5_hex $data;
1866 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1834 1867
1835 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1868 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1836 aio_write $fh, 0, (length $data), $data, 0; 1869 aio_write $fh, 0, (length $data), $data, 0;
1870 undef $fh;
1871 aio_rename "$meta~", $meta;
1837 1872
1838 $exit->slaying ("?random/$md5"); 1873 $exit->slaying ("?random/$md5");
1839 $exit->msg (undef); 1874 $exit->msg (undef);
1840 } 1875 }
1841} 1876}
… …
2151 sub db_sync() { 2186 sub db_sync() {
2152 db_save if $dirty; 2187 db_save if $dirty;
2153 undef $dirty; 2188 undef $dirty;
2154 } 2189 }
2155 2190
2156 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2157 db_sync; 2192 db_sync;
2158 }); 2193 });
2159 2194
2160 sub db_dirty() { 2195 sub db_dirty() {
2161 $dirty = 1; 2196 $dirty = 1;
… …
2211 2246
2212sub main { 2247sub main {
2213 # we must not ever block the main coroutine 2248 # we must not ever block the main coroutine
2214 local $Coro::idle = sub { 2249 local $Coro::idle = sub {
2215 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2250 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2251 (async {
2216 async { Event::one_event }; 2252 Event::one_event;
2253 })->prio (Coro::PRIO_MAX);
2217 }; 2254 };
2218 2255
2219 cfg_load; 2256 cfg_load;
2220 db_load; 2257 db_load;
2221 load_extensions; 2258 load_extensions;
2259
2260 $TICK_WATCHER->start;
2222 Event::loop; 2261 Event::loop;
2223} 2262}
2224 2263
2225############################################################################# 2264#############################################################################
2226# initialisation and cleanup 2265# initialisation and cleanup
… …
2268} 2307}
2269 2308
2270sub reload() { 2309sub reload() {
2271 # can/must only be called in main 2310 # can/must only be called in main
2272 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2273 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine";
2274 return; 2313 return;
2275 } 2314 }
2276 2315
2277 warn "reloading..."; 2316 warn "reloading...";
2278 2317
2279 warn "freezing server"; 2318 warn "cancelling server ticker";
2280 my $guard = freeze_mainloop; 2319 $TICK_WATCHER->cancel;
2320
2281 cf::emergency_save; 2321 cf::emergency_save;
2282
2283 warn "sync database to disk";
2284 cf::db_sync;
2285 IO::AIO::flush;
2286 2322
2287 eval { 2323 eval {
2288 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2289 2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328
2290 warn "cancel all watchers"; 2329 warn "cancelling all WF_AUTOCANCEL watchers";
2291 for (Event::all_watchers) { 2330 for (Event::all_watchers) {
2292 $_->cancel if $_->data & WF_AUTOCANCEL; 2331 $_->cancel if $_->data & WF_AUTOCANCEL;
2293 } 2332 }
2294 2333
2334 warn "flushing outstanding aio requests";
2335 for (;;) {
2336 IO::AIO::flush;
2337 Coro::cede;
2338 last unless IO::AIO::nreqs;
2339 warn "iterate...";
2340 }
2341
2295 warn "cancel all extension coros"; 2342 warn "cancelling all extension coros";
2296 $_->cancel for values %EXT_CORO; 2343 $_->cancel for values %EXT_CORO;
2297 %EXT_CORO = (); 2344 %EXT_CORO = ();
2298 2345
2299 warn "remove commands"; 2346 warn "removing commands";
2300 %COMMAND = (); 2347 %COMMAND = ();
2301 2348
2302 warn "remove ext commands"; 2349 warn "removing ext commands";
2303 %EXTCMD = (); 2350 %EXTCMD = ();
2304 2351
2305 warn "unload/nuke all extensions"; 2352 warn "unloading/nuking all extensions";
2306 for my $pkg (@EXTS) { 2353 for my $pkg (@EXTS) {
2307 warn "... unloading $pkg"; 2354 warn "... unloading $pkg";
2308 2355
2309 if (my $cb = $pkg->can ("unload")) { 2356 if (my $cb = $pkg->can ("unload")) {
2310 eval { 2357 eval {
… …
2315 2362
2316 warn "... nuking $pkg"; 2363 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg; 2364 Symbol::delete_package $pkg;
2318 } 2365 }
2319 2366
2320 warn "unload all perl modules loaded from $LIBDIR"; 2367 warn "unloading all perl modules loaded from $LIBDIR";
2321 while (my ($k, $v) = each %INC) { 2368 while (my ($k, $v) = each %INC) {
2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2369 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2323 2370
2324 warn "removing <$k>"; 2371 warn "... unloading $k";
2325 delete $INC{$k}; 2372 delete $INC{$k};
2326 2373
2327 $k =~ s/\.pm$//; 2374 $k =~ s/\.pm$//;
2328 $k =~ s/\//::/g; 2375 $k =~ s/\//::/g;
2329 2376
… …
2332 } 2379 }
2333 2380
2334 Symbol::delete_package $k; 2381 Symbol::delete_package $k;
2335 } 2382 }
2336 2383
2337 warn "get rid of safe::, as good as possible"; 2384 warn "getting rid of safe::, as good as possible";
2338 Symbol::delete_package "safe::$_" 2385 Symbol::delete_package "safe::$_"
2339 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2386 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2340 2387
2341 warn "unload cf.pm \"a bit\""; 2388 warn "unloading cf.pm \"a bit\"";
2342 delete $INC{"cf.pm"}; 2389 delete $INC{"cf.pm"};
2343 2390
2344 # don't, removes xs symbols, too, 2391 # don't, removes xs symbols, too,
2345 # and global variables created in xs 2392 # and global variables created in xs
2346 #Symbol::delete_package __PACKAGE__; 2393 #Symbol::delete_package __PACKAGE__;
2347 2394
2395 warn "unload completed, starting to reload now";
2396
2348 warn "reloading cf.pm"; 2397 warn "reloading cf.pm";
2349 require cf; 2398 require cf;
2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2351 2400
2352 warn "load config and database again"; 2401 warn "loading config and database again";
2353 cf::cfg_load; 2402 cf::cfg_load;
2354 cf::db_load; 2403 cf::db_load;
2355 2404
2356 warn "load extensions"; 2405 warn "loading extensions";
2357 cf::load_extensions; 2406 cf::load_extensions;
2358 2407
2359 warn "reattach attachments to objects/players"; 2408 warn "reattaching attachments to objects/players";
2360 _global_reattach; 2409 _global_reattach;
2361 warn "reattach attachments to maps"; 2410 warn "reattaching attachments to maps";
2362 reattach $_ for values %MAP; 2411 reattach $_ for values %MAP;
2412
2413 warn "restarting server ticker";
2414
2415 $TICK_WATCHER->start;
2363 }; 2416 };
2364 2417
2365 if ($@) { 2418 if ($@) {
2366 warn $@; 2419 warn $@;
2367 warn "error while reloading, exiting."; 2420 warn "error while reloading, exiting.";
… …
2369 } 2422 }
2370 2423
2371 warn "reloaded"; 2424 warn "reloaded";
2372}; 2425};
2373 2426
2427our $RELOAD_WATCHER; # used only during reload
2428
2374register_command "reload" => sub { 2429register_command "reload" => sub {
2375 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2376 2431
2377 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2378 $who->message ("start of reload."); 2433 $who->message ("reloading server.");
2434
2435 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here.
2437
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2379 reload; 2439 reload;
2380 $who->message ("end of reload."); 2440 undef $RELOAD_WATCHER;
2441 });
2381 } 2442 }
2382}; 2443};
2383 2444
2384unshift @INC, $LIBDIR; 2445unshift @INC, $LIBDIR;
2446
2447my $bug_warning = 0;
2385 2448
2386$TICK_WATCHER = Event->timer ( 2449$TICK_WATCHER = Event->timer (
2387 reentrant => 0, 2450 reentrant => 0,
2451 parked => 1,
2388 prio => 0, 2452 prio => 0,
2389 at => $NEXT_TICK || $TICK, 2453 at => $NEXT_TICK || $TICK,
2390 data => WF_AUTOCANCEL, 2454 data => WF_AUTOCANCEL,
2391 cb => sub { 2455 cb => sub {
2456 if ($Coro::current != $Coro::main) {
2457 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2458 unless ++$bug_warning > 10;
2459 return;
2460 }
2461
2392 $NOW = Event::time; 2462 $NOW = Event::time;
2393 2463
2394 cf::server_tick; # one server iteration 2464 cf::server_tick; # one server iteration
2395 $RUNTIME += $TICK; 2465 $RUNTIME += $TICK;
2396 $NEXT_TICK += $TICK; 2466 $NEXT_TICK += $TICK;
… …
2416 cb => \&IO::AIO::poll_cb, 2486 cb => \&IO::AIO::poll_cb,
2417); 2487);
2418 2488
2419$WRITE_RUNTIME_WATCHER = Event->timer ( 2489$WRITE_RUNTIME_WATCHER = Event->timer (
2420 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2421 after => 0, 2491 after => 1,
2422 interval => 10, 2492 interval => 10,
2423 cb => sub { 2493 prio => 6, # keep it lowest so it acts like a watchdog
2424 (Coro::unblock_sub { 2494 cb => Coro::unblock_sub {
2425 write_runtime 2495 write_runtime
2426 or warn "ERROR: unable to write runtime file: $!"; 2496 or warn "ERROR: unable to write runtime file: $!";
2427 })->();
2428 }, 2497 },
2429); 2498);
2430 2499
2431END { cf::emergency_save } 2500END { cf::emergency_save }
2432 2501

Diff Legend

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