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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.350 by root, Sat Sep 1 08:03:45 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
… …
1542=cut 1511=cut
1543 1512
1544sub ext_reply($$@) { 1513sub 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
1558Sends an ext event to the client. 1521Sends 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
1958sub load_diag { 1922sub 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
1987sub do_load_sync { 1953sub 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
1993our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1995 1964
1996sub find_async { 1965sub 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
2023sub save { 1993sub 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
… …
2116my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2117 2087
2118sub nuke { 2088sub nuke {
2119 my ($self) = @_; 2089 my ($self) = @_;
2120 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2121 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2122 2095
2123 $self->unlink_save;
2124
2125 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2101
2102 $self->unlink_save;
2103
2131 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2132 2106
2133 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2134} 2108}
2135 2109
2136=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2352 2326
2353 $map->load; 2327 $map->load;
2354 $map->load_diag; 2328 $map->load_neighbours;
2355 2329
2356 return unless $self->contr->active; 2330 return unless $self->contr->active;
2357 $self->activate_recursive; 2331 $self->activate_recursive;
2358 2332
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2532 2506
2533=cut 2507=cut
2534 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2535sub cf::client::send_msg { 2518sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2520
2538 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2539 2522
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2541 2527
2542 if (ref $channel) { 2528 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2529 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2530 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2531 $self->{channel}{$channel->{id}} = $channel;
… …
2592=cut 2578=cut
2593 2579
2594sub cf::client::ext_msg($$@) { 2580sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2581 my ($self, $type, @msg) = @_;
2596 2582
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2583 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2585 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2586 push @msg, msgtype => "event_$type";
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2591=item $client->ext_reply ($msgid, @msg)
2592
2593Sends an ext reply to the client.
2594
2595=cut
2596
2597sub cf::client::ext_reply($$@) {
2598 my ($self, $id, @msg) = @_;
2599
2600 if ($self->extcmd == 2) {
2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2602 } elsif ($self->extcmd == 1) {
2603 #TODO: version 1, remove
2604 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2606 }
2605} 2607}
2606 2608
2607=item $success = $client->query ($flags, "text", \&cb) 2609=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2671 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2672 "ARRAY" eq ref $msg
2671 ? @$msg 2673 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2675
2676 my @reply;
2677
2674 if (my $cb = $EXTICMD{$type}) { 2678 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2679 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2680 } else { 2685 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2687 }
2683 2688
2684 cf::override; 2689 cf::override;
… …
2745 2750
2746The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2747 2752
2748 cf::object 2753 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2754 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race 2755 insert remove name archname title slaying race decrease_ob_nr
2751 2756
2752 cf::object::player 2757 cf::object::player
2753 player 2758 player
2754 2759
2755 cf::player 2760 cf::player
… …
2760 2765
2761=cut 2766=cut
2762 2767
2763for ( 2768for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2770 insert remove inv name archname title slaying race
2771 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2769) { 2775) {
2770 no strict 'refs'; 2776 no strict 'refs';
… …
2846# the server's init and main functions 2852# the server's init and main functions
2847 2853
2848sub load_facedata($) { 2854sub load_facedata($) {
2849 my ($path) = @_; 2855 my ($path) = @_;
2850 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2862
2851 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2852 2864
2853 my $facedata; 2865 my $facedata;
2854 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 2867 or die "$path: $!";
2856 2868
2857 $facedata = Coro::Storable::thaw $facedata; 2869 $facedata = Coro::Storable::thaw $facedata;
2858 2870
2859 $facedata->{version} == 2 2871 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2873
2874 # patch in the exptable
2875 $facedata->{resource}{"res/exp_table"} = {
2876 type => FT_RSRC,
2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2878 };
2879 cf::cede_to_tick;
2861 2880
2862 { 2881 {
2863 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
2864 2883
2865 while (my ($face, $info) = each %$faces) { 2884 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2885 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 2886 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 2887 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 2890
2872 cf::cede_to_tick; 2891 cf::cede_to_tick;
2873 } 2892 }
2874 2893
2875 while (my ($face, $info) = each %$faces) { 2894 while (my ($face, $info) = each %$faces) {
… …
2900 2919
2901 { 2920 {
2902 # TODO: for gcfclient pleasure, we should give resources 2921 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 2922 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 2923 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 2924
2907 my $soundconf = delete $res->{"res/sound.conf"}; 2925 my $soundconf = delete $res->{"res/sound.conf"};
2908 2926
2909 while (my ($name, $info) = each %$res) { 2927 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2928 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data;
2916 2930
2917 if ($info->{type} & 1) { 2931 if ($info->{type} & 1) {
2918 # prepend meta info 2932 # prepend meta info
2919 2933
2934 my $meta = $enc->encode ({
2935 name => $name,
2936 %{ $info->{meta} || {} },
2937 });
2938
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 2939 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 2940 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2941 $data = $info->{data};
2926 } 2942 }
2927 2943
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 2945 cf::face::set_type $idx, $info->{type};
2929 2946
2930 cf::cede_to_tick; 2947 cf::cede_to_tick;
2931 } 2948 }
2932 2949
… …
2959 $ns->fx_want ($k, $v); 2976 $ns->fx_want ($k, $v);
2960 } 2977 }
2961}; 2978};
2962 2979
2963sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2964 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2966 2987
2967 for (cf::region::list) { 2988 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 2989 $_->{match} = qr/$_->{match}/
… …
3004 3025
3005sub init { 3026sub init {
3006 reload_resources; 3027 reload_resources;
3007} 3028}
3008 3029
3009sub cfg_load { 3030sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3032 or return;
3012 3033
3013 local $/; 3034 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
3034 (async { 3055 (async {
3035 Event::one_event; 3056 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
3037 }; 3058 };
3038 3059
3039 cfg_load; 3060 reload_config;
3040 db_init; 3061 db_init;
3041 load_extensions; 3062 load_extensions;
3042 3063
3043 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
3044 Event::loop; 3065 Event::loop;
… …
3237 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3238 require cf; 3259 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3261
3241 warn "loading config and database again"; 3262 warn "loading config and database again";
3242 cf::cfg_load; 3263 cf::reload_config;
3243 3264
3244 warn "loading extensions"; 3265 warn "loading extensions";
3245 cf::load_extensions; 3266 cf::load_extensions;
3246 3267
3247 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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