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.323 by root, Sat Jul 28 12:02:58 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 }
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
… …
2240 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2241 } 2224 }
2242 } 2225 }
2243} 2226}
2244 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
2245=item $player_object->may ("access") 2238=item $player_object->may ("access")
2246 2239
2247Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2241(e.g. "command_wizcast").
2249 2242
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
2329 2322
2330 $map->load; 2323 $map->load;
2331 $map->load_diag; 2324 $map->load_neighbours;
2332 2325
2333 return unless $self->contr->active; 2326 return unless $self->contr->active;
2334 $self->activate_recursive; 2327 $self->activate_recursive;
2335 2328
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 } 2541 }
2549 2542
2550 $color &= cf::NDI_COLOR_MASK; 2543 $color &= cf::NDI_COLOR_MASK;
2551 2544
2545 utf8::encode $msg;
2546
2552 if (0 && $msg =~ /\[/) { 2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 4 0 $msg") 2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else { 2550 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg") 2552 $self->send_packet ("drawinfo $color $msg")
2557 } 2553 }
2558 } 2554 }
… …
2566=cut 2562=cut
2567 2563
2568sub cf::client::ext_msg($$@) { 2564sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 2565 my ($self, $type, @msg) = @_;
2570 2566
2571 my $extcmd = $self->extcmd;
2572
2573 if ($extcmd == 2) { 2567 if ($self->extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove 2569 } elsif ($self->extcmd == 1) { # TODO: remove
2576 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;
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 } 2590 }
2579} 2591}
2580 2592
2581=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
… …
2643 my ($type, $reply, @payload) = 2655 my ($type, $reply, @payload) =
2644 "ARRAY" eq ref $msg 2656 "ARRAY" eq ref $msg
2645 ? @$msg 2657 ? @$msg
2646 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2647 2659
2660 my @reply;
2661
2648 if (my $cb = $EXTICMD{$type}) { 2662 if (my $cb = $EXTICMD{$type}) {
2649 my @reply = $cb->($ns, @payload); 2663 @reply = $cb->($ns, @payload);
2650
2651 $ns->ext_reply ($reply, @reply)
2652 if $reply;
2653 } 2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2654 } else { 2669 } else {
2655 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";
2656 } 2671 }
2657 2672
2658 cf::override; 2673 cf::override;
… …
2705our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2706our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2707 2722
2708$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2709 2724
2710$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));
2711 2730
2712# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2713 2732
2714=pod 2733=pod
2715 2734
2716The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2717 2736
2718 cf::object 2737 cf::object
2719 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
2720 insert remove 2739 insert remove name archname title slaying race decrease_ob_nr
2721 2740
2722 cf::object::player 2741 cf::object::player
2723 player 2742 player
2724 2743
2725 cf::player 2744 cf::player
… …
2730 2749
2731=cut 2750=cut
2732 2751
2733for ( 2752for (
2734 ["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
2735 insert remove)], 2755 decrease_ob_nr)],
2736 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2737 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2738 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2739) { 2759) {
2740 no strict 'refs'; 2760 no strict 'refs';
… …
2816# the server's init and main functions 2836# the server's init and main functions
2817 2837
2818sub load_facedata($) { 2838sub load_facedata($) {
2819 my ($path) = @_; 2839 my ($path) = @_;
2820 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
2821 warn "loading facedata from $path\n"; 2847 warn "loading facedata from $path\n";
2822 2848
2823 my $facedata; 2849 my $facedata;
2824 0 < aio_load $path, $facedata 2850 0 < aio_load $path, $facedata
2825 or die "$path: $!"; 2851 or die "$path: $!";
2826 2852
2827 $facedata = Coro::Storable::thaw $facedata; 2853 $facedata = Coro::Storable::thaw $facedata;
2828 2854
2829 $facedata->{version} == 2 2855 $facedata->{version} == 2
2830 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;
2831 2864
2832 { 2865 {
2833 my $faces = $facedata->{faceinfo}; 2866 my $faces = $facedata->{faceinfo};
2834 2867
2835 while (my ($face, $info) = each %$faces) { 2868 while (my ($face, $info) = each %$faces) {
2836 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2837 cf::face::set_visibility $idx, $info->{visibility}; 2870 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap}; 2871 cf::face::set_magicmap $idx, $info->{magicmap};
2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2841 2874
2842 cf::cede_to_tick; 2875 cf::cede_to_tick;
2843 } 2876 }
2844 2877
2845 while (my ($face, $info) = each %$faces) { 2878 while (my ($face, $info) = each %$faces) {
… …
2870 2903
2871 { 2904 {
2872 # TODO: for gcfclient pleasure, we should give resources 2905 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index. 2906 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource}; 2907 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876 2908
2877 my $soundconf = delete $res->{"res/sound.conf"}; 2909 my $soundconf = delete $res->{"res/sound.conf"};
2878 2910
2879 while (my ($name, $info) = each %$res) { 2911 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2912 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2886 2914
2887 if ($info->{type} & 1) { 2915 if ($info->{type} & 1) {
2888 # prepend meta info 2916 # prepend meta info
2889 2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2890 my $data = pack "(w/a*)*", $meta, $info->{data}; 2923 $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2892
2893 cf::face::set_data $idx, 0, $data, $chk;
2894 } else { 2924 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2925 $data = $info->{data};
2896 } 2926 }
2897 2927
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type}; 2929 cf::face::set_type $idx, $info->{type};
2899 2930
2900 cf::cede_to_tick; 2931 cf::cede_to_tick;
2901 } 2932 }
2902 2933
… …
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) { 2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_] 2938 my $sound = $soundconf->{compat}[$_]
2908 or next; 2939 or next;
2909 2940
2910 my $face = cf::face::find "sound/$sound->[1]"; 2941 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face; 2942 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat 2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 } 2944 }
2915 2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2916 #TODO 2949 }
2917 } 2950 }
2918 } 2951 }
2919 2952
2920 1 2953 1
2921} 2954}
… …
2927 $ns->fx_want ($k, $v); 2960 $ns->fx_want ($k, $v);
2928 } 2961 }
2929}; 2962};
2930 2963
2931sub 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
2932 load_resource_file "$MAPDIR/regions" 2969 load_resource_file "$MAPDIR/regions"
2933 or die "unable to load regions file\n"; 2970 or die "unable to load regions file\n";
2934 2971
2935 for (cf::region::list) { 2972 for (cf::region::list) {
2936 $_->{match} = qr/$_->{match}/ 2973 $_->{match} = qr/$_->{match}/
… …
2972 3009
2973sub init { 3010sub init {
2974 reload_resources; 3011 reload_resources;
2975} 3012}
2976 3013
2977sub cfg_load { 3014sub reload_config {
2978 open my $fh, "<:utf8", "$CONFDIR/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2979 or return; 3016 or return;
2980 3017
2981 local $/; 3018 local $/;
2982 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
… …
3002 (async { 3039 (async {
3003 Event::one_event; 3040 Event::one_event;
3004 })->prio (Coro::PRIO_MAX); 3041 })->prio (Coro::PRIO_MAX);
3005 }; 3042 };
3006 3043
3007 cfg_load; 3044 reload_config;
3008 db_init; 3045 db_init;
3009 load_extensions; 3046 load_extensions;
3010 3047
3011 $TICK_WATCHER->start; 3048 $TICK_WATCHER->start;
3012 Event::loop; 3049 Event::loop;
… …
3205 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
3206 require cf; 3243 require cf;
3207 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3208 3245
3209 warn "loading config and database again"; 3246 warn "loading config and database again";
3210 cf::cfg_load; 3247 cf::reload_config;
3211 3248
3212 warn "loading extensions"; 3249 warn "loading extensions";
3213 cf::load_extensions; 3250 cf::load_extensions;
3214 3251
3215 warn "reattaching attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";

Diff Legend

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