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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.360 by root, Sun Sep 9 06:25:46 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
86our %CFG; 87our %CFG;
87 88
88our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 90our $RUNTIME;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock 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
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
281Return 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.
282 286
283=cut 287=cut
284 288
285our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
286 291
287sub lock_wait($) { 292sub lock_wait($) {
288 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#
289 299
290 # wait for lock, if any 300 # wait for lock, if any
291 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 303 Coro::schedule;
… …
299 309
300 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
301 lock_wait $key; 311 lock_wait $key;
302 312
303 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
304 315
305 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
308 } 320 }
309} 321}
310 322
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
474 486
475=cut 487=cut
476 488
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 489sub fork_call(&@) {
487 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
488 491
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 495
494 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 497 reset_signals;
508 local $SIG{__WARN__}; 498 &$cb
509 local $SIG{__DIE__}; 499 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 500
516 eval { 501 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 502}
529 503
530=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
531 505
532Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
612 if (1) { 586 if (1) {
613 $md5 = 587 $md5 =
614 join "\x00", 588 join "\x00",
615 $processversion, 589 $processversion,
616 map { 590 map {
617 Coro::cede; 591 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 593 } 0.. $#$src;
620 594
621 595
622 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
1038 }, 1012 },
1039); 1013);
1040 1014
1041sub object_freezer_save { 1015sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
1043 1019
1044 sync_job { 1020 sync_job {
1045 if (length $$rdata) { 1021 if (length $$rdata) {
1046 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1071 } 1047 }
1072 } else { 1048 } else {
1073 aio_unlink $filename; 1049 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1075 } 1051 }
1076 } 1052 };
1053
1054 undef $guard;
1077} 1055}
1078 1056
1079sub object_freezer_as_string { 1057sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1081 1059
… …
1086 1064
1087sub object_thawer_load { 1065sub object_thawer_load {
1088 my ($filename) = @_; 1066 my ($filename) = @_;
1089 1067
1090 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1091 1071
1092 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1093 or return; 1073 or return;
1094 1074
1095 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1077 or return;
1078
1079 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1081 }
1100 1082
1101 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1103 return ($data, $av); 1086 ($data, $av)
1104} 1087}
1105 1088
1106=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1107 1090
1108=over 4 1091=over 4
… …
1186 my ($type, $reply, @payload) = 1169 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1170 "ARRAY" eq ref $msg
1188 ? @$msg 1171 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1173
1174 my @reply;
1175
1191 if (my $cb = $EXTCMD{$type}) { 1176 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1177 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1197 } else { 1183 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1185 }
1200 1186
1201 cf::override; 1187 cf::override;
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1325
1340 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1343 } 1335 }
1344 } 1336 }
1345} 1337}
1346 1338
… …
1356 1348
1357 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1359 1351
1360 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1361 Coro::cede; 1353 cf::cede_to_tick;
1362} 1354}
1363 1355
1364sub new($) { 1356sub new($) {
1365 my ($login) = @_; 1357 my ($login) = @_;
1366 1358
… …
1444 or return []; 1436 or return [];
1445 1437
1446 my @logins; 1438 my @logins;
1447 1439
1448 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") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1452 1449
1453 utf8::decode $login; 1450 utf8::decode $login;
1454 push @logins, $login; 1451 push @logins, $login;
1455 } 1452 }
1456 1453
… …
1494sub expand_cfpod { 1491sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1496 1493
1497 # escape & and < 1494 # escape & and <
1498 s/&/&amp;/g; 1495 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1500 1497
1501 # 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
1502 1499
1503 1 while 1500 1 while
1504 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1506 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1511 }ge 1509 }ge
1512 # replace H<hint text> 1510 # replace H<hint text>
… …
1542=cut 1540=cut
1543 1541
1544sub ext_reply($$@) { 1542sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1543 my ($self, $id, @msg) = @_;
1546 1544
1547 if ($self->ns->extcmd == 2) { 1545 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1546}
1555 1547
1556=item $player->ext_msg ($type, @msg) 1548=item $player->ext_msg ($type, @msg)
1557 1549
1558Sends an ext event to the client. 1550Sends an ext event to the client.
… …
1786 1778
1787sub load_header_from($) { 1779sub load_header_from($) {
1788 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1789 1781
1790 utf8::encode $path; 1782 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 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;
1796 1791
1797 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1798 1793
1799 1 1794 1
1800} 1795}
… …
1854sub find { 1849sub find {
1855 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1856 1851
1857 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1858 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1860 1856
1861 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1862 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
1863 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1864 or return; 1862 or return;
1865 1863
1866 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1867 1865
… …
1869 or return; 1867 or return;
1870 1868
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 1874 $map->reset;
1875 undef $guard;
1876 return find $path; 1875 return find $path;
1877 } 1876 }
1878 1877
1879 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1880 } 1879 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1890 1889
1891 my $path = $self->{path}; 1890 my $path = $self->{path};
1892 1891
1893 { 1892 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1895 1894
1895 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1897
1898 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1899 1899
1900 $self->alloc; 1900 $self->alloc;
1901 1901
1902 $self->pre_load; 1902 $self->pre_load;
1903 Coro::cede; 1903 cf::cede_to_tick;
1904 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1906 or return; 1908 or return;
1907 1909
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1910 1912
1911 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1914 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1917 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1916 } 1921 }
1917 } 1922 }
1918 1923
1919 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1920 # now do the right thing for maps 1927 # now do the right thing for maps
1921 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1930 unless $self->difficulty;
1924 Coro::cede; 1931 cf::cede_to_tick;
1925 1932
1926 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1934 $self->decay_objects;
1928 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1929 $self->update_buttons; 1936 $self->update_buttons;
1930 Coro::cede; 1937 cf::cede_to_tick;
1931 $self->set_darkness_map; 1938 $self->set_darkness_map;
1932 Coro::cede; 1939 cf::cede_to_tick;
1933 $self->activate; 1940 $self->activate;
1934 } 1941 }
1935 1942
1936 $self->{last_save} = $cf::RUNTIME; 1943 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1944 $self->last_access ($cf::RUNTIME);
… …
1953 1960
1954 $self 1961 $self
1955} 1962}
1956 1963
1957# 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
1958sub load_diag { 1965sub load_neighbours {
1959 my ($map) = @_; 1966 my ($map) = @_;
1960 1967
1961 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1962 1969
1963 for (0 .. 3) { 1970 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1965 or next; 1972 or next;
1966 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1967 or next; 1974 or next;
1968 $neigh->load; 1975 $neigh->load;
1969 1976
1977 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1980 }
1973 1981
1974 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1976 or next; 1985 or next;
1977 $neigh->load; 1986 $neigh->load;
1978 } 1987 }
1979} 1988}
1980 1989
… …
1985} 1994}
1986 1995
1987sub do_load_sync { 1996sub do_load_sync {
1988 my ($map) = @_; 1997 my ($map) = @_;
1989 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1990 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1991} 2003}
1992 2004
1993our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1995 2007
1996sub find_async { 2008sub find_async {
1997 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1998 2010
1999 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
2000 2012
2001 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2015 }
2004 2016
2005 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
2006 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2022 if (my $map = find $k) {
2010 $map->load; 2023 $map->load if $v;
2011 } 2024 }
2012 2025
2013 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
2014 } 2027 }
2015 } 2028 }
2016 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
2017 }; 2030 };
2018 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
2021} 2034}
2022 2035
2023sub save { 2036sub save {
2024 my ($self) = @_; 2037 my ($self) = @_;
2025 2038
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2040
2028 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2029 2042
2030 return unless $self->dirty; 2043 return unless $self->dirty;
2031 2044
… …
2054 my ($self) = @_; 2067 my ($self) = @_;
2055 2068
2056 # save first because save cedes 2069 # save first because save cedes
2057 $self->save; 2070 $self->save;
2058 2071
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2073
2061 return if $self->players; 2074 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2064 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2082 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2083}
2068 2084
2069sub reset_at { 2085sub reset_at {
2070 my ($self) = @_; 2086 my ($self) = @_;
2071 2087
… …
2103 if $uniq; 2119 if $uniq;
2104 } 2120 }
2105 2121
2106 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2107 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2126 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2127
2112 $self->unlink_save; 2128 $self->unlink_save;
2113 $self->destroy; 2129 $self->destroy;
2114} 2130}
2115 2131
2116my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2117 2133
2118sub nuke { 2134sub nuke {
2119 my ($self) = @_; 2135 my ($self) = @_;
2120 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2121 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2122 2141
2123 $self->unlink_save; 2142 $self->unlink_save;
2124 2143
2125 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2149
2131 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2132 2152
2133 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2134} 2154}
2135 2155
2136=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2212 2232
2213sub inv_recursive { 2233sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2215} 2235}
2216 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
2217package cf; 2268package cf;
2218 2269
2219=back 2270=back
2220 2271
2221=head3 cf::object::player 2272=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
2352 2403
2353 $map->load; 2404 $map->load;
2354 $map->load_diag; 2405 $map->load_neighbours;
2355 2406
2356 return unless $self->contr->active; 2407 return unless $self->contr->active;
2357 $self->activate_recursive; 2408 $self->activate_recursive;
2358 2409
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2530the 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
2531the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2532 2583
2533=cut 2584=cut
2534 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
2535sub cf::client::send_msg { 2601sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2603
2538 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2539 2605
2540 $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};
2541 2610
2542 if (ref $channel) { 2611 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2612 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2613 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2614 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2547 } 2617 }
2548 2618
2549 $channel = $channel->{id}; 2619 $channel = $channel->{id};
2550 } 2620 }
2551 2621
… …
2573 $color &= cf::NDI_COLOR_MASK; 2643 $color &= cf::NDI_COLOR_MASK;
2574 2644
2575 utf8::encode $msg; 2645 utf8::encode $msg;
2576 2646
2577 if (0 && $msg =~ /\[/) { 2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2650 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2652 $self->send_packet ("drawinfo $color $msg")
2582 } 2653 }
2583 } 2654 }
… …
2591=cut 2662=cut
2592 2663
2593sub cf::client::ext_msg($$@) { 2664sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2665 my ($self, $type, @msg) = @_;
2595 2666
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2667 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2669 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2670 push @msg, msgtype => "event_$type";
2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2672 }
2673}
2674
2675=item $client->ext_reply ($msgid, @msg)
2676
2677Sends an ext reply to the client.
2678
2679=cut
2680
2681sub cf::client::ext_reply($$@) {
2682 my ($self, $id, @msg) = @_;
2683
2684 if ($self->extcmd == 2) {
2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2686 } elsif ($self->extcmd == 1) {
2687 #TODO: version 1, remove
2688 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2690 }
2604} 2691}
2605 2692
2606=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2755 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2756 "ARRAY" eq ref $msg
2670 ? @$msg 2757 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2758 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2759
2760 my @reply;
2761
2673 if (my $cb = $EXTICMD{$type}) { 2762 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2763 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2679 } else { 2769 } else {
2680 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";
2681 } 2771 }
2682 2772
2683 cf::override; 2773 cf::override;
… …
2744 2834
2745The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2746 2836
2747 cf::object 2837 cf::object
2748 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
2749 insert remove name archname title slaying race 2839 insert remove name archname title slaying race decrease_ob_nr
2750 2840
2751 cf::object::player 2841 cf::object::player
2752 player 2842 player
2753 2843
2754 cf::player 2844 cf::player
… …
2759 2849
2760=cut 2850=cut
2761 2851
2762for ( 2852for (
2763 ["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
2764 insert remove inv name archname title slaying race)], 2854 insert remove inv name archname title slaying race
2855 decrease_ob_nr)],
2765 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2768) { 2859) {
2769 no strict 'refs'; 2860 no strict 'refs';
… …
2845# the server's init and main functions 2936# the server's init and main functions
2846 2937
2847sub load_facedata($) { 2938sub load_facedata($) {
2848 my ($path) = @_; 2939 my ($path) = @_;
2849 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
2945 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2946
2850 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2851 2948
2852 my $facedata; 2949 my $facedata;
2853 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 2951 or die "$path: $!";
2855 2952
2856 $facedata = Coro::Storable::thaw $facedata; 2953 $facedata = Coro::Storable::thaw $facedata;
2857 2954
2858 $facedata->{version} == 2 2955 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2957
2958 # patch in the exptable
2959 $facedata->{resource}{"res/exp_table"} = {
2960 type => FT_RSRC,
2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2962 };
2963 cf::cede_to_tick;
2860 2964
2861 { 2965 {
2862 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
2863 2967
2864 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 2971 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 2974
2871 cf::cede_to_tick; 2975 cf::cede_to_tick;
2872 } 2976 }
2873 2977
2874 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
… …
2899 3003
2900 { 3004 {
2901 # TODO: for gcfclient pleasure, we should give resources 3005 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3006 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3007 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 3008
2906 my $soundconf = delete $res->{"res/sound.conf"}; 3009 my $soundconf = delete $res->{"res/sound.conf"};
2907 3010
2908 while (my ($name, $info) = each %$res) { 3011 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3012 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
2915 3014
2916 if ($info->{type} & 1) { 3015 if ($info->{type} & 1) {
2917 # prepend meta info 3016 # prepend meta info
2918 3017
3018 my $meta = $enc->encode ({
3019 name => $name,
3020 %{ $info->{meta} || {} },
3021 });
3022
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3023 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2921
2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else { 3024 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3025 $data = $info->{data};
2925 } 3026 }
2926 3027
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 3029 cf::face::set_type $idx, $info->{type};
2928 3030
2929 cf::cede_to_tick; 3031 cf::cede_to_tick;
2930 } 3032 }
2931 3033
… …
2958 $ns->fx_want ($k, $v); 3060 $ns->fx_want ($k, $v);
2959 } 3061 }
2960}; 3062};
2961 3063
2962sub 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
2963 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3070 or die "unable to load regions file\n";
2965 3071
2966 for (cf::region::list) { 3072 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3073 $_->{match} = qr/$_->{match}/
… …
3003 3109
3004sub init { 3110sub init {
3005 reload_resources; 3111 reload_resources;
3006} 3112}
3007 3113
3008sub cfg_load { 3114sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3116 or return;
3011 3117
3012 local $/; 3118 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
3033 (async { 3139 (async {
3034 Event::one_event; 3140 Event::one_event;
3035 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
3036 }; 3142 };
3037 3143
3038 cfg_load; 3144 reload_config;
3039 db_init; 3145 db_init;
3040 load_extensions; 3146 load_extensions;
3041 3147
3042 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
3043 Event::loop; 3149 Event::loop;
… …
3236 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3237 require cf; 3343 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3345
3240 warn "loading config and database again"; 3346 warn "loading config and database again";
3241 cf::cfg_load; 3347 cf::reload_config;
3242 3348
3243 warn "loading extensions"; 3349 warn "loading extensions";
3244 cf::load_extensions; 3350 cf::load_extensions;
3245 3351
3246 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3339 or die; 3445 or die;
3340 3446
3341 $map->width (50); 3447 $map->width (50);
3342 $map->height (50); 3448 $map->height (50);
3343 $map->alloc; 3449 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3345 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3346 3452
3347 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3348 if ($t < $min) { 3454 if ($t < $min) {
3349 $min = $t; 3455 $min = $t;

Diff Legend

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