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.324 by root, Sat Jul 28 14:23: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 }
1925 1930
1926 $map->{last_save} = $cf::RUNTIME; 1931 $self->{last_save} = $cf::RUNTIME;
1927 $map->last_access ($cf::RUNTIME); 1932 $self->last_access ($cf::RUNTIME);
1928 1933
1929 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1930 } 1935 }
1931 1936
1932 $self->post_load; 1937 $self->post_load;
… …
1943 1948
1944 $self 1949 $self
1945} 1950}
1946 1951
1947# 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
1948sub load_diag { 1953sub load_neighbours {
1949 my ($map) = @_; 1954 my ($map) = @_;
1950 1955
1951 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1952 1957
1953 for (0 .. 3) { 1958 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1955 or next; 1960 or next;
1956 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1957 or next; 1962 or next;
1958 $neigh->load; 1963 $neigh->load;
1959 1964
1965 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 1968 }
1963 1969
1964 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1966 or next; 1973 or next;
1967 $neigh->load; 1974 $neigh->load;
1968 } 1975 }
1969} 1976}
1970 1977
… …
1975} 1982}
1976 1983
1977sub do_load_sync { 1984sub do_load_sync {
1978 my ($map) = @_; 1985 my ($map) = @_;
1979 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1980 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1981} 1991}
1982 1992
1983our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1985 1995
1986sub find_async { 1996sub find_async {
1987 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1988 1998
1989 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1990 2000
1991 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2003 }
1994 2004
1995 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1996 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1997 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2010 if (my $map = find $k) {
2000 $map->load; 2011 $map->load if $v;
2001 } 2012 }
2002 2013
2003 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
2004 } 2015 }
2005 } 2016 }
2006 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
2007 }; 2018 };
2008 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
2011} 2022}
2012 2023
2013sub save { 2024sub save {
2014 my ($self) = @_; 2025 my ($self) = @_;
2015 2026
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2028
2018 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
2019 2030
2020 return unless $self->dirty; 2031 return unless $self->dirty;
2021 2032
… …
2044 my ($self) = @_; 2055 my ($self) = @_;
2045 2056
2046 # save first because save cedes 2057 # save first because save cedes
2047 $self->save; 2058 $self->save;
2048 2059
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2061
2051 return if $self->players; 2062 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2064 return if $self->{deny_save};
2054 2065
… …
2106my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2107 2118
2108sub nuke { 2119sub nuke {
2109 my ($self) = @_; 2120 my ($self) = @_;
2110 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2111 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2112 2126
2113 $self->unlink_save; 2127 $self->unlink_save;
2114 2128
2115 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2134
2121 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2122 2137
2123 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2124} 2139}
2125 2140
2126=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2202 2217
2203sub inv_recursive { 2218sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2205} 2220}
2206 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
2207package cf; 2253package cf;
2208 2254
2209=back 2255=back
2210 2256
2211=head3 cf::object::player 2257=head3 cf::object::player
… …
2243 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2244 } 2290 }
2245 } 2291 }
2246} 2292}
2247 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
2248=item $player_object->may ("access") 2304=item $player_object->may ("access")
2249 2305
2250Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2307(e.g. "command_wizcast").
2252 2308
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2332 2388
2333 $map->load; 2389 $map->load;
2334 $map->load_diag; 2390 $map->load_neighbours;
2335 2391
2336 return unless $self->contr->active; 2392 return unless $self->contr->active;
2337 $self->activate_recursive; 2393 $self->activate_recursive;
2338 2394
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2510the 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
2511the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2512 2568
2513=cut 2569=cut
2514 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
2515sub cf::client::send_msg { 2586sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2588
2518 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2519 2590
2520 $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};
2521 2595
2522 if (ref $channel) { 2596 if (ref $channel) {
2523 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2527 } 2602 }
2528 2603
2529 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2530 } 2605 }
2531 2606
… …
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2626 }
2552 2627
2553 $color &= cf::NDI_COLOR_MASK; 2628 $color &= cf::NDI_COLOR_MASK;
2554 2629
2630 utf8::encode $msg;
2631
2555 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2635 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2560 } 2638 }
2561 } 2639 }
… …
2569=cut 2647=cut
2570 2648
2571sub cf::client::ext_msg($$@) { 2649sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2650 my ($self, $type, @msg) = @_;
2573 2651
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2652 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2654 } elsif ($self->extcmd == 1) { # TODO: remove
2579 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;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2675 }
2582} 2676}
2583 2677
2584=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2740 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2741 "ARRAY" eq ref $msg
2648 ? @$msg 2742 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2744
2745 my @reply;
2746
2651 if (my $cb = $EXTICMD{$type}) { 2747 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2748 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2657 } else { 2754 } else {
2658 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";
2659 } 2756 }
2660 2757
2661 cf::override; 2758 cf::override;
… …
2708our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2710 2807
2711$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2712 2809
2713$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));
2714 2815
2715# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2716 2817
2717=pod 2818=pod
2718 2819
2719The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2720 2821
2721 cf::object 2822 cf::object
2722 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
2723 insert remove 2824 insert remove name archname title slaying race decrease_ob_nr
2724 2825
2725 cf::object::player 2826 cf::object::player
2726 player 2827 player
2727 2828
2728 cf::player 2829 cf::player
… …
2733 2834
2734=cut 2835=cut
2735 2836
2736for ( 2837for (
2737 ["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
2738 insert remove)], 2840 decrease_ob_nr)],
2739 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2742) { 2844) {
2743 no strict 'refs'; 2845 no strict 'refs';
… …
2819# the server's init and main functions 2921# the server's init and main functions
2820 2922
2821sub load_facedata($) { 2923sub load_facedata($) {
2822 my ($path) = @_; 2924 my ($path) = @_;
2823 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
2824 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2825 2933
2826 my $facedata; 2934 my $facedata;
2827 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 2936 or die "$path: $!";
2829 2937
2830 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2831 2939
2832 $facedata->{version} == 2 2940 $facedata->{version} == 2
2833 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;
2834 2949
2835 { 2950 {
2836 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2837 2952
2838 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840 cf::face::set_visibility $idx, $info->{visibility}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 2959
2845 cf::cede_to_tick; 2960 cf::cede_to_tick;
2846 } 2961 }
2847 2962
2848 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
… …
2873 2988
2874 { 2989 {
2875 # TODO: for gcfclient pleasure, we should give resources 2990 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 2991 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 2992 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879 2993
2880 my $soundconf = delete $res->{"res/sound.conf"}; 2994 my $soundconf = delete $res->{"res/sound.conf"};
2881 2995
2882 while (my ($name, $info) = each %$res) { 2996 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2889 2999
2890 if ($info->{type} & 1) { 3000 if ($info->{type} & 1) {
2891 # prepend meta info 3001 # prepend meta info
2892 3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3008 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else { 3009 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3010 $data = $info->{data};
2899 } 3011 }
2900 3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901 cf::face::set_type $idx, $info->{type}; 3014 cf::face::set_type $idx, $info->{type};
2902 3015
2903 cf::cede_to_tick; 3016 cf::cede_to_tick;
2904 } 3017 }
2905 3018
… …
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_] 3023 my $sound = $soundconf->{compat}[$_]
2911 or next; 3024 or next;
2912 3025
2913 my $face = cf::face::find "sound/$sound->[1]"; 3026 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face; 3027 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 } 3029 }
2918 3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
2919 #TODO 3034 }
2920 } 3035 }
2921 } 3036 }
2922 3037
2923 1 3038 1
2924} 3039}
… …
2930 $ns->fx_want ($k, $v); 3045 $ns->fx_want ($k, $v);
2931 } 3046 }
2932}; 3047};
2933 3048
2934sub 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
2935 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2937 3056
2938 for (cf::region::list) { 3057 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
2975 3094
2976sub init { 3095sub init {
2977 reload_resources; 3096 reload_resources;
2978} 3097}
2979 3098
2980sub cfg_load { 3099sub reload_config {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3101 or return;
2983 3102
2984 local $/; 3103 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
3005 (async { 3124 (async {
3006 Event::one_event; 3125 Event::one_event;
3007 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
3008 }; 3127 };
3009 3128
3010 cfg_load; 3129 reload_config;
3011 db_init; 3130 db_init;
3012 load_extensions; 3131 load_extensions;
3013 3132
3014 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
3015 Event::loop; 3134 Event::loop;
… …
3208 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3209 require cf; 3328 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3211 3330
3212 warn "loading config and database again"; 3331 warn "loading config and database again";
3213 cf::cfg_load; 3332 cf::reload_config;
3214 3333
3215 warn "loading extensions"; 3334 warn "loading extensions";
3216 cf::load_extensions; 3335 cf::load_extensions;
3217 3336
3218 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3311 or die; 3430 or die;
3312 3431
3313 $map->width (50); 3432 $map->width (50);
3314 $map->height (50); 3433 $map->height (50);
3315 $map->alloc; 3434 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3317 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3318 3437
3319 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3320 if ($t < $min) { 3439 if ($t < $min) {
3321 $min = $t; 3440 $min = $t;

Diff Legend

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