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.591 by root, Tue Nov 6 23:33:15 2012 UTC vs.
Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC

… …
58use BDB (); 58use BDB ();
59use Data::Dumper; 59use Data::Dumper;
60use Fcntl; 60use Fcntl;
61use YAML::XS (); 61use YAML::XS ();
62use IO::AIO (); 62use IO::AIO ();
63use Time::HiRes;
64use Compress::LZF; 63use Compress::LZF;
65use Digest::MD5 (); 64use Digest::MD5 ();
66 65
67AnyEvent::detect; 66AnyEvent::detect;
68 67
… …
87our %COMMAND = (); 86our %COMMAND = ();
88our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
89 88
90our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
91our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
92our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
93our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
94our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
95 96
96our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
97our @EVENT; 98our @EVENT;
… …
250Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
251from wherever your confdir points to. 252from wherever your confdir points to.
252 253
253=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
254 255
255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
256returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
257per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
258 260
259Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
263 265
264=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
571Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
572(default: 0): This call blocks and returns only when you have at least 574(default: 0): This call blocks and returns only when you have at least
573C<$time> seconds of cpu time till the next tick. The slot is only valid 575C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede. 576till the next cede.
575 577
576Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
577should use 100 or more. 579should use 100 or more.
578 580
579The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
580used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
581 583
… …
736 reset_signals; 738 reset_signals;
737} 739}
738 740
739sub fork_call(&@) { 741sub fork_call(&@) {
740 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
741
742 # we seemingly have to make a local copy of the whole thing,
743 # otherwise perl prematurely frees the stuff :/
744 # TODO: investigate and fix (likely this will be rather laborious)
745 743
746 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
747 cf::post_fork; 745 cf::post_fork;
748 &$cb 746 &$cb
749 } @args; 747 } @args;
… …
899 897
900 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
901 } 899 }
902 } 900 }
903 901
904 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
905 my $data = $process->(\@data); 903 my $data = $process->(\@data);
906 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
907 905
908 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
909 907
910 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
911 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
… …
1431=cut 1429=cut
1432 1430
1433############################################################################# 1431#############################################################################
1434# command handling &c 1432# command handling &c
1435 1433
1436=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1437 1435
1438Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1439$name. 1437$name.
1440 1438
1441=cut 1439=cut
… …
1447 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1448 1446
1449 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1450} 1448}
1451 1449
1452=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1453 1451
1454Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1455extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1456received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1457the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1458has logged in successfully. 1456has logged in successfully.
1459 1457
1460If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1461called.
1462 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1463=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1464 1466
1465Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1466exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1467are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1468is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1469log-in. 1471log-in.
1470 1472
1471If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1472called.
1473 1474
1474=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1475 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1476sub register_extcmd { 1482sub register_extcmd($$) {
1477 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1478 1484
1479 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1480} 1486}
1481 1487
1482sub register_exticmd { 1488sub register_async_extcmd($$) {
1483 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1484 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1485 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1486} 1504}
1487 1505
1488use File::Glob (); 1506use File::Glob ();
1489 1507
1490cf::player->attach ( 1508cf::player->attach (
… …
1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1507 1525
1508 if (ref $msg) { 1526 if (ref $msg) {
1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1510 1528
1511 my @reply;
1512
1513 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1514 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1515 } 1547 }
1516
1517 $pl->ext_reply ($reply, @reply)
1518 if $reply;
1519 1548
1520 } else { 1549 } else {
1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1522 } 1551 }
1523 1552
… …
1909} 1938}
1910 1939
1911=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1912 1941
1913Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1914
1915=item $player->ext_reply ($msgid, @msg)
1916
1917Sends an ext reply to the player.
1918
1919=cut
1920
1921sub ext_reply($$@) {
1922 my ($self, $id, @msg) = @_;
1923
1924 $self->ns->ext_reply ($id, @msg)
1925}
1926 1943
1927=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1928 1945
1929Sends an ext event to the client. 1946Sends an ext event to the client.
1930 1947
… …
2633 2650
2634Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2635 2652
2636=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2637 2654
2638returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2639even if the object actually exists. May block. 2656even if the object actually exists. May block.
2640 2657
2641=cut 2658=cut
2642 2659
2643sub deref { 2660sub deref {
… …
3036 3053
3037sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
3038 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
3039 3056
3040 utf8::encode $text; 3057 utf8::encode $text;
3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "msg %d log %s", $flags || cf::NDI_BLACK, $text);
3042} 3059}
3043 3060
3044=item $client->send_big_packet ($pkt) 3061=item $client->send_big_packet ($pkt)
3045 3062
3046Like C<send_packet>, but tries to compress large packets, and fragments 3063Like C<send_packet>, but tries to compress large packets, and fragments
… …
3066 $self->send_packet ($pkt); 3083 $self->send_packet ($pkt);
3067} 3084}
3068 3085
3069=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
3070 3087
3071Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a msg packet to the client, formatting the msg for the client if
3072client if neccessary. C<$type> should be a string identifying the type of 3089necessary. C<$type> should be a string identifying the type of the
3073the message, with C<log> being the default. If C<$color> is negative, suppress 3090message, with C<log> being the default. If C<$color> is negative, suppress
3074the message unless the client supports the msg packet. 3091the message unless the client supports the msg packet.
3075 3092
3076=cut 3093=cut
3077 3094
3078# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
… …
3183 id => "death", 3200 id => "death",
3184 title => "Death", 3201 title => "Death",
3185 reply => undef, 3202 reply => undef,
3186 tooltip => "Reason for and more info about your most recent death", 3203 tooltip => "Reason for and more info about your most recent death",
3187 }, 3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
3188 "c/say" => $SAY_CHANNEL, 3211 "c/say" => $SAY_CHANNEL,
3189 "c/chat" => $CHAT_CHANNEL, 3212 "c/chat" => $CHAT_CHANNEL,
3190); 3213);
3191 3214
3192sub cf::client::send_msg { 3215sub cf::client::send_msg {
… …
3236 3259
3237sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
3238 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
3239 3262
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3241}
3242
3243=item $client->ext_reply ($msgid, @msg)
3244
3245Sends an ext reply to the client.
3246
3247=cut
3248
3249sub cf::client::ext_reply($$@) {
3250 my ($self, $id, @msg) = @_;
3251
3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3253} 3264}
3254 3265
3255=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
3256 3267
3257Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
… …
3314 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3315 3326
3316 if (ref $msg) { 3327 if (ref $msg) {
3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3318 3329
3319 my @reply;
3320
3321 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
3322 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
3323 } 3348 }
3324
3325 $ns->ext_reply ($reply, @reply)
3326 if $reply;
3327
3328 } else { 3349 } else {
3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3330 } 3351 }
3331 3352
3332 cf::override; 3353 cf::override;
… …
3500=cut 3521=cut
3501 3522
3502############################################################################# 3523#############################################################################
3503# the server's init and main functions 3524# the server's init and main functions
3504 3525
3505our %FACEHASH; # hash => idx, #d# HACK for http server 3526{
3527 package cf::face;
3506 3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3507# internal api, not fianlised 3536 # internal api, not finalised
3508sub add_face { 3537 sub set {
3509 my ($name, $type, $data) = @_; 3538 my ($name, $type, $data) = @_;
3510 3539
3511 my $idx = cf::face::find $name; 3540 my $idx = cf::face::find $name;
3512 3541
3513 if ($idx) { 3542 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx}; 3543 delete $HASH{cf::face::get_csum $idx};
3515 } else { 3544 } else {
3516 $idx = cf::face::alloc $name; 3545 $idx = cf::face::alloc $name;
3517 } 3546 }
3518 3547
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3520 3549
3521 cf::face::set_type $idx, $type; 3550 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash; 3551 cf::face::set_csum $idx, 0, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3524 $FACEHASH{$hash} = $idx;#d# 3560 $HASH{$hash} = $idx;#d#
3525 3561
3526 $idx 3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3527} 3601}
3528 3602
3529sub load_facedata($) { 3603sub load_facedata($) {
3530 my ($path) = @_; 3604 my ($path) = @_;
3531 3605
3532 # HACK to clear player env face cache, we need some signal framework
3533 # for this (global event?)
3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3535
3536 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3537 3607
3538 trace "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3539 3609
3540 my $facedata = decode_storable load_file $path; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3541 3611
3542 $facedata->{version} == 2 3612 $facedata->{version} == 2
3543 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3544 3614
3545 cf::cede_to_tick; 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3617
3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3619
3620 # BEGIN ATOMIC
3621 # from here on, everything must be atomic - no thread switch allowed
3622 my $t1 = EV::time;
3546 3623
3547 { 3624 {
3548 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3549 3626
3550 for my $face (sort keys %$faces) { 3627 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face}; 3628 my $info = $faces->{$face};
3552 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3553 3630
3554 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3555 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3559 $FACEHASH{$info->{hash64}} = $idx;#d# 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3560 3637 delete $cf::face::META[$idx];
3561 cf::cede_to_tick;
3562 } 3638 }
3563 3639
3564 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3565 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3566 3642
… …
3571 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3573 } else { 3649 } else {
3574 error "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3575 } 3651 }
3576
3577 cf::cede_to_tick;
3578 } 3652 }
3579 } 3653 }
3580 3654
3581 { 3655 {
3582 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3583 3657
3584 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3585 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3586 cf::cede_to_tick;
3587 } 3660 }
3588 3661
3589 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3590 } 3663 }
3591 3664
… …
3596 if (defined (my $type = $info->{type})) { 3669 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue 3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3598 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3599 3672
3600 cf::face::set_type $idx, $type; 3673 cf::face::set_type $idx, $type;
3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d# 3678 $cf::face::HASH{$info->{hash}} = $idx;
3604 } else { 3679 } else {
3605# $RESOURCE{$name} = $info; # unused 3680# $RESOURCE{$name} = $info; # unused
3606 } 3681 }
3607
3608 cf::cede_to_tick;
3609 } 3682 }
3610 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3611 3694
3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3696
3697 aio_close $fh if $fh; # close old facedata
3613 3698
3614 1 3699 1
3615} 3700}
3616 3701
3617register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
… …
3633} 3718}
3634 3719
3635sub reload_exp_table { 3720sub reload_exp_table {
3636 _reload_exp_table; 3721 _reload_exp_table;
3637 3722
3723 cf::face::set
3638 add_face "res/exp_table" => FT_RSRC, 3724 "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode ( 3725 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 ); 3727 );
3642} 3728}
3643 3729
3644sub reload_materials { 3730sub reload_materials {
3645 _reload_materials; 3731 _reload_materials;
3646} 3732}
… …
3658 if exists $_->{match}; 3744 if exists $_->{match};
3659 } 3745 }
3660} 3746}
3661 3747
3662sub reload_facedata { 3748sub reload_facedata {
3663 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3664 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3665} 3751}
3666 3752
3667sub reload_archetypes { 3753sub reload_archetypes {
3668 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3669 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3670 3756
3757 cf::face::set
3671 add_face "res/skill_info" => FT_RSRC, 3758 "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode ( 3759 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 ); 3761 );
3762
3763 cf::face::set
3675 add_face "res/spell_paths" => FT_RSRC, 3764 "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode ( 3765 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 ); 3767 );
3679} 3768}
3680 3769
3681sub reload_treasures { 3770sub reload_treasures {
3682 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3683 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
… …
3699 3788
3700 while (my ($k, $v) = each %{$soundconf->{event}}) { 3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v"; 3790 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face; 3791 cf::sound::set $k => $face;
3703 } 3792 }
3704}
3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759} 3793}
3760 3794
3761sub reload_resources { 3795sub reload_resources {
3762 trace "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3763 3797
… …
3766 reload_exp_table; 3800 reload_exp_table;
3767 reload_sound; 3801 reload_sound;
3768 reload_archetypes; 3802 reload_archetypes;
3769 reload_regions; 3803 reload_regions;
3770 reload_treasures; 3804 reload_treasures;
3771 reload_pod;
3772 3805
3773 trace "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3774} 3807}
3775 3808
3776sub reload_config { 3809sub reload_config {

Diff Legend

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