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.348 by root, Thu Aug 30 08:34:40 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 }
1925 1899
1926 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
1943 1917
1944 $self 1918 $self
1945} 1919}
1946 1920
1947# 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
1948sub load_diag { 1922sub load_neighbours {
1949 my ($map) = @_; 1923 my ($map) = @_;
1950 1924
1951 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1952 1926
1953 for (0 .. 3) { 1927 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1955 or next; 1929 or next;
1956 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1957 or next; 1931 or next;
1958 $neigh->load; 1932 $neigh->load;
1959 1933
1934 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 1937 }
1963 1938
1964 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1966 or next; 1942 or next;
1967 $neigh->load; 1943 $neigh->load;
1968 } 1944 }
1969} 1945}
1970 1946
… …
1975} 1951}
1976 1952
1977sub do_load_sync { 1953sub do_load_sync {
1978 my ($map) = @_; 1954 my ($map) = @_;
1979 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1980 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1981} 1960}
1982 1961
1983our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1985 1964
1986sub find_async { 1965sub find_async {
1987 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1988 1967
1989 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1990 1969
1991 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 1972 }
1994 1973
1995 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1996 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1997 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 1979 if (my $map = find $k) {
2000 $map->load; 1980 $map->load if $v;
2001 } 1981 }
2002 1982
2003 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
2004 } 1984 }
2005 } 1985 }
2006 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
2007 }; 1987 };
2008 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
2011} 1991}
2012 1992
2013sub save { 1993sub save {
2014 my ($self) = @_; 1994 my ($self) = @_;
2015 1995
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 1997
2018 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
2019 1999
2020 return unless $self->dirty; 2000 return unless $self->dirty;
2021 2001
… …
2044 my ($self) = @_; 2024 my ($self) = @_;
2045 2025
2046 # save first because save cedes 2026 # save first because save cedes
2047 $self->save; 2027 $self->save;
2048 2028
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2030
2051 return if $self->players; 2031 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2054 2034
… …
2243 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2244 } 2224 }
2245 } 2225 }
2246} 2226}
2247 2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
2236}
2237
2248=item $player_object->may ("access") 2238=item $player_object->may ("access")
2249 2239
2250Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2241(e.g. "command_wizcast").
2252 2242
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
2332 2322
2333 $map->load; 2323 $map->load;
2334 $map->load_diag; 2324 $map->load_neighbours;
2335 2325
2336 return unless $self->contr->active; 2326 return unless $self->contr->active;
2337 $self->activate_recursive; 2327 $self->activate_recursive;
2338 2328
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2541 }
2552 2542
2553 $color &= cf::NDI_COLOR_MASK; 2543 $color &= cf::NDI_COLOR_MASK;
2554 2544
2545 utf8::encode $msg;
2546
2555 if (0 && $msg =~ /\[/) { 2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2550 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2552 $self->send_packet ("drawinfo $color $msg")
2560 } 2553 }
2561 } 2554 }
… …
2569=cut 2562=cut
2570 2563
2571sub cf::client::ext_msg($$@) { 2564sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2565 my ($self, $type, @msg) = @_;
2573 2566
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2567 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2569 } elsif ($self->extcmd == 1) { # TODO: remove
2579 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
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub 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;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2590 }
2582} 2591}
2583 2592
2584=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2655 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2656 "ARRAY" eq ref $msg
2648 ? @$msg 2657 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2659
2660 my @reply;
2661
2651 if (my $cb = $EXTICMD{$type}) { 2662 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2663 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2657 } else { 2669 } else {
2658 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";
2659 } 2671 }
2660 2672
2661 cf::override; 2673 cf::override;
… …
2708our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2710 2722
2711$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2712 2724
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2714 2730
2715# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2716 2732
2717=pod 2733=pod
2718 2734
2719The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2720 2736
2721 cf::object 2737 cf::object
2722 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
2723 insert remove 2739 insert remove name archname title slaying race decrease_ob_nr
2724 2740
2725 cf::object::player 2741 cf::object::player
2726 player 2742 player
2727 2743
2728 cf::player 2744 cf::player
… …
2733 2749
2734=cut 2750=cut
2735 2751
2736for ( 2752for (
2737 ["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
2754 insert remove inv name archname title slaying race
2738 insert remove)], 2755 decrease_ob_nr)],
2739 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2742) { 2759) {
2743 no strict 'refs'; 2760 no strict 'refs';
… …
2819# the server's init and main functions 2836# the server's init and main functions
2820 2837
2821sub load_facedata($) { 2838sub load_facedata($) {
2822 my ($path) = @_; 2839 my ($path) = @_;
2823 2840
2841 # HACK to clear player env face cache, we need some signal framework
2842 # for this (global event?)
2843 %ext::player_env::MUSIC_FACE_CACHE = ();
2844
2845 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2846
2824 warn "loading facedata from $path\n"; 2847 warn "loading facedata from $path\n";
2825 2848
2826 my $facedata; 2849 my $facedata;
2827 0 < aio_load $path, $facedata 2850 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 2851 or die "$path: $!";
2829 2852
2830 $facedata = Coro::Storable::thaw $facedata; 2853 $facedata = Coro::Storable::thaw $facedata;
2831 2854
2832 $facedata->{version} == 2 2855 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 2856 or cf::cleanup "$path: version mismatch, cannot proceed.";
2857
2858 # patch in the exptable
2859 $facedata->{resource}{"res/exp_table"} = {
2860 type => FT_RSRC,
2861 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2862 };
2863 cf::cede_to_tick;
2834 2864
2835 { 2865 {
2836 my $faces = $facedata->{faceinfo}; 2866 my $faces = $facedata->{faceinfo};
2837 2867
2838 while (my ($face, $info) = each %$faces) { 2868 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840 cf::face::set_visibility $idx, $info->{visibility}; 2870 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 2871 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 2874
2845 cf::cede_to_tick; 2875 cf::cede_to_tick;
2846 } 2876 }
2847 2877
2848 while (my ($face, $info) = each %$faces) { 2878 while (my ($face, $info) = each %$faces) {
… …
2873 2903
2874 { 2904 {
2875 # TODO: for gcfclient pleasure, we should give resources 2905 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 2906 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 2907 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879 2908
2880 my $soundconf = delete $res->{"res/sound.conf"}; 2909 my $soundconf = delete $res->{"res/sound.conf"};
2881 2910
2882 while (my ($name, $info) = each %$res) { 2911 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; 2912 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2889 2914
2890 if ($info->{type} & 1) { 2915 if ($info->{type} & 1) {
2891 # prepend meta info 2916 # prepend meta info
2892 2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 2923 $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 { 2924 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2925 $data = $info->{data};
2899 } 2926 }
2900 2927
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901 cf::face::set_type $idx, $info->{type}; 2929 cf::face::set_type $idx, $info->{type};
2902 2930
2903 cf::cede_to_tick; 2931 cf::cede_to_tick;
2904 } 2932 }
2905 2933
… …
2932 $ns->fx_want ($k, $v); 2960 $ns->fx_want ($k, $v);
2933 } 2961 }
2934}; 2962};
2935 2963
2936sub reload_regions { 2964sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = ();
2968
2937 load_resource_file "$MAPDIR/regions" 2969 load_resource_file "$MAPDIR/regions"
2938 or die "unable to load regions file\n"; 2970 or die "unable to load regions file\n";
2939 2971
2940 for (cf::region::list) { 2972 for (cf::region::list) {
2941 $_->{match} = qr/$_->{match}/ 2973 $_->{match} = qr/$_->{match}/
… …
2977 3009
2978sub init { 3010sub init {
2979 reload_resources; 3011 reload_resources;
2980} 3012}
2981 3013
2982sub cfg_load { 3014sub reload_config {
2983 open my $fh, "<:utf8", "$CONFDIR/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2984 or return; 3016 or return;
2985 3017
2986 local $/; 3018 local $/;
2987 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
… …
3007 (async { 3039 (async {
3008 Event::one_event; 3040 Event::one_event;
3009 })->prio (Coro::PRIO_MAX); 3041 })->prio (Coro::PRIO_MAX);
3010 }; 3042 };
3011 3043
3012 cfg_load; 3044 reload_config;
3013 db_init; 3045 db_init;
3014 load_extensions; 3046 load_extensions;
3015 3047
3016 $TICK_WATCHER->start; 3048 $TICK_WATCHER->start;
3017 Event::loop; 3049 Event::loop;
… …
3210 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
3211 require cf; 3243 require cf;
3212 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3213 3245
3214 warn "loading config and database again"; 3246 warn "loading config and database again";
3215 cf::cfg_load; 3247 cf::reload_config;
3216 3248
3217 warn "loading extensions"; 3249 warn "loading extensions";
3218 cf::load_extensions; 3250 cf::load_extensions;
3219 3251
3220 warn "reattaching attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";

Diff Legend

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