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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.359 by root, Sat Sep 8 18:15:55 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
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1325
1306 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1309 } 1335 }
1310 } 1336 }
1311} 1337}
1312 1338
… …
1322 1348
1323 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1325 1351
1326 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1327 Coro::cede; 1353 cf::cede_to_tick;
1328} 1354}
1329 1355
1330sub new($) { 1356sub new($) {
1331 my ($login) = @_; 1357 my ($login) = @_;
1332 1358
… …
1410 or return []; 1436 or return [];
1411 1437
1412 my @logins; 1438 my @logins;
1413 1439
1414 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1418 1449
1419 utf8::decode $login; 1450 utf8::decode $login;
1420 push @logins, $login; 1451 push @logins, $login;
1421 } 1452 }
1422 1453
… …
1460sub expand_cfpod { 1491sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1462 1493
1463 # escape & and < 1494 # escape & and <
1464 s/&/&amp;/g; 1495 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1466 1497
1467 # this is buggy, it needs to properly take care of nested <'s 1498 # this is buggy, it needs to properly take care of nested <'s
1468 1499
1469 1 while 1500 1 while
1470 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1506 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1477 }ge 1509 }ge
1478 # replace H<hint text> 1510 # replace H<hint text>
… …
1746 1778
1747sub load_header_from($) { 1779sub load_header_from($) {
1748 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1749 1781
1750 utf8::encode $path; 1782 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1756 1791
1757 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1758 1793
1759 1 1794 1
1760} 1795}
… …
1814sub find { 1849sub find {
1815 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1816 1851
1817 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1818 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1820 1856
1821 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1823 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1824 or return; 1862 or return;
1825 1863
1826 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1827 1865
… …
1829 or return; 1867 or return;
1830 1868
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1834 $map->reset; 1874 $map->reset;
1835 undef $guard;
1836 return find $path; 1875 return find $path;
1837 } 1876 }
1838 1877
1839 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1840 } 1879 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1850 1889
1851 my $path = $self->{path}; 1890 my $path = $self->{path};
1852 1891
1853 { 1892 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1855 1894
1895 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1857 1897
1858 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1859 1899
1860 $self->alloc; 1900 $self->alloc;
1861 1901
1862 $self->pre_load; 1902 $self->pre_load;
1863 Coro::cede; 1903 cf::cede_to_tick;
1864 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1866 or return; 1908 or return;
1867 1909
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1870 1912
1871 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1914 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1917 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1876 } 1921 }
1877 } 1922 }
1878 1923
1879 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1880 # now do the right thing for maps 1927 # now do the right thing for maps
1881 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1930 unless $self->difficulty;
1884 Coro::cede; 1931 cf::cede_to_tick;
1885 1932
1886 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1934 $self->decay_objects;
1888 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1889 $self->update_buttons; 1936 $self->update_buttons;
1890 Coro::cede; 1937 cf::cede_to_tick;
1891 $self->set_darkness_map; 1938 $self->set_darkness_map;
1892 Coro::cede; 1939 cf::cede_to_tick;
1893 $self->activate; 1940 $self->activate;
1894 } 1941 }
1895 1942
1896 $self->{last_save} = $cf::RUNTIME; 1943 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1944 $self->last_access ($cf::RUNTIME);
… …
1947} 1994}
1948 1995
1949sub do_load_sync { 1996sub do_load_sync {
1950 my ($map) = @_; 1997 my ($map) = @_;
1951 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1952 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1953} 2003}
1954 2004
1955our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1957 2007
1958sub find_async { 2008sub find_async {
1959 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1960 2010
1961 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1962 2012
1963 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 2015 }
1966 2016
1967 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1968 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1969 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 2022 if (my $map = find $k) {
1972 $map->load; 2023 $map->load if $v;
1973 } 2024 }
1974 2025
1975 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1976 } 2027 }
1977 } 2028 }
1978 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1979 }; 2030 };
1980 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1983} 2034}
1984 2035
1985sub save { 2036sub save {
1986 my ($self) = @_; 2037 my ($self) = @_;
1987 2038
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 2040
1990 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1991 2042
1992 return unless $self->dirty; 2043 return unless $self->dirty;
1993 2044
… …
2016 my ($self) = @_; 2067 my ($self) = @_;
2017 2068
2018 # save first because save cedes 2069 # save first because save cedes
2019 $self->save; 2070 $self->save;
2020 2071
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2073
2023 return if $self->players; 2074 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2026 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
2027 $self->clear; 2082 $self->clear;
2028 $self->in_memory (cf::MAP_SWAPPED);
2029} 2083}
2030 2084
2031sub reset_at { 2085sub reset_at {
2032 my ($self) = @_; 2086 my ($self) = @_;
2033 2087
… …
2065 if $uniq; 2119 if $uniq;
2066 } 2120 }
2067 2121
2068 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2069 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2070 $self->clear; 2126 $self->clear;
2071
2072 $_->clear_links_to ($self) for values %cf::MAP;
2073 2127
2074 $self->unlink_save; 2128 $self->unlink_save;
2075 $self->destroy; 2129 $self->destroy;
2076} 2130}
2077 2131
2078my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2079 2133
2080sub nuke { 2134sub nuke {
2081 my ($self) = @_; 2135 my ($self) = @_;
2082 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2083 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2084 2141
2085 $self->unlink_save; 2142 $self->unlink_save;
2086 2143
2087 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2149
2093 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2094 2152
2095 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2096} 2154}
2097 2155
2098=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2174 2232
2175sub inv_recursive { 2233sub inv_recursive {
2176 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2177} 2235}
2178 2236
2237=item $ref = $ob->ref
2238
2239creates and returns a persistent reference to an objetc that can be stored as a string.
2240
2241=item $ob = cf::object::deref ($refstring)
2242
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block.
2245
2246=cut
2247
2248sub deref {
2249 my ($ref) = @_;
2250
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return;
2258 $pl->ob->uuid eq $uuid
2259 or return;
2260
2261 $pl->ob
2262 } else {
2263 warn "$ref: cannot resolve object reference\n";
2264 undef
2265 }
2266}
2267
2179package cf; 2268package cf;
2180 2269
2181=back 2270=back
2182 2271
2183=head3 cf::object::player 2272=head3 cf::object::player
… …
2492the message, with C<log> being the default. If C<$color> is negative, suppress 2581the message, with C<log> being the default. If C<$color> is negative, suppress
2493the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2494 2583
2495=cut 2584=cut
2496 2585
2586our %CHANNEL = (
2587 "c/identify" => {
2588 id => "identify",
2589 title => "Identify",
2590 reply => undef,
2591 tooltip => "Items recently identified",
2592 },
2593 "c/examine" => {
2594 id => "examine",
2595 title => "Examine",
2596 reply => undef,
2597 tooltip => "Signs and other items you examined",
2598 },
2599);
2600
2497sub cf::client::send_msg { 2601sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2603
2500 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2501 2605
2502 $color &= cf::NDI_CLIENT_MASK; # just in case... 2606 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607
2608 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2503 2610
2504 if (ref $channel) { 2611 if (ref $channel) {
2505 # send meta info to client, if not yet sent 2612 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2613 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2614 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2509 } 2617 }
2510 2618
2511 $channel = $channel->{id}; 2619 $channel = $channel->{id};
2512 } 2620 }
2513 2621
… …
2554=cut 2662=cut
2555 2663
2556sub cf::client::ext_msg($$@) { 2664sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2665 my ($self, $type, @msg) = @_;
2558 2666
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2667 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2669 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2670 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2672 }
2567} 2673}
2568 2674
… …
2575sub cf::client::ext_reply($$@) { 2681sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2682 my ($self, $id, @msg) = @_;
2577 2683
2578 if ($self->extcmd == 2) { 2684 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2686 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2687 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2688 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2690 }
2585} 2691}
… …
2728 2834
2729The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2730 2836
2731 cf::object 2837 cf::object
2732 contr pay_amount pay_player map x y force_find force_add 2838 contr pay_amount pay_player map x y force_find force_add
2733 insert remove name archname title slaying race 2839 insert remove name archname title slaying race decrease_ob_nr
2734 2840
2735 cf::object::player 2841 cf::object::player
2736 player 2842 player
2737 2843
2738 cf::player 2844 cf::player
… …
2743 2849
2744=cut 2850=cut
2745 2851
2746for ( 2852for (
2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2748 insert remove inv name archname title slaying race)], 2854 insert remove inv name archname title slaying race
2855 decrease_ob_nr)],
2749 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2752) { 2859) {
2753 no strict 'refs'; 2860 no strict 'refs';
… …
2829# the server's init and main functions 2936# the server's init and main functions
2830 2937
2831sub load_facedata($) { 2938sub load_facedata($) {
2832 my ($path) = @_; 2939 my ($path) = @_;
2833 2940
2941 # HACK to clear player env face cache, we need some signal framework
2942 # for this (global event?)
2943 %ext::player_env::MUSIC_FACE_CACHE = ();
2944
2834 my $enc = JSON::XS->new->utf8->canonical; 2945 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 2946
2836 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2837 2948
2838 my $facedata; 2949 my $facedata;
2839 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
… …
2949 $ns->fx_want ($k, $v); 3060 $ns->fx_want ($k, $v);
2950 } 3061 }
2951}; 3062};
2952 3063
2953sub reload_regions { 3064sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = ();
3068
2954 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 3070 or die "unable to load regions file\n";
2956 3071
2957 for (cf::region::list) { 3072 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 3073 $_->{match} = qr/$_->{match}/
… …
2994 3109
2995sub init { 3110sub init {
2996 reload_resources; 3111 reload_resources;
2997} 3112}
2998 3113
2999sub cfg_load { 3114sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3116 or return;
3002 3117
3003 local $/; 3118 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
3024 (async { 3139 (async {
3025 Event::one_event; 3140 Event::one_event;
3026 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
3027 }; 3142 };
3028 3143
3029 cfg_load; 3144 reload_config;
3030 db_init; 3145 db_init;
3031 load_extensions; 3146 load_extensions;
3032 3147
3033 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
3034 Event::loop; 3149 Event::loop;
… …
3227 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3228 require cf; 3343 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3345
3231 warn "loading config and database again"; 3346 warn "loading config and database again";
3232 cf::cfg_load; 3347 cf::reload_config;
3233 3348
3234 warn "loading extensions"; 3349 warn "loading extensions";
3235 cf::load_extensions; 3350 cf::load_extensions;
3236 3351
3237 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3330 or die; 3445 or die;
3331 3446
3332 $map->width (50); 3447 $map->width (50);
3333 $map->height (50); 3448 $map->height (50);
3334 $map->alloc; 3449 $map->alloc;
3335 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3336 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3337 3452
3338 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3339 if ($t < $min) { 3454 if ($t < $min) {
3340 $min = $t; 3455 $min = $t;

Diff Legend

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