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.172 by root, Sun Jan 14 13:32:48 2007 UTC vs.
Revision 1.190 by root, Mon Jan 22 03:44:41 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;
… …
957 960
958sub exists($) { 961sub exists($) {
959 my ($login) = @_; 962 my ($login) = @_;
960 963
961 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
963} 966}
964 967
965sub find($) { 968sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 970 my $login = $_[0];
… …
1113 1116
1114use Fcntl; 1117use Fcntl;
1115use Coro::AIO; 1118use Coro::AIO;
1116 1119
1117use overload 1120use overload
1118 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1119 1123
1120our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1122 1126
1123sub generate_random_map { 1127sub generate_random_map {
1124 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1130 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1142 )
1140} 1143}
1141 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
1142sub register { 1153sub register {
1143 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1155 my $pkg = caller;
1145 1156
1146 no strict; 1157 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1159
1149 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1161}
1151 1162
1152# also paths starting with '/' 1163# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1165
1155sub thawer_merge { 1166sub thawer_merge {
1156 my ($self, $merge) = @_; 1167 my ($self, $merge) = @_;
1157 1168
1158 # we have to keep some variables in memory intact 1169 # we have to keep some variables in memory intact
… …
1201 1212
1202 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
1203 1214
1204 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1205 1216
1206 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1211 return $self; 1222 return $self;
1212 } 1223 }
… …
1286 $self->{load_path} = $path; 1297 $self->{load_path} = $path;
1287 1298
1288 1 1299 1
1289} 1300}
1290 1301
1291sub load_orig { 1302sub load_header_orig {
1292 my ($self) = @_; 1303 my ($self) = @_;
1293 1304
1294 $self->load_header_from ($self->load_path) 1305 $self->load_header_from ($self->load_path)
1295} 1306}
1296 1307
1297sub load_temp { 1308sub load_header_temp {
1298 my ($self) = @_; 1309 my ($self) = @_;
1299 1310
1300 $self->load_header_from ($self->save_path) 1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub prepare_temp {
1315 my ($self) = @_;
1316
1317 $self->last_access ((delete $self->{last_access})
1318 || $cf::RUNTIME); #d#
1319 # safety
1320 $self->{instantiate_time} = $cf::RUNTIME
1321 if $self->{instantiate_time} > $cf::RUNTIME;
1322}
1323
1324sub prepare_orig {
1325 my ($self) = @_;
1326
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1301} 1331}
1302 1332
1303sub load_header { 1333sub load_header {
1304 my ($self) = @_; 1334 my ($self) = @_;
1305 1335
1306 if ($self->load_temp) { 1336 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1337 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1338 } else {
1313 $self->load_orig 1339 $self->load_header_orig
1314 or return; 1340 or return;
1315 1341 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1342 }
1321 1343
1322 1 1344 1
1323} 1345}
1324 1346
… …
1339 1361
1340 $map->load_header 1362 $map->load_header
1341 or return; 1363 or return;
1342 1364
1343 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1367 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1368 $map->reset;
1346 undef $guard; 1369 undef $guard;
1347 $map = find $path 1370 $map = find $path
1348 or return; 1371 or return;
1349 } 1372 }
1350 1373
1351 $cf::MAP{$path} = $map 1374 $cf::MAP{$path} = $map
1352 } 1375 }
1353} 1376}
1354 1377
1378sub pre_load { }
1379sub post_load { }
1380
1355sub load { 1381sub load {
1356 my ($self) = @_; 1382 my ($self) = @_;
1357 1383
1358 my $path = $self->{path}; 1384 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1385 my $guard = cf::lock_acquire "map_load:$path";
… …
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1388
1363 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1364 1390
1365 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1366 $self->_load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1396 or return;
1368 1397
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1399 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1421 unless $self->difficulty;
1393 Coro::cede; 1422 Coro::cede;
1394 $self->activate; 1423 $self->activate;
1395 } 1424 }
1396 1425
1426 $self->post_load;
1427
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1429}
1399 1430
1400sub customise_for { 1431sub customise_for {
1401 my ($self, $ob) = @_; 1432 my ($self, $ob) = @_;
… …
1441 1472
1442 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1443} 1474}
1444 1475
1445our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1477our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1478
1459sub find_async { 1479sub find_async {
1460 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1461 1481
1462 $path = normalise $path, $origin && $origin->{path}; 1482 $path = normalise $path, $origin && $origin->{path};
1463 1483
1464 if (my $map = $cf::MAP{$path}) { 1484 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1486 }
1467 1487
1468 $MAP_PREFETCH{$path} = 0; 1488 undef $MAP_PREFETCH{$path};
1489 $MAP_PREFETCHER ||= cf::async {
1490 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) {
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495
1496 delete $MAP_PREFETCH{$path};
1497 }
1498 }
1499 undef $MAP_PREFETCHER;
1500 };
1469 $MAP_PREFETCHER->ready; 1501 $MAP_PREFETCHER->prio (6);
1470 1502
1471 () 1503 ()
1472} 1504}
1473 1505
1474sub save { 1506sub save {
… …
1534 my ($self) = @_; 1566 my ($self) = @_;
1535 1567
1536 $self->reset_at <= $cf::RUNTIME 1568 $self->reset_at <= $cf::RUNTIME
1537} 1569}
1538 1570
1539sub rename {
1540 my ($self, $new_path) = @_;
1541
1542 normalise $new_path;
1543
1544 $self->unlink_save;
1545
1546 delete $cf::MAP{$self->path};
1547 $self->{path} = $new_path; $self->path ($self->{path});
1548 $cf::MAP{$self->path} = $self;
1549
1550 $self->save;
1551}
1552
1553sub reset { 1571sub reset {
1554 my ($self) = @_; 1572 my ($self) = @_;
1555 1573
1556 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1574 my $lock = cf::lock_acquire "map_data:$self->{path}";
1557 1575
… …
1574my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1575 1593
1576sub nuke { 1594sub nuke {
1577 my ($self) = @_; 1595 my ($self) = @_;
1578 1596
1597 delete $cf::MAP{$self->path};
1598
1599 $self->unlink_save;
1600
1601 bless $self, "cf::map";
1602 delete $self->{deny_reset};
1579 $self->{deny_save} = 1; 1603 $self->{deny_save} = 1;
1580 $self->reset_timeout (1); 1604 $self->reset_timeout (1);
1581 $self->rename ("{nuke}/" . ($nuke_counter++)); 1605 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1606
1607 $cf::MAP{$self->path} = $self;
1608
1582 $self->reset; # polite request, might not happen 1609 $self->reset; # polite request, might not happen
1583} 1610}
1584 1611
1585=item cf::map::unique_maps 1612=item cf::map::unique_maps
1586 1613
… …
1817 1844
1818sub parse_random_map_params { 1845sub parse_random_map_params {
1819 my ($spec) = @_; 1846 my ($spec) = @_;
1820 1847
1821 my $rmp = { # defaults 1848 my $rmp = { # defaults
1822 xsize => 10, 1849 xsize => (cf::rndm 15, 40),
1823 ysize => 10, 1850 ysize => (cf::rndm 15, 40),
1851 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1852 #layout => string,
1824 }; 1853 };
1825 1854
1826 for (split /\n/, $spec) { 1855 for (split /\n/, $spec) {
1827 my ($k, $v) = split /\s+/, $_, 2; 1856 my ($k, $v) = split /\s+/, $_, 2;
1828 1857
… …
1832 $rmp 1861 $rmp
1833} 1862}
1834 1863
1835sub prepare_random_map { 1864sub prepare_random_map {
1836 my ($exit) = @_; 1865 my ($exit) = @_;
1866
1867 my $guard = cf::lock_acquire "exit_prepare:$exit";
1837 1868
1838 # all this does is basically replace the /! path by 1869 # all this does is basically replace the /! path by
1839 # a new random map path (?random/...) with a seed 1870 # a new random map path (?random/...) with a seed
1840 # that depends on the exit object 1871 # that depends on the exit object
1841 1872
… …
1850 1881
1851 $rmp->{random_seed} ||= $exit->random_seed; 1882 $rmp->{random_seed} ||= $exit->random_seed;
1852 1883
1853 my $data = cf::to_json $rmp; 1884 my $data = cf::to_json $rmp;
1854 my $md5 = Digest::MD5::md5_hex $data; 1885 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1855 1887
1856 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1857 aio_write $fh, 0, (length $data), $data, 0; 1889 aio_write $fh, 0, (length $data), $data, 0;
1890 undef $fh;
1891 aio_rename "$meta~", $meta;
1858 1892
1859 $exit->slaying ("?random/$md5"); 1893 $exit->slaying ("?random/$md5");
1860 $exit->msg (undef); 1894 $exit->msg (undef);
1861 } 1895 }
1862} 1896}
… …
2172 sub db_sync() { 2206 sub db_sync() {
2173 db_save if $dirty; 2207 db_save if $dirty;
2174 undef $dirty; 2208 undef $dirty;
2175 } 2209 }
2176 2210
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2211 my $idle = Event->idle (
2178 db_sync; 2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2179 }); 2218 );
2180 2219
2181 sub db_dirty() { 2220 sub db_dirty() {
2182 $dirty = 1; 2221 $dirty = 1;
2183 $idle->start; 2222 $idle->start;
2184 } 2223 }
… …
2232 2271
2233sub main { 2272sub main {
2234 # we must not ever block the main coroutine 2273 # we must not ever block the main coroutine
2235 local $Coro::idle = sub { 2274 local $Coro::idle = sub {
2236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2275 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2276 (async {
2237 async { Event::one_event }; 2277 Event::one_event;
2278 })->prio (Coro::PRIO_MAX);
2238 }; 2279 };
2239 2280
2240 cfg_load; 2281 cfg_load;
2241 db_load; 2282 db_load;
2242 load_extensions; 2283 load_extensions;
2284
2285 $TICK_WATCHER->start;
2243 Event::loop; 2286 Event::loop;
2244} 2287}
2245 2288
2246############################################################################# 2289#############################################################################
2247# initialisation and cleanup 2290# initialisation and cleanup
2248 2291
2249# install some emergency cleanup handlers 2292# install some emergency cleanup handlers
2250BEGIN { 2293BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2294 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2295 Event->signal (
2296 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2297 data => WF_AUTOCANCEL,
2254 signal => $signal, 2298 signal => $signal,
2255 cb => sub { 2299 cb => sub {
2256 cf::cleanup "SIG$signal"; 2300 cf::cleanup "SIG$signal";
2257 }, 2301 },
2258 ); 2302 );
2259 } 2303 }
2260} 2304}
… …
2289} 2333}
2290 2334
2291sub reload() { 2335sub reload() {
2292 # can/must only be called in main 2336 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2337 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2338 warn "can only reload from main coroutine";
2295 return; 2339 return;
2296 } 2340 }
2297 2341
2298 warn "reloading..."; 2342 warn "reloading...";
2299 2343
2300 warn "freezing server"; 2344 warn "cancelling server ticker";
2301 my $guard = freeze_mainloop; 2345 $TICK_WATCHER->cancel;
2346
2302 cf::emergency_save; 2347 cf::emergency_save;
2303
2304 warn "sync database to disk";
2305 cf::db_sync;
2306 IO::AIO::flush;
2307 2348
2308 eval { 2349 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2350 # if anything goes wrong in here, we should simply crash as we already saved
2310 2351
2352 warn "syncing database to disk";
2353 cf::db_sync;
2354
2311 warn "cancel all watchers"; 2355 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2356 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2357 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2358 }
2315 2359
2360 warn "flushing outstanding aio requests";
2361 for (;;) {
2362 IO::AIO::flush;
2363 Coro::cede;
2364 last unless IO::AIO::nreqs;
2365 warn "iterate...";
2366 }
2367
2316 warn "cancel all extension coros"; 2368 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2369 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2370 %EXT_CORO = ();
2319 2371
2320 warn "remove commands"; 2372 warn "removing commands";
2321 %COMMAND = (); 2373 %COMMAND = ();
2322 2374
2323 warn "remove ext commands"; 2375 warn "removing ext commands";
2324 %EXTCMD = (); 2376 %EXTCMD = ();
2325 2377
2326 warn "unload/nuke all extensions"; 2378 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2379 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2380 warn "... unloading $pkg";
2329 2381
2330 if (my $cb = $pkg->can ("unload")) { 2382 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2383 eval {
… …
2336 2388
2337 warn "... nuking $pkg"; 2389 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2390 Symbol::delete_package $pkg;
2339 } 2391 }
2340 2392
2341 warn "unload all perl modules loaded from $LIBDIR"; 2393 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2394 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2395 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2396
2345 warn "removing <$k>"; 2397 warn "... unloading $k";
2346 delete $INC{$k}; 2398 delete $INC{$k};
2347 2399
2348 $k =~ s/\.pm$//; 2400 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2401 $k =~ s/\//::/g;
2350 2402
… …
2353 } 2405 }
2354 2406
2355 Symbol::delete_package $k; 2407 Symbol::delete_package $k;
2356 } 2408 }
2357 2409
2358 warn "get rid of safe::, as good as possible"; 2410 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2411 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2412 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2413
2362 warn "unload cf.pm \"a bit\""; 2414 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2415 delete $INC{"cf.pm"};
2364 2416
2365 # don't, removes xs symbols, too, 2417 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2418 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2419 #Symbol::delete_package __PACKAGE__;
2368 2420
2421 warn "unload completed, starting to reload now";
2422
2369 warn "reloading cf.pm"; 2423 warn "reloading cf.pm";
2370 require cf; 2424 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2426
2373 warn "load config and database again"; 2427 warn "loading config and database again";
2374 cf::cfg_load; 2428 cf::cfg_load;
2375 cf::db_load; 2429 cf::db_load;
2376 2430
2377 warn "load extensions"; 2431 warn "loading extensions";
2378 cf::load_extensions; 2432 cf::load_extensions;
2379 2433
2380 warn "reattach attachments to objects/players"; 2434 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2435 _global_reattach;
2382 warn "reattach attachments to maps"; 2436 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2437 reattach $_ for values %MAP;
2438
2439 warn "restarting server ticker";
2440
2441 $TICK_WATCHER->start;
2384 }; 2442 };
2385 2443
2386 if ($@) { 2444 if ($@) {
2387 warn $@; 2445 warn $@;
2388 warn "error while reloading, exiting."; 2446 warn "error while reloading, exiting.";
… …
2390 } 2448 }
2391 2449
2392 warn "reloaded"; 2450 warn "reloaded";
2393}; 2451};
2394 2452
2453our $RELOAD_WATCHER; # used only during reload
2454
2395register_command "reload" => sub { 2455register_command "reload" => sub {
2396 my ($who, $arg) = @_; 2456 my ($who, $arg) = @_;
2397 2457
2398 if ($who->flag (FLAG_WIZ)) { 2458 if ($who->flag (FLAG_WIZ)) {
2399 $who->message ("start of reload."); 2459 $who->message ("reloading server.");
2460
2461 # doing reload synchronously and two reloads happen back-to-back,
2462 # coro crashes during coro_state_free->destroy here.
2463
2464 $RELOAD_WATCHER ||= Event->timer (
2465 reentrant => 0,
2466 after => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => sub {
2400 reload; 2469 reload;
2401 $who->message ("end of reload."); 2470 undef $RELOAD_WATCHER;
2471 },
2472 );
2402 } 2473 }
2403}; 2474};
2404 2475
2405unshift @INC, $LIBDIR; 2476unshift @INC, $LIBDIR;
2477
2478my $bug_warning = 0;
2406 2479
2407$TICK_WATCHER = Event->timer ( 2480$TICK_WATCHER = Event->timer (
2408 reentrant => 0, 2481 reentrant => 0,
2482 parked => 1,
2409 prio => 0, 2483 prio => -1,
2410 at => $NEXT_TICK || $TICK, 2484 at => $NEXT_TICK || $TICK,
2411 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2412 cb => sub { 2486 cb => sub {
2487 if ($Coro::current != $Coro::main) {
2488 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2489 unless ++$bug_warning > 10;
2490 return;
2491 }
2492
2413 $NOW = Event::time; 2493 $NOW = Event::time;
2414 2494
2415 cf::server_tick; # one server iteration 2495 cf::server_tick; # one server iteration
2416 $RUNTIME += $TICK; 2496 $RUNTIME += $TICK;
2417 $NEXT_TICK += $TICK; 2497 $NEXT_TICK += $TICK;
2418 2498
2419 $WAIT_FOR_TICK->broadcast; 2499 $WAIT_FOR_TICK->broadcast;
2420 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501
2502 my $AFTER = Event::time;
2503 warn $AFTER - $NOW;#d#
2421 2504
2422 # if we are delayed by four ticks or more, skip them all 2505 # if we are delayed by four ticks or more, skip them all
2423 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2506 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2424 2507
2425 $TICK_WATCHER->at ($NEXT_TICK); 2508 $TICK_WATCHER->at ($NEXT_TICK);
… …
2427 }, 2510 },
2428); 2511);
2429 2512
2430IO::AIO::max_poll_time $TICK * 0.2; 2513IO::AIO::max_poll_time $TICK * 0.2;
2431 2514
2515undef $Coro::AIO::WATCHER;
2432$AIO_POLL_WATCHER = Event->io ( 2516$AIO_POLL_WATCHER = Event->io (
2517 reentrant => 0,
2433 fd => IO::AIO::poll_fileno, 2518 fd => IO::AIO::poll_fileno,
2434 poll => 'r', 2519 poll => 'r',
2435 prio => 5, 2520 prio => 6,
2436 data => WF_AUTOCANCEL, 2521 data => WF_AUTOCANCEL,
2437 cb => \&IO::AIO::poll_cb, 2522 cb => \&IO::AIO::poll_cb,
2438); 2523);
2439 2524
2440$WRITE_RUNTIME_WATCHER = Event->timer ( 2525$WRITE_RUNTIME_WATCHER = Event->timer (
2526 reentrant => 0,
2441 data => WF_AUTOCANCEL, 2527 data => WF_AUTOCANCEL,
2442 after => 0, 2528 after => 1,
2443 interval => 10, 2529 interval => 10,
2444 cb => sub { 2530 prio => 6, # keep it lowest so it acts like a watchdog
2445 (Coro::unblock_sub { 2531 cb => Coro::unblock_sub {
2446 write_runtime 2532 write_runtime
2447 or warn "ERROR: unable to write runtime file: $!"; 2533 or warn "ERROR: unable to write runtime file: $!";
2448 })->();
2449 }, 2534 },
2450); 2535);
2451 2536
2452END { cf::emergency_save } 2537END { cf::emergency_save }
2453 2538

Diff Legend

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