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.317 by root, Mon Jul 23 23:38:17 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
… …
1370 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1371 1355
1372 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1373 1357
1374 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1375} 1369}
1376 1370
1377=item $pl->quit_character 1371=item $pl->quit_character
1378 1372
1379Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1428 or return [];
1435 1429
1436 my @logins; 1430 my @logins;
1437 1431
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1442 1441
1443 utf8::decode $login; 1442 utf8::decode $login;
1444 push @logins, $login; 1443 push @logins, $login;
1445 } 1444 }
1446 1445
… …
1484sub expand_cfpod { 1483sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1486 1485
1487 # escape & and < 1486 # escape & and <
1488 s/&/&amp;/g; 1487 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1490 1489
1491 # 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
1492 1491
1493 1 while 1492 1 while
1494 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1501 }ge 1501 }ge
1502 # replace H<hint text> 1502 # replace H<hint text>
… …
1532=cut 1532=cut
1533 1533
1534sub ext_reply($$@) { 1534sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1535 my ($self, $id, @msg) = @_;
1536 1536
1537 if ($self->ns->extcmd == 2) { 1537 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1538}
1545 1539
1546=item $player->ext_msg ($type, @msg) 1540=item $player->ext_msg ($type, @msg)
1547 1541
1548Sends an ext event to the client. 1542Sends an ext event to the client.
… …
1776 1770
1777sub load_header_from($) { 1771sub load_header_from($) {
1778 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1779 1773
1780 utf8::encode $path; 1774 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1783
1787 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1788 1785
1789 1 1786 1
1790} 1787}
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1880 1877
1881 my $path = $self->{path}; 1878 my $path = $self->{path};
1882 1879
1883 { 1880 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1885 1882
1883 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1887 1885
1888 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1889 1887
1890 $self->alloc; 1888 $self->alloc;
1891 1889
1892 $self->pre_load; 1890 $self->pre_load;
1893 Coro::cede; 1891 cf::cede_to_tick;
1894 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1896 or return; 1896 or return;
1897 1897
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1900 1900
1901 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1902 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1905 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1906 } 1909 }
1907 } 1910 }
1908 1911
1909 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1910 # now do the right thing for maps 1915 # now do the right thing for maps
1911 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1918 unless $self->difficulty;
1914 Coro::cede; 1919 cf::cede_to_tick;
1915 1920
1916 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1922 $self->decay_objects;
1918 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1919 $self->update_buttons; 1924 $self->update_buttons;
1920 Coro::cede; 1925 cf::cede_to_tick;
1921 $self->set_darkness_map; 1926 $self->set_darkness_map;
1922 Coro::cede; 1927 cf::cede_to_tick;
1923 $self->activate; 1928 $self->activate;
1924 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1925 1933
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1935 }
1928 1936
1929 $self->post_load; 1937 $self->post_load;
… …
1940 1948
1941 $self 1949 $self
1942} 1950}
1943 1951
1944# 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
1945sub load_diag { 1953sub load_neighbours {
1946 my ($map) = @_; 1954 my ($map) = @_;
1947 1955
1948 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1949 1957
1950 for (0 .. 3) { 1958 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1952 or next; 1960 or next;
1953 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1954 or next; 1962 or next;
1955 $neigh->load; 1963 $neigh->load;
1956 1964
1965 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1968 }
1960 1969
1961 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1963 or next; 1973 or next;
1964 $neigh->load; 1974 $neigh->load;
1965 } 1975 }
1966} 1976}
1967 1977
… …
1972} 1982}
1973 1983
1974sub do_load_sync { 1984sub do_load_sync {
1975 my ($map) = @_; 1985 my ($map) = @_;
1976 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1977 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1978} 1991}
1979 1992
1980our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1982 1995
1983sub find_async { 1996sub find_async {
1984 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1985 1998
1986 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1987 2000
1988 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2003 }
1991 2004
1992 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1993 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2010 if (my $map = find $k) {
1997 $map->load; 2011 $map->load if $v;
1998 } 2012 }
1999 2013
2000 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
2001 } 2015 }
2002 } 2016 }
2003 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
2004 }; 2018 };
2005 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
2008} 2022}
2009 2023
2010sub save { 2024sub save {
2011 my ($self) = @_; 2025 my ($self) = @_;
2012 2026
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2028
2015 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
2016 2030
2017 return unless $self->dirty; 2031 return unless $self->dirty;
2018 2032
… …
2041 my ($self) = @_; 2055 my ($self) = @_;
2042 2056
2043 # save first because save cedes 2057 # save first because save cedes
2044 $self->save; 2058 $self->save;
2045 2059
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2061
2048 return if $self->players; 2062 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2064 return if $self->{deny_save};
2051 2065
… …
2103my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2104 2118
2105sub nuke { 2119sub nuke {
2106 my ($self) = @_; 2120 my ($self) = @_;
2107 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2108 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2109 2126
2110 $self->unlink_save; 2127 $self->unlink_save;
2111 2128
2112 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2134
2118 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2119 2137
2120 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2121} 2139}
2122 2140
2123=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2199 2217
2200sub inv_recursive { 2218sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2202} 2220}
2203 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
2204package cf; 2253package cf;
2205 2254
2206=back 2255=back
2207 2256
2208=head3 cf::object::player 2257=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2241 } 2290 }
2242 } 2291 }
2243} 2292}
2244 2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
2302}
2303
2245=item $player_object->may ("access") 2304=item $player_object->may ("access")
2246 2305
2247Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2307(e.g. "command_wizcast").
2249 2308
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2329 2388
2330 $map->load; 2389 $map->load;
2331 $map->load_diag; 2390 $map->load_neighbours;
2332 2391
2333 return unless $self->contr->active; 2392 return unless $self->contr->active;
2334 $self->activate_recursive; 2393 $self->activate_recursive;
2335 2394
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2507the 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
2508the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2509 2568
2510=cut 2569=cut
2511 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
2512sub cf::client::send_msg { 2586sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2588
2515 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2516 2590
2517 $color &= ~cf::NDI_UNIQUE; # 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};
2518 2595
2519 if (ref $channel) { 2596 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2524 } 2602 }
2525 2603
2526 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2527 } 2605 }
2528 2606
2529 return unless @extra || length $msg; 2607 return unless @extra || length $msg;
2530 2608
2531 if ($self->can_msg) { 2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2616 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2545 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2635 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2550 } 2638 }
2551 } 2639 }
… …
2559=cut 2647=cut
2560 2648
2561sub cf::client::ext_msg($$@) { 2649sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2650 my ($self, $type, @msg) = @_;
2563 2651
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2652 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2654 } elsif ($self->extcmd == 1) { # TODO: remove
2569 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;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2675 }
2572} 2676}
2573 2677
2574=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2740 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2741 "ARRAY" eq ref $msg
2638 ? @$msg 2742 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2744
2745 my @reply;
2746
2641 if (my $cb = $EXTICMD{$type}) { 2747 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2748 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2647 } else { 2754 } else {
2648 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";
2649 } 2756 }
2650 2757
2651 cf::override; 2758 cf::override;
… …
2698our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2700 2807
2701$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2702 2809
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2704 2815
2705# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2706 2817
2707=pod 2818=pod
2708 2819
2709The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2710 2821
2711 cf::object 2822 cf::object
2712 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
2713 insert remove 2824 insert remove name archname title slaying race decrease_ob_nr
2714 2825
2715 cf::object::player 2826 cf::object::player
2716 player 2827 player
2717 2828
2718 cf::player 2829 cf::player
… …
2723 2834
2724=cut 2835=cut
2725 2836
2726for ( 2837for (
2727 ["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
2839 insert remove inv name archname title slaying race
2728 insert remove)], 2840 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2732) { 2844) {
2733 no strict 'refs'; 2845 no strict 'refs';
… …
2809# the server's init and main functions 2921# the server's init and main functions
2810 2922
2811sub load_facedata($) { 2923sub load_facedata($) {
2812 my ($path) = @_; 2924 my ($path) = @_;
2813 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
2814 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2815 2933
2816 my $facedata; 2934 my $facedata;
2817 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2936 or die "$path: $!";
2819 2937
2820 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2821 2939
2822 $facedata->{version} == 2 2940 $facedata->{version} == 2
2823 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;
2824 2949
2825 { 2950 {
2826 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2827 2952
2828 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2959
2835 cf::cede_to_tick; 2960 cf::cede_to_tick;
2836 } 2961 }
2837 2962
2838 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
… …
2863 2988
2864 { 2989 {
2865 # TODO: for gcfclient pleasure, we should give resources 2990 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2991 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2992 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical; 2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2869 2995
2870 while (my ($name, $info) = each %$res) { 2996 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2878 2999
2879 if ($name =~ /\.(?:jpg|png)$/) { 3000 if ($info->{type} & 1) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3001 # prepend meta info
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
2882 } else { 3009 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3010 $data = $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 } 3011 }
2889 3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
2890 cf::cede_to_tick; 3016 cf::cede_to_tick;
2891 } 3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
2892 } 3036 }
2893 3037
2894 1 3038 1
2895} 3039}
2896 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2897sub 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
2898 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2900 3056
2901 for (cf::region::list) { 3057 for (cf::region::list) {
2902 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
2938 3094
2939sub init { 3095sub init {
2940 reload_resources; 3096 reload_resources;
2941} 3097}
2942 3098
2943sub cfg_load { 3099sub reload_config {
2944 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2945 or return; 3101 or return;
2946 3102
2947 local $/; 3103 local $/;
2948 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2968 (async { 3124 (async {
2969 Event::one_event; 3125 Event::one_event;
2970 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2971 }; 3127 };
2972 3128
2973 cfg_load; 3129 reload_config;
2974 db_init; 3130 db_init;
2975 load_extensions; 3131 load_extensions;
2976 3132
2977 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2978 Event::loop; 3134 Event::loop;
… …
3171 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3172 require cf; 3328 require cf;
3173 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3174 3330
3175 warn "loading config and database again"; 3331 warn "loading config and database again";
3176 cf::cfg_load; 3332 cf::reload_config;
3177 3333
3178 warn "loading extensions"; 3334 warn "loading extensions";
3179 cf::load_extensions; 3335 cf::load_extensions;
3180 3336
3181 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3274 or die; 3430 or die;
3275 3431
3276 $map->width (50); 3432 $map->width (50);
3277 $map->height (50); 3433 $map->height (50);
3278 $map->alloc; 3434 $map->alloc;
3279 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3280 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3281 3437
3282 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3283 if ($t < $min) { 3439 if ($t < $min) {
3284 $min = $t; 3440 $min = $t;

Diff Legend

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