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.177 by root, Sun Jan 14 22:54:18 2007 UTC vs.
Revision 1.196 by root, Sat Jan 27 23:59:29 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.4 (); 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
… …
1339 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
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 && 0) {#d#TODO# disabled, crashy (locking issue?)
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
1385 local $self->{deny_reset} = 1; # loading can take a long time
1386
1359 my $path = $self->{path}; 1387 my $path = $self->{path};
1360 my $guard = cf::lock_acquire "map_load:$path"; 1388 my $guard = cf::lock_acquire "map_load:$path";
1361 1389
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1390 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1391
1364 $self->in_memory (cf::MAP_LOADING); 1392 $self->in_memory (cf::MAP_LOADING);
1365 1393
1366 $self->alloc; 1394 $self->alloc;
1395
1396 $self->pre_load;
1397
1367 $self->_load_objects ($self->{load_path}, 1) 1398 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1399 or return;
1369 1400
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1401 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1402 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1424 unless $self->difficulty;
1394 Coro::cede; 1425 Coro::cede;
1395 $self->activate; 1426 $self->activate;
1396 } 1427 }
1397 1428
1429 $self->post_load;
1430
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1431 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1432}
1400 1433
1401sub customise_for { 1434sub customise_for {
1402 my ($self, $ob) = @_; 1435 my ($self, $ob) = @_;
… …
1442 1475
1443 cf::sync_job { $map->load }; 1476 cf::sync_job { $map->load };
1444} 1477}
1445 1478
1446our %MAP_PREFETCH; 1479our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1480our $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 1481
1460sub find_async { 1482sub find_async {
1461 my ($path, $origin) = @_; 1483 my ($path, $origin) = @_;
1462 1484
1463 $path = normalise $path, $origin && $origin->{path}; 1485 $path = normalise $path, $origin && $origin->{path};
1464 1486
1465 if (my $map = $cf::MAP{$path}) { 1487 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1488 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1489 }
1468 1490
1469 $MAP_PREFETCH{$path} = 0; 1491 undef $MAP_PREFETCH{$path};
1492 $MAP_PREFETCHER ||= cf::async {
1493 while (%MAP_PREFETCH) {
1494 for my $path (keys %MAP_PREFETCH) {
1495 my $map = find $path
1496 or next;
1497 $map->load;
1498
1499 delete $MAP_PREFETCH{$path};
1500 }
1501 }
1502 undef $MAP_PREFETCHER;
1503 };
1470 $MAP_PREFETCHER->ready; 1504 $MAP_PREFETCHER->prio (6);
1471 1505
1472 () 1506 ()
1473} 1507}
1474 1508
1475sub save { 1509sub save {
… …
1699=cut 1733=cut
1700 1734
1701sub link_map { 1735sub link_map {
1702 unless ($LINK_MAP) { 1736 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1737 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1738 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1739 $LINK_MAP->load;
1706 } 1740 }
1707 1741
1708 $LINK_MAP 1742 $LINK_MAP
1709} 1743}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1750 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1751
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1753 if $self->map;
1720 1754
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1755 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1756}
1723 1757
1724sub cf::object::player::leave_link { 1758sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1759 my ($self, $map, $x, $y) = @_;
1726 1760
… …
1813 1847
1814sub parse_random_map_params { 1848sub parse_random_map_params {
1815 my ($spec) = @_; 1849 my ($spec) = @_;
1816 1850
1817 my $rmp = { # defaults 1851 my $rmp = { # defaults
1818 xsize => 10, 1852 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 1853 ysize => (cf::rndm 15, 40),
1854 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1855 #layout => string,
1820 }; 1856 };
1821 1857
1822 for (split /\n/, $spec) { 1858 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 1859 my ($k, $v) = split /\s+/, $_, 2;
1824 1860
… …
1828 $rmp 1864 $rmp
1829} 1865}
1830 1866
1831sub prepare_random_map { 1867sub prepare_random_map {
1832 my ($exit) = @_; 1868 my ($exit) = @_;
1869
1870 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 1871
1834 # all this does is basically replace the /! path by 1872 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 1873 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 1874 # that depends on the exit object
1837 1875
… …
1863sub cf::object::player::enter_exit { 1901sub cf::object::player::enter_exit {
1864 my ($self, $exit) = @_; 1902 my ($self, $exit) = @_;
1865 1903
1866 return unless $self->type == cf::PLAYER; 1904 return unless $self->type == cf::PLAYER;
1867 1905
1906 if ($exit->slaying eq "/!") {
1907 #TODO: this should de-fi-ni-te-ly not be a sync-job
1908 cf::sync_job { prepare_random_map $exit };
1909 }
1910
1911 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1912 my $hp = $exit->stats->hp;
1913 my $sp = $exit->stats->sp;
1914
1868 $self->enter_link; 1915 $self->enter_link;
1869 1916
1870 (async { 1917 (async {
1871 $self->deactivate_recursive; # just to be sure 1918 $self->deactivate_recursive; # just to be sure
1872 unless (eval { 1919 unless (eval {
1873 prepare_random_map $exit 1920 $self->goto ($slaying, $hp, $sp);
1874 if $exit->slaying eq "/!";
1875
1876 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1877 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1878 1921
1879 1; 1922 1;
1880 }) { 1923 }) {
1881 $self->message ("Something went wrong deep within the crossfire server. " 1924 $self->message ("Something went wrong deep within the crossfire server. "
1882 . "I'll try to bring you back to the map you were before. " 1925 . "I'll try to bring you back to the map you were before. "
… …
2171 sub db_sync() { 2214 sub db_sync() {
2172 db_save if $dirty; 2215 db_save if $dirty;
2173 undef $dirty; 2216 undef $dirty;
2174 } 2217 }
2175 2218
2176 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2219 my $idle = Event->idle (
2177 db_sync; 2220 reentrant => 0,
2221 min => 10,
2222 max => 20,
2223 repeat => 0,
2224 data => WF_AUTOCANCEL,
2225 cb => \&db_sync,
2178 }); 2226 );
2179 2227
2180 sub db_dirty() { 2228 sub db_dirty() {
2181 $dirty = 1; 2229 $dirty = 1;
2182 $idle->start; 2230 $idle->start;
2183 } 2231 }
… …
2239 }; 2287 };
2240 2288
2241 cfg_load; 2289 cfg_load;
2242 db_load; 2290 db_load;
2243 load_extensions; 2291 load_extensions;
2292
2293 $TICK_WATCHER->start;
2244 Event::loop; 2294 Event::loop;
2245} 2295}
2246 2296
2247############################################################################# 2297#############################################################################
2248# initialisation and cleanup 2298# initialisation and cleanup
2249 2299
2250# install some emergency cleanup handlers 2300# install some emergency cleanup handlers
2251BEGIN { 2301BEGIN {
2252 for my $signal (qw(INT HUP TERM)) { 2302 for my $signal (qw(INT HUP TERM)) {
2253 Event->signal ( 2303 Event->signal (
2304 reentrant => 0,
2254 data => WF_AUTOCANCEL, 2305 data => WF_AUTOCANCEL,
2255 signal => $signal, 2306 signal => $signal,
2307 prio => 0,
2256 cb => sub { 2308 cb => sub {
2257 cf::cleanup "SIG$signal"; 2309 cf::cleanup "SIG$signal";
2258 }, 2310 },
2259 ); 2311 );
2260 } 2312 }
2261} 2313}
… …
2290} 2342}
2291 2343
2292sub reload() { 2344sub reload() {
2293 # can/must only be called in main 2345 # can/must only be called in main
2294 if ($Coro::current != $Coro::main) { 2346 if ($Coro::current != $Coro::main) {
2295 warn "can only reload from main coroutine\n"; 2347 warn "can only reload from main coroutine";
2296 return; 2348 return;
2297 } 2349 }
2298 2350
2299 warn "reloading..."; 2351 warn "reloading...";
2300 2352
2301 warn "freezing server"; 2353 warn "cancelling server ticker";
2302 my $guard = freeze_mainloop; 2354 $TICK_WATCHER->cancel;
2355
2303 cf::emergency_save; 2356 cf::emergency_save;
2304
2305 warn "sync database to disk";
2306 cf::db_sync;
2307 IO::AIO::flush;
2308 2357
2309 eval { 2358 eval {
2310 # if anything goes wrong in here, we should simply crash as we already saved 2359 # if anything goes wrong in here, we should simply crash as we already saved
2311 2360
2361 warn "syncing database to disk";
2362 cf::db_sync;
2363
2312 warn "cancel all watchers"; 2364 warn "cancelling all WF_AUTOCANCEL watchers";
2313 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2314 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2315 } 2367 }
2316 2368
2369 warn "flushing outstanding aio requests";
2370 for (;;) {
2371 IO::AIO::flush;
2372 Coro::cede;
2373 last unless IO::AIO::nreqs;
2374 warn "iterate...";
2375 }
2376
2317 warn "cancel all extension coros"; 2377 warn "cancelling all extension coros";
2318 $_->cancel for values %EXT_CORO; 2378 $_->cancel for values %EXT_CORO;
2319 %EXT_CORO = (); 2379 %EXT_CORO = ();
2320 2380
2321 warn "remove commands"; 2381 warn "removing commands";
2322 %COMMAND = (); 2382 %COMMAND = ();
2323 2383
2324 warn "remove ext commands"; 2384 warn "removing ext commands";
2325 %EXTCMD = (); 2385 %EXTCMD = ();
2326 2386
2327 warn "unload/nuke all extensions"; 2387 warn "unloading/nuking all extensions";
2328 for my $pkg (@EXTS) { 2388 for my $pkg (@EXTS) {
2329 warn "... unloading $pkg"; 2389 warn "... unloading $pkg";
2330 2390
2331 if (my $cb = $pkg->can ("unload")) { 2391 if (my $cb = $pkg->can ("unload")) {
2332 eval { 2392 eval {
… …
2337 2397
2338 warn "... nuking $pkg"; 2398 warn "... nuking $pkg";
2339 Symbol::delete_package $pkg; 2399 Symbol::delete_package $pkg;
2340 } 2400 }
2341 2401
2342 warn "unload all perl modules loaded from $LIBDIR"; 2402 warn "unloading all perl modules loaded from $LIBDIR";
2343 while (my ($k, $v) = each %INC) { 2403 while (my ($k, $v) = each %INC) {
2344 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2404 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2345 2405
2346 warn "removing <$k>"; 2406 warn "... unloading $k";
2347 delete $INC{$k}; 2407 delete $INC{$k};
2348 2408
2349 $k =~ s/\.pm$//; 2409 $k =~ s/\.pm$//;
2350 $k =~ s/\//::/g; 2410 $k =~ s/\//::/g;
2351 2411
… …
2354 } 2414 }
2355 2415
2356 Symbol::delete_package $k; 2416 Symbol::delete_package $k;
2357 } 2417 }
2358 2418
2359 warn "get rid of safe::, as good as possible"; 2419 warn "getting rid of safe::, as good as possible";
2360 Symbol::delete_package "safe::$_" 2420 Symbol::delete_package "safe::$_"
2361 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2421 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2362 2422
2363 warn "unload cf.pm \"a bit\""; 2423 warn "unloading cf.pm \"a bit\"";
2364 delete $INC{"cf.pm"}; 2424 delete $INC{"cf.pm"};
2365 2425
2366 # don't, removes xs symbols, too, 2426 # don't, removes xs symbols, too,
2367 # and global variables created in xs 2427 # and global variables created in xs
2368 #Symbol::delete_package __PACKAGE__; 2428 #Symbol::delete_package __PACKAGE__;
2369 2429
2430 warn "unload completed, starting to reload now";
2431
2370 warn "reloading cf.pm"; 2432 warn "reloading cf.pm";
2371 require cf; 2433 require cf;
2372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2434 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2373 2435
2374 warn "load config and database again"; 2436 warn "loading config and database again";
2375 cf::cfg_load; 2437 cf::cfg_load;
2376 cf::db_load; 2438 cf::db_load;
2377 2439
2378 warn "load extensions"; 2440 warn "loading extensions";
2379 cf::load_extensions; 2441 cf::load_extensions;
2380 2442
2381 warn "reattach attachments to objects/players"; 2443 warn "reattaching attachments to objects/players";
2382 _global_reattach; 2444 _global_reattach;
2383 warn "reattach attachments to maps"; 2445 warn "reattaching attachments to maps";
2384 reattach $_ for values %MAP; 2446 reattach $_ for values %MAP;
2447
2448 warn "restarting server ticker";
2449
2450 $TICK_WATCHER->start;
2385 }; 2451 };
2386 2452
2387 if ($@) { 2453 if ($@) {
2388 warn $@; 2454 warn $@;
2389 warn "error while reloading, exiting."; 2455 warn "error while reloading, exiting.";
… …
2402 $who->message ("reloading server."); 2468 $who->message ("reloading server.");
2403 2469
2404 # doing reload synchronously and two reloads happen back-to-back, 2470 # doing reload synchronously and two reloads happen back-to-back,
2405 # coro crashes during coro_state_free->destroy here. 2471 # coro crashes during coro_state_free->destroy here.
2406 2472
2407 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2473 $RELOAD_WATCHER ||= Event->timer (
2474 reentrant => 0,
2475 after => 0,
2476 data => WF_AUTOCANCEL,
2477 cb => sub {
2408 reload; 2478 reload;
2409 undef $RELOAD_WATCHER; 2479 undef $RELOAD_WATCHER;
2480 },
2410 }); 2481 );
2411 } 2482 }
2412}; 2483};
2413 2484
2414unshift @INC, $LIBDIR; 2485unshift @INC, $LIBDIR;
2486
2487my $bug_warning = 0;
2415 2488
2416$TICK_WATCHER = Event->timer ( 2489$TICK_WATCHER = Event->timer (
2417 reentrant => 0, 2490 reentrant => 0,
2491 parked => 1,
2418 prio => 0, 2492 prio => 0,
2419 at => $NEXT_TICK || $TICK, 2493 at => $NEXT_TICK || $TICK,
2420 data => WF_AUTOCANCEL, 2494 data => WF_AUTOCANCEL,
2421 cb => sub { 2495 cb => sub {
2496 if ($Coro::current != $Coro::main) {
2497 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2498 unless ++$bug_warning > 10;
2499 return;
2500 }
2501
2422 $NOW = Event::time; 2502 $NOW = Event::time;
2423 2503
2424 cf::server_tick; # one server iteration 2504 cf::server_tick; # one server iteration
2425 $RUNTIME += $TICK; 2505 $RUNTIME += $TICK;
2426 $NEXT_TICK += $TICK; 2506 $NEXT_TICK += $TICK;
2427 2507
2428 $WAIT_FOR_TICK->broadcast; 2508 $WAIT_FOR_TICK->broadcast;
2429 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2509 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2510
2511 Event::sweep;
2512 Coro::cede_notself;
2513
2514# my $AFTER = Event::time;
2515# warn $AFTER - $NOW;#d#
2430 2516
2431 # if we are delayed by four ticks or more, skip them all 2517 # if we are delayed by four ticks or more, skip them all
2432 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2518 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2433 2519
2434 $TICK_WATCHER->at ($NEXT_TICK); 2520 $TICK_WATCHER->at ($NEXT_TICK);
2435 $TICK_WATCHER->start; 2521 $TICK_WATCHER->start;
2436 }, 2522 },
2437); 2523);
2438 2524
2439IO::AIO::max_poll_time $TICK * 0.2; 2525IO::AIO::max_poll_time $TICK * 0.1;
2440 2526
2527undef $Coro::AIO::WATCHER;
2441$AIO_POLL_WATCHER = Event->io ( 2528$AIO_POLL_WATCHER = Event->io (
2529 reentrant => 0,
2442 fd => IO::AIO::poll_fileno, 2530 fd => IO::AIO::poll_fileno,
2443 poll => 'r', 2531 poll => 'r',
2444 prio => 5, 2532 prio => 6,
2445 data => WF_AUTOCANCEL, 2533 data => WF_AUTOCANCEL,
2446 cb => \&IO::AIO::poll_cb, 2534 cb => \&IO::AIO::poll_cb,
2447); 2535);
2448 2536
2449$WRITE_RUNTIME_WATCHER = Event->timer ( 2537$WRITE_RUNTIME_WATCHER = Event->timer (
2538 reentrant => 0,
2450 data => WF_AUTOCANCEL, 2539 data => WF_AUTOCANCEL,
2451 after => 0, 2540 after => 1,
2452 interval => 10, 2541 interval => 10,
2453 cb => sub { 2542 prio => 6, # keep it lowest so it acts like a watchdog
2454 (Coro::unblock_sub { 2543 cb => Coro::unblock_sub {
2455 write_runtime 2544 write_runtime
2456 or warn "ERROR: unable to write runtime file: $!"; 2545 or warn "ERROR: unable to write runtime file: $!";
2457 })->();
2458 }, 2546 },
2459); 2547);
2460 2548
2461END { cf::emergency_save } 2549END { cf::emergency_save }
2462 2550

Diff Legend

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