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.189 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.205 by root, Mon Feb 5 18:29:20 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;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 50our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 51our $NEXT_TICK;
52our $NOW; 52our $NOW;
53our $USE_FSYNC = 1; # use fsync to write maps - default off
53 54
54our %CFG; 55our %CFG;
55 56
56our $UPTIME; $UPTIME ||= time; 57our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 58our $RUNTIME;
82mkdir cf::localdir . "/" . cf::tmpdir; 83mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 84mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 85mkdir $RANDOM_MAPS;
85 86
86our $EMERGENCY_POSITION; 87our $EMERGENCY_POSITION;
88
89sub cf::map::normalise;
87 90
88############################################################################# 91#############################################################################
89 92
90=head2 GLOBAL VARIABLES 93=head2 GLOBAL VARIABLES
91 94
356 # 60 allows for the watchdog to kill the server. 359 # 60 allows for the watchdog to kill the server.
357 360
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 361 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 362 and return;
360 363
364 # always fsync - this file is important
361 aio_fsync $fh 365 aio_fsync $fh
362 and return; 366 and return;
363 367
364 close $fh 368 close $fh
365 or return; 369 or return;
750 $filename, length $$rdata, scalar @$objs; 754 $filename, length $$rdata, scalar @$objs;
751 755
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 756 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 757 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 758 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 759 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 760 close $fh;
757 761
758 if (@$objs) { 762 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 765 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 766 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 767 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 768 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 769 aio_rename "$filename.pst~", "$filename.pst";
766 } 770 }
767 } else { 771 } else {
768 aio_unlink "$filename.pst"; 772 aio_unlink "$filename.pst";
774 } 778 }
775 } else { 779 } else {
776 aio_unlink $filename; 780 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
778 } 782 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
779 } 789 }
780} 790}
781 791
782sub object_freezer_as_string { 792sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 793 my ($rdata, $objs) = @_;
789 799
790sub object_thawer_load { 800sub object_thawer_load {
791 my ($filename) = @_; 801 my ($filename) = @_;
792 802
793 my ($data, $av); 803 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
794 807
795 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
796 or return; 809 or return;
797 810
798 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
1068=cut 1081=cut
1069 1082
1070sub maps($) { 1083sub maps($) {
1071 my ($pl) = @_; 1084 my ($pl) = @_;
1072 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1073 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1074 or return; 1089 or return;
1075 1090
1076 my @paths; 1091 my @paths;
1077 1092
1078 for (@$files) { 1093 for (@$files) {
1079 utf8::decode $_; 1094 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1082 1097
1083 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1099 }
1086 1100
1087 \@paths 1101 \@paths
1088} 1102}
1089 1103
1176} 1190}
1177 1191
1178sub normalise { 1192sub normalise {
1179 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1180 1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1198
1181 # map plan: 1199 # map plan:
1182 # 1200 #
1183 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1203 # ?xxx/... are special absolute paths
1221 $self->init; # pass $1 etc. 1239 $self->init; # pass $1 etc.
1222 return $self; 1240 return $self;
1223 } 1241 }
1224 } 1242 }
1225 1243
1226 Carp::carp "unable to resolve path '$path'."; 1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1245 ()
1228} 1246}
1229 1247
1230sub init { 1248sub init {
1231 my ($self) = @_; 1249 my ($self) = @_;
1246 1264
1247# the original (read-only) location 1265# the original (read-only) location
1248sub load_path { 1266sub load_path {
1249 my ($self) = @_; 1267 my ($self) = @_;
1250 1268
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1270}
1253 1271
1254# the temporary/swap location 1272# the temporary/swap location
1255sub save_path { 1273sub save_path {
1256 my ($self) = @_; 1274 my ($self) = @_;
1257 1275
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1278}
1261 1279
1262# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1263sub uniq_path { 1281sub uniq_path {
1264 my ($self) = @_; 1282 my ($self) = @_;
1280 my ($self) = @_; 1298 my ($self) = @_;
1281 1299
1282 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1285} 1308}
1286 1309
1287sub load_header_from($) { 1310sub load_header_from($) {
1288 my ($self, $path) = @_; 1311 my ($self, $path) = @_;
1289 1312
1290 utf8::encode $path; 1313 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1314 #aio_open $path, O_RDONLY, 0
1292 or return; 1315 # or return;
1293 1316
1294 $self->_load_header ($path) 1317 $self->_load_header ($path)
1295 or return; 1318 or return;
1296 1319
1297 $self->{load_path} = $path; 1320 $self->{load_path} = $path;
1360 $map->{last_save} = $cf::RUNTIME; 1383 $map->{last_save} = $cf::RUNTIME;
1361 1384
1362 $map->load_header 1385 $map->load_header
1363 or return; 1386 or return;
1364 1387
1365 if ($map->should_reset) { 1388 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1389 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1390 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1391 $map->reset;
1369 undef $guard; 1392 undef $guard;
1370 $map = find $path 1393 return find $path;
1371 or return;
1372 } 1394 }
1373 1395
1374 $cf::MAP{$path} = $map 1396 $cf::MAP{$path} = $map
1375 } 1397 }
1376} 1398}
1378sub pre_load { } 1400sub pre_load { }
1379sub post_load { } 1401sub post_load { }
1380 1402
1381sub load { 1403sub load {
1382 my ($self) = @_; 1404 my ($self) = @_;
1405
1406 local $self->{deny_reset} = 1; # loading can take a long time
1383 1407
1384 my $path = $self->{path}; 1408 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1409 my $guard = cf::lock_acquire "map_load:$path";
1386 1410
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1411 return if $self->in_memory != cf::MAP_SWAPPED;
1625 for (@$files) { 1649 for (@$files) {
1626 utf8::decode $_; 1650 utf8::decode $_;
1627 next if /\.pst$/; 1651 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1652 next unless /^$PATH_SEP/o;
1629 1653
1630 s/\.map$//; 1654 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1655 }
1633 1656
1634 \@paths 1657 \@paths
1635} 1658}
1636 1659
1730=cut 1753=cut
1731 1754
1732sub link_map { 1755sub link_map {
1733 unless ($LINK_MAP) { 1756 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1757 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1758 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1759 $LINK_MAP->load;
1737 } 1760 }
1738 1761
1739 $LINK_MAP 1762 $LINK_MAP
1740} 1763}
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1770 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1771
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1773 if $self->map;
1751 1774
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1775 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1776}
1754 1777
1755sub cf::object::player::leave_link { 1778sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1779 my ($self, $map, $x, $y) = @_;
1757 1780
1824 my ($self, $path, $x, $y) = @_; 1847 my ($self, $path, $x, $y) = @_;
1825 1848
1826 $self->enter_link; 1849 $self->enter_link;
1827 1850
1828 (async { 1851 (async {
1852 my $map = eval {
1829 my $map = cf::map::find $path; 1853 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1854 $map = $map->customise_for ($self) if $map;
1831 1855 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1856 } or
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1857 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1836 1858
1837 $self->leave_link ($map, $x, $y); 1859 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1860 })->prio (1);
1839} 1861}
1840 1862
1871 # that depends on the exit object 1893 # that depends on the exit object
1872 1894
1873 my $rmp = parse_random_map_params $exit->msg; 1895 my $rmp = parse_random_map_params $exit->msg;
1874 1896
1875 if ($exit->map) { 1897 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1898 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1899 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1900 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1901 $rmp->{origin_y} = $exit->y;
1880 } 1902 }
1881 1903
1898sub cf::object::player::enter_exit { 1920sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 1921 my ($self, $exit) = @_;
1900 1922
1901 return unless $self->type == cf::PLAYER; 1923 return unless $self->type == cf::PLAYER;
1902 1924
1925 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job
1927 cf::sync_job { prepare_random_map $exit };
1928 }
1929
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp;
1932 my $sp = $exit->stats->sp;
1933
1903 $self->enter_link; 1934 $self->enter_link;
1904 1935
1905 (async { 1936 (async {
1906 $self->deactivate_recursive; # just to be sure 1937 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 1938 unless (eval {
1908 prepare_random_map $exit 1939 $self->goto ($slaying, $hp, $sp);
1909 if $exit->slaying eq "/!";
1910
1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1913 1940
1914 1; 1941 1;
1915 }) { 1942 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 1943 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 1944 . "I'll try to bring you back to the map you were before. "
1978 # get handled first 2005 # get handled first
1979 my $queue = delete $ns->{query_queue} 2006 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 2007 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 2008
1982 (shift @$queue)->[1]->($msg); 2009 (shift @$queue)->[1]->($msg);
2010 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2011
1984 push @{ $ns->{query_queue} }, @$queue; 2012 push @{ $ns->{query_queue} }, @$queue;
1985 2013
1986 if (@{ $ns->{query_queue} } == @$queue) { 2014 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2015 if (@$queue) {
2244 }, 2272 },
2245 ); 2273 );
2246} 2274}
2247 2275
2248############################################################################# 2276#############################################################################
2249# the server's main() 2277# the server's init and main functions
2278
2279sub load_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d#
2282}
2250 2283
2251sub cfg_load { 2284sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2285 open my $fh, "<:utf8", cf::confdir . "/config"
2253 or return; 2286 or return;
2254 2287
2265 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2266 and die "WARNING: m(un)lockall failed: $!\n"; 2299 and die "WARNING: m(un)lockall failed: $!\n";
2267 }; 2300 };
2268 warn $@ if $@; 2301 warn $@ if $@;
2269 } 2302 }
2303}
2304
2305sub init {
2306 load_resources;
2270} 2307}
2271 2308
2272sub main { 2309sub main {
2273 # we must not ever block the main coroutine 2310 # we must not ever block the main coroutine
2274 local $Coro::idle = sub { 2311 local $Coro::idle = sub {
2294 for my $signal (qw(INT HUP TERM)) { 2331 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 2332 Event->signal (
2296 reentrant => 0, 2333 reentrant => 0,
2297 data => WF_AUTOCANCEL, 2334 data => WF_AUTOCANCEL,
2298 signal => $signal, 2335 signal => $signal,
2336 prio => 0,
2299 cb => sub { 2337 cb => sub {
2300 cf::cleanup "SIG$signal"; 2338 cf::cleanup "SIG$signal";
2301 }, 2339 },
2302 ); 2340 );
2303 } 2341 }
2433 2471
2434 warn "reattaching attachments to objects/players"; 2472 warn "reattaching attachments to objects/players";
2435 _global_reattach; 2473 _global_reattach;
2436 warn "reattaching attachments to maps"; 2474 warn "reattaching attachments to maps";
2437 reattach $_ for values %MAP; 2475 reattach $_ for values %MAP;
2476
2477 warn "loading reloadable resources";
2478 load_resources;
2438 2479
2439 warn "restarting server ticker"; 2480 warn "restarting server ticker";
2440 2481
2441 $TICK_WATCHER->start; 2482 $TICK_WATCHER->start;
2442 }; 2483 };
2497 $NEXT_TICK += $TICK; 2538 $NEXT_TICK += $TICK;
2498 2539
2499 $WAIT_FOR_TICK->broadcast; 2540 $WAIT_FOR_TICK->broadcast;
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501 2542
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d#
2548
2502 # if we are delayed by four ticks or more, skip them all 2549 # if we are delayed by four ticks or more, skip them all
2503 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2504 2551
2505 $TICK_WATCHER->at ($NEXT_TICK); 2552 $TICK_WATCHER->at ($NEXT_TICK);
2506 $TICK_WATCHER->start; 2553 $TICK_WATCHER->start;
2507 }, 2554 },
2508); 2555);
2509 2556
2510IO::AIO::max_poll_time $TICK * 0.2; 2557IO::AIO::max_poll_time $TICK * 0.1;
2511 2558
2512undef $Coro::AIO::WATCHER; 2559undef $Coro::AIO::WATCHER;
2513$AIO_POLL_WATCHER = Event->io ( 2560$AIO_POLL_WATCHER = Event->io (
2514 reentrant => 0, 2561 reentrant => 0,
2515 fd => IO::AIO::poll_fileno, 2562 fd => IO::AIO::poll_fileno,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines