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.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;
… …
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
354 my $value = $cf::RUNTIME + 90 + 10;
350 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
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 359 and return;
353 360
354 aio_fsync $fh 361 aio_fsync $fh
355 and return; 362 and return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 507our @CB_MAP = ();
501 508
502my %attachment; 509my %attachment;
503 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
504sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
506 519
507 use sort 'stable'; 520 use sort 'stable';
508 521
… …
679# object support 692# object support
680 693
681sub reattach { 694sub reattach {
682 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 699
685 my $registry = $obj->registry; 700 my $registry = $obj->registry;
686 701
687 @$registry = (); 702 @$registry = ();
688 703
… …
945 960
946sub exists($) { 961sub exists($) {
947 my ($login) = @_; 962 my ($login) = @_;
948 963
949 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
951} 966}
952 967
953sub find($) { 968sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 970 my $login = $_[0];
… …
1101 1116
1102use Fcntl; 1117use Fcntl;
1103use Coro::AIO; 1118use Coro::AIO;
1104 1119
1105use overload 1120use overload
1106 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1107 1123
1108our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1110 1126
1111sub generate_random_map { 1127sub generate_random_map {
1112 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1130 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1142 )
1128} 1143}
1129 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
1130sub register { 1153sub register {
1131 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1155 my $pkg = caller;
1133 1156
1134 no strict; 1157 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1159
1137 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1161}
1139 1162
1140# also paths starting with '/' 1163# also paths starting with '/'
1141$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}
1142 1177
1143sub normalise { 1178sub normalise {
1144 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1145 1180
1146 # map plan: 1181 # map plan:
… …
1177 1212
1178 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
1179 1214
1180 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1181 1216
1182 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1187 return $self; 1222 return $self;
1188 } 1223 }
… …
1243 1278
1244sub unlink_save { 1279sub unlink_save {
1245 my ($self) = @_; 1280 my ($self) = @_;
1246 1281
1247 utf8::encode (my $save = $self->save_path); 1282 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1285}
1251 1286
1252sub load_header_from($) { 1287sub load_header_from($) {
1253 my ($self, $path) = @_; 1288 my ($self, $path) = @_;
1254 1289
… …
1315 1350
1316 $map->load_header 1351 $map->load_header
1317 or return; 1352 or return;
1318 1353
1319 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;
1320 $map->reset; 1357 $map->reset;
1321 undef $guard; 1358 undef $guard;
1322 $map = find $path 1359 $map = find $path
1323 or return; 1360 or return;
1324 } 1361 }
… …
1416 1453
1417 cf::sync_job { $map->load }; 1454 cf::sync_job { $map->load };
1418} 1455}
1419 1456
1420our %MAP_PREFETCH; 1457our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1458our $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 1459
1434sub find_async { 1460sub find_async {
1435 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1436 1462
1437 $path = normalise $path, $origin && $origin->{path}; 1463 $path = normalise $path, $origin && $origin->{path};
1438 1464
1439 if (my $map = $cf::MAP{$path}) { 1465 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1467 }
1442 1468
1443 $MAP_PREFETCH{$path} = 0; 1469 undef $MAP_PREFETCH{$path};
1444 $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 };
1445 1482
1446 () 1483 ()
1447} 1484}
1448 1485
1449sub save { 1486sub save {
… …
1494 1531
1495sub reset_at { 1532sub reset_at {
1496 my ($self) = @_; 1533 my ($self) = @_;
1497 1534
1498 # TODO: safety, remove and allow resettable per-player maps 1535 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1536 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1537 return 1e99 if $self->{deny_reset};
1501 1538
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 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;
1504 1541
… …
1509 my ($self) = @_; 1546 my ($self) = @_;
1510 1547
1511 $self->reset_at <= $cf::RUNTIME 1548 $self->reset_at <= $cf::RUNTIME
1512} 1549}
1513 1550
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 { 1551sub reset {
1529 my ($self) = @_; 1552 my ($self) = @_;
1530 1553
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1554 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1555
… …
1549my $nuke_counter = "aaaa"; 1572my $nuke_counter = "aaaa";
1550 1573
1551sub nuke { 1574sub nuke {
1552 my ($self) = @_; 1575 my ($self) = @_;
1553 1576
1577 delete $cf::MAP{$self->path};
1578
1579 $self->unlink_save;
1580
1581 bless $self, "cf::map";
1582 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1583 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1584 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1585 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1586
1587 $cf::MAP{$self->path} = $self;
1588
1557 $self->reset; # polite request, might not happen 1589 $self->reset; # polite request, might not happen
1558} 1590}
1559 1591
1560=item cf::map::unique_maps 1592=item cf::map::unique_maps
1561 1593
… …
1792 1824
1793sub parse_random_map_params { 1825sub parse_random_map_params {
1794 my ($spec) = @_; 1826 my ($spec) = @_;
1795 1827
1796 my $rmp = { # defaults 1828 my $rmp = { # defaults
1797 xsize => 10, 1829 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1830 ysize => (cf::rndm 15, 40),
1831 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1832 #layout => string,
1799 }; 1833 };
1800 1834
1801 for (split /\n/, $spec) { 1835 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1836 my ($k, $v) = split /\s+/, $_, 2;
1803 1837
… …
1807 $rmp 1841 $rmp
1808} 1842}
1809 1843
1810sub prepare_random_map { 1844sub prepare_random_map {
1811 my ($exit) = @_; 1845 my ($exit) = @_;
1846
1847 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1848
1813 # all this does is basically replace the /! path by 1849 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1850 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1851 # that depends on the exit object
1816 1852
… …
1825 1861
1826 $rmp->{random_seed} ||= $exit->random_seed; 1862 $rmp->{random_seed} ||= $exit->random_seed;
1827 1863
1828 my $data = cf::to_json $rmp; 1864 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 1865 my $md5 = Digest::MD5::md5_hex $data;
1866 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1830 1867
1831 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) {
1832 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;
1833 1872
1834 $exit->slaying ("?random/$md5"); 1873 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 1874 $exit->msg (undef);
1836 } 1875 }
1837} 1876}
… …
2147 sub db_sync() { 2186 sub db_sync() {
2148 db_save if $dirty; 2187 db_save if $dirty;
2149 undef $dirty; 2188 undef $dirty;
2150 } 2189 }
2151 2190
2152 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 {
2153 db_sync; 2192 db_sync;
2154 }); 2193 });
2155 2194
2156 sub db_dirty() { 2195 sub db_dirty() {
2157 $dirty = 1; 2196 $dirty = 1;
… …
2207 2246
2208sub main { 2247sub main {
2209 # we must not ever block the main coroutine 2248 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2249 local $Coro::idle = sub {
2211 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 {
2212 async { Event::one_event }; 2252 Event::one_event;
2253 })->prio (Coro::PRIO_MAX);
2213 }; 2254 };
2214 2255
2215 cfg_load; 2256 cfg_load;
2216 db_load; 2257 db_load;
2217 load_extensions; 2258 load_extensions;
2259
2260 $TICK_WATCHER->start;
2218 Event::loop; 2261 Event::loop;
2219} 2262}
2220 2263
2221############################################################################# 2264#############################################################################
2222# initialisation and cleanup 2265# initialisation and cleanup
… …
2264} 2307}
2265 2308
2266sub reload() { 2309sub reload() {
2267 # can/must only be called in main 2310 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine";
2270 return; 2313 return;
2271 } 2314 }
2272 2315
2273 warn "reloading..."; 2316 warn "reloading...";
2274 2317
2275 warn "freezing server"; 2318 warn "cancelling server ticker";
2276 my $guard = freeze_mainloop; 2319 $TICK_WATCHER->cancel;
2320
2277 cf::emergency_save; 2321 cf::emergency_save;
2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2282 2322
2283 eval { 2323 eval {
2284 # 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
2285 2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328
2286 warn "cancel all watchers"; 2329 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2330 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2331 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2332 }
2290 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
2291 warn "cancel all extension coros"; 2342 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2343 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2344 %EXT_CORO = ();
2294 2345
2295 warn "remove commands"; 2346 warn "removing commands";
2296 %COMMAND = (); 2347 %COMMAND = ();
2297 2348
2298 warn "remove ext commands"; 2349 warn "removing ext commands";
2299 %EXTCMD = (); 2350 %EXTCMD = ();
2300 2351
2301 warn "unload/nuke all extensions"; 2352 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2353 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2354 warn "... unloading $pkg";
2304 2355
2305 if (my $cb = $pkg->can ("unload")) { 2356 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2357 eval {
… …
2311 2362
2312 warn "... nuking $pkg"; 2363 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2364 Symbol::delete_package $pkg;
2314 } 2365 }
2315 2366
2316 warn "unload all perl modules loaded from $LIBDIR"; 2367 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2368 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2369 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2370
2320 warn "removing <$k>"; 2371 warn "... unloading $k";
2321 delete $INC{$k}; 2372 delete $INC{$k};
2322 2373
2323 $k =~ s/\.pm$//; 2374 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2375 $k =~ s/\//::/g;
2325 2376
… …
2328 } 2379 }
2329 2380
2330 Symbol::delete_package $k; 2381 Symbol::delete_package $k;
2331 } 2382 }
2332 2383
2333 warn "get rid of safe::, as good as possible"; 2384 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2385 Symbol::delete_package "safe::$_"
2335 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);
2336 2387
2337 warn "unload cf.pm \"a bit\""; 2388 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2389 delete $INC{"cf.pm"};
2339 2390
2340 # don't, removes xs symbols, too, 2391 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2392 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2393 #Symbol::delete_package __PACKAGE__;
2343 2394
2395 warn "unload completed, starting to reload now";
2396
2344 warn "reloading cf.pm"; 2397 warn "reloading cf.pm";
2345 require cf; 2398 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2400
2348 warn "load config and database again"; 2401 warn "loading config and database again";
2349 cf::cfg_load; 2402 cf::cfg_load;
2350 cf::db_load; 2403 cf::db_load;
2351 2404
2352 warn "load extensions"; 2405 warn "loading extensions";
2353 cf::load_extensions; 2406 cf::load_extensions;
2354 2407
2355 warn "reattach attachments to objects/players"; 2408 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2409 _global_reattach;
2357 warn "reattach attachments to maps"; 2410 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2411 reattach $_ for values %MAP;
2412
2413 warn "restarting server ticker";
2414
2415 $TICK_WATCHER->start;
2359 }; 2416 };
2360 2417
2361 if ($@) { 2418 if ($@) {
2362 warn $@; 2419 warn $@;
2363 warn "error while reloading, exiting."; 2420 warn "error while reloading, exiting.";
… …
2365 } 2422 }
2366 2423
2367 warn "reloaded"; 2424 warn "reloaded";
2368}; 2425};
2369 2426
2427our $RELOAD_WATCHER; # used only during reload
2428
2370register_command "reload" => sub { 2429register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2372 2431
2373 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2374 $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 {
2375 reload; 2439 reload;
2376 $who->message ("end of reload."); 2440 undef $RELOAD_WATCHER;
2441 });
2377 } 2442 }
2378}; 2443};
2379 2444
2380unshift @INC, $LIBDIR; 2445unshift @INC, $LIBDIR;
2446
2447my $bug_warning = 0;
2381 2448
2382$TICK_WATCHER = Event->timer ( 2449$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2450 reentrant => 0,
2451 parked => 1,
2384 prio => 0, 2452 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2453 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2454 data => WF_AUTOCANCEL,
2387 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
2388 $NOW = Event::time; 2462 $NOW = Event::time;
2389 2463
2390 cf::server_tick; # one server iteration 2464 cf::server_tick; # one server iteration
2391 $RUNTIME += $TICK; 2465 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2466 $NEXT_TICK += $TICK;
… …
2402 }, 2476 },
2403); 2477);
2404 2478
2405IO::AIO::max_poll_time $TICK * 0.2; 2479IO::AIO::max_poll_time $TICK * 0.2;
2406 2480
2407Event->io ( 2481$AIO_POLL_WATCHER = Event->io (
2408 fd => IO::AIO::poll_fileno, 2482 fd => IO::AIO::poll_fileno,
2409 poll => 'r', 2483 poll => 'r',
2410 prio => 5, 2484 prio => 5,
2411 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb, 2486 cb => \&IO::AIO::poll_cb,
2413); 2487);
2414 2488
2415Event->timer ( 2489$WRITE_RUNTIME_WATCHER = Event->timer (
2416 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2417 after => 0, 2491 after => 1,
2418 interval => 10, 2492 interval => 10,
2419 cb => sub { 2493 prio => 6, # keep it lowest so it acts like a watchdog
2420 (Coro::unblock_sub { 2494 cb => Coro::unblock_sub {
2421 write_runtime 2495 write_runtime
2422 or warn "ERROR: unable to write runtime file: $!"; 2496 or warn "ERROR: unable to write runtime file: $!";
2423 })->();
2424 }, 2497 },
2425); 2498);
2426 2499
2427END { cf::emergency_save } 2500END { cf::emergency_save }
2428 2501

Diff Legend

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