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.172 by root, Sun Jan 14 13:32:48 2007 UTC vs.
Revision 1.197 by root, Sun Jan 28 00:20:02 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];
… …
1113 1116
1114use Fcntl; 1117use Fcntl;
1115use Coro::AIO; 1118use Coro::AIO;
1116 1119
1117use overload 1120use overload
1118 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1119 1123
1120our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1122 1126
1123sub generate_random_map { 1127sub generate_random_map {
1124 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1130 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1142 )
1140} 1143}
1141 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1142sub register { 1153sub register {
1143 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1155 my $pkg = caller;
1145 1156
1146 no strict; 1157 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1159
1149 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1161}
1151 1162
1152# also paths starting with '/' 1163# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1165
1155sub thawer_merge { 1166sub thawer_merge {
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 {
… …
1534 my ($self) = @_; 1569 my ($self) = @_;
1535 1570
1536 $self->reset_at <= $cf::RUNTIME 1571 $self->reset_at <= $cf::RUNTIME
1537} 1572}
1538 1573
1539sub rename {
1540 my ($self, $new_path) = @_;
1541
1542 normalise $new_path;
1543
1544 $self->unlink_save;
1545
1546 delete $cf::MAP{$self->path};
1547 $self->{path} = $new_path; $self->path ($self->{path});
1548 $cf::MAP{$self->path} = $self;
1549
1550 $self->save;
1551}
1552
1553sub reset { 1574sub reset {
1554 my ($self) = @_; 1575 my ($self) = @_;
1555 1576
1556 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1577 my $lock = cf::lock_acquire "map_data:$self->{path}";
1557 1578
… …
1574my $nuke_counter = "aaaa"; 1595my $nuke_counter = "aaaa";
1575 1596
1576sub nuke { 1597sub nuke {
1577 my ($self) = @_; 1598 my ($self) = @_;
1578 1599
1600 delete $cf::MAP{$self->path};
1601
1602 $self->unlink_save;
1603
1604 bless $self, "cf::map";
1605 delete $self->{deny_reset};
1579 $self->{deny_save} = 1; 1606 $self->{deny_save} = 1;
1580 $self->reset_timeout (1); 1607 $self->reset_timeout (1);
1581 $self->rename ("{nuke}/" . ($nuke_counter++)); 1608 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1609
1610 $cf::MAP{$self->path} = $self;
1611
1582 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1583} 1613}
1584 1614
1585=item cf::map::unique_maps 1615=item cf::map::unique_maps
1586 1616
… …
1703=cut 1733=cut
1704 1734
1705sub link_map { 1735sub link_map {
1706 unless ($LINK_MAP) { 1736 unless ($LINK_MAP) {
1707 $LINK_MAP = cf::map::find "{link}" 1737 $LINK_MAP = cf::map::find "{link}"
1708 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1738 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1709 $LINK_MAP->load; 1739 $LINK_MAP->load;
1710 } 1740 }
1711 1741
1712 $LINK_MAP 1742 $LINK_MAP
1713} 1743}
… …
1720 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1750 return if UNIVERSAL::isa $self->map, "ext::map_link";
1721 1751
1722 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1723 if $self->map; 1753 if $self->map;
1724 1754
1725 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1755 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1726} 1756}
1727 1757
1728sub cf::object::player::leave_link { 1758sub cf::object::player::leave_link {
1729 my ($self, $map, $x, $y) = @_; 1759 my ($self, $map, $x, $y) = @_;
1730 1760
… …
1797 my ($self, $path, $x, $y) = @_; 1827 my ($self, $path, $x, $y) = @_;
1798 1828
1799 $self->enter_link; 1829 $self->enter_link;
1800 1830
1801 (async { 1831 (async {
1832 my $map = eval {
1802 my $map = cf::map::find $path; 1833 my $map = cf::map::find $path;
1803 $map = $map->customise_for ($self) if $map; 1834 $map = $map->customise_for ($self) if $map;
1804 1835 $map
1805# warn "entering ", $map->path, " at ($x, $y)\n" 1836 } or
1806# if $map;
1807
1808 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1837 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1809 1838
1810 $self->leave_link ($map, $x, $y); 1839 $self->leave_link ($map, $x, $y);
1811 })->prio (1); 1840 })->prio (1);
1812} 1841}
1813 1842
… …
1817 1846
1818sub parse_random_map_params { 1847sub parse_random_map_params {
1819 my ($spec) = @_; 1848 my ($spec) = @_;
1820 1849
1821 my $rmp = { # defaults 1850 my $rmp = { # defaults
1822 xsize => 10, 1851 xsize => (cf::rndm 15, 40),
1823 ysize => 10, 1852 ysize => (cf::rndm 15, 40),
1853 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1854 #layout => string,
1824 }; 1855 };
1825 1856
1826 for (split /\n/, $spec) { 1857 for (split /\n/, $spec) {
1827 my ($k, $v) = split /\s+/, $_, 2; 1858 my ($k, $v) = split /\s+/, $_, 2;
1828 1859
… …
1832 $rmp 1863 $rmp
1833} 1864}
1834 1865
1835sub prepare_random_map { 1866sub prepare_random_map {
1836 my ($exit) = @_; 1867 my ($exit) = @_;
1868
1869 my $guard = cf::lock_acquire "exit_prepare:$exit";
1837 1870
1838 # all this does is basically replace the /! path by 1871 # all this does is basically replace the /! path by
1839 # a new random map path (?random/...) with a seed 1872 # a new random map path (?random/...) with a seed
1840 # that depends on the exit object 1873 # that depends on the exit object
1841 1874
… …
1850 1883
1851 $rmp->{random_seed} ||= $exit->random_seed; 1884 $rmp->{random_seed} ||= $exit->random_seed;
1852 1885
1853 my $data = cf::to_json $rmp; 1886 my $data = cf::to_json $rmp;
1854 my $md5 = Digest::MD5::md5_hex $data; 1887 my $md5 = Digest::MD5::md5_hex $data;
1888 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1855 1889
1856 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1890 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1857 aio_write $fh, 0, (length $data), $data, 0; 1891 aio_write $fh, 0, (length $data), $data, 0;
1892 undef $fh;
1893 aio_rename "$meta~", $meta;
1858 1894
1859 $exit->slaying ("?random/$md5"); 1895 $exit->slaying ("?random/$md5");
1860 $exit->msg (undef); 1896 $exit->msg (undef);
1861 } 1897 }
1862} 1898}
1863 1899
1864sub cf::object::player::enter_exit { 1900sub cf::object::player::enter_exit {
1865 my ($self, $exit) = @_; 1901 my ($self, $exit) = @_;
1866 1902
1867 return unless $self->type == cf::PLAYER; 1903 return unless $self->type == cf::PLAYER;
1904
1905 if ($exit->slaying eq "/!") {
1906 #TODO: this should de-fi-ni-te-ly not be a sync-job
1907 cf::sync_job { prepare_random_map $exit };
1908 }
1909
1910 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1911 my $hp = $exit->stats->hp;
1912 my $sp = $exit->stats->sp;
1868 1913
1869 $self->enter_link; 1914 $self->enter_link;
1870 1915
1871 (async { 1916 (async {
1872 $self->deactivate_recursive; # just to be sure 1917 $self->deactivate_recursive; # just to be sure
1873 unless (eval { 1918 unless (eval {
1874 prepare_random_map $exit 1919 $self->goto ($slaying, $hp, $sp);
1875 if $exit->slaying eq "/!";
1876
1877 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1878 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1879 1920
1880 1; 1921 1;
1881 }) { 1922 }) {
1882 $self->message ("Something went wrong deep within the crossfire server. " 1923 $self->message ("Something went wrong deep within the crossfire server. "
1883 . "I'll try to bring you back to the map you were before. " 1924 . "I'll try to bring you back to the map you were before. "
… …
2172 sub db_sync() { 2213 sub db_sync() {
2173 db_save if $dirty; 2214 db_save if $dirty;
2174 undef $dirty; 2215 undef $dirty;
2175 } 2216 }
2176 2217
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2218 my $idle = Event->idle (
2178 db_sync; 2219 reentrant => 0,
2220 min => 10,
2221 max => 20,
2222 repeat => 0,
2223 data => WF_AUTOCANCEL,
2224 cb => \&db_sync,
2179 }); 2225 );
2180 2226
2181 sub db_dirty() { 2227 sub db_dirty() {
2182 $dirty = 1; 2228 $dirty = 1;
2183 $idle->start; 2229 $idle->start;
2184 } 2230 }
… …
2232 2278
2233sub main { 2279sub main {
2234 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2235 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
2236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2282 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2283 (async {
2237 async { Event::one_event }; 2284 Event::one_event;
2285 })->prio (Coro::PRIO_MAX);
2238 }; 2286 };
2239 2287
2240 cfg_load; 2288 cfg_load;
2241 db_load; 2289 db_load;
2242 load_extensions; 2290 load_extensions;
2291
2292 $TICK_WATCHER->start;
2243 Event::loop; 2293 Event::loop;
2244} 2294}
2245 2295
2246############################################################################# 2296#############################################################################
2247# initialisation and cleanup 2297# initialisation and cleanup
2248 2298
2249# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2250BEGIN { 2300BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2254 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2255 cb => sub { 2307 cb => sub {
2256 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2257 }, 2309 },
2258 ); 2310 );
2259 } 2311 }
2260} 2312}
… …
2289} 2341}
2290 2342
2291sub reload() { 2343sub reload() {
2292 # can/must only be called in main 2344 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2345 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2346 warn "can only reload from main coroutine";
2295 return; 2347 return;
2296 } 2348 }
2297 2349
2298 warn "reloading..."; 2350 warn "reloading...";
2299 2351
2300 warn "freezing server"; 2352 warn "cancelling server ticker";
2301 my $guard = freeze_mainloop; 2353 $TICK_WATCHER->cancel;
2354
2302 cf::emergency_save; 2355 cf::emergency_save;
2303
2304 warn "sync database to disk";
2305 cf::db_sync;
2306 IO::AIO::flush;
2307 2356
2308 eval { 2357 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2358 # if anything goes wrong in here, we should simply crash as we already saved
2310 2359
2360 warn "syncing database to disk";
2361 cf::db_sync;
2362
2311 warn "cancel all watchers"; 2363 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2364 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2365 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2366 }
2315 2367
2368 warn "flushing outstanding aio requests";
2369 for (;;) {
2370 IO::AIO::flush;
2371 Coro::cede;
2372 last unless IO::AIO::nreqs;
2373 warn "iterate...";
2374 }
2375
2316 warn "cancel all extension coros"; 2376 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2377 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2378 %EXT_CORO = ();
2319 2379
2320 warn "remove commands"; 2380 warn "removing commands";
2321 %COMMAND = (); 2381 %COMMAND = ();
2322 2382
2323 warn "remove ext commands"; 2383 warn "removing ext commands";
2324 %EXTCMD = (); 2384 %EXTCMD = ();
2325 2385
2326 warn "unload/nuke all extensions"; 2386 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2387 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2388 warn "... unloading $pkg";
2329 2389
2330 if (my $cb = $pkg->can ("unload")) { 2390 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2391 eval {
… …
2336 2396
2337 warn "... nuking $pkg"; 2397 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2398 Symbol::delete_package $pkg;
2339 } 2399 }
2340 2400
2341 warn "unload all perl modules loaded from $LIBDIR"; 2401 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2402 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2403 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2404
2345 warn "removing <$k>"; 2405 warn "... unloading $k";
2346 delete $INC{$k}; 2406 delete $INC{$k};
2347 2407
2348 $k =~ s/\.pm$//; 2408 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2409 $k =~ s/\//::/g;
2350 2410
… …
2353 } 2413 }
2354 2414
2355 Symbol::delete_package $k; 2415 Symbol::delete_package $k;
2356 } 2416 }
2357 2417
2358 warn "get rid of safe::, as good as possible"; 2418 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2419 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2420 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2421
2362 warn "unload cf.pm \"a bit\""; 2422 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2423 delete $INC{"cf.pm"};
2364 2424
2365 # don't, removes xs symbols, too, 2425 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2426 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2427 #Symbol::delete_package __PACKAGE__;
2368 2428
2429 warn "unload completed, starting to reload now";
2430
2369 warn "reloading cf.pm"; 2431 warn "reloading cf.pm";
2370 require cf; 2432 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2433 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2434
2373 warn "load config and database again"; 2435 warn "loading config and database again";
2374 cf::cfg_load; 2436 cf::cfg_load;
2375 cf::db_load; 2437 cf::db_load;
2376 2438
2377 warn "load extensions"; 2439 warn "loading extensions";
2378 cf::load_extensions; 2440 cf::load_extensions;
2379 2441
2380 warn "reattach attachments to objects/players"; 2442 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2443 _global_reattach;
2382 warn "reattach attachments to maps"; 2444 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2445 reattach $_ for values %MAP;
2446
2447 warn "restarting server ticker";
2448
2449 $TICK_WATCHER->start;
2384 }; 2450 };
2385 2451
2386 if ($@) { 2452 if ($@) {
2387 warn $@; 2453 warn $@;
2388 warn "error while reloading, exiting."; 2454 warn "error while reloading, exiting.";
… …
2390 } 2456 }
2391 2457
2392 warn "reloaded"; 2458 warn "reloaded";
2393}; 2459};
2394 2460
2461our $RELOAD_WATCHER; # used only during reload
2462
2395register_command "reload" => sub { 2463register_command "reload" => sub {
2396 my ($who, $arg) = @_; 2464 my ($who, $arg) = @_;
2397 2465
2398 if ($who->flag (FLAG_WIZ)) { 2466 if ($who->flag (FLAG_WIZ)) {
2399 $who->message ("start of reload."); 2467 $who->message ("reloading server.");
2468
2469 # doing reload synchronously and two reloads happen back-to-back,
2470 # coro crashes during coro_state_free->destroy here.
2471
2472 $RELOAD_WATCHER ||= Event->timer (
2473 reentrant => 0,
2474 after => 0,
2475 data => WF_AUTOCANCEL,
2476 cb => sub {
2400 reload; 2477 reload;
2401 $who->message ("end of reload."); 2478 undef $RELOAD_WATCHER;
2479 },
2480 );
2402 } 2481 }
2403}; 2482};
2404 2483
2405unshift @INC, $LIBDIR; 2484unshift @INC, $LIBDIR;
2485
2486my $bug_warning = 0;
2406 2487
2407$TICK_WATCHER = Event->timer ( 2488$TICK_WATCHER = Event->timer (
2408 reentrant => 0, 2489 reentrant => 0,
2490 parked => 1,
2409 prio => 0, 2491 prio => 0,
2410 at => $NEXT_TICK || $TICK, 2492 at => $NEXT_TICK || $TICK,
2411 data => WF_AUTOCANCEL, 2493 data => WF_AUTOCANCEL,
2412 cb => sub { 2494 cb => sub {
2495 if ($Coro::current != $Coro::main) {
2496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2497 unless ++$bug_warning > 10;
2498 return;
2499 }
2500
2413 $NOW = Event::time; 2501 $NOW = Event::time;
2414 2502
2415 cf::server_tick; # one server iteration 2503 cf::server_tick; # one server iteration
2416 $RUNTIME += $TICK; 2504 $RUNTIME += $TICK;
2417 $NEXT_TICK += $TICK; 2505 $NEXT_TICK += $TICK;
2418 2506
2419 $WAIT_FOR_TICK->broadcast; 2507 $WAIT_FOR_TICK->broadcast;
2420 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2509
2510 Event::sweep;
2511 Coro::cede_notself;
2512
2513# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d#
2421 2515
2422 # if we are delayed by four ticks or more, skip them all 2516 # if we are delayed by four ticks or more, skip them all
2423 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2424 2518
2425 $TICK_WATCHER->at ($NEXT_TICK); 2519 $TICK_WATCHER->at ($NEXT_TICK);
2426 $TICK_WATCHER->start; 2520 $TICK_WATCHER->start;
2427 }, 2521 },
2428); 2522);
2429 2523
2430IO::AIO::max_poll_time $TICK * 0.2; 2524IO::AIO::max_poll_time $TICK * 0.1;
2431 2525
2526undef $Coro::AIO::WATCHER;
2432$AIO_POLL_WATCHER = Event->io ( 2527$AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0,
2433 fd => IO::AIO::poll_fileno, 2529 fd => IO::AIO::poll_fileno,
2434 poll => 'r', 2530 poll => 'r',
2435 prio => 5, 2531 prio => 6,
2436 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2437 cb => \&IO::AIO::poll_cb, 2533 cb => \&IO::AIO::poll_cb,
2438); 2534);
2439 2535
2440$WRITE_RUNTIME_WATCHER = Event->timer ( 2536$WRITE_RUNTIME_WATCHER = Event->timer (
2537 reentrant => 0,
2441 data => WF_AUTOCANCEL, 2538 data => WF_AUTOCANCEL,
2442 after => 0, 2539 after => 1,
2443 interval => 10, 2540 interval => 10,
2444 cb => sub { 2541 prio => 6, # keep it lowest so it acts like a watchdog
2445 (Coro::unblock_sub { 2542 cb => Coro::unblock_sub {
2446 write_runtime 2543 write_runtime
2447 or warn "ERROR: unable to write runtime file: $!"; 2544 or warn "ERROR: unable to write runtime file: $!";
2448 })->();
2449 }, 2545 },
2450); 2546);
2451 2547
2452END { cf::emergency_save } 2548END { cf::emergency_save }
2453 2549

Diff Legend

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