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.326 by root, Tue Jul 31 17:33:15 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 }
1925 1900
1926 $self->{last_save} = $cf::RUNTIME; 1901 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 1902 $self->last_access ($cf::RUNTIME);
… …
1943 1918
1944 $self 1919 $self
1945} 1920}
1946 1921
1947# 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
1948sub load_diag { 1923sub load_neighbours {
1949 my ($map) = @_; 1924 my ($map) = @_;
1950 1925
1951 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1952 1927
1953 for (0 .. 3) { 1928 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1955 or next; 1930 or next;
1956 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1957 or next; 1932 or next;
1958 $neigh->load; 1933 $neigh->load;
1959 1934
1935 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 1938 }
1963 1939
1964 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1966 or next; 1943 or next;
1967 $neigh->load; 1944 $neigh->load;
1968 } 1945 }
1969} 1946}
1970 1947
… …
1975} 1952}
1976 1953
1977sub do_load_sync { 1954sub do_load_sync {
1978 my ($map) = @_; 1955 my ($map) = @_;
1979 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1980 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1981} 1961}
1982 1962
1983our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1985 1965
1986sub find_async { 1966sub find_async {
1987 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1988 1968
1989 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1990 1970
1991 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 1973 }
1994 1974
1995 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1996 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1997 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 1980 if (my $map = find $k) {
2000 $map->load; 1981 $map->load if $v;
2001 } 1982 }
2002 1983
2003 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
2004 } 1985 }
2005 } 1986 }
2006 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
2007 }; 1988 };
2008 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
2011} 1992}
2012 1993
2013sub save { 1994sub save {
2014 my ($self) = @_; 1995 my ($self) = @_;
2015 1996
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 1998
2018 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
2019 2000
2020 return unless $self->dirty; 2001 return unless $self->dirty;
2021 2002
… …
2044 my ($self) = @_; 2025 my ($self) = @_;
2045 2026
2046 # save first because save cedes 2027 # save first because save cedes
2047 $self->save; 2028 $self->save;
2048 2029
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2031
2051 return if $self->players; 2032 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2054 2035
… …
2106my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2107 2088
2108sub nuke { 2089sub nuke {
2109 my ($self) = @_; 2090 my ($self) = @_;
2110 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2111 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2112 2096
2113 $self->unlink_save; 2097 $self->unlink_save;
2114 2098
2115 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2104
2121 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2122 2107
2123 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2124} 2109}
2125 2110
2126=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2243 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2244 } 2229 }
2245 } 2230 }
2246} 2231}
2247 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
2248=item $player_object->may ("access") 2243=item $player_object->may ("access")
2249 2244
2250Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2246(e.g. "command_wizcast").
2252 2247
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2332 2327
2333 $map->load; 2328 $map->load;
2334 $map->load_diag; 2329 $map->load_neighbours;
2335 2330
2336 return unless $self->contr->active; 2331 return unless $self->contr->active;
2337 $self->activate_recursive; 2332 $self->activate_recursive;
2338 2333
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 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 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2512 2507
2513=cut 2508=cut
2514 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
2515sub cf::client::send_msg { 2525sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2527
2518 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2519 2529
2520 $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};
2521 2534
2522 if (ref $channel) { 2535 if (ref $channel) {
2523 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
… …
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2564 }
2552 2565
2553 $color &= cf::NDI_COLOR_MASK; 2566 $color &= cf::NDI_COLOR_MASK;
2554 2567
2568 utf8::encode $msg;
2569
2555 if (0 && $msg =~ /\[/) { 2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2573 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2575 $self->send_packet ("drawinfo $color $msg")
2560 } 2576 }
2561 } 2577 }
… …
2569=cut 2585=cut
2570 2586
2571sub cf::client::ext_msg($$@) { 2587sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2588 my ($self, $type, @msg) = @_;
2573 2589
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2590 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2592 } elsif ($self->extcmd == 1) { # TODO: remove
2579 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;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2613 }
2582} 2614}
2583 2615
2584=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2678 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2679 "ARRAY" eq ref $msg
2648 ? @$msg 2680 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2682
2683 my @reply;
2684
2651 if (my $cb = $EXTICMD{$type}) { 2685 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2686 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2657 } else { 2692 } else {
2658 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";
2659 } 2694 }
2660 2695
2661 cf::override; 2696 cf::override;
… …
2708our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2710 2745
2711$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2712 2747
2713$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));
2714 2753
2715# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2716 2755
2717=pod 2756=pod
2718 2757
2719The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2720 2759
2721 cf::object 2760 cf::object
2722 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
2723 insert remove 2762 insert remove name archname title slaying race decrease_ob_nr
2724 2763
2725 cf::object::player 2764 cf::object::player
2726 player 2765 player
2727 2766
2728 cf::player 2767 cf::player
… …
2733 2772
2734=cut 2773=cut
2735 2774
2736for ( 2775for (
2737 ["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
2738 insert remove)], 2778 decrease_ob_nr)],
2739 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2742) { 2782) {
2743 no strict 'refs'; 2783 no strict 'refs';
… …
2819# the server's init and main functions 2859# the server's init and main functions
2820 2860
2821sub load_facedata($) { 2861sub load_facedata($) {
2822 my ($path) = @_; 2862 my ($path) = @_;
2823 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
2824 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2825 2871
2826 my $facedata; 2872 my $facedata;
2827 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 2874 or die "$path: $!";
2829 2875
2830 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2831 2877
2832 $facedata->{version} == 2 2878 $facedata->{version} == 2
2833 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;
2834 2887
2835 { 2888 {
2836 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2837 2890
2838 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840 cf::face::set_visibility $idx, $info->{visibility}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 2897
2845 cf::cede_to_tick; 2898 cf::cede_to_tick;
2846 } 2899 }
2847 2900
2848 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
… …
2873 2926
2874 { 2927 {
2875 # TODO: for gcfclient pleasure, we should give resources 2928 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 2929 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 2930 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879 2931
2880 my $soundconf = delete $res->{"res/sound.conf"}; 2932 my $soundconf = delete $res->{"res/sound.conf"};
2881 2933
2882 while (my ($name, $info) = each %$res) { 2934 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; 2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2889 2937
2890 if ($info->{type} & 1) { 2938 if ($info->{type} & 1) {
2891 # prepend meta info 2939 # prepend meta info
2892 2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 2946 $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 { 2947 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2948 $data = $info->{data};
2899 } 2949 }
2900 2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901 cf::face::set_type $idx, $info->{type}; 2952 cf::face::set_type $idx, $info->{type};
2902 2953
2903 cf::cede_to_tick; 2954 cf::cede_to_tick;
2904 } 2955 }
2905 2956
… …
2932 $ns->fx_want ($k, $v); 2983 $ns->fx_want ($k, $v);
2933 } 2984 }
2934}; 2985};
2935 2986
2936sub 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
2937 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2938 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2939 2994
2940 for (cf::region::list) { 2995 for (cf::region::list) {
2941 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
… …
2977 3032
2978sub init { 3033sub init {
2979 reload_resources; 3034 reload_resources;
2980} 3035}
2981 3036
2982sub cfg_load { 3037sub reload_config {
2983 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2984 or return; 3039 or return;
2985 3040
2986 local $/; 3041 local $/;
2987 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
3007 (async { 3062 (async {
3008 Event::one_event; 3063 Event::one_event;
3009 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
3010 }; 3065 };
3011 3066
3012 cfg_load; 3067 reload_config;
3013 db_init; 3068 db_init;
3014 load_extensions; 3069 load_extensions;
3015 3070
3016 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
3017 Event::loop; 3072 Event::loop;
… …
3210 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3211 require cf; 3266 require cf;
3212 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3213 3268
3214 warn "loading config and database again"; 3269 warn "loading config and database again";
3215 cf::cfg_load; 3270 cf::reload_config;
3216 3271
3217 warn "loading extensions"; 3272 warn "loading extensions";
3218 cf::load_extensions; 3273 cf::load_extensions;
3219 3274
3220 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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