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.192 by root, Wed Jan 24 01:43:01 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
… …
1178sub normalise { 1198sub normalise {
1179 my ($path, $base) = @_; 1199 my ($path, $base) = @_;
1180 1200
1181 $path = "$path"; # make sure its a string 1201 $path = "$path"; # make sure its a string
1182 1202
1203 $path =~ s/\.map$//;
1204
1183 # map plan: 1205 # map plan:
1184 # 1206 #
1185 # /! non-realised random map exit (special hack!) 1207 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1208 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1209 # ?xxx/... are special absolute paths
… …
1248 1270
1249# the original (read-only) location 1271# the original (read-only) location
1250sub load_path { 1272sub load_path {
1251 my ($self) = @_; 1273 my ($self) = @_;
1252 1274
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1275 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1276}
1255 1277
1256# the temporary/swap location 1278# the temporary/swap location
1257sub save_path { 1279sub save_path {
1258 my ($self) = @_; 1280 my ($self) = @_;
1259 1281
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1283 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1284}
1263 1285
1264# the unique path, undef == no special unique path 1286# the unique path, undef == no special unique path
1265sub uniq_path { 1287sub uniq_path {
1266 my ($self) = @_; 1288 my ($self) = @_;
… …
1282 my ($self) = @_; 1304 my ($self) = @_;
1283 1305
1284 utf8::encode (my $save = $self->save_path); 1306 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 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#
1287} 1314}
1288 1315
1289sub load_header_from($) { 1316sub load_header_from($) {
1290 my ($self, $path) = @_; 1317 my ($self, $path) = @_;
1291 1318
1292 utf8::encode $path; 1319 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1320 #aio_open $path, O_RDONLY, 0
1294 or return; 1321 # or return;
1295 1322
1296 $self->_load_header ($path) 1323 $self->_load_header ($path)
1297 or return; 1324 or return;
1298 1325
1299 $self->{load_path} = $path; 1326 $self->{load_path} = $path;
… …
1362 $map->{last_save} = $cf::RUNTIME; 1389 $map->{last_save} = $cf::RUNTIME;
1363 1390
1364 $map->load_header 1391 $map->load_header
1365 or return; 1392 or return;
1366 1393
1367 if ($map->should_reset) { 1394 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously 1395 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait; 1396 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1397 $map->reset;
1371 undef $guard; 1398 undef $guard;
1372 return find $path; 1399 return find $path;
… …
1379sub pre_load { } 1406sub pre_load { }
1380sub post_load { } 1407sub post_load { }
1381 1408
1382sub load { 1409sub load {
1383 my ($self) = @_; 1410 my ($self) = @_;
1411
1412 local $self->{deny_reset} = 1; # loading can take a long time
1384 1413
1385 my $path = $self->{path}; 1414 my $path = $self->{path};
1386 my $guard = cf::lock_acquire "map_load:$path"; 1415 my $guard = cf::lock_acquire "map_load:$path";
1387 1416
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1417 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1626 for (@$files) { 1655 for (@$files) {
1627 utf8::decode $_; 1656 utf8::decode $_;
1628 next if /\.pst$/; 1657 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1658 next unless /^$PATH_SEP/o;
1630 1659
1631 s/\.map$//; 1660 push @paths, cf::map::normalise $_;
1632 push @paths, $_;
1633 } 1661 }
1634 1662
1635 \@paths 1663 \@paths
1636} 1664}
1637 1665
… …
1731=cut 1759=cut
1732 1760
1733sub link_map { 1761sub link_map {
1734 unless ($LINK_MAP) { 1762 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1763 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1764 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1765 $LINK_MAP->load;
1738 } 1766 }
1739 1767
1740 $LINK_MAP 1768 $LINK_MAP
1741} 1769}
… …
1748 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1776 return if UNIVERSAL::isa $self->map, "ext::map_link";
1749 1777
1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1751 if $self->map; 1779 if $self->map;
1752 1780
1753 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1781 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1754} 1782}
1755 1783
1756sub cf::object::player::leave_link { 1784sub cf::object::player::leave_link {
1757 my ($self, $map, $x, $y) = @_; 1785 my ($self, $map, $x, $y) = @_;
1758 1786
… …
1825 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1826 1854
1827 $self->enter_link; 1855 $self->enter_link;
1828 1856
1829 (async { 1857 (async {
1858 my $map = eval {
1830 my $map = cf::map::find $path; 1859 my $map = cf::map::find $path;
1831 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1832 1861 $map
1833# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1834# if $map;
1835
1836 $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);
1837 1864
1838 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1839 })->prio (1); 1866 })->prio (1);
1840} 1867}
1841 1868
… …
1872 # that depends on the exit object 1899 # that depends on the exit object
1873 1900
1874 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1875 1902
1876 if ($exit->map) { 1903 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1881 } 1908 }
1882 1909
… …
1899sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1900 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1901 1928
1902 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1903 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
1904 $self->enter_link; 1940 $self->enter_link;
1905 1941
1906 (async { 1942 (async {
1907 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1908 unless (eval { 1944 unless (eval {
1909 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1910 if $exit->slaying eq "/!";
1911
1912 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1913 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1914 1946
1915 1; 1947 1;
1916 }) { 1948 }) {
1917 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1918 . "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. "
… …
1979 # get handled first 2011 # get handled first
1980 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1981 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
1982 2014
1983 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1984 2017
1985 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1986 2019
1987 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1988 if (@$queue) { 2021 if (@$queue) {
… …
2245 }, 2278 },
2246 ); 2279 );
2247} 2280}
2248 2281
2249############################################################################# 2282#############################################################################
2250# 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}
2251 2289
2252sub cfg_load { 2290sub cfg_load {
2253 open my $fh, "<:utf8", cf::confdir . "/config" 2291 open my $fh, "<:utf8", cf::confdir . "/config"
2254 or return; 2292 or return;
2255 2293
… …
2266 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2304 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2267 and die "WARNING: m(un)lockall failed: $!\n"; 2305 and die "WARNING: m(un)lockall failed: $!\n";
2268 }; 2306 };
2269 warn $@ if $@; 2307 warn $@ if $@;
2270 } 2308 }
2309}
2310
2311sub init {
2312 load_resources;
2271} 2313}
2272 2314
2273sub main { 2315sub main {
2274 # we must not ever block the main coroutine 2316 # we must not ever block the main coroutine
2275 local $Coro::idle = sub { 2317 local $Coro::idle = sub {
… …
2436 warn "reattaching attachments to objects/players"; 2478 warn "reattaching attachments to objects/players";
2437 _global_reattach; 2479 _global_reattach;
2438 warn "reattaching attachments to maps"; 2480 warn "reattaching attachments to maps";
2439 reattach $_ for values %MAP; 2481 reattach $_ for values %MAP;
2440 2482
2483 warn "loading reloadable resources";
2484 load_resources;
2485
2441 warn "restarting server ticker"; 2486 warn "restarting server ticker";
2442 2487
2443 $TICK_WATCHER->start; 2488 $TICK_WATCHER->start;
2444 }; 2489 };
2445 2490
… …
2513 $TICK_WATCHER->at ($NEXT_TICK); 2558 $TICK_WATCHER->at ($NEXT_TICK);
2514 $TICK_WATCHER->start; 2559 $TICK_WATCHER->start;
2515 }, 2560 },
2516); 2561);
2517 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;
2518IO::AIO::max_poll_time $TICK * 0.1; 2613 IO::AIO::max_poll_time $TICK * 0.1;
2519
2520undef $Coro::AIO::WATCHER;
2521$AIO_POLL_WATCHER = Event->io ( 2614 $AIO_POLL_WATCHER = Event->io (
2522 reentrant => 0, 2615 reentrant => 0,
2523 fd => IO::AIO::poll_fileno, 2616 fd => IO::AIO::poll_fileno,
2524 poll => 'r', 2617 poll => 'r',
2525 prio => 6, 2618 prio => 6,
2526 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2527 cb => \&IO::AIO::poll_cb, 2620 cb => \&IO::AIO::poll_cb,
2528); 2621 );
2622}
2529 2623
2530$WRITE_RUNTIME_WATCHER = Event->timer ( 2624$WRITE_RUNTIME_WATCHER = Event->timer (
2531 reentrant => 0, 2625 reentrant => 0,
2532 data => WF_AUTOCANCEL, 2626 data => WF_AUTOCANCEL,
2533 after => 1, 2627 after => 1,

Diff Legend

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