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.190 by root, Mon Jan 22 03:44:41 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 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
… …
774 } 776 }
775 } else { 777 } else {
776 aio_unlink $filename; 778 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
778 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
779 } 787 }
780} 788}
781 789
782sub object_freezer_as_string { 790sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
789 797
790sub object_thawer_load { 798sub object_thawer_load {
791 my ($filename) = @_; 799 my ($filename) = @_;
792 800
793 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
794 805
795 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
796 or return; 807 or return;
797 808
798 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1078 for (@$files) { 1089 for (@$files) {
1079 utf8::decode $_; 1090 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1082 1093
1083 s/\.map$//;
1084 push @paths, "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1085 } 1095 }
1086 1096
1087 \@paths 1097 \@paths
1088} 1098}
1089 1099
… …
1176} 1186}
1177 1187
1178sub normalise { 1188sub normalise {
1179 my ($path, $base) = @_; 1189 my ($path, $base) = @_;
1180 1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1194
1181 # map plan: 1195 # map plan:
1182 # 1196 #
1183 # /! non-realised random map exit (special hack!) 1197 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1198 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1199 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1235 $self->init; # pass $1 etc.
1222 return $self; 1236 return $self;
1223 } 1237 }
1224 } 1238 }
1225 1239
1226 Carp::carp "unable to resolve path '$path'."; 1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1241 ()
1228} 1242}
1229 1243
1230sub init { 1244sub init {
1231 my ($self) = @_; 1245 my ($self) = @_;
… …
1246 1260
1247# the original (read-only) location 1261# the original (read-only) location
1248sub load_path { 1262sub load_path {
1249 my ($self) = @_; 1263 my ($self) = @_;
1250 1264
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1266}
1253 1267
1254# the temporary/swap location 1268# the temporary/swap location
1255sub save_path { 1269sub save_path {
1256 my ($self) = @_; 1270 my ($self) = @_;
1257 1271
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1274}
1261 1275
1262# the unique path, undef == no special unique path 1276# the unique path, undef == no special unique path
1263sub uniq_path { 1277sub uniq_path {
1264 my ($self) = @_; 1278 my ($self) = @_;
… …
1280 my ($self) = @_; 1294 my ($self) = @_;
1281 1295
1282 utf8::encode (my $save = $self->save_path); 1296 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1285} 1304}
1286 1305
1287sub load_header_from($) { 1306sub load_header_from($) {
1288 my ($self, $path) = @_; 1307 my ($self, $path) = @_;
1289 1308
1290 utf8::encode $path; 1309 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1292 or return; 1311 # or return;
1293 1312
1294 $self->_load_header ($path) 1313 $self->_load_header ($path)
1295 or return; 1314 or return;
1296 1315
1297 $self->{load_path} = $path; 1316 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1379 $map->{last_save} = $cf::RUNTIME;
1361 1380
1362 $map->load_header 1381 $map->load_header
1363 or return; 1382 or return;
1364 1383
1365 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1385 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1386 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1387 $map->reset;
1369 undef $guard; 1388 undef $guard;
1370 $map = find $path 1389 return find $path;
1371 or return;
1372 } 1390 }
1373 1391
1374 $cf::MAP{$path} = $map 1392 $cf::MAP{$path} = $map
1375 } 1393 }
1376} 1394}
… …
1378sub pre_load { } 1396sub pre_load { }
1379sub post_load { } 1397sub post_load { }
1380 1398
1381sub load { 1399sub load {
1382 my ($self) = @_; 1400 my ($self) = @_;
1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1383 1403
1384 my $path = $self->{path}; 1404 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1405 my $guard = cf::lock_acquire "map_load:$path";
1386 1406
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1625 for (@$files) { 1645 for (@$files) {
1626 utf8::decode $_; 1646 utf8::decode $_;
1627 next if /\.pst$/; 1647 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1629 1649
1630 s/\.map$//; 1650 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1651 }
1633 1652
1634 \@paths 1653 \@paths
1635} 1654}
1636 1655
… …
1730=cut 1749=cut
1731 1750
1732sub link_map { 1751sub link_map {
1733 unless ($LINK_MAP) { 1752 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1753 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1755 $LINK_MAP->load;
1737 } 1756 }
1738 1757
1739 $LINK_MAP 1758 $LINK_MAP
1740} 1759}
… …
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1767
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1769 if $self->map;
1751 1770
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1772}
1754 1773
1755sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1757 1776
… …
1824 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1825 1844
1826 $self->enter_link; 1845 $self->enter_link;
1827 1846
1828 (async { 1847 (async {
1848 my $map = eval {
1829 my $map = cf::map::find $path; 1849 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1831 1851 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1836 1854
1837 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1856 })->prio (1);
1839} 1857}
1840 1858
… …
1871 # that depends on the exit object 1889 # that depends on the exit object
1872 1890
1873 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1874 1892
1875 if ($exit->map) { 1893 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1880 } 1898 }
1881 1899
… …
1898sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1900 1918
1901 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1902 1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1929
1903 $self->enter_link; 1930 $self->enter_link;
1904 1931
1905 (async { 1932 (async {
1906 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 1934 unless (eval {
1908 prepare_random_map $exit 1935 $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 1936
1914 1; 1937 1;
1915 }) { 1938 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
… …
2294 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 2318 Event->signal (
2296 reentrant => 0, 2319 reentrant => 0,
2297 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2298 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2299 cb => sub { 2323 cb => sub {
2300 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2301 }, 2325 },
2302 ); 2326 );
2303 } 2327 }
… …
2478my $bug_warning = 0; 2502my $bug_warning = 0;
2479 2503
2480$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2481 reentrant => 0, 2505 reentrant => 0,
2482 parked => 1, 2506 parked => 1,
2483 prio => -1, 2507 prio => 0,
2484 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2485 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2486 cb => sub { 2510 cb => sub {
2487 if ($Coro::current != $Coro::main) { 2511 if ($Coro::current != $Coro::main) {
2488 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
… …
2497 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2498 2522
2499 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501 2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2502 my $AFTER = Event::time; 2529# my $AFTER = Event::time;
2503 warn $AFTER - $NOW;#d# 2530# warn $AFTER - $NOW;#d#
2504 2531
2505 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2506 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2507 2534
2508 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2509 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2510 }, 2537 },
2511); 2538);
2512 2539
2513IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2514 2541
2515undef $Coro::AIO::WATCHER; 2542undef $Coro::AIO::WATCHER;
2516$AIO_POLL_WATCHER = Event->io ( 2543$AIO_POLL_WATCHER = Event->io (
2517 reentrant => 0, 2544 reentrant => 0,
2518 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,

Diff Legend

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