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.178 by root, Thu Jan 18 00:06:55 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];
… …
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
… …
1164 $self->SUPER::thawer_merge ($merge); 1175 $self->SUPER::thawer_merge ($merge);
1165} 1176}
1166 1177
1167sub normalise { 1178sub normalise {
1168 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1169 1182
1170 # map plan: 1183 # map plan:
1171 # 1184 #
1172 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
… …
1201 1214
1202 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
1203 1216
1204 $path = normalise $path, $base; 1217 $path = normalise $path, $base;
1205 1218
1206 for my $pkg (keys %EXT_MAP) { 1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1221 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1222 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1211 return $self; 1224 return $self;
1212 } 1225 }
1213 } 1226 }
1214 1227
1215 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1229 ()
1217} 1230}
1218 1231
1219sub init { 1232sub init {
1220 my ($self) = @_; 1233 my ($self) = @_;
… …
1286 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1287 1300
1288 1 1301 1
1289} 1302}
1290 1303
1291sub load_orig { 1304sub load_header_orig {
1292 my ($self) = @_; 1305 my ($self) = @_;
1293 1306
1294 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1295} 1308}
1296 1309
1297sub load_temp { 1310sub load_header_temp {
1298 my ($self) = @_; 1311 my ($self) = @_;
1299 1312
1300 $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;
1301} 1333}
1302 1334
1303sub load_header { 1335sub load_header {
1304 my ($self) = @_; 1336 my ($self) = @_;
1305 1337
1306 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1340 } else {
1313 $self->load_orig 1341 $self->load_header_orig
1314 or return; 1342 or return;
1315 1343 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1344 }
1321 1345
1322 1 1346 1
1323} 1347}
1324 1348
… …
1338 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
1339 1363
1340 $map->load_header 1364 $map->load_header
1341 or return; 1365 or return;
1342 1366
1343 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
1344 $cf::WAIT_FOR_TICK->wait; 1369 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1370 $map->reset;
1346 undef $guard; 1371 undef $guard;
1347 $map = find $path 1372 return find $path;
1348 or return;
1349 } 1373 }
1350 1374
1351 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1352 } 1376 }
1353} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1354 1381
1355sub load { 1382sub load {
1356 my ($self) = @_; 1383 my ($self) = @_;
1357 1384
1385 local $self->{deny_reset} = 1; # loading can take a long time
1386
1358 my $path = $self->{path}; 1387 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1388 my $guard = cf::lock_acquire "map_load:$path";
1360 1389
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1390 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1391
1363 $self->in_memory (cf::MAP_LOADING); 1392 $self->in_memory (cf::MAP_LOADING);
1364 1393
1365 $self->alloc; 1394 $self->alloc;
1395
1396 $self->pre_load;
1397
1366 $self->_load_objects ($self->{load_path}, 1) 1398 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1399 or return;
1368 1400
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1401 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1402 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1424 unless $self->difficulty;
1393 Coro::cede; 1425 Coro::cede;
1394 $self->activate; 1426 $self->activate;
1395 } 1427 }
1396 1428
1429 $self->post_load;
1430
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1431 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1432}
1399 1433
1400sub customise_for { 1434sub customise_for {
1401 my ($self, $ob) = @_; 1435 my ($self, $ob) = @_;
… …
1441 1475
1442 cf::sync_job { $map->load }; 1476 cf::sync_job { $map->load };
1443} 1477}
1444 1478
1445our %MAP_PREFETCH; 1479our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1480our $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 1481
1459sub find_async { 1482sub find_async {
1460 my ($path, $origin) = @_; 1483 my ($path, $origin) = @_;
1461 1484
1462 $path = normalise $path, $origin && $origin->{path}; 1485 $path = normalise $path, $origin && $origin->{path};
1463 1486
1464 if (my $map = $cf::MAP{$path}) { 1487 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1488 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1489 }
1467 1490
1468 $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 };
1469 $MAP_PREFETCHER->ready; 1504 $MAP_PREFETCHER->prio (6);
1470 1505
1471 () 1506 ()
1472} 1507}
1473 1508
1474sub save { 1509sub save {
… …
1698=cut 1733=cut
1699 1734
1700sub link_map { 1735sub link_map {
1701 unless ($LINK_MAP) { 1736 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1737 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1738 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1739 $LINK_MAP->load;
1705 } 1740 }
1706 1741
1707 $LINK_MAP 1742 $LINK_MAP
1708} 1743}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1750 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1751
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1753 if $self->map;
1719 1754
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1755 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1756}
1722 1757
1723sub cf::object::player::leave_link { 1758sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1759 my ($self, $map, $x, $y) = @_;
1725 1760
… …
1812 1847
1813sub parse_random_map_params { 1848sub parse_random_map_params {
1814 my ($spec) = @_; 1849 my ($spec) = @_;
1815 1850
1816 my $rmp = { # defaults 1851 my $rmp = { # defaults
1817 xsize => -1, 1852 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1853 ysize => (cf::rndm 15, 40),
1854 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1855 #layout => string,
1819 }; 1856 };
1820 1857
1821 for (split /\n/, $spec) { 1858 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1859 my ($k, $v) = split /\s+/, $_, 2;
1823 1860
… …
1827 $rmp 1864 $rmp
1828} 1865}
1829 1866
1830sub prepare_random_map { 1867sub prepare_random_map {
1831 my ($exit) = @_; 1868 my ($exit) = @_;
1869
1870 my $guard = cf::lock_acquire "exit_prepare:$exit";
1832 1871
1833 # all this does is basically replace the /! path by 1872 # all this does is basically replace the /! path by
1834 # a new random map path (?random/...) with a seed 1873 # a new random map path (?random/...) with a seed
1835 # that depends on the exit object 1874 # that depends on the exit object
1836 1875
… …
1862sub cf::object::player::enter_exit { 1901sub cf::object::player::enter_exit {
1863 my ($self, $exit) = @_; 1902 my ($self, $exit) = @_;
1864 1903
1865 return unless $self->type == cf::PLAYER; 1904 return unless $self->type == cf::PLAYER;
1866 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
1867 $self->enter_link; 1915 $self->enter_link;
1868 1916
1869 (async { 1917 (async {
1870 $self->deactivate_recursive; # just to be sure 1918 $self->deactivate_recursive; # just to be sure
1871 unless (eval { 1919 unless (eval {
1872 prepare_random_map $exit 1920 $self->goto ($slaying, $hp, $sp);
1873 if $exit->slaying eq "/!";
1874
1875 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1876 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1877 1921
1878 1; 1922 1;
1879 }) { 1923 }) {
1880 $self->message ("Something went wrong deep within the crossfire server. " 1924 $self->message ("Something went wrong deep within the crossfire server. "
1881 . "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. "
… …
2170 sub db_sync() { 2214 sub db_sync() {
2171 db_save if $dirty; 2215 db_save if $dirty;
2172 undef $dirty; 2216 undef $dirty;
2173 } 2217 }
2174 2218
2175 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2219 my $idle = Event->idle (
2176 db_sync; 2220 reentrant => 0,
2221 min => 10,
2222 max => 20,
2223 repeat => 0,
2224 data => WF_AUTOCANCEL,
2225 cb => \&db_sync,
2177 }); 2226 );
2178 2227
2179 sub db_dirty() { 2228 sub db_dirty() {
2180 $dirty = 1; 2229 $dirty = 1;
2181 $idle->start; 2230 $idle->start;
2182 } 2231 }
… …
2238 }; 2287 };
2239 2288
2240 cfg_load; 2289 cfg_load;
2241 db_load; 2290 db_load;
2242 load_extensions; 2291 load_extensions;
2292
2293 $TICK_WATCHER->start;
2243 Event::loop; 2294 Event::loop;
2244} 2295}
2245 2296
2246############################################################################# 2297#############################################################################
2247# initialisation and cleanup 2298# initialisation and cleanup
2248 2299
2249# install some emergency cleanup handlers 2300# install some emergency cleanup handlers
2250BEGIN { 2301BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2302 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2303 Event->signal (
2304 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2305 data => WF_AUTOCANCEL,
2254 signal => $signal, 2306 signal => $signal,
2307 prio => 0,
2255 cb => sub { 2308 cb => sub {
2256 cf::cleanup "SIG$signal"; 2309 cf::cleanup "SIG$signal";
2257 }, 2310 },
2258 ); 2311 );
2259 } 2312 }
2260} 2313}
… …
2289} 2342}
2290 2343
2291sub reload() { 2344sub reload() {
2292 # can/must only be called in main 2345 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2346 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2347 warn "can only reload from main coroutine";
2295 return; 2348 return;
2296 } 2349 }
2297 2350
2298 warn "reloading..."; 2351 warn "reloading...";
2299 2352
2300 warn "freezing server"; 2353 warn "cancelling server ticker";
2301 my $guard = freeze_mainloop; 2354 $TICK_WATCHER->cancel;
2355
2302 cf::emergency_save; 2356 cf::emergency_save;
2303
2304 warn "sync database to disk";
2305 cf::db_sync;
2306 IO::AIO::flush;
2307 2357
2308 eval { 2358 eval {
2309 # 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
2310 2360
2361 warn "syncing database to disk";
2362 cf::db_sync;
2363
2311 warn "cancel all watchers"; 2364 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2367 }
2315 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
2316 warn "cancel all extension coros"; 2377 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2378 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2379 %EXT_CORO = ();
2319 2380
2320 warn "remove commands"; 2381 warn "removing commands";
2321 %COMMAND = (); 2382 %COMMAND = ();
2322 2383
2323 warn "remove ext commands"; 2384 warn "removing ext commands";
2324 %EXTCMD = (); 2385 %EXTCMD = ();
2325 2386
2326 warn "unload/nuke all extensions"; 2387 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2388 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2389 warn "... unloading $pkg";
2329 2390
2330 if (my $cb = $pkg->can ("unload")) { 2391 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2392 eval {
… …
2336 2397
2337 warn "... nuking $pkg"; 2398 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2399 Symbol::delete_package $pkg;
2339 } 2400 }
2340 2401
2341 warn "unload all perl modules loaded from $LIBDIR"; 2402 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2403 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2404 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2405
2345 warn "removing <$k>"; 2406 warn "... unloading $k";
2346 delete $INC{$k}; 2407 delete $INC{$k};
2347 2408
2348 $k =~ s/\.pm$//; 2409 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2410 $k =~ s/\//::/g;
2350 2411
… …
2353 } 2414 }
2354 2415
2355 Symbol::delete_package $k; 2416 Symbol::delete_package $k;
2356 } 2417 }
2357 2418
2358 warn "get rid of safe::, as good as possible"; 2419 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2420 Symbol::delete_package "safe::$_"
2360 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);
2361 2422
2362 warn "unload cf.pm \"a bit\""; 2423 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2424 delete $INC{"cf.pm"};
2364 2425
2365 # don't, removes xs symbols, too, 2426 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2427 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2428 #Symbol::delete_package __PACKAGE__;
2368 2429
2430 warn "unload completed, starting to reload now";
2431
2369 warn "reloading cf.pm"; 2432 warn "reloading cf.pm";
2370 require cf; 2433 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2434 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2435
2373 warn "load config and database again"; 2436 warn "loading config and database again";
2374 cf::cfg_load; 2437 cf::cfg_load;
2375 cf::db_load; 2438 cf::db_load;
2376 2439
2377 warn "load extensions"; 2440 warn "loading extensions";
2378 cf::load_extensions; 2441 cf::load_extensions;
2379 2442
2380 warn "reattach attachments to objects/players"; 2443 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2444 _global_reattach;
2382 warn "reattach attachments to maps"; 2445 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2446 reattach $_ for values %MAP;
2447
2448 warn "restarting server ticker";
2449
2450 $TICK_WATCHER->start;
2384 }; 2451 };
2385 2452
2386 if ($@) { 2453 if ($@) {
2387 warn $@; 2454 warn $@;
2388 warn "error while reloading, exiting."; 2455 warn "error while reloading, exiting.";
… …
2401 $who->message ("reloading server."); 2468 $who->message ("reloading server.");
2402 2469
2403 # doing reload synchronously and two reloads happen back-to-back, 2470 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here. 2471 # coro crashes during coro_state_free->destroy here.
2405 2472
2406 $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 {
2407 reload; 2478 reload;
2408 undef $RELOAD_WATCHER; 2479 undef $RELOAD_WATCHER;
2480 },
2409 }); 2481 );
2410 } 2482 }
2411}; 2483};
2412 2484
2413unshift @INC, $LIBDIR; 2485unshift @INC, $LIBDIR;
2486
2487my $bug_warning = 0;
2414 2488
2415$TICK_WATCHER = Event->timer ( 2489$TICK_WATCHER = Event->timer (
2416 reentrant => 0, 2490 reentrant => 0,
2491 parked => 1,
2417 prio => 0, 2492 prio => 0,
2418 at => $NEXT_TICK || $TICK, 2493 at => $NEXT_TICK || $TICK,
2419 data => WF_AUTOCANCEL, 2494 data => WF_AUTOCANCEL,
2420 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
2421 $NOW = Event::time; 2502 $NOW = Event::time;
2422 2503
2423 cf::server_tick; # one server iteration 2504 cf::server_tick; # one server iteration
2424 $RUNTIME += $TICK; 2505 $RUNTIME += $TICK;
2425 $NEXT_TICK += $TICK; 2506 $NEXT_TICK += $TICK;
2426 2507
2427 $WAIT_FOR_TICK->broadcast; 2508 $WAIT_FOR_TICK->broadcast;
2428 $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#
2429 2516
2430 # 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
2431 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2518 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2432 2519
2433 $TICK_WATCHER->at ($NEXT_TICK); 2520 $TICK_WATCHER->at ($NEXT_TICK);
2434 $TICK_WATCHER->start; 2521 $TICK_WATCHER->start;
2435 }, 2522 },
2436); 2523);
2437 2524
2438IO::AIO::max_poll_time $TICK * 0.2; 2525IO::AIO::max_poll_time $TICK * 0.1;
2439 2526
2527undef $Coro::AIO::WATCHER;
2440$AIO_POLL_WATCHER = Event->io ( 2528$AIO_POLL_WATCHER = Event->io (
2529 reentrant => 0,
2441 fd => IO::AIO::poll_fileno, 2530 fd => IO::AIO::poll_fileno,
2442 poll => 'r', 2531 poll => 'r',
2443 prio => 5, 2532 prio => 6,
2444 data => WF_AUTOCANCEL, 2533 data => WF_AUTOCANCEL,
2445 cb => \&IO::AIO::poll_cb, 2534 cb => \&IO::AIO::poll_cb,
2446); 2535);
2447 2536
2448$WRITE_RUNTIME_WATCHER = Event->timer ( 2537$WRITE_RUNTIME_WATCHER = Event->timer (
2538 reentrant => 0,
2449 data => WF_AUTOCANCEL, 2539 data => WF_AUTOCANCEL,
2450 after => 0, 2540 after => 1,
2451 interval => 10, 2541 interval => 10,
2452 cb => sub { 2542 prio => 6, # keep it lowest so it acts like a watchdog
2453 (Coro::unblock_sub { 2543 cb => Coro::unblock_sub {
2454 write_runtime 2544 write_runtime
2455 or warn "ERROR: unable to write runtime file: $!"; 2545 or warn "ERROR: unable to write runtime file: $!";
2456 })->();
2457 }, 2546 },
2458); 2547);
2459 2548
2460END { cf::emergency_save } 2549END { cf::emergency_save }
2461 2550

Diff Legend

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