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.171 by root, Sun Jan 14 12:24:48 2007 UTC vs.
Revision 1.189 by root, Sun Jan 21 21:28:27 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 {
1167 my ($self, $merge) = @_;
1168
1156 # we have to keep some variables in memory intact 1169 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1170 local $self->{path};
1171 local $self->{load_path};
1158 local $_[0]{deny_save}; 1172 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1173 local $self->{deny_reset};
1160 1174
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1175 $self->SUPER::thawer_merge ($merge);
1162} 1176}
1163 1177
1164sub normalise { 1178sub normalise {
1165 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1166 1180
… …
1198 1212
1199 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
1200 1214
1201 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1202 1216
1203 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1205 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1208 return $self; 1222 return $self;
1209 } 1223 }
… …
1283 $self->{load_path} = $path; 1297 $self->{load_path} = $path;
1284 1298
1285 1 1299 1
1286} 1300}
1287 1301
1288sub load_orig { 1302sub load_header_orig {
1289 my ($self) = @_; 1303 my ($self) = @_;
1290 1304
1291 $self->load_header_from ($self->load_path) 1305 $self->load_header_from ($self->load_path)
1292} 1306}
1293 1307
1294sub load_temp { 1308sub load_header_temp {
1295 my ($self) = @_; 1309 my ($self) = @_;
1296 1310
1297 $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;
1298} 1331}
1299 1332
1300sub load_header { 1333sub load_header {
1301 my ($self) = @_; 1334 my ($self) = @_;
1302 1335
1303 if ($self->load_temp) { 1336 if ($self->load_header_temp) {
1304 $self->last_access ((delete $self->{last_access}) 1337 $self->prepare_temp;
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else { 1338 } else {
1310 $self->load_orig 1339 $self->load_header_orig
1311 or return; 1340 or return;
1312 1341 $self->prepare_orig;
1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 } 1342 }
1318 1343
1319 1 1344 1
1320} 1345}
1321 1346
… …
1336 1361
1337 $map->load_header 1362 $map->load_header
1338 or return; 1363 or return;
1339 1364
1340 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1341 $cf::WAIT_FOR_TICK->wait; 1367 #$cf::WAIT_FOR_TICK->wait;
1342 $map->reset; 1368 $map->reset;
1343 undef $guard; 1369 undef $guard;
1344 $map = find $path 1370 $map = find $path
1345 or return; 1371 or return;
1346 } 1372 }
1347 1373
1348 $cf::MAP{$path} = $map 1374 $cf::MAP{$path} = $map
1349 } 1375 }
1350} 1376}
1351 1377
1378sub pre_load { }
1379sub post_load { }
1380
1352sub load { 1381sub load {
1353 my ($self) = @_; 1382 my ($self) = @_;
1354 1383
1355 my $path = $self->{path}; 1384 my $path = $self->{path};
1356 my $guard = cf::lock_acquire "map_load:$path"; 1385 my $guard = cf::lock_acquire "map_load:$path";
… …
1358 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1359 1388
1360 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1361 1390
1362 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1363 $self->_load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1364 or return; 1396 or return;
1365 1397
1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1367 if delete $self->{load_original}; 1399 if delete $self->{load_original};
… …
1389 unless $self->difficulty; 1421 unless $self->difficulty;
1390 Coro::cede; 1422 Coro::cede;
1391 $self->activate; 1423 $self->activate;
1392 } 1424 }
1393 1425
1426 $self->post_load;
1427
1394 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1395} 1429}
1396 1430
1397sub customise_for { 1431sub customise_for {
1398 my ($self, $ob) = @_; 1432 my ($self, $ob) = @_;
… …
1438 1472
1439 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1440} 1474}
1441 1475
1442our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async { 1477our $MAP_PREFETCHER = undef;
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455 1478
1456sub find_async { 1479sub find_async {
1457 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1458 1481
1459 $path = normalise $path, $origin && $origin->{path}; 1482 $path = normalise $path, $origin && $origin->{path};
1460 1483
1461 if (my $map = $cf::MAP{$path}) { 1484 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 } 1486 }
1464 1487
1465 $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 };
1466 $MAP_PREFETCHER->ready; 1501 $MAP_PREFETCHER->prio (6);
1467 1502
1468 () 1503 ()
1469} 1504}
1470 1505
1471sub save { 1506sub save {
… …
1531 my ($self) = @_; 1566 my ($self) = @_;
1532 1567
1533 $self->reset_at <= $cf::RUNTIME 1568 $self->reset_at <= $cf::RUNTIME
1534} 1569}
1535 1570
1536sub rename {
1537 my ($self, $new_path) = @_;
1538
1539 normalise $new_path;
1540
1541 $self->unlink_save;
1542
1543 delete $cf::MAP{$self->path};
1544 $self->{path} = $new_path; $self->path ($self->{path});
1545 $cf::MAP{$self->path} = $self;
1546
1547 $self->save;
1548}
1549
1550sub reset { 1571sub reset {
1551 my ($self) = @_; 1572 my ($self) = @_;
1552 1573
1553 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1574 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 1575
… …
1571my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1572 1593
1573sub nuke { 1594sub nuke {
1574 my ($self) = @_; 1595 my ($self) = @_;
1575 1596
1597 delete $cf::MAP{$self->path};
1598
1599 $self->unlink_save;
1600
1601 bless $self, "cf::map";
1602 delete $self->{deny_reset};
1576 $self->{deny_save} = 1; 1603 $self->{deny_save} = 1;
1577 $self->reset_timeout (1); 1604 $self->reset_timeout (1);
1578 $self->rename ("{nuke}/" . ($nuke_counter++)); 1605 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1606
1607 $cf::MAP{$self->path} = $self;
1608
1579 $self->reset; # polite request, might not happen 1609 $self->reset; # polite request, might not happen
1580} 1610}
1581 1611
1582=item cf::map::unique_maps 1612=item cf::map::unique_maps
1583 1613
… …
1814 1844
1815sub parse_random_map_params { 1845sub parse_random_map_params {
1816 my ($spec) = @_; 1846 my ($spec) = @_;
1817 1847
1818 my $rmp = { # defaults 1848 my $rmp = { # defaults
1819 xsize => 10, 1849 xsize => (cf::rndm 15, 40),
1820 ysize => 10, 1850 ysize => (cf::rndm 15, 40),
1851 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1852 #layout => string,
1821 }; 1853 };
1822 1854
1823 for (split /\n/, $spec) { 1855 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1856 my ($k, $v) = split /\s+/, $_, 2;
1825 1857
… …
1829 $rmp 1861 $rmp
1830} 1862}
1831 1863
1832sub prepare_random_map { 1864sub prepare_random_map {
1833 my ($exit) = @_; 1865 my ($exit) = @_;
1866
1867 my $guard = cf::lock_acquire "exit_prepare:$exit";
1834 1868
1835 # all this does is basically replace the /! path by 1869 # all this does is basically replace the /! path by
1836 # a new random map path (?random/...) with a seed 1870 # a new random map path (?random/...) with a seed
1837 # that depends on the exit object 1871 # that depends on the exit object
1838 1872
… …
1847 1881
1848 $rmp->{random_seed} ||= $exit->random_seed; 1882 $rmp->{random_seed} ||= $exit->random_seed;
1849 1883
1850 my $data = cf::to_json $rmp; 1884 my $data = cf::to_json $rmp;
1851 my $md5 = Digest::MD5::md5_hex $data; 1885 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1852 1887
1853 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) {
1854 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;
1855 1892
1856 $exit->slaying ("?random/$md5"); 1893 $exit->slaying ("?random/$md5");
1857 $exit->msg (undef); 1894 $exit->msg (undef);
1858 } 1895 }
1859} 1896}
… …
2169 sub db_sync() { 2206 sub db_sync() {
2170 db_save if $dirty; 2207 db_save if $dirty;
2171 undef $dirty; 2208 undef $dirty;
2172 } 2209 }
2173 2210
2174 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2211 my $idle = Event->idle (
2175 db_sync; 2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2176 }); 2218 );
2177 2219
2178 sub db_dirty() { 2220 sub db_dirty() {
2179 $dirty = 1; 2221 $dirty = 1;
2180 $idle->start; 2222 $idle->start;
2181 } 2223 }
… …
2229 2271
2230sub main { 2272sub main {
2231 # we must not ever block the main coroutine 2273 # we must not ever block the main coroutine
2232 local $Coro::idle = sub { 2274 local $Coro::idle = sub {
2233 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 {
2234 async { Event::one_event }; 2277 Event::one_event;
2278 })->prio (Coro::PRIO_MAX);
2235 }; 2279 };
2236 2280
2237 cfg_load; 2281 cfg_load;
2238 db_load; 2282 db_load;
2239 load_extensions; 2283 load_extensions;
2284
2285 $TICK_WATCHER->start;
2240 Event::loop; 2286 Event::loop;
2241} 2287}
2242 2288
2243############################################################################# 2289#############################################################################
2244# initialisation and cleanup 2290# initialisation and cleanup
2245 2291
2246# install some emergency cleanup handlers 2292# install some emergency cleanup handlers
2247BEGIN { 2293BEGIN {
2248 for my $signal (qw(INT HUP TERM)) { 2294 for my $signal (qw(INT HUP TERM)) {
2249 Event->signal ( 2295 Event->signal (
2296 reentrant => 0,
2250 data => WF_AUTOCANCEL, 2297 data => WF_AUTOCANCEL,
2251 signal => $signal, 2298 signal => $signal,
2252 cb => sub { 2299 cb => sub {
2253 cf::cleanup "SIG$signal"; 2300 cf::cleanup "SIG$signal";
2254 }, 2301 },
2255 ); 2302 );
2256 } 2303 }
2257} 2304}
… …
2286} 2333}
2287 2334
2288sub reload() { 2335sub reload() {
2289 # can/must only be called in main 2336 # can/must only be called in main
2290 if ($Coro::current != $Coro::main) { 2337 if ($Coro::current != $Coro::main) {
2291 warn "can only reload from main coroutine\n"; 2338 warn "can only reload from main coroutine";
2292 return; 2339 return;
2293 } 2340 }
2294 2341
2295 warn "reloading..."; 2342 warn "reloading...";
2296 2343
2297 warn "freezing server"; 2344 warn "cancelling server ticker";
2298 my $guard = freeze_mainloop; 2345 $TICK_WATCHER->cancel;
2346
2299 cf::emergency_save; 2347 cf::emergency_save;
2300
2301 warn "sync database to disk";
2302 cf::db_sync;
2303 IO::AIO::flush;
2304 2348
2305 eval { 2349 eval {
2306 # 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
2307 2351
2352 warn "syncing database to disk";
2353 cf::db_sync;
2354
2308 warn "cancel all watchers"; 2355 warn "cancelling all WF_AUTOCANCEL watchers";
2309 for (Event::all_watchers) { 2356 for (Event::all_watchers) {
2310 $_->cancel if $_->data & WF_AUTOCANCEL; 2357 $_->cancel if $_->data & WF_AUTOCANCEL;
2311 } 2358 }
2312 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
2313 warn "cancel all extension coros"; 2368 warn "cancelling all extension coros";
2314 $_->cancel for values %EXT_CORO; 2369 $_->cancel for values %EXT_CORO;
2315 %EXT_CORO = (); 2370 %EXT_CORO = ();
2316 2371
2317 warn "remove commands"; 2372 warn "removing commands";
2318 %COMMAND = (); 2373 %COMMAND = ();
2319 2374
2320 warn "remove ext commands"; 2375 warn "removing ext commands";
2321 %EXTCMD = (); 2376 %EXTCMD = ();
2322 2377
2323 warn "unload/nuke all extensions"; 2378 warn "unloading/nuking all extensions";
2324 for my $pkg (@EXTS) { 2379 for my $pkg (@EXTS) {
2325 warn "... unloading $pkg"; 2380 warn "... unloading $pkg";
2326 2381
2327 if (my $cb = $pkg->can ("unload")) { 2382 if (my $cb = $pkg->can ("unload")) {
2328 eval { 2383 eval {
… …
2333 2388
2334 warn "... nuking $pkg"; 2389 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg; 2390 Symbol::delete_package $pkg;
2336 } 2391 }
2337 2392
2338 warn "unload all perl modules loaded from $LIBDIR"; 2393 warn "unloading all perl modules loaded from $LIBDIR";
2339 while (my ($k, $v) = each %INC) { 2394 while (my ($k, $v) = each %INC) {
2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2395 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2341 2396
2342 warn "removing <$k>"; 2397 warn "... unloading $k";
2343 delete $INC{$k}; 2398 delete $INC{$k};
2344 2399
2345 $k =~ s/\.pm$//; 2400 $k =~ s/\.pm$//;
2346 $k =~ s/\//::/g; 2401 $k =~ s/\//::/g;
2347 2402
… …
2350 } 2405 }
2351 2406
2352 Symbol::delete_package $k; 2407 Symbol::delete_package $k;
2353 } 2408 }
2354 2409
2355 warn "get rid of safe::, as good as possible"; 2410 warn "getting rid of safe::, as good as possible";
2356 Symbol::delete_package "safe::$_" 2411 Symbol::delete_package "safe::$_"
2357 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);
2358 2413
2359 warn "unload cf.pm \"a bit\""; 2414 warn "unloading cf.pm \"a bit\"";
2360 delete $INC{"cf.pm"}; 2415 delete $INC{"cf.pm"};
2361 2416
2362 # don't, removes xs symbols, too, 2417 # don't, removes xs symbols, too,
2363 # and global variables created in xs 2418 # and global variables created in xs
2364 #Symbol::delete_package __PACKAGE__; 2419 #Symbol::delete_package __PACKAGE__;
2365 2420
2421 warn "unload completed, starting to reload now";
2422
2366 warn "reloading cf.pm"; 2423 warn "reloading cf.pm";
2367 require cf; 2424 require cf;
2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2369 2426
2370 warn "load config and database again"; 2427 warn "loading config and database again";
2371 cf::cfg_load; 2428 cf::cfg_load;
2372 cf::db_load; 2429 cf::db_load;
2373 2430
2374 warn "load extensions"; 2431 warn "loading extensions";
2375 cf::load_extensions; 2432 cf::load_extensions;
2376 2433
2377 warn "reattach attachments to objects/players"; 2434 warn "reattaching attachments to objects/players";
2378 _global_reattach; 2435 _global_reattach;
2379 warn "reattach attachments to maps"; 2436 warn "reattaching attachments to maps";
2380 reattach $_ for values %MAP; 2437 reattach $_ for values %MAP;
2438
2439 warn "restarting server ticker";
2440
2441 $TICK_WATCHER->start;
2381 }; 2442 };
2382 2443
2383 if ($@) { 2444 if ($@) {
2384 warn $@; 2445 warn $@;
2385 warn "error while reloading, exiting."; 2446 warn "error while reloading, exiting.";
… …
2387 } 2448 }
2388 2449
2389 warn "reloaded"; 2450 warn "reloaded";
2390}; 2451};
2391 2452
2453our $RELOAD_WATCHER; # used only during reload
2454
2392register_command "reload" => sub { 2455register_command "reload" => sub {
2393 my ($who, $arg) = @_; 2456 my ($who, $arg) = @_;
2394 2457
2395 if ($who->flag (FLAG_WIZ)) { 2458 if ($who->flag (FLAG_WIZ)) {
2396 $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 {
2397 reload; 2469 reload;
2398 $who->message ("end of reload."); 2470 undef $RELOAD_WATCHER;
2471 },
2472 );
2399 } 2473 }
2400}; 2474};
2401 2475
2402unshift @INC, $LIBDIR; 2476unshift @INC, $LIBDIR;
2477
2478my $bug_warning = 0;
2403 2479
2404$TICK_WATCHER = Event->timer ( 2480$TICK_WATCHER = Event->timer (
2405 reentrant => 0, 2481 reentrant => 0,
2482 parked => 1,
2406 prio => 0, 2483 prio => 0,
2407 at => $NEXT_TICK || $TICK, 2484 at => $NEXT_TICK || $TICK,
2408 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2409 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
2410 $NOW = Event::time; 2493 $NOW = Event::time;
2411 2494
2412 cf::server_tick; # one server iteration 2495 cf::server_tick; # one server iteration
2413 $RUNTIME += $TICK; 2496 $RUNTIME += $TICK;
2414 $NEXT_TICK += $TICK; 2497 $NEXT_TICK += $TICK;
… …
2424 }, 2507 },
2425); 2508);
2426 2509
2427IO::AIO::max_poll_time $TICK * 0.2; 2510IO::AIO::max_poll_time $TICK * 0.2;
2428 2511
2512undef $Coro::AIO::WATCHER;
2429$AIO_POLL_WATCHER = Event->io ( 2513$AIO_POLL_WATCHER = Event->io (
2514 reentrant => 0,
2430 fd => IO::AIO::poll_fileno, 2515 fd => IO::AIO::poll_fileno,
2431 poll => 'r', 2516 poll => 'r',
2432 prio => 5, 2517 prio => 6,
2433 data => WF_AUTOCANCEL, 2518 data => WF_AUTOCANCEL,
2434 cb => \&IO::AIO::poll_cb, 2519 cb => \&IO::AIO::poll_cb,
2435); 2520);
2436 2521
2437$WRITE_RUNTIME_WATCHER = Event->timer ( 2522$WRITE_RUNTIME_WATCHER = Event->timer (
2523 reentrant => 0,
2438 data => WF_AUTOCANCEL, 2524 data => WF_AUTOCANCEL,
2439 after => 0, 2525 after => 1,
2440 interval => 10, 2526 interval => 10,
2441 cb => sub { 2527 prio => 6, # keep it lowest so it acts like a watchdog
2442 (Coro::unblock_sub { 2528 cb => Coro::unblock_sub {
2443 write_runtime 2529 write_runtime
2444 or warn "ERROR: unable to write runtime file: $!"; 2530 or warn "ERROR: unable to write runtime file: $!";
2445 })->();
2446 }, 2531 },
2447); 2532);
2448 2533
2449END { cf::emergency_save } 2534END { cf::emergency_save }
2450 2535

Diff Legend

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