ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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>
… …
1505=cut 1540=cut
1506 1541
1507sub ext_reply($$@) { 1542sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1543 my ($self, $id, @msg) = @_;
1509 1544
1510 if ($self->ns->extcmd == 2) { 1545 $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} 1546}
1518 1547
1519=item $player->ext_msg ($type, @msg) 1548=item $player->ext_msg ($type, @msg)
1520 1549
1521Sends an ext event to the client. 1550Sends an ext event to the client.
… …
1749 1778
1750sub load_header_from($) { 1779sub load_header_from($) {
1751 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1752 1781
1753 utf8::encode $path; 1782 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1791
1760 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1761 1793
1762 1 1794 1
1763} 1795}
… …
1817sub find { 1849sub find {
1818 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1819 1851
1820 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1821 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1823 1856
1824 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1827 or return; 1862 or return;
1828 1863
1829 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1830 1865
… …
1832 or return; 1867 or return;
1833 1868
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1837 $map->reset; 1874 $map->reset;
1838 undef $guard;
1839 return find $path; 1875 return find $path;
1840 } 1876 }
1841 1877
1842 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1843 } 1879 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1853 1889
1854 my $path = $self->{path}; 1890 my $path = $self->{path};
1855 1891
1856 { 1892 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1858 1894
1895 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1860 1897
1861 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1862 1899
1863 $self->alloc; 1900 $self->alloc;
1864 1901
1865 $self->pre_load; 1902 $self->pre_load;
1866 Coro::cede; 1903 cf::cede_to_tick;
1867 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1869 or return; 1908 or return;
1870 1909
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1873 1912
1874 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1914 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1917 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1879 } 1921 }
1880 } 1922 }
1881 1923
1882 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1883 # now do the right thing for maps 1927 # now do the right thing for maps
1884 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1930 unless $self->difficulty;
1887 Coro::cede; 1931 cf::cede_to_tick;
1888 1932
1889 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1934 $self->decay_objects;
1891 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1892 $self->update_buttons; 1936 $self->update_buttons;
1893 Coro::cede; 1937 cf::cede_to_tick;
1894 $self->set_darkness_map; 1938 $self->set_darkness_map;
1895 Coro::cede; 1939 cf::cede_to_tick;
1896 $self->activate; 1940 $self->activate;
1897 } 1941 }
1898 1942
1899 $self->{last_save} = $cf::RUNTIME; 1943 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1944 $self->last_access ($cf::RUNTIME);
… …
1916 1960
1917 $self 1961 $self
1918} 1962}
1919 1963
1920# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1965sub load_neighbours {
1922 my ($map) = @_; 1966 my ($map) = @_;
1923 1967
1924 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1925 1969
1926 for (0 .. 3) { 1970 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1928 or next; 1972 or next;
1929 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1930 or next; 1974 or next;
1931 $neigh->load; 1975 $neigh->load;
1932 1976
1977 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 1980 }
1936 1981
1937 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1939 or next; 1985 or next;
1940 $neigh->load; 1986 $neigh->load;
1941 } 1987 }
1942} 1988}
1943 1989
… …
1948} 1994}
1949 1995
1950sub do_load_sync { 1996sub do_load_sync {
1951 my ($map) = @_; 1997 my ($map) = @_;
1952 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1953 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1954} 2003}
1955 2004
1956our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1958 2007
1959sub find_async { 2008sub find_async {
1960 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1961 2010
1962 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1963 2012
1964 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2015 }
1967 2016
1968 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1969 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2022 if (my $map = find $k) {
1973 $map->load; 2023 $map->load if $v;
1974 } 2024 }
1975 2025
1976 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1977 } 2027 }
1978 } 2028 }
1979 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1980 }; 2030 };
1981 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1984} 2034}
1985 2035
1986sub save { 2036sub save {
1987 my ($self) = @_; 2037 my ($self) = @_;
1988 2038
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2040
1991 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1992 2042
1993 return unless $self->dirty; 2043 return unless $self->dirty;
1994 2044
… …
2017 my ($self) = @_; 2067 my ($self) = @_;
2018 2068
2019 # save first because save cedes 2069 # save first because save cedes
2020 $self->save; 2070 $self->save;
2021 2071
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2073
2024 return if $self->players; 2074 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2027 2077
2078 $self->deactivate;
2028 $self->clear; 2079 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
2030} 2081}
2031 2082
2032sub reset_at { 2083sub reset_at {
… …
2066 if $uniq; 2117 if $uniq;
2067 } 2118 }
2068 2119
2069 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
2070 2121
2122 $self->deactivate;
2071 $self->clear; 2123 $self->clear;
2072 2124
2073 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
2074 2126
2075 $self->unlink_save; 2127 $self->unlink_save;
… …
2079my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
2080 2132
2081sub nuke { 2133sub nuke {
2082 my ($self) = @_; 2134 my ($self) = @_;
2083 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
2084 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
2085 2140
2086 $self->unlink_save; 2141 $self->unlink_save;
2087 2142
2088 bless $self, "cf::map"; 2143 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2148
2094 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
2095 2151
2096 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2097} 2153}
2098 2154
2099=item $maps = cf::map::tmp_maps 2155=item $maps = cf::map::tmp_maps
… …
2175 2231
2176sub inv_recursive { 2232sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2178} 2234}
2179 2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
2265}
2266
2180package cf; 2267package cf;
2181 2268
2182=back 2269=back
2183 2270
2184=head3 cf::object::player 2271=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
2315 2402
2316 $map->load; 2403 $map->load;
2317 $map->load_diag; 2404 $map->load_neighbours;
2318 2405
2319 return unless $self->contr->active; 2406 return unless $self->contr->active;
2320 $self->activate_recursive; 2407 $self->activate_recursive;
2321 2408
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 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 2580the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2581the message unless the client supports the msg packet.
2495 2582
2496=cut 2583=cut
2497 2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2498sub cf::client::send_msg { 2600sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2601 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2602
2501 $msg = $self->pl->expand_cfpod ($msg); 2603 $msg = $self->pl->expand_cfpod ($msg);
2502 2604
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2504 2609
2505 if (ref $channel) { 2610 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2611 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2612 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2613 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2510 } 2616 }
2511 2617
2512 $channel = $channel->{id}; 2618 $channel = $channel->{id};
2513 } 2619 }
2514 2620
… …
2555=cut 2661=cut
2556 2662
2557sub cf::client::ext_msg($$@) { 2663sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2664 my ($self, $type, @msg) = @_;
2559 2665
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2666 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2668 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2669 push @msg, msgtype => "event_$type";
2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2689 }
2568} 2690}
2569 2691
2570=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2754 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2755 "ARRAY" eq ref $msg
2634 ? @$msg 2756 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2758
2759 my @reply;
2760
2637 if (my $cb = $EXTICMD{$type}) { 2761 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2762 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2643 } else { 2768 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2770 }
2646 2771
2647 cf::override; 2772 cf::override;
… …
2708 2833
2709The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2710 2835
2711 cf::object 2836 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2837 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2838 insert remove name archname title slaying race decrease_ob_nr
2714 2839
2715 cf::object::player 2840 cf::object::player
2716 player 2841 player
2717 2842
2718 cf::player 2843 cf::player
… …
2723 2848
2724=cut 2849=cut
2725 2850
2726for ( 2851for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2732) { 2858) {
2733 no strict 'refs'; 2859 no strict 'refs';
… …
2809# the server's init and main functions 2935# the server's init and main functions
2810 2936
2811sub load_facedata($) { 2937sub load_facedata($) {
2812 my ($path) = @_; 2938 my ($path) = @_;
2813 2939
2940 # HACK to clear player env face cache, we need some signal framework
2941 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2943
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2945
2814 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2815 2947
2816 my $facedata; 2948 my $facedata;
2817 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2950 or die "$path: $!";
2819 2951
2820 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2821 2953
2822 $facedata->{version} == 2 2954 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2824 2963
2825 { 2964 {
2826 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2827 2966
2828 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2970 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2973
2835 cf::cede_to_tick; 2974 cf::cede_to_tick;
2836 } 2975 }
2837 2976
2838 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
… …
2863 3002
2864 { 3003 {
2865 # TODO: for gcfclient pleasure, we should give resources 3004 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3005 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3006 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3007
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3008 my $soundconf = delete $res->{"res/sound.conf"};
2871 3009
2872 while (my ($name, $info) = each %$res) { 3010 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; 3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
2879 3013
2880 if ($info->{type} & 1) { 3014 if ($info->{type} & 1) {
2881 # prepend meta info 3015 # prepend meta info
2882 3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3022 $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 { 3023 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3024 $data = $info->{data};
2889 } 3025 }
2890 3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3028 cf::face::set_type $idx, $info->{type};
2892 3029
2893 cf::cede_to_tick; 3030 cf::cede_to_tick;
2894 } 3031 }
2895 3032
… …
2922 $ns->fx_want ($k, $v); 3059 $ns->fx_want ($k, $v);
2923 } 3060 }
2924}; 3061};
2925 3062
2926sub reload_regions { 3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
2927 load_resource_file "$MAPDIR/regions" 3068 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3069 or die "unable to load regions file\n";
2929 3070
2930 for (cf::region::list) { 3071 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3072 $_->{match} = qr/$_->{match}/
… …
2967 3108
2968sub init { 3109sub init {
2969 reload_resources; 3110 reload_resources;
2970} 3111}
2971 3112
2972sub cfg_load { 3113sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3115 or return;
2975 3116
2976 local $/; 3117 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3138 (async {
2998 Event::one_event; 3139 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
3000 }; 3141 };
3001 3142
3002 cfg_load; 3143 reload_config;
3003 db_init; 3144 db_init;
3004 load_extensions; 3145 load_extensions;
3005 3146
3006 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
3007 Event::loop; 3148 Event::loop;
… …
3200 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
3201 require cf; 3342 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3344
3204 warn "loading config and database again"; 3345 warn "loading config and database again";
3205 cf::cfg_load; 3346 cf::reload_config;
3206 3347
3207 warn "loading extensions"; 3348 warn "loading extensions";
3208 cf::load_extensions; 3349 cf::load_extensions;
3209 3350
3210 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
… …
3303 or die; 3444 or die;
3304 3445
3305 $map->width (50); 3446 $map->width (50);
3306 $map->height (50); 3447 $map->height (50);
3307 $map->alloc; 3448 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1); 3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3309 my $t = Event::time - $t; 3450 my $t = Event::time - $t;
3310 3451
3311 #next unless $t < 0.0013;#d# 3452 #next unless $t < 0.0013;#d#
3312 if ($t < $min) { 3453 if ($t < $min) {
3313 $min = $t; 3454 $min = $t;

Diff Legend

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