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.356 by root, Tue Sep 4 05:43:21 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
… …
478sub fork_call(&@) { 481sub fork_call(&@) {
479 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
480 483
481 # we seemingly have to make a local copy of the whole thing, 484 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 485 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 486 # TODO: investigate and fix (likely this will be rather laborious)
484 487
485 my @res = Coro::Util::fork_eval { 488 my @res = Coro::Util::fork_eval {
486 reset_signals; 489 reset_signals;
487 &$cb 490 &$cb
488 }, @args; 491 }, @args;
… …
575 if (1) { 578 if (1) {
576 $md5 = 579 $md5 =
577 join "\x00", 580 join "\x00",
578 $processversion, 581 $processversion,
579 map { 582 map {
580 Coro::cede; 583 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 585 } 0.. $#$src;
583 586
584 587
585 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1001 }, 1004 },
1002); 1005);
1003 1006
1004sub object_freezer_save { 1007sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
1006 1011
1007 sync_job { 1012 sync_job {
1008 if (length $$rdata) { 1013 if (length $$rdata) {
1009 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
1034 } 1039 }
1035 } else { 1040 } else {
1036 aio_unlink $filename; 1041 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
1038 } 1043 }
1039 } 1044 };
1045
1046 undef $guard;
1040} 1047}
1041 1048
1042sub object_freezer_as_string { 1049sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
1044 1051
… …
1049 1056
1050sub object_thawer_load { 1057sub object_thawer_load {
1051 my ($filename) = @_; 1058 my ($filename) = @_;
1052 1059
1053 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1054 1063
1055 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1056 or return; 1065 or return;
1057 1066
1058 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1069 or return;
1070
1071 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1073 }
1063 1074
1064 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1066 return ($data, $av); 1078 ($data, $av)
1067} 1079}
1068 1080
1069=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1070 1082
1071=over 4 1083=over 4
… …
1149 my ($type, $reply, @payload) = 1161 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1162 "ARRAY" eq ref $msg
1151 ? @$msg 1163 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1165
1166 my @reply;
1167
1154 if (my $cb = $EXTCMD{$type}) { 1168 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1169 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1160 } else { 1175 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1177 }
1163 1178
1164 cf::override; 1179 cf::override;
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1317
1303 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1306 } 1327 }
1307 } 1328 }
1308} 1329}
1309 1330
… …
1319 1340
1320 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1322 1343
1323 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1324 Coro::cede; 1345 cf::cede_to_tick;
1325} 1346}
1326 1347
1327sub new($) { 1348sub new($) {
1328 my ($login) = @_; 1349 my ($login) = @_;
1329 1350
… …
1407 or return []; 1428 or return [];
1408 1429
1409 my @logins; 1430 my @logins;
1410 1431
1411 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1415 1441
1416 utf8::decode $login; 1442 utf8::decode $login;
1417 push @logins, $login; 1443 push @logins, $login;
1418 } 1444 }
1419 1445
… …
1457sub expand_cfpod { 1483sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1459 1485
1460 # escape & and < 1486 # escape & and <
1461 s/&/&amp;/g; 1487 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1463 1489
1464 # this is buggy, it needs to properly take care of nested <'s 1490 # this is buggy, it needs to properly take care of nested <'s
1465 1491
1466 1 while 1492 1 while
1467 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1498 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1474 }ge 1501 }ge
1475 # replace H<hint text> 1502 # replace H<hint text>
… …
1505=cut 1532=cut
1506 1533
1507sub ext_reply($$@) { 1534sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1535 my ($self, $id, @msg) = @_;
1509 1536
1510 if ($self->ns->extcmd == 2) { 1537 $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} 1538}
1518 1539
1519=item $player->ext_msg ($type, @msg) 1540=item $player->ext_msg ($type, @msg)
1520 1541
1521Sends an ext event to the client. 1542Sends an ext event to the client.
… …
1749 1770
1750sub load_header_from($) { 1771sub load_header_from($) {
1751 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1752 1773
1753 utf8::encode $path; 1774 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1759 1783
1760 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1761 1785
1762 1 1786 1
1763} 1787}
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1853 1877
1854 my $path = $self->{path}; 1878 my $path = $self->{path};
1855 1879
1856 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1857 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1858 1883
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1860 1885
1861 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1862 1887
1863 $self->alloc; 1888 $self->alloc;
1864 1889
1865 $self->pre_load; 1890 $self->pre_load;
1866 Coro::cede; 1891 cf::cede_to_tick;
1867 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1869 or return; 1896 or return;
1870 1897
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1873 1900
1874 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1902 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1905 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1879 } 1909 }
1880 } 1910 }
1881 1911
1882 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1883 # now do the right thing for maps 1915 # now do the right thing for maps
1884 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1918 unless $self->difficulty;
1887 Coro::cede; 1919 cf::cede_to_tick;
1888 1920
1889 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1922 $self->decay_objects;
1891 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1892 $self->update_buttons; 1924 $self->update_buttons;
1893 Coro::cede; 1925 cf::cede_to_tick;
1894 $self->set_darkness_map; 1926 $self->set_darkness_map;
1895 Coro::cede; 1927 cf::cede_to_tick;
1896 $self->activate; 1928 $self->activate;
1897 } 1929 }
1898 1930
1899 $self->{last_save} = $cf::RUNTIME; 1931 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1932 $self->last_access ($cf::RUNTIME);
… …
1916 1948
1917 $self 1949 $self
1918} 1950}
1919 1951
1920# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1953sub load_neighbours {
1922 my ($map) = @_; 1954 my ($map) = @_;
1923 1955
1924 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1925 1957
1926 for (0 .. 3) { 1958 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1928 or next; 1960 or next;
1929 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1930 or next; 1962 or next;
1931 $neigh->load; 1963 $neigh->load;
1932 1964
1965 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 1968 }
1936 1969
1937 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1939 or next; 1973 or next;
1940 $neigh->load; 1974 $neigh->load;
1941 } 1975 }
1942} 1976}
1943 1977
… …
1948} 1982}
1949 1983
1950sub do_load_sync { 1984sub do_load_sync {
1951 my ($map) = @_; 1985 my ($map) = @_;
1952 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1953 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1954} 1991}
1955 1992
1956our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1958 1995
1959sub find_async { 1996sub find_async {
1960 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1961 1998
1962 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1963 2000
1964 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2003 }
1967 2004
1968 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1969 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2010 if (my $map = find $k) {
1973 $map->load; 2011 $map->load if $v;
1974 } 2012 }
1975 2013
1976 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1977 } 2015 }
1978 } 2016 }
1979 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1980 }; 2018 };
1981 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1984} 2022}
1985 2023
1986sub save { 2024sub save {
1987 my ($self) = @_; 2025 my ($self) = @_;
1988 2026
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2028
1991 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1992 2030
1993 return unless $self->dirty; 2031 return unless $self->dirty;
1994 2032
… …
2017 my ($self) = @_; 2055 my ($self) = @_;
2018 2056
2019 # save first because save cedes 2057 # save first because save cedes
2020 $self->save; 2058 $self->save;
2021 2059
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2061
2024 return if $self->players; 2062 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2064 return if $self->{deny_save};
2027 2065
… …
2079my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2080 2118
2081sub nuke { 2119sub nuke {
2082 my ($self) = @_; 2120 my ($self) = @_;
2083 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2084 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2085 2126
2086 $self->unlink_save; 2127 $self->unlink_save;
2087 2128
2088 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2134
2094 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2095 2137
2096 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2097} 2139}
2098 2140
2099=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2175 2217
2176sub inv_recursive { 2218sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2178} 2220}
2179 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
2180package cf; 2253package cf;
2181 2254
2182=back 2255=back
2183 2256
2184=head3 cf::object::player 2257=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2315 2388
2316 $map->load; 2389 $map->load;
2317 $map->load_diag; 2390 $map->load_neighbours;
2318 2391
2319 return unless $self->contr->active; 2392 return unless $self->contr->active;
2320 $self->activate_recursive; 2393 $self->activate_recursive;
2321 2394
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 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 2566the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2495 2568
2496=cut 2569=cut
2497 2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2498sub cf::client::send_msg { 2586sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2588
2501 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2502 2590
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2504 2595
2505 if (ref $channel) { 2596 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2510 } 2602 }
2511 2603
2512 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2513 } 2605 }
2514 2606
… …
2555=cut 2647=cut
2556 2648
2557sub cf::client::ext_msg($$@) { 2649sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2650 my ($self, $type, @msg) = @_;
2559 2651
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2652 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2654 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2655 push @msg, msgtype => "event_$type";
2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2675 }
2568} 2676}
2569 2677
2570=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2740 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2741 "ARRAY" eq ref $msg
2634 ? @$msg 2742 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2744
2745 my @reply;
2746
2637 if (my $cb = $EXTICMD{$type}) { 2747 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2748 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2643 } else { 2754 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2756 }
2646 2757
2647 cf::override; 2758 cf::override;
… …
2708 2819
2709The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2710 2821
2711 cf::object 2822 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2823 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2824 insert remove name archname title slaying race decrease_ob_nr
2714 2825
2715 cf::object::player 2826 cf::object::player
2716 player 2827 player
2717 2828
2718 cf::player 2829 cf::player
… …
2723 2834
2724=cut 2835=cut
2725 2836
2726for ( 2837for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2732) { 2844) {
2733 no strict 'refs'; 2845 no strict 'refs';
… …
2809# the server's init and main functions 2921# the server's init and main functions
2810 2922
2811sub load_facedata($) { 2923sub load_facedata($) {
2812 my ($path) = @_; 2924 my ($path) = @_;
2813 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931
2814 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2815 2933
2816 my $facedata; 2934 my $facedata;
2817 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2936 or die "$path: $!";
2819 2937
2820 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2821 2939
2822 $facedata->{version} == 2 2940 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2824 2949
2825 { 2950 {
2826 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2827 2952
2828 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2959
2835 cf::cede_to_tick; 2960 cf::cede_to_tick;
2836 } 2961 }
2837 2962
2838 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
… …
2863 2988
2864 { 2989 {
2865 # TODO: for gcfclient pleasure, we should give resources 2990 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2991 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2992 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2993
2870 my $soundconf = delete $res->{"res/sound.conf"}; 2994 my $soundconf = delete $res->{"res/sound.conf"};
2871 2995
2872 while (my ($name, $info) = each %$res) { 2996 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; 2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2879 2999
2880 if ($info->{type} & 1) { 3000 if ($info->{type} & 1) {
2881 # prepend meta info 3001 # prepend meta info
2882 3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3008 $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 { 3009 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3010 $data = $info->{data};
2889 } 3011 }
2890 3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3014 cf::face::set_type $idx, $info->{type};
2892 3015
2893 cf::cede_to_tick; 3016 cf::cede_to_tick;
2894 } 3017 }
2895 3018
… …
2922 $ns->fx_want ($k, $v); 3045 $ns->fx_want ($k, $v);
2923 } 3046 }
2924}; 3047};
2925 3048
2926sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2927 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2929 3056
2930 for (cf::region::list) { 3057 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
2967 3094
2968sub init { 3095sub init {
2969 reload_resources; 3096 reload_resources;
2970} 3097}
2971 3098
2972sub cfg_load { 3099sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3101 or return;
2975 3102
2976 local $/; 3103 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3124 (async {
2998 Event::one_event; 3125 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
3000 }; 3127 };
3001 3128
3002 cfg_load; 3129 reload_config;
3003 db_init; 3130 db_init;
3004 load_extensions; 3131 load_extensions;
3005 3132
3006 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
3007 Event::loop; 3134 Event::loop;
… …
3200 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3201 require cf; 3328 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3330
3204 warn "loading config and database again"; 3331 warn "loading config and database again";
3205 cf::cfg_load; 3332 cf::reload_config;
3206 3333
3207 warn "loading extensions"; 3334 warn "loading extensions";
3208 cf::load_extensions; 3335 cf::load_extensions;
3209 3336
3210 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3303 or die; 3430 or die;
3304 3431
3305 $map->width (50); 3432 $map->width (50);
3306 $map->height (50); 3433 $map->height (50);
3307 $map->alloc; 3434 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3309 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3310 3437
3311 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3312 if ($t < $min) { 3439 if ($t < $min) {
3313 $min = $t; 3440 $min = $t;

Diff Legend

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