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.323 by root, Sat Jul 28 12:02:58 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
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_CLIENT_MASK; # 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;
2523 $self->ext_msg (channel_info => $channel); 2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2524 } 2541 }
2525 2542
2526 $channel = $channel->{id}; 2543 $channel = $channel->{id};
2527 } 2544 }
2528 2545
… …
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 } 2565 }
2549 2566
2550 $color &= cf::NDI_COLOR_MASK; 2567 $color &= cf::NDI_COLOR_MASK;
2551 2568
2569 utf8::encode $msg;
2570
2552 if (0 && $msg =~ /\[/) { 2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 4 0 $msg") 2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else { 2574 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg") 2576 $self->send_packet ("drawinfo $color $msg")
2557 } 2577 }
2558 } 2578 }
… …
2566=cut 2586=cut
2567 2587
2568sub cf::client::ext_msg($$@) { 2588sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 2589 my ($self, $type, @msg) = @_;
2570 2590
2571 my $extcmd = $self->extcmd;
2572
2573 if ($extcmd == 2) { 2591 if ($self->extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove 2593 } elsif ($self->extcmd == 1) { # TODO: remove
2576 push @msg, msgtype => "event_$type"; 2594 push @msg, msgtype => "event_$type";
2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 } 2614 }
2579} 2615}
2580 2616
2581=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
… …
2643 my ($type, $reply, @payload) = 2679 my ($type, $reply, @payload) =
2644 "ARRAY" eq ref $msg 2680 "ARRAY" eq ref $msg
2645 ? @$msg 2681 ? @$msg
2646 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2647 2683
2684 my @reply;
2685
2648 if (my $cb = $EXTICMD{$type}) { 2686 if (my $cb = $EXTICMD{$type}) {
2649 my @reply = $cb->($ns, @payload); 2687 @reply = $cb->($ns, @payload);
2650
2651 $ns->ext_reply ($reply, @reply)
2652 if $reply;
2653 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2654 } else { 2693 } else {
2655 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2656 } 2695 }
2657 2696
2658 cf::override; 2697 cf::override;
… …
2705our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2706our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2707 2746
2708$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2709 2748
2710$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
2711 2754
2712# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2713 2756
2714=pod 2757=pod
2715 2758
2716The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2717 2760
2718 cf::object 2761 cf::object
2719 contr pay_amount pay_player map x y force_find force_add 2762 contr pay_amount pay_player map x y force_find force_add
2720 insert remove 2763 insert remove name archname title slaying race decrease_ob_nr
2721 2764
2722 cf::object::player 2765 cf::object::player
2723 player 2766 player
2724 2767
2725 cf::player 2768 cf::player
… …
2730 2773
2731=cut 2774=cut
2732 2775
2733for ( 2776for (
2734 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2735 insert remove)], 2779 decrease_ob_nr)],
2736 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2737 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2738 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2739) { 2783) {
2740 no strict 'refs'; 2784 no strict 'refs';
… …
2816# the server's init and main functions 2860# the server's init and main functions
2817 2861
2818sub load_facedata($) { 2862sub load_facedata($) {
2819 my ($path) = @_; 2863 my ($path) = @_;
2820 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870
2821 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2822 2872
2823 my $facedata; 2873 my $facedata;
2824 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2825 or die "$path: $!"; 2875 or die "$path: $!";
2826 2876
2827 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2828 2878
2829 $facedata->{version} == 2 2879 $facedata->{version} == 2
2830 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2831 2888
2832 { 2889 {
2833 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2834 2891
2835 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2836 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2837 cf::face::set_visibility $idx, $info->{visibility}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap}; 2895 cf::face::set_magicmap $idx, $info->{magicmap};
2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2841 2898
2842 cf::cede_to_tick; 2899 cf::cede_to_tick;
2843 } 2900 }
2844 2901
2845 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
… …
2870 2927
2871 { 2928 {
2872 # TODO: for gcfclient pleasure, we should give resources 2929 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index. 2930 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource}; 2931 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876 2932
2877 my $soundconf = delete $res->{"res/sound.conf"}; 2933 my $soundconf = delete $res->{"res/sound.conf"};
2878 2934
2879 while (my ($name, $info) = each %$res) { 2935 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2886 2938
2887 if ($info->{type} & 1) { 2939 if ($info->{type} & 1) {
2888 # prepend meta info 2940 # prepend meta info
2889 2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2890 my $data = pack "(w/a*)*", $meta, $info->{data}; 2947 $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2892
2893 cf::face::set_data $idx, 0, $data, $chk;
2894 } else { 2948 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2949 $data = $info->{data};
2896 } 2950 }
2897 2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type}; 2953 cf::face::set_type $idx, $info->{type};
2899 2954
2900 cf::cede_to_tick; 2955 cf::cede_to_tick;
2901 } 2956 }
2902 2957
… …
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) { 2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_] 2962 my $sound = $soundconf->{compat}[$_]
2908 or next; 2963 or next;
2909 2964
2910 my $face = cf::face::find "sound/$sound->[1]"; 2965 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face; 2966 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat 2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 } 2968 }
2915 2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2916 #TODO 2973 }
2917 } 2974 }
2918 } 2975 }
2919 2976
2920 1 2977 1
2921} 2978}
… …
2927 $ns->fx_want ($k, $v); 2984 $ns->fx_want ($k, $v);
2928 } 2985 }
2929}; 2986};
2930 2987
2931sub reload_regions { 2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2932 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2933 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2934 2995
2935 for (cf::region::list) { 2996 for (cf::region::list) {
2936 $_->{match} = qr/$_->{match}/ 2997 $_->{match} = qr/$_->{match}/
… …
2972 3033
2973sub init { 3034sub init {
2974 reload_resources; 3035 reload_resources;
2975} 3036}
2976 3037
2977sub cfg_load { 3038sub reload_config {
2978 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2979 or return; 3040 or return;
2980 3041
2981 local $/; 3042 local $/;
2982 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
3002 (async { 3063 (async {
3003 Event::one_event; 3064 Event::one_event;
3004 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
3005 }; 3066 };
3006 3067
3007 cfg_load; 3068 reload_config;
3008 db_init; 3069 db_init;
3009 load_extensions; 3070 load_extensions;
3010 3071
3011 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
3012 Event::loop; 3073 Event::loop;
… …
3205 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3206 require cf; 3267 require cf;
3207 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3208 3269
3209 warn "loading config and database again"; 3270 warn "loading config and database again";
3210 cf::cfg_load; 3271 cf::reload_config;
3211 3272
3212 warn "loading extensions"; 3273 warn "loading extensions";
3213 cf::load_extensions; 3274 cf::load_extensions;
3214 3275
3215 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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