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.357 by root, Tue Sep 4 08:42:58 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
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
474 478
475=cut 479=cut
476 480
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(&@) { 481sub fork_call(&@) {
487 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
488 483
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 487
494 if (my $pid = fork) { 488 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; 489 reset_signals;
508 local $SIG{__WARN__}; 490 &$cb
509 local $SIG{__DIE__}; 491 }, @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 492
516 eval { 493 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} 494}
529 495
530=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
531 497
532Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
612 if (1) { 578 if (1) {
613 $md5 = 579 $md5 =
614 join "\x00", 580 join "\x00",
615 $processversion, 581 $processversion,
616 map { 582 map {
617 Coro::cede; 583 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 585 } 0.. $#$src;
620 586
621 587
622 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1038 }, 1004 },
1039); 1005);
1040 1006
1041sub object_freezer_save { 1007sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
1043 1011
1044 sync_job { 1012 sync_job {
1045 if (length $$rdata) { 1013 if (length $$rdata) {
1046 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
1071 } 1039 }
1072 } else { 1040 } else {
1073 aio_unlink $filename; 1041 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
1075 } 1043 }
1076 } 1044 };
1045
1046 undef $guard;
1077} 1047}
1078 1048
1079sub object_freezer_as_string { 1049sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
1081 1051
… …
1086 1056
1087sub object_thawer_load { 1057sub object_thawer_load {
1088 my ($filename) = @_; 1058 my ($filename) = @_;
1089 1059
1090 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1091 1063
1092 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1093 or return; 1065 or return;
1094 1066
1095 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1069 or return;
1070
1071 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1073 }
1100 1074
1101 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1103 return ($data, $av); 1078 ($data, $av)
1104} 1079}
1105 1080
1106=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1107 1082
1108=over 4 1083=over 4
… …
1186 my ($type, $reply, @payload) = 1161 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1162 "ARRAY" eq ref $msg
1188 ? @$msg 1163 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1165
1166 my @reply;
1167
1191 if (my $cb = $EXTCMD{$type}) { 1168 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1169 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1197 } else { 1175 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1177 }
1200 1178
1201 cf::override; 1179 cf::override;
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1317
1340 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1343 } 1327 }
1344 } 1328 }
1345} 1329}
1346 1330
… …
1356 1340
1357 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1359 1343
1360 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1361 Coro::cede; 1345 cf::cede_to_tick;
1362} 1346}
1363 1347
1364sub new($) { 1348sub new($) {
1365 my ($login) = @_; 1349 my ($login) = @_;
1366 1350
… …
1444 or return []; 1428 or return [];
1445 1429
1446 my @logins; 1430 my @logins;
1447 1431
1448 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1452 1441
1453 utf8::decode $login; 1442 utf8::decode $login;
1454 push @logins, $login; 1443 push @logins, $login;
1455 } 1444 }
1456 1445
… …
1494sub expand_cfpod { 1483sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1496 1485
1497 # escape & and < 1486 # escape & and <
1498 s/&/&amp;/g; 1487 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1500 1489
1501 # this is buggy, it needs to properly take care of nested <'s 1490 # this is buggy, it needs to properly take care of nested <'s
1502 1491
1503 1 while 1492 1 while
1504 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1498 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1511 }ge 1501 }ge
1512 # replace H<hint text> 1502 # replace H<hint text>
… …
1542=cut 1532=cut
1543 1533
1544sub ext_reply($$@) { 1534sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1535 my ($self, $id, @msg) = @_;
1546 1536
1547 if ($self->ns->extcmd == 2) { 1537 $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} 1538}
1555 1539
1556=item $player->ext_msg ($type, @msg) 1540=item $player->ext_msg ($type, @msg)
1557 1541
1558Sends an ext event to the client. 1542Sends an ext event to the client.
… …
1786 1770
1787sub load_header_from($) { 1771sub load_header_from($) {
1788 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1789 1773
1790 utf8::encode $path; 1774 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1796 1783
1797 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1798 1785
1799 1 1786 1
1800} 1787}
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1890 1877
1891 my $path = $self->{path}; 1878 my $path = $self->{path};
1892 1879
1893 { 1880 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1895 1882
1883 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1897 1885
1898 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1899 1887
1900 $self->alloc; 1888 $self->alloc;
1901 1889
1902 $self->pre_load; 1890 $self->pre_load;
1903 Coro::cede; 1891 cf::cede_to_tick;
1904 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1906 or return; 1896 or return;
1907 1897
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1910 1900
1911 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1902 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1905 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1916 } 1909 }
1917 } 1910 }
1918 1911
1919 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1920 # now do the right thing for maps 1915 # now do the right thing for maps
1921 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1918 unless $self->difficulty;
1924 Coro::cede; 1919 cf::cede_to_tick;
1925 1920
1926 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1922 $self->decay_objects;
1928 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1929 $self->update_buttons; 1924 $self->update_buttons;
1930 Coro::cede; 1925 cf::cede_to_tick;
1931 $self->set_darkness_map; 1926 $self->set_darkness_map;
1932 Coro::cede; 1927 cf::cede_to_tick;
1933 $self->activate; 1928 $self->activate;
1934 } 1929 }
1935 1930
1936 $self->{last_save} = $cf::RUNTIME; 1931 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1932 $self->last_access ($cf::RUNTIME);
… …
1953 1948
1954 $self 1949 $self
1955} 1950}
1956 1951
1957# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1953sub load_neighbours {
1959 my ($map) = @_; 1954 my ($map) = @_;
1960 1955
1961 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1962 1957
1963 for (0 .. 3) { 1958 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1965 or next; 1960 or next;
1966 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1967 or next; 1962 or next;
1968 $neigh->load; 1963 $neigh->load;
1969 1964
1965 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1968 }
1973 1969
1974 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1976 or next; 1973 or next;
1977 $neigh->load; 1974 $neigh->load;
1978 } 1975 }
1979} 1976}
1980 1977
… …
1985} 1982}
1986 1983
1987sub do_load_sync { 1984sub do_load_sync {
1988 my ($map) = @_; 1985 my ($map) = @_;
1989 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1990 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1991} 1991}
1992 1992
1993our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1995 1995
1996sub find_async { 1996sub find_async {
1997 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1998 1998
1999 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
2000 2000
2001 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2003 }
2004 2004
2005 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
2006 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2010 if (my $map = find $k) {
2010 $map->load; 2011 $map->load if $v;
2011 } 2012 }
2012 2013
2013 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
2014 } 2015 }
2015 } 2016 }
2016 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
2017 }; 2018 };
2018 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
2021} 2022}
2022 2023
2023sub save { 2024sub save {
2024 my ($self) = @_; 2025 my ($self) = @_;
2025 2026
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2028
2028 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
2029 2030
2030 return unless $self->dirty; 2031 return unless $self->dirty;
2031 2032
… …
2054 my ($self) = @_; 2055 my ($self) = @_;
2055 2056
2056 # save first because save cedes 2057 # save first because save cedes
2057 $self->save; 2058 $self->save;
2058 2059
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2061
2061 return if $self->players; 2062 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2064 return if $self->{deny_save};
2064 2065
… …
2116my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2117 2118
2118sub nuke { 2119sub nuke {
2119 my ($self) = @_; 2120 my ($self) = @_;
2120 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2121 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2122 2126
2123 $self->unlink_save; 2127 $self->unlink_save;
2124 2128
2125 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2134
2131 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2132 2137
2133 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2134} 2139}
2135 2140
2136=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2212 2217
2213sub inv_recursive { 2218sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2215} 2220}
2216 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
2217package cf; 2253package cf;
2218 2254
2219=back 2255=back
2220 2256
2221=head3 cf::object::player 2257=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2352 2388
2353 $map->load; 2389 $map->load;
2354 $map->load_diag; 2390 $map->load_neighbours;
2355 2391
2356 return unless $self->contr->active; 2392 return unless $self->contr->active;
2357 $self->activate_recursive; 2393 $self->activate_recursive;
2358 2394
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 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 2566the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2532 2568
2533=cut 2569=cut
2534 2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2535sub cf::client::send_msg { 2586sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2588
2538 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2539 2590
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2541 2595
2542 if (ref $channel) { 2596 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2547 } 2602 }
2548 2603
2549 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2550 } 2605 }
2551 2606
… …
2573 $color &= cf::NDI_COLOR_MASK; 2628 $color &= cf::NDI_COLOR_MASK;
2574 2629
2575 utf8::encode $msg; 2630 utf8::encode $msg;
2576 2631
2577 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2635 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2582 } 2638 }
2583 } 2639 }
… …
2591=cut 2647=cut
2592 2648
2593sub cf::client::ext_msg($$@) { 2649sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2650 my ($self, $type, @msg) = @_;
2595 2651
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2652 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2654 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2655 push @msg, msgtype => "event_$type";
2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2675 }
2604} 2676}
2605 2677
2606=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2740 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2741 "ARRAY" eq ref $msg
2670 ? @$msg 2742 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2744
2745 my @reply;
2746
2673 if (my $cb = $EXTICMD{$type}) { 2747 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2748 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2679 } else { 2754 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 2756 }
2682 2757
2683 cf::override; 2758 cf::override;
… …
2744 2819
2745The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2746 2821
2747 cf::object 2822 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 2823 contr pay_amount pay_player map x y force_find force_add
2749 insert remove name archname title slaying race 2824 insert remove name archname title slaying race decrease_ob_nr
2750 2825
2751 cf::object::player 2826 cf::object::player
2752 player 2827 player
2753 2828
2754 cf::player 2829 cf::player
… …
2759 2834
2760=cut 2835=cut
2761 2836
2762for ( 2837for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv name archname title slaying race)], 2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2765 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2768) { 2844) {
2769 no strict 'refs'; 2845 no strict 'refs';
… …
2845# the server's init and main functions 2921# the server's init and main functions
2846 2922
2847sub load_facedata($) { 2923sub load_facedata($) {
2848 my ($path) = @_; 2924 my ($path) = @_;
2849 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931
2850 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2851 2933
2852 my $facedata; 2934 my $facedata;
2853 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 2936 or die "$path: $!";
2855 2937
2856 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2857 2939
2858 $facedata->{version} == 2 2940 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2860 2949
2861 { 2950 {
2862 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2863 2952
2864 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 2959
2871 cf::cede_to_tick; 2960 cf::cede_to_tick;
2872 } 2961 }
2873 2962
2874 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
… …
2899 2988
2900 { 2989 {
2901 # TODO: for gcfclient pleasure, we should give resources 2990 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 2991 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 2992 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 2993
2906 my $soundconf = delete $res->{"res/sound.conf"}; 2994 my $soundconf = delete $res->{"res/sound.conf"};
2907 2995
2908 while (my ($name, $info) = each %$res) { 2996 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; 2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2915 2999
2916 if ($info->{type} & 1) { 3000 if ($info->{type} & 1) {
2917 # prepend meta info 3001 # prepend meta info
2918 3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3008 $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 { 3009 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3010 $data = $info->{data};
2925 } 3011 }
2926 3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 3014 cf::face::set_type $idx, $info->{type};
2928 3015
2929 cf::cede_to_tick; 3016 cf::cede_to_tick;
2930 } 3017 }
2931 3018
… …
2958 $ns->fx_want ($k, $v); 3045 $ns->fx_want ($k, $v);
2959 } 3046 }
2960}; 3047};
2961 3048
2962sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2963 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2965 3056
2966 for (cf::region::list) { 3057 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
3003 3094
3004sub init { 3095sub init {
3005 reload_resources; 3096 reload_resources;
3006} 3097}
3007 3098
3008sub cfg_load { 3099sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3101 or return;
3011 3102
3012 local $/; 3103 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
3033 (async { 3124 (async {
3034 Event::one_event; 3125 Event::one_event;
3035 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
3036 }; 3127 };
3037 3128
3038 cfg_load; 3129 reload_config;
3039 db_init; 3130 db_init;
3040 load_extensions; 3131 load_extensions;
3041 3132
3042 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
3043 Event::loop; 3134 Event::loop;
… …
3236 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3237 require cf; 3328 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3330
3240 warn "loading config and database again"; 3331 warn "loading config and database again";
3241 cf::cfg_load; 3332 cf::reload_config;
3242 3333
3243 warn "loading extensions"; 3334 warn "loading extensions";
3244 cf::load_extensions; 3335 cf::load_extensions;
3245 3336
3246 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3339 or die; 3430 or die;
3340 3431
3341 $map->width (50); 3432 $map->width (50);
3342 $map->height (50); 3433 $map->height (50);
3343 $map->alloc; 3434 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3345 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3346 3437
3347 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3348 if ($t < $min) { 3439 if ($t < $min) {
3349 $min = $t; 3440 $min = $t;

Diff Legend

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