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.322 by root, Fri Jul 27 10:10:51 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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 ();
… …
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 (liekly 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";
… …
1186 my ($type, $reply, @payload) = 1152 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1153 "ARRAY" eq ref $msg
1188 ? @$msg 1154 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1156
1157 my @reply;
1158
1191 if (my $cb = $EXTCMD{$type}) { 1159 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1160 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1197 } else { 1166 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1168 }
1200 1169
1201 cf::override; 1170 cf::override;
… …
1356 1325
1357 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1359 1328
1360 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1361 Coro::cede; 1330 cf::cede_to_tick;
1362} 1331}
1363 1332
1364sub new($) { 1333sub new($) {
1365 my ($login) = @_; 1334 my ($login) = @_;
1366 1335
… …
1370 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1371 1340
1372 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1373 1342
1374 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1375} 1354}
1376 1355
1377=item $pl->quit_character 1356=item $pl->quit_character
1378 1357
1379Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1484sub expand_cfpod { 1463sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1486 1465
1487 # escape & and < 1466 # escape & and <
1488 s/&/&amp;/g; 1467 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1490 1469
1491 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1492 1471
1493 1 while 1472 1 while
1494 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1478 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1501 }ge 1481 }ge
1502 # replace H<hint text> 1482 # replace H<hint text>
… …
1532=cut 1512=cut
1533 1513
1534sub ext_reply($$@) { 1514sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1515 my ($self, $id, @msg) = @_;
1536 1516
1537 if ($self->ns->extcmd == 2) { 1517 $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} 1518}
1545 1519
1546=item $player->ext_msg ($type, @msg) 1520=item $player->ext_msg ($type, @msg)
1547 1521
1548Sends an ext event to the client. 1522Sends an ext event to the client.
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1880 1854
1881 my $path = $self->{path}; 1855 my $path = $self->{path};
1882 1856
1883 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1884 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1885 1860
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1887 1862
1888 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1889 1864
1890 $self->alloc; 1865 $self->alloc;
1891 1866
1892 $self->pre_load; 1867 $self->pre_load;
1893 Coro::cede; 1868 cf::cede_to_tick;
1894 1869
1895 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1896 or return; 1871 or return;
1897 1872
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1904 $self->clear_unique_items; 1879 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1906 } 1881 }
1907 } 1882 }
1908 1883
1909 Coro::cede; 1884 cf::cede_to_tick;
1910 # now do the right thing for maps 1885 # now do the right thing for maps
1911 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1888 unless $self->difficulty;
1914 Coro::cede; 1889 cf::cede_to_tick;
1915 1890
1916 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1892 $self->decay_objects;
1918 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1919 $self->update_buttons; 1894 $self->update_buttons;
1920 Coro::cede; 1895 cf::cede_to_tick;
1921 $self->set_darkness_map; 1896 $self->set_darkness_map;
1922 Coro::cede; 1897 cf::cede_to_tick;
1923 $self->activate; 1898 $self->activate;
1924 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1925 1903
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1905 }
1928 1906
1929 $self->post_load; 1907 $self->post_load;
… …
1940 1918
1941 $self 1919 $self
1942} 1920}
1943 1921
1944# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1923sub load_neighbours {
1946 my ($map) = @_; 1924 my ($map) = @_;
1947 1925
1948 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1949 1927
1950 for (0 .. 3) { 1928 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1952 or next; 1930 or next;
1953 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1954 or next; 1932 or next;
1955 $neigh->load; 1933 $neigh->load;
1956 1934
1935 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1938 }
1960 1939
1961 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1963 or next; 1943 or next;
1964 $neigh->load; 1944 $neigh->load;
1965 } 1945 }
1966} 1946}
1967 1947
… …
1972} 1952}
1973 1953
1974sub do_load_sync { 1954sub do_load_sync {
1975 my ($map) = @_; 1955 my ($map) = @_;
1976 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1977 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1978} 1961}
1979 1962
1980our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1982 1965
1983sub find_async { 1966sub find_async {
1984 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1985 1968
1986 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1987 1970
1988 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 1973 }
1991 1974
1992 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1993 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 1980 if (my $map = find $k) {
1997 $map->load; 1981 $map->load if $v;
1998 } 1982 }
1999 1983
2000 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
2001 } 1985 }
2002 } 1986 }
2003 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
2004 }; 1988 };
2005 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
2008} 1992}
2009 1993
2010sub save { 1994sub save {
2011 my ($self) = @_; 1995 my ($self) = @_;
2012 1996
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 1998
2015 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
2016 2000
2017 return unless $self->dirty; 2001 return unless $self->dirty;
2018 2002
… …
2041 my ($self) = @_; 2025 my ($self) = @_;
2042 2026
2043 # save first because save cedes 2027 # save first because save cedes
2044 $self->save; 2028 $self->save;
2045 2029
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2031
2048 return if $self->players; 2032 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2051 2035
… …
2103my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2104 2088
2105sub nuke { 2089sub nuke {
2106 my ($self) = @_; 2090 my ($self) = @_;
2107 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2108 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2109 2096
2110 $self->unlink_save; 2097 $self->unlink_save;
2111 2098
2112 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2104
2118 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2119 2107
2120 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2121} 2109}
2122 2110
2123=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2240 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2241 } 2229 }
2242 } 2230 }
2243} 2231}
2244 2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
2241}
2242
2245=item $player_object->may ("access") 2243=item $player_object->may ("access")
2246 2244
2247Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2246(e.g. "command_wizcast").
2249 2247
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2329 2327
2330 $map->load; 2328 $map->load;
2331 $map->load_diag; 2329 $map->load_neighbours;
2332 2330
2333 return unless $self->contr->active; 2331 return unless $self->contr->active;
2334 $self->activate_recursive; 2332 $self->activate_recursive;
2335 2333
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 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 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2509 2507
2510=cut 2508=cut
2511 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2512sub cf::client::send_msg { 2525sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2527
2515 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2516 2529
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2518 2534
2519 if (ref $channel) { 2535 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
… …
2527 } 2543 }
2528 2544
2529 return unless @extra || length $msg; 2545 return unless @extra || length $msg;
2530 2546
2531 if ($self->can_msg) { 2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2554 } 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) { 2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2545 if (0 && $msg =~ /\[/) { 2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2573 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2575 $self->send_packet ("drawinfo $color $msg")
2550 } 2576 }
2551 } 2577 }
… …
2559=cut 2585=cut
2560 2586
2561sub cf::client::ext_msg($$@) { 2587sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2588 my ($self, $type, @msg) = @_;
2563 2589
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2590 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2592 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2593 push @msg, msgtype => "event_$type";
2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2613 }
2572} 2614}
2573 2615
2574=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2678 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2679 "ARRAY" eq ref $msg
2638 ? @$msg 2680 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2682
2683 my @reply;
2684
2641 if (my $cb = $EXTICMD{$type}) { 2685 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2686 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2647 } else { 2692 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2694 }
2650 2695
2651 cf::override; 2696 cf::override;
… …
2698our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2700 2745
2701$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2702 2747
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2704 2753
2705# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2706 2755
2707=pod 2756=pod
2708 2757
2709The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2710 2759
2711 cf::object 2760 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2761 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2762 insert remove name archname title slaying race decrease_ob_nr
2714 2763
2715 cf::object::player 2764 cf::object::player
2716 player 2765 player
2717 2766
2718 cf::player 2767 cf::player
… …
2723 2772
2724=cut 2773=cut
2725 2774
2726for ( 2775for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2728 insert remove)], 2778 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2732) { 2782) {
2733 no strict 'refs'; 2783 no strict 'refs';
… …
2809# the server's init and main functions 2859# the server's init and main functions
2810 2860
2811sub load_facedata($) { 2861sub load_facedata($) {
2812 my ($path) = @_; 2862 my ($path) = @_;
2813 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2814 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2815 2871
2816 my $facedata; 2872 my $facedata;
2817 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2874 or die "$path: $!";
2819 2875
2820 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2821 2877
2822 $facedata->{version} == 2 2878 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2824 2887
2825 { 2888 {
2826 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2827 2890
2828 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2897
2835 cf::cede_to_tick; 2898 cf::cede_to_tick;
2836 } 2899 }
2837 2900
2838 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
… …
2863 2926
2864 { 2927 {
2865 # TODO: for gcfclient pleasure, we should give resources 2928 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2929 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2930 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2931
2870 my $soundconf = delete $res->{"res/sound.conf"}; 2932 my $soundconf = delete $res->{"res/sound.conf"};
2871 2933
2872 while (my ($name, $info) = each %$res) { 2934 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2879 2937
2880 if ($info->{type} & 1) { 2938 if ($info->{type} & 1) {
2881 # prepend meta info 2939 # prepend meta info
2882 2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2946 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 2947 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2948 $data = $info->{data};
2889 } 2949 }
2890 2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 2952 cf::face::set_type $idx, $info->{type};
2892 2953
2893 cf::cede_to_tick; 2954 cf::cede_to_tick;
2894 } 2955 }
2895 2956
… …
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) { 2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_] 2961 my $sound = $soundconf->{compat}[$_]
2901 or next; 2962 or next;
2902 2963
2903 my $face = cf::face::find "sound/$sound->[1]"; 2964 my $face = cf::face::find "sound/$sound->[1]";
2904
2905 cf::sound::set $sound->[0] => $face; 2965 cf::sound::set $sound->[0] => $face;
2906 cf::sound::old_sound_index $_, $face; # gcfclient-compat 2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2907 } 2967 }
2908 2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2909 #TODO 2972 }
2910 } 2973 }
2911 } 2974 }
2912 2975
2913 1 2976 1
2914} 2977}
… …
2920 $ns->fx_want ($k, $v); 2983 $ns->fx_want ($k, $v);
2921 } 2984 }
2922}; 2985};
2923 2986
2924sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2925 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2926 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2927 2994
2928 for (cf::region::list) { 2995 for (cf::region::list) {
2929 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
… …
2965 3032
2966sub init { 3033sub init {
2967 reload_resources; 3034 reload_resources;
2968} 3035}
2969 3036
2970sub cfg_load { 3037sub reload_config {
2971 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2972 or return; 3039 or return;
2973 3040
2974 local $/; 3041 local $/;
2975 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
2995 (async { 3062 (async {
2996 Event::one_event; 3063 Event::one_event;
2997 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2998 }; 3065 };
2999 3066
3000 cfg_load; 3067 reload_config;
3001 db_init; 3068 db_init;
3002 load_extensions; 3069 load_extensions;
3003 3070
3004 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
3005 Event::loop; 3072 Event::loop;
… …
3198 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3199 require cf; 3266 require cf;
3200 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3201 3268
3202 warn "loading config and database again"; 3269 warn "loading config and database again";
3203 cf::cfg_load; 3270 cf::reload_config;
3204 3271
3205 warn "loading extensions"; 3272 warn "loading extensions";
3206 cf::load_extensions; 3273 cf::load_extensions;
3207 3274
3208 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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