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.336 by root, Tue Aug 21 00:31:18 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
… …
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;
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1325
1303 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1304 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;
1305 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1306 } 1335 }
1307 } 1336 }
1308} 1337}
1309 1338
… …
1319 1348
1320 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1322 1351
1323 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1324 Coro::cede; 1353 cf::cede_to_tick;
1325} 1354}
1326 1355
1327sub new($) { 1356sub new($) {
1328 my ($login) = @_; 1357 my ($login) = @_;
1329 1358
… …
1407 or return []; 1436 or return [];
1408 1437
1409 my @logins; 1438 my @logins;
1410 1439
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1415 1449
1416 utf8::decode $login; 1450 utf8::decode $login;
1417 push @logins, $login; 1451 push @logins, $login;
1418 } 1452 }
1419 1453
… …
1457sub expand_cfpod { 1491sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1459 1493
1460 # escape & and < 1494 # escape & and <
1461 s/&/&amp;/g; 1495 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1463 1497
1464 # 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
1465 1499
1466 1 while 1500 1 while
1467 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1506 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1474 }ge 1509 }ge
1475 # replace H<hint text> 1510 # replace H<hint text>
… …
1743 1778
1744sub load_header_from($) { 1779sub load_header_from($) {
1745 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1746 1781
1747 utf8::encode $path; 1782 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 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;
1753 1791
1754 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1755 1793
1756 1 1794 1
1757} 1795}
… …
1811sub find { 1849sub find {
1812 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1813 1851
1814 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1815 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1817 1856
1818 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1819 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
1820 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1821 or return; 1862 or return;
1822 1863
1823 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1824 1865
… …
1826 or return; 1867 or return;
1827 1868
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1831 $map->reset; 1874 $map->reset;
1832 undef $guard;
1833 return find $path; 1875 return find $path;
1834 } 1876 }
1835 1877
1836 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1837 } 1879 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1847 1889
1848 my $path = $self->{path}; 1890 my $path = $self->{path};
1849 1891
1850 { 1892 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1852 1894
1895 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1854 1897
1855 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1856 1899
1857 $self->alloc; 1900 $self->alloc;
1858 1901
1859 $self->pre_load; 1902 $self->pre_load;
1860 Coro::cede; 1903 cf::cede_to_tick;
1861 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1863 or return; 1908 or return;
1864 1909
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1867 1912
1868 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1914 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1917 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1873 } 1921 }
1874 } 1922 }
1875 1923
1876 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1877 # now do the right thing for maps 1927 # now do the right thing for maps
1878 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1930 unless $self->difficulty;
1881 Coro::cede; 1931 cf::cede_to_tick;
1882 1932
1883 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1934 $self->decay_objects;
1885 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1886 $self->update_buttons; 1936 $self->update_buttons;
1887 Coro::cede; 1937 cf::cede_to_tick;
1888 $self->set_darkness_map; 1938 $self->set_darkness_map;
1889 Coro::cede; 1939 cf::cede_to_tick;
1890 $self->activate; 1940 $self->activate;
1891 } 1941 }
1892 1942
1893 $self->{last_save} = $cf::RUNTIME; 1943 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1944 $self->last_access ($cf::RUNTIME);
… …
1944} 1994}
1945 1995
1946sub do_load_sync { 1996sub do_load_sync {
1947 my ($map) = @_; 1997 my ($map) = @_;
1948 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1949 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1950} 2003}
1951 2004
1952our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1954 2007
1955sub find_async { 2008sub find_async {
1956 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1957 2010
1958 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1959 2012
1960 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2015 }
1963 2016
1964 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1965 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1966 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2022 if (my $map = find $k) {
1969 $map->load; 2023 $map->load if $v;
1970 } 2024 }
1971 2025
1972 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1973 } 2027 }
1974 } 2028 }
1975 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1976 }; 2030 };
1977 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1980} 2034}
1981 2035
1982sub save { 2036sub save {
1983 my ($self) = @_; 2037 my ($self) = @_;
1984 2038
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2040
1987 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1988 2042
1989 return unless $self->dirty; 2043 return unless $self->dirty;
1990 2044
… …
2013 my ($self) = @_; 2067 my ($self) = @_;
2014 2068
2015 # save first because save cedes 2069 # save first because save cedes
2016 $self->save; 2070 $self->save;
2017 2071
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2073
2020 return if $self->players; 2074 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2023 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2082 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2083}
2027 2084
2028sub reset_at { 2085sub reset_at {
2029 my ($self) = @_; 2086 my ($self) = @_;
2030 2087
… …
2062 if $uniq; 2119 if $uniq;
2063 } 2120 }
2064 2121
2065 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2066 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2126 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2127
2071 $self->unlink_save; 2128 $self->unlink_save;
2072 $self->destroy; 2129 $self->destroy;
2073} 2130}
2074 2131
2075my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2076 2133
2077sub nuke { 2134sub nuke {
2078 my ($self) = @_; 2135 my ($self) = @_;
2079 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2080 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2081 2141
2082 $self->unlink_save; 2142 $self->unlink_save;
2083 2143
2084 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2149
2090 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2091 2152
2092 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2093} 2154}
2094 2155
2095=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2171 2232
2172sub inv_recursive { 2233sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2174} 2235}
2175 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
2176package cf; 2268package cf;
2177 2269
2178=back 2270=back
2179 2271
2180=head3 cf::object::player 2272=head3 cf::object::player
… …
2489the 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
2490the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2491 2583
2492=cut 2584=cut
2493 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
2494sub cf::client::send_msg { 2601sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2603
2497 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2498 2605
2499 $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};
2500 2610
2501 if (ref $channel) { 2611 if (ref $channel) {
2502 # send meta info to client, if not yet sent 2612 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2613 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2614 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2506 } 2617 }
2507 2618
2508 $channel = $channel->{id}; 2619 $channel = $channel->{id};
2509 } 2620 }
2510 2621
… …
2551=cut 2662=cut
2552 2663
2553sub cf::client::ext_msg($$@) { 2664sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2665 my ($self, $type, @msg) = @_;
2555 2666
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2667 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2669 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2670 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2672 }
2564} 2673}
2565 2674
… …
2572sub cf::client::ext_reply($$@) { 2681sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2682 my ($self, $id, @msg) = @_;
2574 2683
2575 if ($self->extcmd == 2) { 2684 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2686 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2687 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2688 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2690 }
2582} 2691}
… …
2646 my ($type, $reply, @payload) = 2755 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2756 "ARRAY" eq ref $msg
2648 ? @$msg 2757 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2758 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2759
2760 my @reply;
2761
2651 if (my $cb = $EXTICMD{$type}) { 2762 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2763 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2657 } else { 2769 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2770 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2771 }
2660 2772
2661 cf::override; 2773 cf::override;
… …
2722 2834
2723The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2724 2836
2725 cf::object 2837 cf::object
2726 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
2727 insert remove name archname title slaying race 2839 insert remove name archname title slaying race decrease_ob_nr
2728 2840
2729 cf::object::player 2841 cf::object::player
2730 player 2842 player
2731 2843
2732 cf::player 2844 cf::player
… …
2737 2849
2738=cut 2850=cut
2739 2851
2740for ( 2852for (
2741 ["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
2742 insert remove inv name archname title slaying race)], 2854 insert remove inv name archname title slaying race
2855 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2746) { 2859) {
2747 no strict 'refs'; 2860 no strict 'refs';
… …
2823# the server's init and main functions 2936# the server's init and main functions
2824 2937
2825sub load_facedata($) { 2938sub load_facedata($) {
2826 my ($path) = @_; 2939 my ($path) = @_;
2827 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
2828 my $enc = JSON::XS->new->utf8->canonical; 2945 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 2946
2830 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2831 2948
2832 my $facedata; 2949 my $facedata;
2833 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 2957
2841 # patch in the exptable 2958 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 2959 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 2960 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 2962 };
2846 cf::cede_to_tick; 2963 cf::cede_to_tick;
2847 2964
2848 { 2965 {
2849 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 3019 name => $name,
2903 %{ $info->{meta} || {} }, 3020 %{ $info->{meta} || {} },
2904 }); 3021 });
2905 3022
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3023 $data = pack "(w/a*)*", $meta, $info->{data};
3024 } else {
3025 $data = $info->{data};
2907 } 3026 }
2908 3027
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 3029 cf::face::set_type $idx, $info->{type};
2911 3030
… …
2941 $ns->fx_want ($k, $v); 3060 $ns->fx_want ($k, $v);
2942 } 3061 }
2943}; 3062};
2944 3063
2945sub 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
2946 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3070 or die "unable to load regions file\n";
2948 3071
2949 for (cf::region::list) { 3072 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3073 $_->{match} = qr/$_->{match}/
… …
2986 3109
2987sub init { 3110sub init {
2988 reload_resources; 3111 reload_resources;
2989} 3112}
2990 3113
2991sub cfg_load { 3114sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3116 or return;
2994 3117
2995 local $/; 3118 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
3016 (async { 3139 (async {
3017 Event::one_event; 3140 Event::one_event;
3018 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
3019 }; 3142 };
3020 3143
3021 cfg_load; 3144 reload_config;
3022 db_init; 3145 db_init;
3023 load_extensions; 3146 load_extensions;
3024 3147
3025 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
3026 Event::loop; 3149 Event::loop;
… …
3219 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3220 require cf; 3343 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3345
3223 warn "loading config and database again"; 3346 warn "loading config and database again";
3224 cf::cfg_load; 3347 cf::reload_config;
3225 3348
3226 warn "loading extensions"; 3349 warn "loading extensions";
3227 cf::load_extensions; 3350 cf::load_extensions;
3228 3351
3229 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3322 or die; 3445 or die;
3323 3446
3324 $map->width (50); 3447 $map->width (50);
3325 $map->height (50); 3448 $map->height (50);
3326 $map->alloc; 3449 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3328 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3329 3452
3330 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3331 if ($t < $min) { 3454 if ($t < $min) {
3332 $min = $t; 3455 $min = $t;

Diff Legend

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