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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
87our %CFG; 87our %CFG;
88 88
89our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 90our $RUNTIME;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
… …
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
282Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
283 286
284=cut 287=cut
285 288
286our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
287 291
288sub lock_wait($) { 292sub lock_wait($) {
289 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
290 299
291 # wait for lock, if any 300 # wait for lock, if any
292 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 303 Coro::schedule;
… …
300 309
301 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
302 lock_wait $key; 311 lock_wait $key;
303 312
304 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
305 315
306 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
309 } 320 }
310} 321}
311 322
… …
478sub fork_call(&@) { 489sub fork_call(&@) {
479 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
480 491
481 # we seemingly have to make a local copy of the whole thing, 492 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 493 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 494 # TODO: investigate and fix (likely this will be rather laborious)
484 495
485 my @res = Coro::Util::fork_eval { 496 my @res = Coro::Util::fork_eval {
486 reset_signals; 497 reset_signals;
487 &$cb 498 &$cb
488 }, @args; 499 }, @args;
… …
575 if (1) { 586 if (1) {
576 $md5 = 587 $md5 =
577 join "\x00", 588 join "\x00",
578 $processversion, 589 $processversion,
579 map { 590 map {
580 Coro::cede; 591 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 593 } 0.. $#$src;
583 594
584 595
585 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
1001 }, 1012 },
1002); 1013);
1003 1014
1004sub object_freezer_save { 1015sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
1006 1019
1007 sync_job { 1020 sync_job {
1008 if (length $$rdata) { 1021 if (length $$rdata) {
1009 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1034 } 1047 }
1035 } else { 1048 } else {
1036 aio_unlink $filename; 1049 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1038 } 1051 }
1039 } 1052 };
1053
1054 undef $guard;
1040} 1055}
1041 1056
1042sub object_freezer_as_string { 1057sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1044 1059
… …
1049 1064
1050sub object_thawer_load { 1065sub object_thawer_load {
1051 my ($filename) = @_; 1066 my ($filename) = @_;
1052 1067
1053 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1054 1071
1055 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1056 or return; 1073 or return;
1057 1074
1058 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1077 or return;
1078
1079 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1081 }
1063 1082
1064 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1066 return ($data, $av); 1086 ($data, $av)
1067} 1087}
1068 1088
1069=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1070 1090
1071=over 4 1091=over 4
… …
1149 my ($type, $reply, @payload) = 1169 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1170 "ARRAY" eq ref $msg
1151 ? @$msg 1171 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1173
1174 my @reply;
1175
1154 if (my $cb = $EXTCMD{$type}) { 1176 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1177 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1160 } else { 1183 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1185 }
1163 1186
1164 cf::override; 1187 cf::override;
… …
1254 1277
1255=head3 cf::player 1278=head3 cf::player
1256 1279
1257=over 4 1280=over 4
1258 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1259=item cf::player::find $login 1296=item cf::player::find $login
1260 1297
1261Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1262 1299
1263=cut 1300=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1339
1303 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1306 } 1349 }
1307 } 1350 }
1308} 1351}
1309 1352
… …
1319 1362
1320 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1322 1365
1323 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1324 Coro::cede; 1367 cf::cede_to_tick;
1325} 1368}
1326 1369
1327sub new($) { 1370sub new($) {
1328 my ($login) = @_; 1371 my ($login) = @_;
1329 1372
… …
1407 or return []; 1450 or return [];
1408 1451
1409 my @logins; 1452 my @logins;
1410 1453
1411 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1415 1463
1416 utf8::decode $login; 1464 utf8::decode $login;
1417 push @logins, $login; 1465 push @logins, $login;
1418 } 1466 }
1419 1467
… …
1457sub expand_cfpod { 1505sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1459 1507
1460 # escape & and < 1508 # escape & and <
1461 s/&/&amp;/g; 1509 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1463 1511
1464 # this is buggy, it needs to properly take care of nested <'s 1512 # this is buggy, it needs to properly take care of nested <'s
1465 1513
1466 1 while 1514 1 while
1467 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1520 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1474 }ge 1523 }ge
1475 # replace H<hint text> 1524 # replace H<hint text>
… …
1505=cut 1554=cut
1506 1555
1507sub ext_reply($$@) { 1556sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1557 my ($self, $id, @msg) = @_;
1509 1558
1510 if ($self->ns->extcmd == 2) { 1559 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1560}
1518 1561
1519=item $player->ext_msg ($type, @msg) 1562=item $player->ext_msg ($type, @msg)
1520 1563
1521Sends an ext event to the client. 1564Sends an ext event to the client.
… …
1749 1792
1750sub load_header_from($) { 1793sub load_header_from($) {
1751 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1752 1795
1753 utf8::encode $path; 1796 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1759 1805
1760 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1761 1807
1762 1 1808 1
1763} 1809}
… …
1817sub find { 1863sub find {
1818 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1819 1865
1820 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1821 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1823 1870
1824 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1826 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1827 or return; 1876 or return;
1828 1877
1829 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1830 1879
… …
1832 or return; 1881 or return;
1833 1882
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1837 $map->reset; 1888 $map->reset;
1838 undef $guard;
1839 return find $path; 1889 return find $path;
1840 } 1890 }
1841 1891
1842 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1843 } 1893 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1853 1903
1854 my $path = $self->{path}; 1904 my $path = $self->{path};
1855 1905
1856 { 1906 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1858 1908
1909 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1911
1861 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1862 1913
1863 $self->alloc; 1914 $self->alloc;
1864 1915
1865 $self->pre_load; 1916 $self->pre_load;
1866 Coro::cede; 1917 cf::cede_to_tick;
1867 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1869 or return; 1922 or return;
1870 1923
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1873 1926
1874 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1928 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1931 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1879 } 1935 }
1880 } 1936 }
1881 1937
1882 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1883 # now do the right thing for maps 1941 # now do the right thing for maps
1884 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1944 unless $self->difficulty;
1887 Coro::cede; 1945 cf::cede_to_tick;
1888 1946
1889 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1948 $self->decay_objects;
1891 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1892 $self->update_buttons; 1950 $self->update_buttons;
1893 Coro::cede; 1951 cf::cede_to_tick;
1894 $self->set_darkness_map; 1952 $self->set_darkness_map;
1895 Coro::cede; 1953 cf::cede_to_tick;
1896 $self->activate; 1954 $self->activate;
1897 } 1955 }
1898 1956
1899 $self->{last_save} = $cf::RUNTIME; 1957 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1958 $self->last_access ($cf::RUNTIME);
… …
1916 1974
1917 $self 1975 $self
1918} 1976}
1919 1977
1920# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1979sub load_neighbours {
1922 my ($map) = @_; 1980 my ($map) = @_;
1923 1981
1924 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1925 1983
1926 for (0 .. 3) { 1984 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1928 or next; 1986 or next;
1929 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1930 or next; 1988 or next;
1931 $neigh->load; 1989 $neigh->load;
1932 1990
1991 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 1994 }
1936 1995
1937 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1939 or next; 1999 or next;
1940 $neigh->load; 2000 $neigh->load;
1941 } 2001 }
1942} 2002}
1943 2003
… …
1948} 2008}
1949 2009
1950sub do_load_sync { 2010sub do_load_sync {
1951 my ($map) = @_; 2011 my ($map) = @_;
1952 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1953 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1954} 2017}
1955 2018
1956our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1958 2021
1959sub find_async { 2022sub find_async {
1960 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1961 2024
1962 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1963 2026
1964 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2029 }
1967 2030
1968 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1969 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2036 if (my $map = find $k) {
1973 $map->load; 2037 $map->load if $v;
1974 } 2038 }
1975 2039
1976 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1977 } 2041 }
1978 } 2042 }
1979 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1980 }; 2044 };
1981 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1984} 2048}
1985 2049
1986sub save { 2050sub save {
1987 my ($self) = @_; 2051 my ($self) = @_;
1988 2052
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2054
1991 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1992 2056
1993 return unless $self->dirty; 2057 return unless $self->dirty;
1994 2058
… …
2017 my ($self) = @_; 2081 my ($self) = @_;
2018 2082
2019 # save first because save cedes 2083 # save first because save cedes
2020 $self->save; 2084 $self->save;
2021 2085
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2087
2024 return if $self->players; 2088 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2090 return if $self->{deny_save};
2027 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2096 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2097}
2031 2098
2032sub reset_at { 2099sub reset_at {
2033 my ($self) = @_; 2100 my ($self) = @_;
2034 2101
… …
2066 if $uniq; 2133 if $uniq;
2067 } 2134 }
2068 2135
2069 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2070 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2140 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2141
2075 $self->unlink_save; 2142 $self->unlink_save;
2076 $self->destroy; 2143 $self->destroy;
2077} 2144}
2078 2145
2079my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2080 2147
2081sub nuke { 2148sub nuke {
2082 my ($self) = @_; 2149 my ($self) = @_;
2083 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2084 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2085 2155
2086 $self->unlink_save; 2156 $self->unlink_save;
2087 2157
2088 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2163
2094 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2095 2166
2096 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2097} 2168}
2098 2169
2099=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2175 2246
2176sub inv_recursive { 2247sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2178} 2249}
2179 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
2180package cf; 2282package cf;
2181 2283
2182=back 2284=back
2183 2285
2184=head3 cf::object::player 2286=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2315 2417
2316 $map->load; 2418 $map->load;
2317 $map->load_diag; 2419 $map->load_neighbours;
2318 2420
2319 return unless $self->contr->active; 2421 return unless $self->contr->active;
2320 $self->activate_recursive; 2422 $self->activate_recursive;
2321 2423
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2495 2597
2496=cut 2598=cut
2497 2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2498sub cf::client::send_msg { 2615sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2617
2501 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2502 2619
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2504 2624
2505 if (ref $channel) { 2625 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2626 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2627 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2628 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2510 } 2631 }
2511 2632
2512 $channel = $channel->{id}; 2633 $channel = $channel->{id};
2513 } 2634 }
2514 2635
… …
2555=cut 2676=cut
2556 2677
2557sub cf::client::ext_msg($$@) { 2678sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2679 my ($self, $type, @msg) = @_;
2559 2680
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2681 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2683 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2684 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2704 }
2568} 2705}
2569 2706
2570=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2769 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2770 "ARRAY" eq ref $msg
2634 ? @$msg 2771 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2773
2774 my @reply;
2775
2637 if (my $cb = $EXTICMD{$type}) { 2776 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2777 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2643 } else { 2783 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2785 }
2646 2786
2647 cf::override; 2787 cf::override;
… …
2708 2848
2709The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2710 2850
2711 cf::object 2851 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2852 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2853 insert remove name archname title slaying race decrease_ob_nr
2714 2854
2715 cf::object::player 2855 cf::object::player
2716 player 2856 player
2717 2857
2718 cf::player 2858 cf::player
… …
2723 2863
2724=cut 2864=cut
2725 2865
2726for ( 2866for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2732) { 2873) {
2733 no strict 'refs'; 2874 no strict 'refs';
… …
2809# the server's init and main functions 2950# the server's init and main functions
2810 2951
2811sub load_facedata($) { 2952sub load_facedata($) {
2812 my ($path) = @_; 2953 my ($path) = @_;
2813 2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960
2814 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2815 2962
2816 my $facedata; 2963 my $facedata;
2817 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2965 or die "$path: $!";
2819 2966
2820 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2821 2968
2822 $facedata->{version} == 2 2969 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2824 2978
2825 { 2979 {
2826 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2827 2981
2828 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2988
2835 cf::cede_to_tick; 2989 cf::cede_to_tick;
2836 } 2990 }
2837 2991
2838 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
… …
2863 3017
2864 { 3018 {
2865 # TODO: for gcfclient pleasure, we should give resources 3019 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3020 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3021 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3022
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3023 my $soundconf = delete $res->{"res/sound.conf"};
2871 3024
2872 while (my ($name, $info) = each %$res) { 3025 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
2879 3028
2880 if ($info->{type} & 1) { 3029 if ($info->{type} & 1) {
2881 # prepend meta info 3030 # prepend meta info
2882 3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3037 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 3038 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3039 $data = $info->{data};
2889 } 3040 }
2890 3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3043 cf::face::set_type $idx, $info->{type};
2892 3044
2893 cf::cede_to_tick; 3045 cf::cede_to_tick;
2894 } 3046 }
2895 3047
… …
2922 $ns->fx_want ($k, $v); 3074 $ns->fx_want ($k, $v);
2923 } 3075 }
2924}; 3076};
2925 3077
2926sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2927 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2929 3085
2930 for (cf::region::list) { 3086 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
2967 3123
2968sub init { 3124sub init {
2969 reload_resources; 3125 reload_resources;
2970} 3126}
2971 3127
2972sub cfg_load { 3128sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3130 or return;
2975 3131
2976 local $/; 3132 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3153 (async {
2998 Event::one_event; 3154 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
3000 }; 3156 };
3001 3157
3002 cfg_load; 3158 reload_config;
3003 db_init; 3159 db_init;
3004 load_extensions; 3160 load_extensions;
3005 3161
3006 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
3007 Event::loop; 3163 Event::loop;
… …
3200 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3201 require cf; 3357 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3359
3204 warn "loading config and database again"; 3360 warn "loading config and database again";
3205 cf::cfg_load; 3361 cf::reload_config;
3206 3362
3207 warn "loading extensions"; 3363 warn "loading extensions";
3208 cf::load_extensions; 3364 cf::load_extensions;
3209 3365
3210 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3303 or die; 3459 or die;
3304 3460
3305 $map->width (50); 3461 $map->width (50);
3306 $map->height (50); 3462 $map->height (50);
3307 $map->alloc; 3463 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3309 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3310 3466
3311 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3312 if ($t < $min) { 3468 if ($t < $min) {
3313 $min = $t; 3469 $min = $t;

Diff Legend

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