… | |
… | |
10 | use Event; |
10 | use Event; |
11 | use Opcode; |
11 | use Opcode; |
12 | use Safe; |
12 | use Safe; |
13 | use Safe::Hole; |
13 | use Safe::Hole; |
14 | |
14 | |
15 | use Coro 3.61 (); |
15 | use Coro 3.64 (); |
16 | use Coro::State; |
16 | use Coro::State; |
17 | use Coro::Handle; |
17 | use Coro::Handle; |
18 | use Coro::Event; |
18 | use Coro::Event; |
19 | use Coro::Timer; |
19 | use Coro::Timer; |
20 | use Coro::Signal; |
20 | use Coro::Signal; |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
|
|
24 | use Coro::Util (); |
24 | |
25 | |
25 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
26 | use BDB (); |
27 | use BDB (); |
27 | use Data::Dumper; |
28 | use Data::Dumper; |
28 | use Digest::MD5; |
29 | use Digest::MD5; |
29 | use Fcntl; |
30 | use Fcntl; |
30 | use YAML::Syck (); |
31 | use YAML::Syck (); |
… | |
… | |
271 | Wait until the given lock is available and then acquires it and returns |
272 | Wait until the given lock is available and then acquires it and returns |
272 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
273 | for example when the coroutine gets canceled), the lock is automatically |
274 | for example when the coroutine gets canceled), the lock is automatically |
274 | returned. |
275 | returned. |
275 | |
276 | |
|
|
277 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
278 | deadlocked coro. |
|
|
279 | |
276 | Lock names should begin with a unique identifier (for example, cf::map::find |
280 | Lock names should begin with a unique identifier (for example, cf::map::find |
277 | uses map_find and cf::map::load uses map_load). |
281 | uses 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 | |
… | |
… | |
472 | Coro::Storable. May, of course, block. Note that the executed sub may |
476 | Coro::Storable. May, of course, block. Note that the executed sub may |
473 | never block itself or use any form of Event handling. |
477 | never block itself or use any form of Event handling. |
474 | |
478 | |
475 | =cut |
479 | =cut |
476 | |
480 | |
477 | sub _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 | |
|
|
486 | sub fork_call(&@) { |
481 | sub 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 | |
532 | Returns a single value from the environment database. |
498 | Returns 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 | |
1364 | sub new($) { |
1333 | sub new($) { |
1365 | my ($login) = @_; |
1334 | my ($login) = @_; |
1366 | |
1335 | |
… | |
… | |
1542 | =cut |
1511 | =cut |
1543 | |
1512 | |
1544 | sub ext_reply($$@) { |
1513 | sub ext_reply($$@) { |
1545 | my ($self, $id, @msg) = @_; |
1514 | my ($self, $id, @msg) = @_; |
1546 | |
1515 | |
1547 | if ($self->ns->extcmd == 2) { |
1516 | $self->ns->ext_reply ($id, @msg) |
1548 | $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg])); |
|
|
1549 | } elsif ($self->ns->extcmd == 1) { |
|
|
1550 | #TODO: version 1, remove |
|
|
1551 | unshift @msg, msgtype => "reply", msgid => $id; |
|
|
1552 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1553 | } |
|
|
1554 | } |
1517 | } |
1555 | |
1518 | |
1556 | =item $player->ext_msg ($type, @msg) |
1519 | =item $player->ext_msg ($type, @msg) |
1557 | |
1520 | |
1558 | Sends an ext event to the client. |
1521 | Sends an ext event to the client. |
… | |
… | |
1889 | local $self->{deny_reset} = 1; # loading can take a long time |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1890 | |
1853 | |
1891 | my $path = $self->{path}; |
1854 | my $path = $self->{path}; |
1892 | |
1855 | |
1893 | { |
1856 | { |
|
|
1857 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1894 | my $guard = cf::lock_acquire "map_load:$path"; |
1858 | my $guard2 = cf::lock_acquire "map_load:$path"; |
1895 | |
1859 | |
1896 | return if $self->in_memory != cf::MAP_SWAPPED; |
1860 | return if $self->in_memory != cf::MAP_SWAPPED; |
1897 | |
1861 | |
1898 | $self->in_memory (cf::MAP_LOADING); |
1862 | $self->in_memory (cf::MAP_LOADING); |
1899 | |
1863 | |
1900 | $self->alloc; |
1864 | $self->alloc; |
1901 | |
1865 | |
1902 | $self->pre_load; |
1866 | $self->pre_load; |
1903 | Coro::cede; |
1867 | cf::cede_to_tick; |
1904 | |
1868 | |
1905 | $self->_load_objects ($self->{load_path}, 1) |
1869 | $self->_load_objects ($self->{load_path}, 1) |
1906 | or return; |
1870 | or return; |
1907 | |
1871 | |
1908 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1872 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
… | |
… | |
1914 | $self->clear_unique_items; |
1878 | $self->clear_unique_items; |
1915 | $self->_load_objects ($uniq, 0); |
1879 | $self->_load_objects ($uniq, 0); |
1916 | } |
1880 | } |
1917 | } |
1881 | } |
1918 | |
1882 | |
1919 | Coro::cede; |
1883 | cf::cede_to_tick; |
1920 | # now do the right thing for maps |
1884 | # now do the right thing for maps |
1921 | $self->link_multipart_objects; |
1885 | $self->link_multipart_objects; |
1922 | $self->difficulty ($self->estimate_difficulty) |
1886 | $self->difficulty ($self->estimate_difficulty) |
1923 | unless $self->difficulty; |
1887 | unless $self->difficulty; |
1924 | Coro::cede; |
1888 | cf::cede_to_tick; |
1925 | |
1889 | |
1926 | unless ($self->{deny_activate}) { |
1890 | unless ($self->{deny_activate}) { |
1927 | $self->decay_objects; |
1891 | $self->decay_objects; |
1928 | $self->fix_auto_apply; |
1892 | $self->fix_auto_apply; |
1929 | $self->update_buttons; |
1893 | $self->update_buttons; |
1930 | Coro::cede; |
1894 | cf::cede_to_tick; |
1931 | $self->set_darkness_map; |
1895 | $self->set_darkness_map; |
1932 | Coro::cede; |
1896 | cf::cede_to_tick; |
1933 | $self->activate; |
1897 | $self->activate; |
1934 | } |
1898 | } |
1935 | |
1899 | |
1936 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->{last_save} = $cf::RUNTIME; |
1937 | $self->last_access ($cf::RUNTIME); |
1901 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1953 | |
1917 | |
1954 | $self |
1918 | $self |
1955 | } |
1919 | } |
1956 | |
1920 | |
1957 | # 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 |
1958 | sub load_diag { |
1922 | sub load_neighbours { |
1959 | my ($map) = @_; |
1923 | my ($map) = @_; |
1960 | |
1924 | |
1961 | my @diag; # diagonal neighbours |
1925 | my @neigh; # diagonal neighbours |
1962 | |
1926 | |
1963 | for (0 .. 3) { |
1927 | for (0 .. 3) { |
1964 | my $neigh = $map->tile_path ($_) |
1928 | my $neigh = $map->tile_path ($_) |
1965 | or next; |
1929 | or next; |
1966 | $neigh = find $neigh, $map |
1930 | $neigh = find $neigh, $map |
1967 | or next; |
1931 | or next; |
1968 | $neigh->load; |
1932 | $neigh->load; |
1969 | |
1933 | |
|
|
1934 | push @neigh, |
1970 | push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1935 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1971 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1936 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1972 | } |
1937 | } |
1973 | |
1938 | |
1974 | for (@diag) { |
1939 | for (grep defined $_->[0], @neigh) { |
|
|
1940 | my ($path, $origin) = @$_; |
1975 | my $neigh = find @$_ |
1941 | my $neigh = find $path, $origin |
1976 | or next; |
1942 | or next; |
1977 | $neigh->load; |
1943 | $neigh->load; |
1978 | } |
1944 | } |
1979 | } |
1945 | } |
1980 | |
1946 | |
… | |
… | |
1985 | } |
1951 | } |
1986 | |
1952 | |
1987 | sub do_load_sync { |
1953 | sub do_load_sync { |
1988 | my ($map) = @_; |
1954 | my ($map) = @_; |
1989 | |
1955 | |
|
|
1956 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1957 | if $Coro::current == $Coro::main; |
|
|
1958 | |
1990 | cf::sync_job { $map->load }; |
1959 | cf::sync_job { $map->load }; |
1991 | } |
1960 | } |
1992 | |
1961 | |
1993 | our %MAP_PREFETCH; |
1962 | our %MAP_PREFETCH; |
1994 | our $MAP_PREFETCHER = undef; |
1963 | our $MAP_PREFETCHER = undef; |
1995 | |
1964 | |
1996 | sub find_async { |
1965 | sub find_async { |
1997 | my ($path, $origin) = @_; |
1966 | my ($path, $origin, $load) = @_; |
1998 | |
1967 | |
1999 | $path = normalise $path, $origin && $origin->{path}; |
1968 | $path = normalise $path, $origin && $origin->{path}; |
2000 | |
1969 | |
2001 | if (my $map = $cf::MAP{$path}) { |
1970 | if (my $map = $cf::MAP{$path}) { |
2002 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1971 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
2003 | } |
1972 | } |
2004 | |
1973 | |
2005 | undef $MAP_PREFETCH{$path}; |
1974 | $MAP_PREFETCH{$path} |= $load; |
|
|
1975 | |
2006 | $MAP_PREFETCHER ||= cf::async { |
1976 | $MAP_PREFETCHER ||= cf::async { |
2007 | while (%MAP_PREFETCH) { |
1977 | while (%MAP_PREFETCH) { |
2008 | for my $path (keys %MAP_PREFETCH) { |
1978 | while (my ($k, $v) = each %MAP_PREFETCH) { |
2009 | if (my $map = find $path) { |
1979 | if (my $map = find $k) { |
2010 | $map->load; |
1980 | $map->load if $v; |
2011 | } |
1981 | } |
2012 | |
1982 | |
2013 | delete $MAP_PREFETCH{$path}; |
1983 | delete $MAP_PREFETCH{$k}; |
2014 | } |
1984 | } |
2015 | } |
1985 | } |
2016 | undef $MAP_PREFETCHER; |
1986 | undef $MAP_PREFETCHER; |
2017 | }; |
1987 | }; |
2018 | $MAP_PREFETCHER->prio (6); |
1988 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
2021 | } |
1991 | } |
2022 | |
1992 | |
2023 | sub save { |
1993 | sub save { |
2024 | my ($self) = @_; |
1994 | my ($self) = @_; |
2025 | |
1995 | |
2026 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
1996 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2027 | |
1997 | |
2028 | $self->{last_save} = $cf::RUNTIME; |
1998 | $self->{last_save} = $cf::RUNTIME; |
2029 | |
1999 | |
2030 | return unless $self->dirty; |
2000 | return unless $self->dirty; |
2031 | |
2001 | |
… | |
… | |
2054 | my ($self) = @_; |
2024 | my ($self) = @_; |
2055 | |
2025 | |
2056 | # save first because save cedes |
2026 | # save first because save cedes |
2057 | $self->save; |
2027 | $self->save; |
2058 | |
2028 | |
2059 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2029 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2060 | |
2030 | |
2061 | return if $self->players; |
2031 | return if $self->players; |
2062 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2032 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2063 | return if $self->{deny_save}; |
2033 | return if $self->{deny_save}; |
2064 | |
2034 | |
… | |
… | |
2349 | # use -1 or undef as default coordinates, not 0, 0 |
2319 | # use -1 or undef as default coordinates, not 0, 0 |
2350 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2320 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2351 | if $x <=0 && $y <= 0; |
2321 | if $x <=0 && $y <= 0; |
2352 | |
2322 | |
2353 | $map->load; |
2323 | $map->load; |
2354 | $map->load_diag; |
2324 | $map->load_neighbours; |
2355 | |
2325 | |
2356 | return unless $self->contr->active; |
2326 | return unless $self->contr->active; |
2357 | $self->activate_recursive; |
2327 | $self->activate_recursive; |
2358 | |
2328 | |
2359 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2329 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
… | |
… | |
2573 | $color &= cf::NDI_COLOR_MASK; |
2543 | $color &= cf::NDI_COLOR_MASK; |
2574 | |
2544 | |
2575 | utf8::encode $msg; |
2545 | utf8::encode $msg; |
2576 | |
2546 | |
2577 | if (0 && $msg =~ /\[/) { |
2547 | if (0 && $msg =~ /\[/) { |
|
|
2548 | # COMMAND/INFO |
2578 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2549 | $self->send_packet ("drawextinfo $color 10 8 $msg") |
2579 | } else { |
2550 | } else { |
2580 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2551 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2581 | $self->send_packet ("drawinfo $color $msg") |
2552 | $self->send_packet ("drawinfo $color $msg") |
2582 | } |
2553 | } |
2583 | } |
2554 | } |
… | |
… | |
2591 | =cut |
2562 | =cut |
2592 | |
2563 | |
2593 | sub cf::client::ext_msg($$@) { |
2564 | sub cf::client::ext_msg($$@) { |
2594 | my ($self, $type, @msg) = @_; |
2565 | my ($self, $type, @msg) = @_; |
2595 | |
2566 | |
2596 | my $extcmd = $self->extcmd; |
|
|
2597 | |
|
|
2598 | if ($extcmd == 2) { |
2567 | if ($self->extcmd == 2) { |
2599 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2600 | } elsif ($extcmd == 1) { # TODO: remove |
2569 | } elsif ($self->extcmd == 1) { # TODO: remove |
2601 | push @msg, msgtype => "event_$type"; |
2570 | push @msg, msgtype => "event_$type"; |
|
|
2571 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2572 | } |
|
|
2573 | } |
|
|
2574 | |
|
|
2575 | =item $client->ext_reply ($msgid, @msg) |
|
|
2576 | |
|
|
2577 | Sends an ext reply to the client. |
|
|
2578 | |
|
|
2579 | =cut |
|
|
2580 | |
|
|
2581 | sub cf::client::ext_reply($$@) { |
|
|
2582 | my ($self, $id, @msg) = @_; |
|
|
2583 | |
|
|
2584 | if ($self->extcmd == 2) { |
|
|
2585 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2586 | } elsif ($self->extcmd == 1) { |
|
|
2587 | #TODO: version 1, remove |
|
|
2588 | unshift @msg, msgtype => "reply", msgid => $id; |
2602 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2589 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2603 | } |
2590 | } |
2604 | } |
2591 | } |
2605 | |
2592 | |
2606 | =item $success = $client->query ($flags, "text", \&cb) |
2593 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2668 | my ($type, $reply, @payload) = |
2655 | my ($type, $reply, @payload) = |
2669 | "ARRAY" eq ref $msg |
2656 | "ARRAY" eq ref $msg |
2670 | ? @$msg |
2657 | ? @$msg |
2671 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2658 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2672 | |
2659 | |
|
|
2660 | my @reply; |
|
|
2661 | |
2673 | if (my $cb = $EXTICMD{$type}) { |
2662 | if (my $cb = $EXTICMD{$type}) { |
2674 | my @reply = $cb->($ns, @payload); |
2663 | @reply = $cb->($ns, @payload); |
2675 | |
|
|
2676 | $ns->ext_reply ($reply, @reply) |
|
|
2677 | if $reply; |
|
|
2678 | } |
2664 | } |
|
|
2665 | |
|
|
2666 | $ns->ext_reply ($reply, @reply) |
|
|
2667 | if $reply; |
|
|
2668 | |
2679 | } else { |
2669 | } else { |
2680 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2670 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2681 | } |
2671 | } |
2682 | |
2672 | |
2683 | cf::override; |
2673 | cf::override; |
… | |
… | |
2744 | |
2734 | |
2745 | The following functions and methods are available within a safe environment: |
2735 | The following functions and methods are available within a safe environment: |
2746 | |
2736 | |
2747 | cf::object |
2737 | cf::object |
2748 | contr pay_amount pay_player map x y force_find force_add |
2738 | contr pay_amount pay_player map x y force_find force_add |
2749 | insert remove |
2739 | insert remove name archname title slaying race decrease_ob_nr |
2750 | |
2740 | |
2751 | cf::object::player |
2741 | cf::object::player |
2752 | player |
2742 | player |
2753 | |
2743 | |
2754 | cf::player |
2744 | cf::player |
… | |
… | |
2759 | |
2749 | |
2760 | =cut |
2750 | =cut |
2761 | |
2751 | |
2762 | for ( |
2752 | for ( |
2763 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2753 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2764 | insert remove inv)], |
2754 | insert remove inv name archname title slaying race |
|
|
2755 | decrease_ob_nr)], |
2765 | ["cf::object::player" => qw(player)], |
2756 | ["cf::object::player" => qw(player)], |
2766 | ["cf::player" => qw(peaceful)], |
2757 | ["cf::player" => qw(peaceful)], |
2767 | ["cf::map" => qw(trigger)], |
2758 | ["cf::map" => qw(trigger)], |
2768 | ) { |
2759 | ) { |
2769 | no strict 'refs'; |
2760 | no strict 'refs'; |
… | |
… | |
2845 | # the server's init and main functions |
2836 | # the server's init and main functions |
2846 | |
2837 | |
2847 | sub load_facedata($) { |
2838 | sub load_facedata($) { |
2848 | my ($path) = @_; |
2839 | my ($path) = @_; |
2849 | |
2840 | |
|
|
2841 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
2842 | |
2850 | warn "loading facedata from $path\n"; |
2843 | warn "loading facedata from $path\n"; |
2851 | |
2844 | |
2852 | my $facedata; |
2845 | my $facedata; |
2853 | 0 < aio_load $path, $facedata |
2846 | 0 < aio_load $path, $facedata |
2854 | or die "$path: $!"; |
2847 | or die "$path: $!"; |
2855 | |
2848 | |
2856 | $facedata = Coro::Storable::thaw $facedata; |
2849 | $facedata = Coro::Storable::thaw $facedata; |
2857 | |
2850 | |
2858 | $facedata->{version} == 2 |
2851 | $facedata->{version} == 2 |
2859 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2852 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
|
|
2853 | |
|
|
2854 | # patch in the exptable |
|
|
2855 | $facedata->{resource}{"res/exp_table"} = { |
|
|
2856 | type => FT_RSRC, |
|
|
2857 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
2858 | }; |
|
|
2859 | cf::cede_to_tick; |
2860 | |
2860 | |
2861 | { |
2861 | { |
2862 | my $faces = $facedata->{faceinfo}; |
2862 | my $faces = $facedata->{faceinfo}; |
2863 | |
2863 | |
2864 | while (my ($face, $info) = each %$faces) { |
2864 | while (my ($face, $info) = each %$faces) { |
2865 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2865 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2866 | cf::face::set_visibility $idx, $info->{visibility}; |
2866 | cf::face::set_visibility $idx, $info->{visibility}; |
2867 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2867 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2868 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2868 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2869 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2869 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2870 | |
2870 | |
2871 | cf::cede_to_tick; |
2871 | cf::cede_to_tick; |
2872 | } |
2872 | } |
2873 | |
2873 | |
2874 | while (my ($face, $info) = each %$faces) { |
2874 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
2899 | |
2899 | |
2900 | { |
2900 | { |
2901 | # TODO: for gcfclient pleasure, we should give resources |
2901 | # TODO: for gcfclient pleasure, we should give resources |
2902 | # that gcfclient doesn't grok a >10000 face index. |
2902 | # that gcfclient doesn't grok a >10000 face index. |
2903 | my $res = $facedata->{resource}; |
2903 | my $res = $facedata->{resource}; |
2904 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2905 | |
2904 | |
2906 | my $soundconf = delete $res->{"res/sound.conf"}; |
2905 | my $soundconf = delete $res->{"res/sound.conf"}; |
2907 | |
2906 | |
2908 | while (my ($name, $info) = each %$res) { |
2907 | while (my ($name, $info) = each %$res) { |
2909 | my $meta = $enc->encode ({ |
|
|
2910 | name => $name, |
|
|
2911 | %{ $info->{meta} || {} }, |
|
|
2912 | }); |
|
|
2913 | |
|
|
2914 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2908 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2909 | my $data; |
2915 | |
2910 | |
2916 | if ($info->{type} & 1) { |
2911 | if ($info->{type} & 1) { |
2917 | # prepend meta info |
2912 | # prepend meta info |
2918 | |
2913 | |
|
|
2914 | my $meta = $enc->encode ({ |
|
|
2915 | name => $name, |
|
|
2916 | %{ $info->{meta} || {} }, |
|
|
2917 | }); |
|
|
2918 | |
2919 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2919 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2920 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
|
|
2921 | |
|
|
2922 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2923 | } else { |
2920 | } else { |
2924 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
2921 | $data = $info->{data}; |
2925 | } |
2922 | } |
2926 | |
2923 | |
|
|
2924 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2927 | cf::face::set_type $idx, $info->{type}; |
2925 | cf::face::set_type $idx, $info->{type}; |
2928 | |
2926 | |
2929 | cf::cede_to_tick; |
2927 | cf::cede_to_tick; |
2930 | } |
2928 | } |
2931 | |
2929 | |
… | |
… | |
3003 | |
3001 | |
3004 | sub init { |
3002 | sub init { |
3005 | reload_resources; |
3003 | reload_resources; |
3006 | } |
3004 | } |
3007 | |
3005 | |
3008 | sub cfg_load { |
3006 | sub reload_config { |
3009 | open my $fh, "<:utf8", "$CONFDIR/config" |
3007 | open my $fh, "<:utf8", "$CONFDIR/config" |
3010 | or return; |
3008 | or return; |
3011 | |
3009 | |
3012 | local $/; |
3010 | local $/; |
3013 | *CFG = YAML::Syck::Load <$fh>; |
3011 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3033 | (async { |
3031 | (async { |
3034 | Event::one_event; |
3032 | Event::one_event; |
3035 | })->prio (Coro::PRIO_MAX); |
3033 | })->prio (Coro::PRIO_MAX); |
3036 | }; |
3034 | }; |
3037 | |
3035 | |
3038 | cfg_load; |
3036 | reload_config; |
3039 | db_init; |
3037 | db_init; |
3040 | load_extensions; |
3038 | load_extensions; |
3041 | |
3039 | |
3042 | $TICK_WATCHER->start; |
3040 | $TICK_WATCHER->start; |
3043 | Event::loop; |
3041 | Event::loop; |
… | |
… | |
3236 | warn "reloading cf.pm"; |
3234 | warn "reloading cf.pm"; |
3237 | require cf; |
3235 | require cf; |
3238 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3236 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3239 | |
3237 | |
3240 | warn "loading config and database again"; |
3238 | warn "loading config and database again"; |
3241 | cf::cfg_load; |
3239 | cf::reload_config; |
3242 | |
3240 | |
3243 | warn "loading extensions"; |
3241 | warn "loading extensions"; |
3244 | cf::load_extensions; |
3242 | cf::load_extensions; |
3245 | |
3243 | |
3246 | warn "reattaching attachments to objects/players"; |
3244 | warn "reattaching attachments to objects/players"; |