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

Diff Legend

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