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.188 by root, Sat Jan 20 23:30:16 2007 UTC vs.
Revision 1.203 by root, Thu Feb 1 19:40:42 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") {
… …
1068=cut 1079=cut
1069 1080
1070sub maps($) { 1081sub maps($) {
1071 my ($pl) = @_; 1082 my ($pl) = @_;
1072 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1073 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1074 or return; 1087 or return;
1075 1088
1076 my @paths; 1089 my @paths;
1077 1090
1078 for (@$files) { 1091 for (@$files) {
1079 utf8::decode $_; 1092 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1082 1095
1083 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1097 }
1086 1098
1087 \@paths 1099 \@paths
1088} 1100}
1089 1101
… …
1176} 1188}
1177 1189
1178sub normalise { 1190sub normalise {
1179 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1180 1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1196
1181 # map plan: 1197 # map plan:
1182 # 1198 #
1183 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1201 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1237 $self->init; # pass $1 etc.
1222 return $self; 1238 return $self;
1223 } 1239 }
1224 } 1240 }
1225 1241
1226 Carp::carp "unable to resolve path '$path'."; 1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1243 ()
1228} 1244}
1229 1245
1230sub init { 1246sub init {
1231 my ($self) = @_; 1247 my ($self) = @_;
… …
1246 1262
1247# the original (read-only) location 1263# the original (read-only) location
1248sub load_path { 1264sub load_path {
1249 my ($self) = @_; 1265 my ($self) = @_;
1250 1266
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1268}
1253 1269
1254# the temporary/swap location 1270# the temporary/swap location
1255sub save_path { 1271sub save_path {
1256 my ($self) = @_; 1272 my ($self) = @_;
1257 1273
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1276}
1261 1277
1262# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1263sub uniq_path { 1279sub uniq_path {
1264 my ($self) = @_; 1280 my ($self) = @_;
… …
1280 my ($self) = @_; 1296 my ($self) = @_;
1281 1297
1282 utf8::encode (my $save = $self->save_path); 1298 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1285} 1306}
1286 1307
1287sub load_header_from($) { 1308sub load_header_from($) {
1288 my ($self, $path) = @_; 1309 my ($self, $path) = @_;
1289 1310
1290 utf8::encode $path; 1311 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1292 or return; 1313 # or return;
1293 1314
1294 $self->_load_header ($path) 1315 $self->_load_header ($path)
1295 or return; 1316 or return;
1296 1317
1297 $self->{load_path} = $path; 1318 $self->{load_path} = $path;
… …
1360 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1361 1382
1362 $map->load_header 1383 $map->load_header
1363 or return; 1384 or return;
1364 1385
1365 if ($map->should_reset) { 1386 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1387 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1388 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1389 $map->reset;
1369 undef $guard; 1390 undef $guard;
1370 $map = find $path 1391 return find $path;
1371 or return;
1372 } 1392 }
1373 1393
1374 $cf::MAP{$path} = $map 1394 $cf::MAP{$path} = $map
1375 } 1395 }
1376} 1396}
… …
1378sub pre_load { } 1398sub pre_load { }
1379sub post_load { } 1399sub post_load { }
1380 1400
1381sub load { 1401sub load {
1382 my ($self) = @_; 1402 my ($self) = @_;
1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1383 1405
1384 my $path = $self->{path}; 1406 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1407 my $guard = cf::lock_acquire "map_load:$path";
1386 1408
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
… …
1496 delete $MAP_PREFETCH{$path}; 1518 delete $MAP_PREFETCH{$path};
1497 } 1519 }
1498 } 1520 }
1499 undef $MAP_PREFETCHER; 1521 undef $MAP_PREFETCHER;
1500 }; 1522 };
1523 $MAP_PREFETCHER->prio (6);
1501 1524
1502 () 1525 ()
1503} 1526}
1504 1527
1505sub save { 1528sub save {
… …
1624 for (@$files) { 1647 for (@$files) {
1625 utf8::decode $_; 1648 utf8::decode $_;
1626 next if /\.pst$/; 1649 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1628 1651
1629 s/\.map$//; 1652 push @paths, cf::map::normalise $_;
1630 push @paths, $_;
1631 } 1653 }
1632 1654
1633 \@paths 1655 \@paths
1634} 1656}
1635 1657
… …
1729=cut 1751=cut
1730 1752
1731sub link_map { 1753sub link_map {
1732 unless ($LINK_MAP) { 1754 unless ($LINK_MAP) {
1733 $LINK_MAP = cf::map::find "{link}" 1755 $LINK_MAP = cf::map::find "{link}"
1734 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1735 $LINK_MAP->load; 1757 $LINK_MAP->load;
1736 } 1758 }
1737 1759
1738 $LINK_MAP 1760 $LINK_MAP
1739} 1761}
… …
1746 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1747 1769
1748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1749 if $self->map; 1771 if $self->map;
1750 1772
1751 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1752} 1774}
1753 1775
1754sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1755 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1756 1778
… …
1823 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1824 1846
1825 $self->enter_link; 1847 $self->enter_link;
1826 1848
1827 (async { 1849 (async {
1850 my $map = eval {
1828 my $map = cf::map::find $path; 1851 my $map = cf::map::find $path;
1829 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1830 1853 $map
1831# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1832# if $map;
1833
1834 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1835 1856
1836 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1837 })->prio (1); 1858 })->prio (1);
1838} 1859}
1839 1860
… …
1870 # that depends on the exit object 1891 # that depends on the exit object
1871 1892
1872 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1873 1894
1874 if ($exit->map) { 1895 if ($exit->map) {
1875 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1876 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1877 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1878 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1879 } 1900 }
1880 1901
… …
1897sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1898 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1899 1920
1900 return unless $self->type == cf::PLAYER; 1921 return unless $self->type == cf::PLAYER;
1901 1922
1923 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job
1925 cf::sync_job { prepare_random_map $exit };
1926 }
1927
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp;
1930 my $sp = $exit->stats->sp;
1931
1902 $self->enter_link; 1932 $self->enter_link;
1903 1933
1904 (async { 1934 (async {
1905 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1906 unless (eval { 1936 unless (eval {
1907 prepare_random_map $exit 1937 $self->goto ($slaying, $hp, $sp);
1908 if $exit->slaying eq "/!";
1909
1910 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1911 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1912 1938
1913 1; 1939 1;
1914 }) { 1940 }) {
1915 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1916 . "I'll try to bring you back to the map you were before. " 1942 . "I'll try to bring you back to the map you were before. "
… …
1977 # get handled first 2003 # get handled first
1978 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1979 or return; # be conservative, not sure how that can happen, but we saw a crash here 2005 or return; # be conservative, not sure how that can happen, but we saw a crash here
1980 2006
1981 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1982 2009
1983 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1984 2011
1985 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1986 if (@$queue) { 2013 if (@$queue) {
… …
2205 sub db_sync() { 2232 sub db_sync() {
2206 db_save if $dirty; 2233 db_save if $dirty;
2207 undef $dirty; 2234 undef $dirty;
2208 } 2235 }
2209 2236
2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2211 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2212 }); 2244 );
2213 2245
2214 sub db_dirty() { 2246 sub db_dirty() {
2215 $dirty = 1; 2247 $dirty = 1;
2216 $idle->start; 2248 $idle->start;
2217 } 2249 }
… …
2238 }, 2270 },
2239 ); 2271 );
2240} 2272}
2241 2273
2242############################################################################# 2274#############################################################################
2243# the server's main() 2275# the server's init and main functions
2276
2277sub load_resources {
2278 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2279 or die "unable to load regions file\n";#d#
2280}
2244 2281
2245sub cfg_load { 2282sub cfg_load {
2246 open my $fh, "<:utf8", cf::confdir . "/config" 2283 open my $fh, "<:utf8", cf::confdir . "/config"
2247 or return; 2284 or return;
2248 2285
… …
2259 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2296 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2260 and die "WARNING: m(un)lockall failed: $!\n"; 2297 and die "WARNING: m(un)lockall failed: $!\n";
2261 }; 2298 };
2262 warn $@ if $@; 2299 warn $@ if $@;
2263 } 2300 }
2301}
2302
2303sub init {
2304 load_resources;
2264} 2305}
2265 2306
2266sub main { 2307sub main {
2267 # we must not ever block the main coroutine 2308 # we must not ever block the main coroutine
2268 local $Coro::idle = sub { 2309 local $Coro::idle = sub {
… …
2285 2326
2286# install some emergency cleanup handlers 2327# install some emergency cleanup handlers
2287BEGIN { 2328BEGIN {
2288 for my $signal (qw(INT HUP TERM)) { 2329 for my $signal (qw(INT HUP TERM)) {
2289 Event->signal ( 2330 Event->signal (
2331 reentrant => 0,
2290 data => WF_AUTOCANCEL, 2332 data => WF_AUTOCANCEL,
2291 signal => $signal, 2333 signal => $signal,
2334 prio => 0,
2292 cb => sub { 2335 cb => sub {
2293 cf::cleanup "SIG$signal"; 2336 cf::cleanup "SIG$signal";
2294 }, 2337 },
2295 ); 2338 );
2296 } 2339 }
2297} 2340}
… …
2427 warn "reattaching attachments to objects/players"; 2470 warn "reattaching attachments to objects/players";
2428 _global_reattach; 2471 _global_reattach;
2429 warn "reattaching attachments to maps"; 2472 warn "reattaching attachments to maps";
2430 reattach $_ for values %MAP; 2473 reattach $_ for values %MAP;
2431 2474
2475 warn "loading reloadable resources";
2476 load_resources;
2477
2432 warn "restarting server ticker"; 2478 warn "restarting server ticker";
2433 2479
2434 $TICK_WATCHER->start; 2480 $TICK_WATCHER->start;
2435 }; 2481 };
2436 2482
… …
2452 $who->message ("reloading server."); 2498 $who->message ("reloading server.");
2453 2499
2454 # doing reload synchronously and two reloads happen back-to-back, 2500 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here. 2501 # coro crashes during coro_state_free->destroy here.
2456 2502
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2503 $RELOAD_WATCHER ||= Event->timer (
2504 reentrant => 0,
2505 after => 0,
2506 data => WF_AUTOCANCEL,
2507 cb => sub {
2458 reload; 2508 reload;
2459 undef $RELOAD_WATCHER; 2509 undef $RELOAD_WATCHER;
2510 },
2460 }); 2511 );
2461 } 2512 }
2462}; 2513};
2463 2514
2464unshift @INC, $LIBDIR; 2515unshift @INC, $LIBDIR;
2465 2516
… …
2485 $NEXT_TICK += $TICK; 2536 $NEXT_TICK += $TICK;
2486 2537
2487 $WAIT_FOR_TICK->broadcast; 2538 $WAIT_FOR_TICK->broadcast;
2488 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2539 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2489 2540
2541 Event::sweep;
2542 Coro::cede_notself;
2543
2544# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d#
2546
2490 # if we are delayed by four ticks or more, skip them all 2547 # if we are delayed by four ticks or more, skip them all
2491 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2492 2549
2493 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2494 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2495 }, 2552 },
2496); 2553);
2497 2554
2498IO::AIO::max_poll_time $TICK * 0.2; 2555IO::AIO::max_poll_time $TICK * 0.1;
2499 2556
2557undef $Coro::AIO::WATCHER;
2500$AIO_POLL_WATCHER = Event->io ( 2558$AIO_POLL_WATCHER = Event->io (
2559 reentrant => 0,
2501 fd => IO::AIO::poll_fileno, 2560 fd => IO::AIO::poll_fileno,
2502 poll => 'r', 2561 poll => 'r',
2503 prio => 5, 2562 prio => 6,
2504 data => WF_AUTOCANCEL, 2563 data => WF_AUTOCANCEL,
2505 cb => \&IO::AIO::poll_cb, 2564 cb => \&IO::AIO::poll_cb,
2506); 2565);
2507 2566
2508$WRITE_RUNTIME_WATCHER = Event->timer ( 2567$WRITE_RUNTIME_WATCHER = Event->timer (
2568 reentrant => 0,
2509 data => WF_AUTOCANCEL, 2569 data => WF_AUTOCANCEL,
2510 after => 1, 2570 after => 1,
2511 interval => 10, 2571 interval => 10,
2512 prio => 6, # keep it lowest so it acts like a watchdog 2572 prio => 6, # keep it lowest so it acts like a watchdog
2513 cb => Coro::unblock_sub { 2573 cb => Coro::unblock_sub {
2514 write_runtime 2574 write_runtime
2515 or warn "ERROR: unable to write runtime file: $!"; 2575 or warn "ERROR: unable to write runtime file: $!";
2516 }, 2576 },
2517); 2577);
2518 2578

Diff Legend

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