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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 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
… …
1532=cut 1511=cut
1533 1512
1534sub ext_reply($$@) { 1513sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1514 my ($self, $id, @msg) = @_;
1536 1515
1537 if ($self->ns->extcmd == 2) { 1516 $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} 1517}
1545 1518
1546=item $player->ext_msg ($type, @msg) 1519=item $player->ext_msg ($type, @msg)
1547 1520
1548Sends an ext event to the client. 1521Sends an ext event to the client.
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1880 1853
1881 my $path = $self->{path}; 1854 my $path = $self->{path};
1882 1855
1883 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1884 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1885 1859
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1887 1861
1888 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1889 1863
1890 $self->alloc; 1864 $self->alloc;
1891 1865
1892 $self->pre_load; 1866 $self->pre_load;
1893 Coro::cede; 1867 cf::cede_to_tick;
1894 1868
1895 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1896 or return; 1870 or return;
1897 1871
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1904 $self->clear_unique_items; 1878 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1906 } 1880 }
1907 } 1881 }
1908 1882
1909 Coro::cede; 1883 cf::cede_to_tick;
1910 # now do the right thing for maps 1884 # now do the right thing for maps
1911 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1887 unless $self->difficulty;
1914 Coro::cede; 1888 cf::cede_to_tick;
1915 1889
1916 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1891 $self->decay_objects;
1918 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1919 $self->update_buttons; 1893 $self->update_buttons;
1920 Coro::cede; 1894 cf::cede_to_tick;
1921 $self->set_darkness_map; 1895 $self->set_darkness_map;
1922 Coro::cede; 1896 cf::cede_to_tick;
1923 $self->activate; 1897 $self->activate;
1924 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1925 1902
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1904 }
1928 1905
1929 $self->post_load; 1906 $self->post_load;
… …
1940 1917
1941 $self 1918 $self
1942} 1919}
1943 1920
1944# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1922sub load_neighbours {
1946 my ($map) = @_; 1923 my ($map) = @_;
1947 1924
1948 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1949 1926
1950 for (0 .. 3) { 1927 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1952 or next; 1929 or next;
1953 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1954 or next; 1931 or next;
1955 $neigh->load; 1932 $neigh->load;
1956 1933
1934 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1937 }
1960 1938
1961 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1963 or next; 1942 or next;
1964 $neigh->load; 1943 $neigh->load;
1965 } 1944 }
1966} 1945}
1967 1946
… …
1972} 1951}
1973 1952
1974sub do_load_sync { 1953sub do_load_sync {
1975 my ($map) = @_; 1954 my ($map) = @_;
1976 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1977 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1978} 1960}
1979 1961
1980our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1982 1964
1983sub find_async { 1965sub find_async {
1984 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1985 1967
1986 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1987 1969
1988 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 1972 }
1991 1973
1992 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1993 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 1979 if (my $map = find $k) {
1997 $map->load; 1980 $map->load if $v;
1998 } 1981 }
1999 1982
2000 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
2001 } 1984 }
2002 } 1985 }
2003 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
2004 }; 1987 };
2005 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
2008} 1991}
2009 1992
2010sub save { 1993sub save {
2011 my ($self) = @_; 1994 my ($self) = @_;
2012 1995
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 1997
2015 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
2016 1999
2017 return unless $self->dirty; 2000 return unless $self->dirty;
2018 2001
… …
2041 my ($self) = @_; 2024 my ($self) = @_;
2042 2025
2043 # save first because save cedes 2026 # save first because save cedes
2044 $self->save; 2027 $self->save;
2045 2028
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2030
2048 return if $self->players; 2031 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2051 2034
… …
2103my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2104 2087
2105sub nuke { 2088sub nuke {
2106 my ($self) = @_; 2089 my ($self) = @_;
2107 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2108 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2109 2095
2110 $self->unlink_save;
2111
2112 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2101
2102 $self->unlink_save;
2103
2118 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2119 2106
2120 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2121} 2108}
2122 2109
2123=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2240 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2241 } 2228 }
2242 } 2229 }
2243} 2230}
2244 2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
2240}
2241
2245=item $player_object->may ("access") 2242=item $player_object->may ("access")
2246 2243
2247Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2245(e.g. "command_wizcast").
2249 2246
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2329 2326
2330 $map->load; 2327 $map->load;
2331 $map->load_diag; 2328 $map->load_neighbours;
2332 2329
2333 return unless $self->contr->active; 2330 return unless $self->contr->active;
2334 $self->activate_recursive; 2331 $self->activate_recursive;
2335 2332
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2512sub cf::client::send_msg { 2509sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2510 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2511
2515 $msg = $self->pl->expand_cfpod ($msg); 2512 $msg = $self->pl->expand_cfpod ($msg);
2516 2513
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2514 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2515
2519 if (ref $channel) { 2516 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2517 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2518 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2519 $self->{channel}{$channel->{id}} = $channel;
… …
2527 } 2524 }
2528 2525
2529 return unless @extra || length $msg; 2526 return unless @extra || length $msg;
2530 2527
2531 if ($self->can_msg) { 2528 if ($self->can_msg) {
2529 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF;
2532
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2533 $self->send_packet ("msg " . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2535 } 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) { 2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546
2547 $color &= cf::NDI_COLOR_MASK;
2548
2549 utf8::encode $msg;
2550
2545 if (0 && $msg =~ /\[/) { 2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2554 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2556 $self->send_packet ("drawinfo $color $msg")
2550 } 2557 }
2551 } 2558 }
… …
2559=cut 2566=cut
2560 2567
2561sub cf::client::ext_msg($$@) { 2568sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2569 my ($self, $type, @msg) = @_;
2563 2570
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2571 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2573 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2574 push @msg, msgtype => "event_$type";
2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2594 }
2572} 2595}
2573 2596
2574=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2659 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2660 "ARRAY" eq ref $msg
2638 ? @$msg 2661 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2663
2664 my @reply;
2665
2641 if (my $cb = $EXTICMD{$type}) { 2666 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2667 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2647 } else { 2673 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2675 }
2650 2676
2651 cf::override; 2677 cf::override;
… …
2698our $safe = new Safe "safe"; 2724our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2725our $safe_hole = new Safe::Hole;
2700 2726
2701$SIG{FPE} = 'IGNORE'; 2727$SIG{FPE} = 'IGNORE';
2702 2728
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2729$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math
2731 grepstart grepwhile mapstart mapwhile
2732 sort time
2733));
2704 2734
2705# here we export the classes and methods available to script code 2735# here we export the classes and methods available to script code
2706 2736
2707=pod 2737=pod
2708 2738
2709The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2710 2740
2711 cf::object 2741 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2742 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2743 insert remove name archname title slaying race decrease_ob_nr
2714 2744
2715 cf::object::player 2745 cf::object::player
2716 player 2746 player
2717 2747
2718 cf::player 2748 cf::player
… …
2723 2753
2724=cut 2754=cut
2725 2755
2726for ( 2756for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race
2728 insert remove)], 2759 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2732) { 2763) {
2733 no strict 'refs'; 2764 no strict 'refs';
… …
2809# the server's init and main functions 2840# the server's init and main functions
2810 2841
2811sub load_facedata($) { 2842sub load_facedata($) {
2812 my ($path) = @_; 2843 my ($path) = @_;
2813 2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2850
2814 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2815 2852
2816 my $facedata; 2853 my $facedata;
2817 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2855 or die "$path: $!";
2819 2856
2820 $facedata = Coro::Storable::thaw $facedata; 2857 $facedata = Coro::Storable::thaw $facedata;
2821 2858
2822 $facedata->{version} == 2 2859 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861
2862 # patch in the exptable
2863 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2866 };
2867 cf::cede_to_tick;
2824 2868
2825 { 2869 {
2826 my $faces = $facedata->{faceinfo}; 2870 my $faces = $facedata->{faceinfo};
2827 2871
2828 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2874 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2875 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2878
2835 cf::cede_to_tick; 2879 cf::cede_to_tick;
2836 } 2880 }
2837 2881
2838 while (my ($face, $info) = each %$faces) { 2882 while (my ($face, $info) = each %$faces) {
… …
2863 2907
2864 { 2908 {
2865 # TODO: for gcfclient pleasure, we should give resources 2909 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2910 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2911 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2912
2870 my $soundconf = delete $res->{"res/sound.conf"}; 2913 my $soundconf = delete $res->{"res/sound.conf"};
2871 2914
2872 while (my ($name, $info) = each %$res) { 2915 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; 2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2879 2918
2880 if ($info->{type} & 1) { 2919 if ($info->{type} & 1) {
2881 # prepend meta info 2920 # prepend meta info
2882 2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2927 $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 { 2928 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2929 $data = $info->{data};
2889 } 2930 }
2890 2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 2933 cf::face::set_type $idx, $info->{type};
2892 2934
2893 cf::cede_to_tick; 2935 cf::cede_to_tick;
2894 } 2936 }
2895 2937
… …
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) { 2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_] 2942 my $sound = $soundconf->{compat}[$_]
2901 or next; 2943 or next;
2902 2944
2903 my $face = cf::face::find "sound/$sound->[1]"; 2945 my $face = cf::face::find "sound/$sound->[1]";
2904 warn "$sound->[0]: $face\n";#d#
2905
2906 cf::sound::set $sound->[0] => $face; 2946 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat 2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 } 2948 }
2909 2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2910 #TODO 2953 }
2911 } 2954 }
2912 } 2955 }
2913 2956
2914 1 2957 1
2915} 2958}
… …
2921 $ns->fx_want ($k, $v); 2964 $ns->fx_want ($k, $v);
2922 } 2965 }
2923}; 2966};
2924 2967
2925sub reload_regions { 2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2926 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2927 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2928 2975
2929 for (cf::region::list) { 2976 for (cf::region::list) {
2930 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/
… …
2966 3013
2967sub init { 3014sub init {
2968 reload_resources; 3015 reload_resources;
2969} 3016}
2970 3017
2971sub cfg_load { 3018sub reload_config {
2972 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2973 or return; 3020 or return;
2974 3021
2975 local $/; 3022 local $/;
2976 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
2996 (async { 3043 (async {
2997 Event::one_event; 3044 Event::one_event;
2998 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
2999 }; 3046 };
3000 3047
3001 cfg_load; 3048 reload_config;
3002 db_init; 3049 db_init;
3003 load_extensions; 3050 load_extensions;
3004 3051
3005 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
3006 Event::loop; 3053 Event::loop;
… …
3199 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3200 require cf; 3247 require cf;
3201 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3202 3249
3203 warn "loading config and database again"; 3250 warn "loading config and database again";
3204 cf::cfg_load; 3251 cf::reload_config;
3205 3252
3206 warn "loading extensions"; 3253 warn "loading extensions";
3207 cf::load_extensions; 3254 cf::load_extensions;
3208 3255
3209 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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