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.187 by root, Sat Jan 20 21:06:52 2007 UTC vs.
Revision 1.207 by root, Sun Feb 11 22:42:09 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;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
… …
48our $TICK_WATCHER; 49our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 50our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 51our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 52our $NEXT_TICK;
52our $NOW; 53our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off
55
56our $BDB_POLL_WATCHER;
57our $DB_ENV;
53 58
54our %CFG; 59our %CFG;
55 60
56our $UPTIME; $UPTIME ||= time; 61our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 62our $RUNTIME;
58 63
59our %PLAYER; # all users 64our %PLAYER; # all users
60our %MAP; # all maps 65our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 66our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 67our $RANDOM_MAPS = cf::localdir . "/random";
68our $BDB_ENV_DIR = cf::localdir . "/db";
63 69
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 70our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 71our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 72
67# used to convert map paths into valid unix filenames by replacing / by ∕ 73# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 86mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 87mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 88mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 89mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 90mkdir $RANDOM_MAPS;
91mkdir $BDB_ENV_DIR;
85 92
86our $EMERGENCY_POSITION; 93our $EMERGENCY_POSITION;
94
95sub cf::map::normalise;
87 96
88############################################################################# 97#############################################################################
89 98
90=head2 GLOBAL VARIABLES 99=head2 GLOBAL VARIABLES
91 100
… …
356 # 60 allows for the watchdog to kill the server. 365 # 60 allows for the watchdog to kill the server.
357 366
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 367 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 368 and return;
360 369
370 # always fsync - this file is important
361 aio_fsync $fh 371 aio_fsync $fh
362 and return; 372 and return;
363 373
364 close $fh 374 close $fh
365 or return; 375 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 760 $filename, length $$rdata, scalar @$objs;
751 761
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 762 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 763 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 764 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 765 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 766 close $fh;
757 767
758 if (@$objs) { 768 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 769 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 770 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 771 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 772 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 774 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 775 aio_rename "$filename.pst~", "$filename.pst";
766 } 776 }
767 } else { 777 } else {
768 aio_unlink "$filename.pst"; 778 aio_unlink "$filename.pst";
… …
774 } 784 }
775 } else { 785 } else {
776 aio_unlink $filename; 786 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 787 aio_unlink "$filename.pst";
778 } 788 }
789
790 #d##TODO# nuke non .map-files if exist
791 if ($filename =~ s/\.map$//) {
792 aio_unlink $filename;
793 aio_unlink "$filename.pst";
794 }
779 } 795 }
780} 796}
781 797
782sub object_freezer_as_string { 798sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
789 805
790sub object_thawer_load { 806sub object_thawer_load {
791 my ($filename) = @_; 807 my ($filename) = @_;
792 808
793 my ($data, $av); 809 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
794 813
795 (aio_load $filename, $data) >= 0 814 (aio_load $filename, $data) >= 0
796 or return; 815 or return;
797 816
798 unless (aio_stat "$filename.pst") { 817 unless (aio_stat "$filename.pst") {
… …
1068=cut 1087=cut
1069 1088
1070sub maps($) { 1089sub maps($) {
1071 my ($pl) = @_; 1090 my ($pl) = @_;
1072 1091
1092 $pl = ref $pl ? $pl->ob->name : $pl;
1093
1073 my $files = aio_readdir playerdir $pl 1094 my $files = aio_readdir playerdir $pl
1074 or return; 1095 or return;
1075 1096
1076 my @paths; 1097 my @paths;
1077 1098
1078 for (@$files) { 1099 for (@$files) {
1079 utf8::decode $_; 1100 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1101 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1102 next unless /^$PATH_SEP/o;
1082 1103
1083 s/\.map$//; 1104 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1105 }
1086 1106
1087 \@paths 1107 \@paths
1088} 1108}
1089 1109
… …
1176} 1196}
1177 1197
1178sub normalise { 1198sub normalise {
1179 my ($path, $base) = @_; 1199 my ($path, $base) = @_;
1180 1200
1201 $path = "$path"; # make sure its a string
1202
1203 $path =~ s/\.map$//;
1204
1181 # map plan: 1205 # map plan:
1182 # 1206 #
1183 # /! non-realised random map exit (special hack!) 1207 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1208 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1209 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1245 $self->init; # pass $1 etc.
1222 return $self; 1246 return $self;
1223 } 1247 }
1224 } 1248 }
1225 1249
1226 Carp::carp "unable to resolve path '$path'."; 1250 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1251 ()
1228} 1252}
1229 1253
1230sub init { 1254sub init {
1231 my ($self) = @_; 1255 my ($self) = @_;
… …
1246 1270
1247# the original (read-only) location 1271# the original (read-only) location
1248sub load_path { 1272sub load_path {
1249 my ($self) = @_; 1273 my ($self) = @_;
1250 1274
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1275 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1276}
1253 1277
1254# the temporary/swap location 1278# the temporary/swap location
1255sub save_path { 1279sub save_path {
1256 my ($self) = @_; 1280 my ($self) = @_;
1257 1281
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1283 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1284}
1261 1285
1262# the unique path, undef == no special unique path 1286# the unique path, undef == no special unique path
1263sub uniq_path { 1287sub uniq_path {
1264 my ($self) = @_; 1288 my ($self) = @_;
… …
1280 my ($self) = @_; 1304 my ($self) = @_;
1281 1305
1282 utf8::encode (my $save = $self->save_path); 1306 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1309
1310 #d#TODO remove .map and also nuke
1311 $save =~ s/\.map// or return;#d#
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1285} 1314}
1286 1315
1287sub load_header_from($) { 1316sub load_header_from($) {
1288 my ($self, $path) = @_; 1317 my ($self, $path) = @_;
1289 1318
1290 utf8::encode $path; 1319 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1320 #aio_open $path, O_RDONLY, 0
1292 or return; 1321 # or return;
1293 1322
1294 $self->_load_header ($path) 1323 $self->_load_header ($path)
1295 or return; 1324 or return;
1296 1325
1297 $self->{load_path} = $path; 1326 $self->{load_path} = $path;
1298 1327
1299 1 1328 1
1300} 1329}
1301 1330
1302sub load_orig { 1331sub load_header_orig {
1303 my ($self) = @_; 1332 my ($self) = @_;
1304 1333
1305 $self->load_header_from ($self->load_path) 1334 $self->load_header_from ($self->load_path)
1306} 1335}
1307 1336
1308sub load_temp { 1337sub load_header_temp {
1309 my ($self) = @_; 1338 my ($self) = @_;
1310 1339
1311 $self->load_header_from ($self->save_path) 1340 $self->load_header_from ($self->save_path)
1341}
1342
1343sub prepare_temp {
1344 my ($self) = @_;
1345
1346 $self->last_access ((delete $self->{last_access})
1347 || $cf::RUNTIME); #d#
1348 # safety
1349 $self->{instantiate_time} = $cf::RUNTIME
1350 if $self->{instantiate_time} > $cf::RUNTIME;
1351}
1352
1353sub prepare_orig {
1354 my ($self) = @_;
1355
1356 $self->{load_original} = 1;
1357 $self->{instantiate_time} = $cf::RUNTIME;
1358 $self->last_access ($cf::RUNTIME);
1359 $self->instantiate;
1312} 1360}
1313 1361
1314sub load_header { 1362sub load_header {
1315 my ($self) = @_; 1363 my ($self) = @_;
1316 1364
1317 if ($self->load_temp) { 1365 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1366 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1367 } else {
1324 $self->load_orig 1368 $self->load_header_orig
1325 or return; 1369 or return;
1326 1370 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1371 }
1332 1372
1333 1 1373 1
1334} 1374}
1335 1375
… …
1349 $map->{last_save} = $cf::RUNTIME; 1389 $map->{last_save} = $cf::RUNTIME;
1350 1390
1351 $map->load_header 1391 $map->load_header
1352 or return; 1392 or return;
1353 1393
1354 if ($map->should_reset) { 1394 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1355 # doing this can freeze the server in a sync job, obviously 1395 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait; 1396 #$cf::WAIT_FOR_TICK->wait;
1357 $map->reset; 1397 $map->reset;
1358 undef $guard; 1398 undef $guard;
1359 $map = find $path 1399 return find $path;
1360 or return;
1361 } 1400 }
1362 1401
1363 $cf::MAP{$path} = $map 1402 $cf::MAP{$path} = $map
1364 } 1403 }
1365} 1404}
1405
1406sub pre_load { }
1407sub post_load { }
1366 1408
1367sub load { 1409sub load {
1368 my ($self) = @_; 1410 my ($self) = @_;
1369 1411
1412 local $self->{deny_reset} = 1; # loading can take a long time
1413
1370 my $path = $self->{path}; 1414 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1415 my $guard = cf::lock_acquire "map_load:$path";
1372 1416
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1417 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1418
1375 $self->in_memory (cf::MAP_LOADING); 1419 $self->in_memory (cf::MAP_LOADING);
1376 1420
1377 $self->alloc; 1421 $self->alloc;
1422
1423 $self->pre_load;
1424
1378 $self->_load_objects ($self->{load_path}, 1) 1425 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1426 or return;
1380 1427
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1428 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1429 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1451 unless $self->difficulty;
1405 Coro::cede; 1452 Coro::cede;
1406 $self->activate; 1453 $self->activate;
1407 } 1454 }
1408 1455
1456 $self->post_load;
1457
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1458 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1459}
1411 1460
1412sub customise_for { 1461sub customise_for {
1413 my ($self, $ob) = @_; 1462 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1526 delete $MAP_PREFETCH{$path};
1478 } 1527 }
1479 } 1528 }
1480 undef $MAP_PREFETCHER; 1529 undef $MAP_PREFETCHER;
1481 }; 1530 };
1531 $MAP_PREFETCHER->prio (6);
1482 1532
1483 () 1533 ()
1484} 1534}
1485 1535
1486sub save { 1536sub save {
… …
1605 for (@$files) { 1655 for (@$files) {
1606 utf8::decode $_; 1656 utf8::decode $_;
1607 next if /\.pst$/; 1657 next if /\.pst$/;
1608 next unless /^$PATH_SEP/o; 1658 next unless /^$PATH_SEP/o;
1609 1659
1610 s/\.map$//; 1660 push @paths, cf::map::normalise $_;
1611 push @paths, $_;
1612 } 1661 }
1613 1662
1614 \@paths 1663 \@paths
1615} 1664}
1616 1665
… …
1710=cut 1759=cut
1711 1760
1712sub link_map { 1761sub link_map {
1713 unless ($LINK_MAP) { 1762 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}" 1763 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1764 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716 $LINK_MAP->load; 1765 $LINK_MAP->load;
1717 } 1766 }
1718 1767
1719 $LINK_MAP 1768 $LINK_MAP
1720} 1769}
… …
1727 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1776 return if UNIVERSAL::isa $self->map, "ext::map_link";
1728 1777
1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730 if $self->map; 1779 if $self->map;
1731 1780
1732 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1781 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1733} 1782}
1734 1783
1735sub cf::object::player::leave_link { 1784sub cf::object::player::leave_link {
1736 my ($self, $map, $x, $y) = @_; 1785 my ($self, $map, $x, $y) = @_;
1737 1786
… …
1804 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1805 1854
1806 $self->enter_link; 1855 $self->enter_link;
1807 1856
1808 (async { 1857 (async {
1858 my $map = eval {
1809 my $map = cf::map::find $path; 1859 my $map = cf::map::find $path;
1810 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1811 1861 $map
1812# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1813# if $map;
1814
1815 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1816 1864
1817 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1818 })->prio (1); 1866 })->prio (1);
1819} 1867}
1820 1868
… …
1851 # that depends on the exit object 1899 # that depends on the exit object
1852 1900
1853 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1854 1902
1855 if ($exit->map) { 1903 if ($exit->map) {
1856 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1857 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1858 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1859 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1860 } 1908 }
1861 1909
… …
1878sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1879 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1880 1928
1881 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1882 1930
1931 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job
1933 cf::sync_job { prepare_random_map $exit };
1934 }
1935
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp;
1939
1883 $self->enter_link; 1940 $self->enter_link;
1884 1941
1885 (async { 1942 (async {
1886 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1887 unless (eval { 1944 unless (eval {
1888 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1889 if $exit->slaying eq "/!";
1890
1891 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1892 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1893 1946
1894 1; 1947 1;
1895 }) { 1948 }) {
1896 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1897 . "I'll try to bring you back to the map you were before. " 1950 . "I'll try to bring you back to the map you were before. "
… …
1958 # get handled first 2011 # get handled first
1959 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1960 or return; # be conservative, not sure how that can happen, but we saw a crash here 2013 or return; # be conservative, not sure how that can happen, but we saw a crash here
1961 2014
1962 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1963 2017
1964 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1965 2019
1966 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1967 if (@$queue) { 2021 if (@$queue) {
… …
2186 sub db_sync() { 2240 sub db_sync() {
2187 db_save if $dirty; 2241 db_save if $dirty;
2188 undef $dirty; 2242 undef $dirty;
2189 } 2243 }
2190 2244
2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2245 my $idle = Event->idle (
2192 db_sync; 2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2193 }); 2252 );
2194 2253
2195 sub db_dirty() { 2254 sub db_dirty() {
2196 $dirty = 1; 2255 $dirty = 1;
2197 $idle->start; 2256 $idle->start;
2198 } 2257 }
… …
2219 }, 2278 },
2220 ); 2279 );
2221} 2280}
2222 2281
2223############################################################################# 2282#############################################################################
2224# the server's main() 2283# the server's init and main functions
2284
2285sub load_resources {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2287 or die "unable to load regions file\n";#d#
2288}
2225 2289
2226sub cfg_load { 2290sub cfg_load {
2227 open my $fh, "<:utf8", cf::confdir . "/config" 2291 open my $fh, "<:utf8", cf::confdir . "/config"
2228 or return; 2292 or return;
2229 2293
… …
2240 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2304 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2241 and die "WARNING: m(un)lockall failed: $!\n"; 2305 and die "WARNING: m(un)lockall failed: $!\n";
2242 }; 2306 };
2243 warn $@ if $@; 2307 warn $@ if $@;
2244 } 2308 }
2309}
2310
2311sub init {
2312 load_resources;
2245} 2313}
2246 2314
2247sub main { 2315sub main {
2248 # we must not ever block the main coroutine 2316 # we must not ever block the main coroutine
2249 local $Coro::idle = sub { 2317 local $Coro::idle = sub {
… …
2266 2334
2267# install some emergency cleanup handlers 2335# install some emergency cleanup handlers
2268BEGIN { 2336BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2337 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2338 Event->signal (
2339 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2340 data => WF_AUTOCANCEL,
2272 signal => $signal, 2341 signal => $signal,
2342 prio => 0,
2273 cb => sub { 2343 cb => sub {
2274 cf::cleanup "SIG$signal"; 2344 cf::cleanup "SIG$signal";
2275 }, 2345 },
2276 ); 2346 );
2277 } 2347 }
2278} 2348}
… …
2408 warn "reattaching attachments to objects/players"; 2478 warn "reattaching attachments to objects/players";
2409 _global_reattach; 2479 _global_reattach;
2410 warn "reattaching attachments to maps"; 2480 warn "reattaching attachments to maps";
2411 reattach $_ for values %MAP; 2481 reattach $_ for values %MAP;
2412 2482
2483 warn "loading reloadable resources";
2484 load_resources;
2485
2413 warn "restarting server ticker"; 2486 warn "restarting server ticker";
2414 2487
2415 $TICK_WATCHER->start; 2488 $TICK_WATCHER->start;
2416 }; 2489 };
2417 2490
… …
2433 $who->message ("reloading server."); 2506 $who->message ("reloading server.");
2434 2507
2435 # doing reload synchronously and two reloads happen back-to-back, 2508 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2509 # coro crashes during coro_state_free->destroy here.
2437 2510
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2511 $RELOAD_WATCHER ||= Event->timer (
2512 reentrant => 0,
2513 after => 0,
2514 data => WF_AUTOCANCEL,
2515 cb => sub {
2439 reload; 2516 reload;
2440 undef $RELOAD_WATCHER; 2517 undef $RELOAD_WATCHER;
2518 },
2441 }); 2519 );
2442 } 2520 }
2443}; 2521};
2444 2522
2445unshift @INC, $LIBDIR; 2523unshift @INC, $LIBDIR;
2446 2524
… …
2466 $NEXT_TICK += $TICK; 2544 $NEXT_TICK += $TICK;
2467 2545
2468 $WAIT_FOR_TICK->broadcast; 2546 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2470 2548
2549 Event::sweep;
2550 Coro::cede_notself;
2551
2552# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d#
2554
2471 # if we are delayed by four ticks or more, skip them all 2555 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2557
2474 $TICK_WATCHER->at ($NEXT_TICK); 2558 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2559 $TICK_WATCHER->start;
2476 }, 2560 },
2477); 2561);
2478 2562
2563{
2564 BDB::max_poll_time $TICK * 0.1;
2565 $BDB_POLL_WATCHER = Event->io (
2566 reentrant => 0,
2567 fd => BDB::poll_fileno,
2568 poll => 'r',
2569 prio => 0,
2570 data => WF_AUTOCANCEL,
2571 cb => \&BDB::poll_cb,
2572 );
2573 BDB::min_parallel 8;
2574
2575 BDB::set_sync_prepare {
2576 my $status;
2577 my $current = $Coro::current;
2578 (
2579 sub {
2580 $status = $!;
2581 $current->ready; undef $current;
2582 },
2583 sub {
2584 Coro::schedule while defined $current;
2585 $! = $status;
2586 },
2587 )
2588 };
2589
2590 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create;
2592
2593 cf::sync_job {
2594 BDB::db_env_open
2595 $DB_ENV,
2596 $BDB_ENV_DIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666;
2600
2601 cf::cleanup "$!" if $!;
2602
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2604 $DB_ENV->set_lk_detect;
2605 };
2606 }
2607}
2608
2609{
2610 IO::AIO::min_parallel 8;
2611
2612 undef $Coro::AIO::WATCHER;
2479IO::AIO::max_poll_time $TICK * 0.2; 2613 IO::AIO::max_poll_time $TICK * 0.1;
2480
2481$AIO_POLL_WATCHER = Event->io ( 2614 $AIO_POLL_WATCHER = Event->io (
2615 reentrant => 0,
2482 fd => IO::AIO::poll_fileno, 2616 fd => IO::AIO::poll_fileno,
2483 poll => 'r', 2617 poll => 'r',
2484 prio => 5, 2618 prio => 6,
2485 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2486 cb => \&IO::AIO::poll_cb, 2620 cb => \&IO::AIO::poll_cb,
2487); 2621 );
2622}
2488 2623
2489$WRITE_RUNTIME_WATCHER = Event->timer ( 2624$WRITE_RUNTIME_WATCHER = Event->timer (
2625 reentrant => 0,
2490 data => WF_AUTOCANCEL, 2626 data => WF_AUTOCANCEL,
2491 after => 1, 2627 after => 1,
2492 interval => 10, 2628 interval => 10,
2493 prio => 6, # keep it lowest so it acts like a watchdog 2629 prio => 6, # keep it lowest so it acts like a watchdog
2494 cb => Coro::unblock_sub { 2630 cb => Coro::unblock_sub {
2495 write_runtime 2631 write_runtime
2496 or warn "ERROR: unable to write runtime file: $!"; 2632 or warn "ERROR: unable to write runtime file: $!";
2497 }, 2633 },
2498); 2634);
2499 2635

Diff Legend

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