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.181 by root, Fri Jan 19 15:29:52 2007 UTC vs.
Revision 1.199 by root, Mon Jan 29 14:46:01 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;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
85 85
86our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
87 89
88############################################################################# 90#############################################################################
89 91
90=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
91 93
… …
349 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
350 352
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 354 or return;
353 355
356 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 361 and return;
357 362
358 aio_fsync $fh 363 aio_fsync $fh
359 and return; 364 and return;
… …
1075 for (@$files) { 1080 for (@$files) {
1076 utf8::decode $_; 1081 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1082 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1083 next unless /^$PATH_SEP/o;
1079 1084
1080 s/\.map$//;
1081 push @paths, "~" . $pl->ob->name . "/" . $_; 1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1082 } 1086 }
1083 1087
1084 \@paths 1088 \@paths
1085} 1089}
1086 1090
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1141 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1142 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1143 )
1140} 1144}
1141 1145
1146=item cf::map->register ($regex, $prio)
1147
1148Register a handler for the map path matching the given regex at the
1149givne priority (higher is better, built-in handlers have priority 0, the
1150default).
1151
1152=cut
1153
1142sub register { 1154sub register {
1143 my (undef, $regex) = @_; 1155 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1156 my $pkg = caller;
1145 1157
1146 no strict; 1158 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1159 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1160
1149 $EXT_MAP{$pkg} = qr<$regex>; 1161 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1162}
1151 1163
1152# also paths starting with '/' 1164# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1165$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1166
1155sub thawer_merge { 1167sub thawer_merge {
1156 my ($self, $merge) = @_; 1168 my ($self, $merge) = @_;
1157 1169
1158 # we have to keep some variables in memory intact 1170 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1176 $self->SUPER::thawer_merge ($merge);
1165} 1177}
1166 1178
1167sub normalise { 1179sub normalise {
1168 my ($path, $base) = @_; 1180 my ($path, $base) = @_;
1181
1182 $path = "$path"; # make sure its a string
1183
1184 $path =~ s/\.map$//;
1169 1185
1170 # map plan: 1186 # map plan:
1171 # 1187 #
1172 # /! non-realised random map exit (special hack!) 1188 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1189 # {... are special paths that are not being touched
… …
1201 1217
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1218 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1219
1204 $path = normalise $path, $base; 1220 $path = normalise $path, $base;
1205 1221
1206 for my $pkg (keys %EXT_MAP) { 1222 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1223 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1224 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1225 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1226 $self->init; # pass $1 etc.
1211 return $self; 1227 return $self;
1212 } 1228 }
1213 } 1229 }
1214 1230
1215 Carp::carp "unable to resolve path '$path'."; 1231 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1232 ()
1217} 1233}
1218 1234
1219sub init { 1235sub init {
1220 my ($self) = @_; 1236 my ($self) = @_;
… …
1286 $self->{load_path} = $path; 1302 $self->{load_path} = $path;
1287 1303
1288 1 1304 1
1289} 1305}
1290 1306
1291sub load_orig { 1307sub load_header_orig {
1292 my ($self) = @_; 1308 my ($self) = @_;
1293 1309
1294 $self->load_header_from ($self->load_path) 1310 $self->load_header_from ($self->load_path)
1295} 1311}
1296 1312
1297sub load_temp { 1313sub load_header_temp {
1298 my ($self) = @_; 1314 my ($self) = @_;
1299 1315
1300 $self->load_header_from ($self->save_path) 1316 $self->load_header_from ($self->save_path)
1317}
1318
1319sub prepare_temp {
1320 my ($self) = @_;
1321
1322 $self->last_access ((delete $self->{last_access})
1323 || $cf::RUNTIME); #d#
1324 # safety
1325 $self->{instantiate_time} = $cf::RUNTIME
1326 if $self->{instantiate_time} > $cf::RUNTIME;
1327}
1328
1329sub prepare_orig {
1330 my ($self) = @_;
1331
1332 $self->{load_original} = 1;
1333 $self->{instantiate_time} = $cf::RUNTIME;
1334 $self->last_access ($cf::RUNTIME);
1335 $self->instantiate;
1301} 1336}
1302 1337
1303sub load_header { 1338sub load_header {
1304 my ($self) = @_; 1339 my ($self) = @_;
1305 1340
1306 if ($self->load_temp) { 1341 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1342 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1343 } else {
1313 $self->load_orig 1344 $self->load_header_orig
1314 or return; 1345 or return;
1315 1346 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1347 }
1321 1348
1322 1 1349 1
1323} 1350}
1324 1351
… …
1338 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1339 1366
1340 $map->load_header 1367 $map->load_header
1341 or return; 1368 or return;
1342 1369
1343 if ($map->should_reset) { 1370 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1371 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1372 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1373 $map->reset;
1346 undef $guard; 1374 undef $guard;
1347 $map = find $path 1375 return find $path;
1348 or return;
1349 } 1376 }
1350 1377
1351 $cf::MAP{$path} = $map 1378 $cf::MAP{$path} = $map
1352 } 1379 }
1353} 1380}
1381
1382sub pre_load { }
1383sub post_load { }
1354 1384
1355sub load { 1385sub load {
1356 my ($self) = @_; 1386 my ($self) = @_;
1357 1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1389
1358 my $path = $self->{path}; 1390 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1391 my $guard = cf::lock_acquire "map_load:$path";
1360 1392
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1394
1363 $self->in_memory (cf::MAP_LOADING); 1395 $self->in_memory (cf::MAP_LOADING);
1364 1396
1365 $self->alloc; 1397 $self->alloc;
1398
1399 $self->pre_load;
1400
1366 $self->_load_objects ($self->{load_path}, 1) 1401 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1402 or return;
1368 1403
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1404 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1405 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1427 unless $self->difficulty;
1393 Coro::cede; 1428 Coro::cede;
1394 $self->activate; 1429 $self->activate;
1395 } 1430 }
1396 1431
1432 $self->post_load;
1433
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1434 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1435}
1399 1436
1400sub customise_for { 1437sub customise_for {
1401 my ($self, $ob) = @_; 1438 my ($self, $ob) = @_;
… …
1441 1478
1442 cf::sync_job { $map->load }; 1479 cf::sync_job { $map->load };
1443} 1480}
1444 1481
1445our %MAP_PREFETCH; 1482our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1483our $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 1484
1459sub find_async { 1485sub find_async {
1460 my ($path, $origin) = @_; 1486 my ($path, $origin) = @_;
1461 1487
1462 $path = normalise $path, $origin && $origin->{path}; 1488 $path = normalise $path, $origin && $origin->{path};
1463 1489
1464 if (my $map = $cf::MAP{$path}) { 1490 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1491 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1492 }
1467 1493
1468 $MAP_PREFETCH{$path} = 0; 1494 undef $MAP_PREFETCH{$path};
1495 $MAP_PREFETCHER ||= cf::async {
1496 while (%MAP_PREFETCH) {
1497 for my $path (keys %MAP_PREFETCH) {
1498 my $map = find $path
1499 or next;
1500 $map->load;
1501
1502 delete $MAP_PREFETCH{$path};
1503 }
1504 }
1505 undef $MAP_PREFETCHER;
1506 };
1469 $MAP_PREFETCHER->ready; 1507 $MAP_PREFETCHER->prio (6);
1470 1508
1471 () 1509 ()
1472} 1510}
1473 1511
1474sub save { 1512sub save {
… …
1593 for (@$files) { 1631 for (@$files) {
1594 utf8::decode $_; 1632 utf8::decode $_;
1595 next if /\.pst$/; 1633 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1634 next unless /^$PATH_SEP/o;
1597 1635
1598 s/\.map$//; 1636 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1637 }
1601 1638
1602 \@paths 1639 \@paths
1603} 1640}
1604 1641
… …
1698=cut 1735=cut
1699 1736
1700sub link_map { 1737sub link_map {
1701 unless ($LINK_MAP) { 1738 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1739 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1740 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1741 $LINK_MAP->load;
1705 } 1742 }
1706 1743
1707 $LINK_MAP 1744 $LINK_MAP
1708} 1745}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1752 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1753
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1754 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1755 if $self->map;
1719 1756
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1757 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1758}
1722 1759
1723sub cf::object::player::leave_link { 1760sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1761 my ($self, $map, $x, $y) = @_;
1725 1762
… …
1792 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1793 1830
1794 $self->enter_link; 1831 $self->enter_link;
1795 1832
1796 (async { 1833 (async {
1834 my $map = eval {
1797 my $map = cf::map::find $path; 1835 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1799 1837 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1839 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1840
1805 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1842 })->prio (1);
1807} 1843}
1808 1844
… …
1815 1851
1816 my $rmp = { # defaults 1852 my $rmp = { # defaults
1817 xsize => (cf::rndm 15, 40), 1853 xsize => (cf::rndm 15, 40),
1818 ysize => (cf::rndm 15, 40), 1854 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY), 1855 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string 1856 #layout => string,
1821 }; 1857 };
1822 1858
1823 for (split /\n/, $spec) { 1859 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1860 my ($k, $v) = split /\s+/, $_, 2;
1825 1861
… …
1839 # that depends on the exit object 1875 # that depends on the exit object
1840 1876
1841 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1842 1878
1843 if ($exit->map) { 1879 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1848 } 1884 }
1849 1885
… …
1866sub cf::object::player::enter_exit { 1902sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 1903 my ($self, $exit) = @_;
1868 1904
1869 return unless $self->type == cf::PLAYER; 1905 return unless $self->type == cf::PLAYER;
1870 1906
1907 if ($exit->slaying eq "/!") {
1908 #TODO: this should de-fi-ni-te-ly not be a sync-job
1909 cf::sync_job { prepare_random_map $exit };
1910 }
1911
1912 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1913 my $hp = $exit->stats->hp;
1914 my $sp = $exit->stats->sp;
1915
1871 $self->enter_link; 1916 $self->enter_link;
1872 1917
1873 (async { 1918 (async {
1874 $self->deactivate_recursive; # just to be sure 1919 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 1920 unless (eval {
1876 prepare_random_map $exit 1921 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 1922
1882 1; 1923 1;
1883 }) { 1924 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 1925 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 1926 . "I'll try to bring you back to the map you were before. "
… …
2174 sub db_sync() { 2215 sub db_sync() {
2175 db_save if $dirty; 2216 db_save if $dirty;
2176 undef $dirty; 2217 undef $dirty;
2177 } 2218 }
2178 2219
2179 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2220 my $idle = Event->idle (
2180 db_sync; 2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2181 }); 2227 );
2182 2228
2183 sub db_dirty() { 2229 sub db_dirty() {
2184 $dirty = 1; 2230 $dirty = 1;
2185 $idle->start; 2231 $idle->start;
2186 } 2232 }
… …
2242 }; 2288 };
2243 2289
2244 cfg_load; 2290 cfg_load;
2245 db_load; 2291 db_load;
2246 load_extensions; 2292 load_extensions;
2293
2294 $TICK_WATCHER->start;
2247 Event::loop; 2295 Event::loop;
2248} 2296}
2249 2297
2250############################################################################# 2298#############################################################################
2251# initialisation and cleanup 2299# initialisation and cleanup
2252 2300
2253# install some emergency cleanup handlers 2301# install some emergency cleanup handlers
2254BEGIN { 2302BEGIN {
2255 for my $signal (qw(INT HUP TERM)) { 2303 for my $signal (qw(INT HUP TERM)) {
2256 Event->signal ( 2304 Event->signal (
2305 reentrant => 0,
2257 data => WF_AUTOCANCEL, 2306 data => WF_AUTOCANCEL,
2258 signal => $signal, 2307 signal => $signal,
2308 prio => 0,
2259 cb => sub { 2309 cb => sub {
2260 cf::cleanup "SIG$signal"; 2310 cf::cleanup "SIG$signal";
2261 }, 2311 },
2262 ); 2312 );
2263 } 2313 }
2264} 2314}
… …
2293} 2343}
2294 2344
2295sub reload() { 2345sub reload() {
2296 # can/must only be called in main 2346 # can/must only be called in main
2297 if ($Coro::current != $Coro::main) { 2347 if ($Coro::current != $Coro::main) {
2298 warn "can only reload from main coroutine\n"; 2348 warn "can only reload from main coroutine";
2299 return; 2349 return;
2300 } 2350 }
2301 2351
2302 warn "reloading..."; 2352 warn "reloading...";
2303 2353
2304 warn "freezing server"; 2354 warn "cancelling server ticker";
2305 my $guard = freeze_mainloop; 2355 $TICK_WATCHER->cancel;
2356
2306 cf::emergency_save; 2357 cf::emergency_save;
2307
2308 warn "sync database to disk";
2309 cf::db_sync;
2310 IO::AIO::flush;
2311 2358
2312 eval { 2359 eval {
2313 # if anything goes wrong in here, we should simply crash as we already saved 2360 # if anything goes wrong in here, we should simply crash as we already saved
2314 2361
2362 warn "syncing database to disk";
2363 cf::db_sync;
2364
2315 warn "cancel all watchers"; 2365 warn "cancelling all WF_AUTOCANCEL watchers";
2316 for (Event::all_watchers) { 2366 for (Event::all_watchers) {
2317 $_->cancel if $_->data & WF_AUTOCANCEL; 2367 $_->cancel if $_->data & WF_AUTOCANCEL;
2318 } 2368 }
2319 2369
2370 warn "flushing outstanding aio requests";
2371 for (;;) {
2372 IO::AIO::flush;
2373 Coro::cede;
2374 last unless IO::AIO::nreqs;
2375 warn "iterate...";
2376 }
2377
2320 warn "cancel all extension coros"; 2378 warn "cancelling all extension coros";
2321 $_->cancel for values %EXT_CORO; 2379 $_->cancel for values %EXT_CORO;
2322 %EXT_CORO = (); 2380 %EXT_CORO = ();
2323 2381
2324 warn "remove commands"; 2382 warn "removing commands";
2325 %COMMAND = (); 2383 %COMMAND = ();
2326 2384
2327 warn "remove ext commands"; 2385 warn "removing ext commands";
2328 %EXTCMD = (); 2386 %EXTCMD = ();
2329 2387
2330 warn "unload/nuke all extensions"; 2388 warn "unloading/nuking all extensions";
2331 for my $pkg (@EXTS) { 2389 for my $pkg (@EXTS) {
2332 warn "... unloading $pkg"; 2390 warn "... unloading $pkg";
2333 2391
2334 if (my $cb = $pkg->can ("unload")) { 2392 if (my $cb = $pkg->can ("unload")) {
2335 eval { 2393 eval {
… …
2340 2398
2341 warn "... nuking $pkg"; 2399 warn "... nuking $pkg";
2342 Symbol::delete_package $pkg; 2400 Symbol::delete_package $pkg;
2343 } 2401 }
2344 2402
2345 warn "unload all perl modules loaded from $LIBDIR"; 2403 warn "unloading all perl modules loaded from $LIBDIR";
2346 while (my ($k, $v) = each %INC) { 2404 while (my ($k, $v) = each %INC) {
2347 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2405 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2348 2406
2349 warn "removing <$k>"; 2407 warn "... unloading $k";
2350 delete $INC{$k}; 2408 delete $INC{$k};
2351 2409
2352 $k =~ s/\.pm$//; 2410 $k =~ s/\.pm$//;
2353 $k =~ s/\//::/g; 2411 $k =~ s/\//::/g;
2354 2412
… …
2357 } 2415 }
2358 2416
2359 Symbol::delete_package $k; 2417 Symbol::delete_package $k;
2360 } 2418 }
2361 2419
2362 warn "get rid of safe::, as good as possible"; 2420 warn "getting rid of safe::, as good as possible";
2363 Symbol::delete_package "safe::$_" 2421 Symbol::delete_package "safe::$_"
2364 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2422 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2365 2423
2366 warn "unload cf.pm \"a bit\""; 2424 warn "unloading cf.pm \"a bit\"";
2367 delete $INC{"cf.pm"}; 2425 delete $INC{"cf.pm"};
2368 2426
2369 # don't, removes xs symbols, too, 2427 # don't, removes xs symbols, too,
2370 # and global variables created in xs 2428 # and global variables created in xs
2371 #Symbol::delete_package __PACKAGE__; 2429 #Symbol::delete_package __PACKAGE__;
2372 2430
2431 warn "unload completed, starting to reload now";
2432
2373 warn "reloading cf.pm"; 2433 warn "reloading cf.pm";
2374 require cf; 2434 require cf;
2375 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2376 2436
2377 warn "load config and database again"; 2437 warn "loading config and database again";
2378 cf::cfg_load; 2438 cf::cfg_load;
2379 cf::db_load; 2439 cf::db_load;
2380 2440
2381 warn "load extensions"; 2441 warn "loading extensions";
2382 cf::load_extensions; 2442 cf::load_extensions;
2383 2443
2384 warn "reattach attachments to objects/players"; 2444 warn "reattaching attachments to objects/players";
2385 _global_reattach; 2445 _global_reattach;
2386 warn "reattach attachments to maps"; 2446 warn "reattaching attachments to maps";
2387 reattach $_ for values %MAP; 2447 reattach $_ for values %MAP;
2448
2449 warn "restarting server ticker";
2450
2451 $TICK_WATCHER->start;
2388 }; 2452 };
2389 2453
2390 if ($@) { 2454 if ($@) {
2391 warn $@; 2455 warn $@;
2392 warn "error while reloading, exiting."; 2456 warn "error while reloading, exiting.";
… …
2405 $who->message ("reloading server."); 2469 $who->message ("reloading server.");
2406 2470
2407 # doing reload synchronously and two reloads happen back-to-back, 2471 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here. 2472 # coro crashes during coro_state_free->destroy here.
2409 2473
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2474 $RELOAD_WATCHER ||= Event->timer (
2475 reentrant => 0,
2476 after => 0,
2477 data => WF_AUTOCANCEL,
2478 cb => sub {
2411 reload; 2479 reload;
2412 undef $RELOAD_WATCHER; 2480 undef $RELOAD_WATCHER;
2481 },
2413 }); 2482 );
2414 } 2483 }
2415}; 2484};
2416 2485
2417unshift @INC, $LIBDIR; 2486unshift @INC, $LIBDIR;
2487
2488my $bug_warning = 0;
2418 2489
2419$TICK_WATCHER = Event->timer ( 2490$TICK_WATCHER = Event->timer (
2420 reentrant => 0, 2491 reentrant => 0,
2492 parked => 1,
2421 prio => 0, 2493 prio => 0,
2422 at => $NEXT_TICK || $TICK, 2494 at => $NEXT_TICK || $TICK,
2423 data => WF_AUTOCANCEL, 2495 data => WF_AUTOCANCEL,
2424 cb => sub { 2496 cb => sub {
2497 if ($Coro::current != $Coro::main) {
2498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2499 unless ++$bug_warning > 10;
2500 return;
2501 }
2502
2425 $NOW = Event::time; 2503 $NOW = Event::time;
2426 2504
2427 cf::server_tick; # one server iteration 2505 cf::server_tick; # one server iteration
2428 $RUNTIME += $TICK; 2506 $RUNTIME += $TICK;
2429 $NEXT_TICK += $TICK; 2507 $NEXT_TICK += $TICK;
2430 2508
2431 $WAIT_FOR_TICK->broadcast; 2509 $WAIT_FOR_TICK->broadcast;
2432 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2511
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d#
2433 2517
2434 # if we are delayed by four ticks or more, skip them all 2518 # if we are delayed by four ticks or more, skip them all
2435 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2436 2520
2437 $TICK_WATCHER->at ($NEXT_TICK); 2521 $TICK_WATCHER->at ($NEXT_TICK);
2438 $TICK_WATCHER->start; 2522 $TICK_WATCHER->start;
2439 }, 2523 },
2440); 2524);
2441 2525
2442IO::AIO::max_poll_time $TICK * 0.2; 2526IO::AIO::max_poll_time $TICK * 0.1;
2443 2527
2528undef $Coro::AIO::WATCHER;
2444$AIO_POLL_WATCHER = Event->io ( 2529$AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0,
2445 fd => IO::AIO::poll_fileno, 2531 fd => IO::AIO::poll_fileno,
2446 poll => 'r', 2532 poll => 'r',
2447 prio => 5, 2533 prio => 6,
2448 data => WF_AUTOCANCEL, 2534 data => WF_AUTOCANCEL,
2449 cb => \&IO::AIO::poll_cb, 2535 cb => \&IO::AIO::poll_cb,
2450); 2536);
2451 2537
2452$WRITE_RUNTIME_WATCHER = Event->timer ( 2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2453 data => WF_AUTOCANCEL, 2540 data => WF_AUTOCANCEL,
2454 after => 0, 2541 after => 1,
2455 interval => 10, 2542 interval => 10,
2456 cb => sub { 2543 prio => 6, # keep it lowest so it acts like a watchdog
2457 (Coro::unblock_sub { 2544 cb => Coro::unblock_sub {
2458 write_runtime 2545 write_runtime
2459 or warn "ERROR: unable to write runtime file: $!"; 2546 or warn "ERROR: unable to write runtime file: $!";
2460 })->();
2461 }, 2547 },
2462); 2548);
2463 2549
2464END { cf::emergency_save } 2550END { cf::emergency_save }
2465 2551

Diff Legend

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