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.593 by root, Fri Nov 9 01:59:33 2012 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 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
… …
594 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
595 my $busy; 597 my $busy;
596 598
597 while () { 599 while () {
598 next_job: 600 next_job:
601
602 Coro::cede;
599 603
600 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
601 605
602 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
603 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0; 608 $busy = 0;
605 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
606 $job->[2]->send; 610 $job->[2]->send;
607 Coro::cede;
608 goto next_job; 611 goto next_job;
609 } else { 612 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
611 } 614 }
612 } 615 }
613 616
614 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
615 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
616 $WAIT_FOR_TICK->wait;
617 } else { 619 } else {
618 $busy = 0; 620 $busy = 0;
619 Coro::schedule; 621 Coro::schedule;
620 } 622 }
621 } 623 }
… …
685 687
686 while ($busy) { 688 while ($busy) {
687 if (Coro::nready) { 689 if (Coro::nready) {
688 Coro::cede_notself; 690 Coro::cede_notself;
689 } else { 691 } else {
690 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
691 } 693 }
692 } 694 }
693 695
694 my $time = AE::time - $time; 696 my $time = AE::time - $time;
695 697
… …
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;
… …
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_msg ("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
… …
2355 2384
2356 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2357 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2358 2387
2359 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2360 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2361 if (my $map = find $k) { 2390 if (my $map = find $k) {
2362 $map->load if $v; 2391 $map->load if $v;
2363 } 2392 }
2364 2393
2365 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
… …
2621 2650
2622Creates 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.
2623 2652
2624=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2625 2654
2626returns 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,
2627even if the object actually exists. May block. 2656even if the object actually exists. May block.
2628 2657
2629=cut 2658=cut
2630 2659
2631sub deref { 2660sub deref {
… …
2713=item $player_object->may ("access") 2742=item $player_object->may ("access")
2714 2743
2715Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2716(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2717 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2718=cut 2772=cut
2719 2773
2720sub cf::object::player::may { 2774sub cf::object::player::may {
2721 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2722 2776
2723 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2724 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2725 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2726 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2727} 2781}
2728 2782
2729=item $player_object->enter_link 2783=item $player_object->enter_link
2730 2784
… …
2733The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2734for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2735though, as the player cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2736map. 2790map.
2737 2791
2738Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2739 2799
2740=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2741 2801
2742Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2743map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
… …
3013 3073
3014=head3 cf::client 3074=head3 cf::client
3015 3075
3016=over 4 3076=over 4
3017 3077
3018=item $client->send_drawinfo ($text, $flags)
3019
3020Sends a drawinfo packet to the client. Circumvents output buffering so
3021should not be used under normal circumstances.
3022
3023=cut
3024
3025sub cf::client::send_drawinfo {
3026 my ($self, $text, $flags) = @_;
3027
3028 utf8::encode $text;
3029 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3030}
3031
3032=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
3033 3079
3034Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
3035them as required. 3081them as required.
3036 3082
… …
3054 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
3055} 3101}
3056 3102
3057=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
3058 3104
3059Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
3060client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
3061the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
3062the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
3063 3109
3064=cut 3110=cut
3065 3111
3066# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
… …
3171 id => "death", 3217 id => "death",
3172 title => "Death", 3218 title => "Death",
3173 reply => undef, 3219 reply => undef,
3174 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3175 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3176 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3177 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3178); 3230);
3179 3231
3180sub cf::client::send_msg { 3232sub cf::client::send_msg {
… …
3253 3305
3254 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3255 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3256 3308
3257 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
3258} 3349}
3259 3350
3260cf::client->attach ( 3351cf::client->attach (
3261 on_connect => sub { 3352 on_connect => sub {
3262 my ($ns) = @_; 3353 my ($ns) = @_;
… …
3290 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3291 3382
3292 if (ref $msg) { 3383 if (ref $msg) {
3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3294 3385
3295 my @reply;
3296
3297 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
3298 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3299 } 3404 }
3300
3301 $ns->ext_msg ("reply-$reply", @reply)
3302 if $reply;
3303
3304 } else { 3405 } else {
3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3306 } 3407 }
3307 3408
3308 cf::override; 3409 cf::override;
… …
3476=cut 3577=cut
3477 3578
3478############################################################################# 3579#############################################################################
3479# the server's init and main functions 3580# the server's init and main functions
3480 3581
3481our %FACEHASH; # hash => idx, #d# HACK for http server 3582{
3583 package cf::face;
3482 3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3483# internal api, not fianlised 3592 # internal api, not finalised
3484sub add_face { 3593 sub set {
3485 my ($name, $type, $data) = @_; 3594 my ($name, $type, $data) = @_;
3486 3595
3487 my $idx = cf::face::find $name; 3596 my $idx = cf::face::find $name;
3488 3597
3489 if ($idx) { 3598 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx}; 3599 delete $HASH{cf::face::get_csum $idx};
3491 } else { 3600 } else {
3492 $idx = cf::face::alloc $name; 3601 $idx = cf::face::alloc $name;
3493 } 3602 }
3494 3603
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3496 3605
3497 cf::face::set_type $idx, $type; 3606 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash; 3607 cf::face::set_csum $idx, 0, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3500 $FACEHASH{$hash} = $idx;#d# 3616 $HASH{$hash} = $idx;#d#
3501 3617
3502 $idx 3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3503} 3657}
3504 3658
3505sub load_facedata($) { 3659sub load_facedata($) {
3506 my ($path) = @_; 3660 my ($path) = @_;
3507 3661
3508 # HACK to clear player env face cache, we need some signal framework
3509 # for this (global event?)
3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3511
3512 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3513 3663
3514 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3515 3665
3516 my $facedata = decode_storable load_file $path; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3517 3667
3518 $facedata->{version} == 2 3668 $facedata->{version} == 2
3519 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3520 3670
3521 cf::cede_to_tick; 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3673
3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3675
3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3522 3679
3523 { 3680 {
3524 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3525 3682
3526 for my $face (sort keys %$faces) { 3683 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face}; 3684 my $info = $faces->{$face};
3528 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3529 3686
3530 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3531 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3535 $FACEHASH{$info->{hash64}} = $idx;#d# 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3536 3693 delete $cf::face::META[$idx];
3537 cf::cede_to_tick;
3538 } 3694 }
3539 3695
3540 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3541 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3542 3698
… …
3547 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3549 } else { 3705 } else {
3550 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3551 } 3707 }
3552
3553 cf::cede_to_tick;
3554 } 3708 }
3555 } 3709 }
3556 3710
3557 { 3711 {
3558 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3559 3713
3560 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3561 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3562 cf::cede_to_tick;
3563 } 3716 }
3564 3717
3565 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3566 } 3719 }
3567 3720
… …
3572 if (defined (my $type = $info->{type})) { 3725 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue 3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3574 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3575 3728
3576 cf::face::set_type $idx, $type; 3729 cf::face::set_type $idx, $type;
3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d# 3734 $cf::face::HASH{$info->{hash}} = $idx;
3580 } else { 3735 } else {
3581# $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3582 } 3737 }
3583
3584 cf::cede_to_tick;
3585 } 3738 }
3586 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3587 3750
3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3589 3754
3590 1 3755 1
3591} 3756}
3592 3757
3593register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
… …
3609} 3774}
3610 3775
3611sub reload_exp_table { 3776sub reload_exp_table {
3612 _reload_exp_table; 3777 _reload_exp_table;
3613 3778
3779 cf::face::set
3614 add_face "res/exp_table" => FT_RSRC, 3780 "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode ( 3781 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 ); 3783 );
3618} 3784}
3619 3785
3620sub reload_materials { 3786sub reload_materials {
3621 _reload_materials; 3787 _reload_materials;
3622} 3788}
… …
3634 if exists $_->{match}; 3800 if exists $_->{match};
3635 } 3801 }
3636} 3802}
3637 3803
3638sub reload_facedata { 3804sub reload_facedata {
3639 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3640 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3641} 3807}
3642 3808
3643sub reload_archetypes { 3809sub reload_archetypes {
3644 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3645 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3646 3812
3813 cf::face::set
3647 add_face "res/skill_info" => FT_RSRC, 3814 "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode ( 3815 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 ); 3817 );
3818
3819 cf::face::set
3651 add_face "res/spell_paths" => FT_RSRC, 3820 "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode ( 3821 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 ); 3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3655} 3838}
3656 3839
3657sub reload_treasures { 3840sub reload_treasures {
3658 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3659 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
… …
3675 3858
3676 while (my ($k, $v) = each %{$soundconf->{event}}) { 3859 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v"; 3860 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face; 3861 cf::sound::set $k => $face;
3679 } 3862 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742} 3863}
3743 3864
3744sub reload_resources { 3865sub reload_resources {
3745 trace "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3746 3867
… …
3749 reload_exp_table; 3870 reload_exp_table;
3750 reload_sound; 3871 reload_sound;
3751 reload_archetypes; 3872 reload_archetypes;
3752 reload_regions; 3873 reload_regions;
3753 reload_treasures; 3874 reload_treasures;
3754 reload_pod;
3755 3875
3756 trace "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3757} 3877}
3758 3878
3759sub reload_config { 3879sub reload_config {
… …
3795 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3796 print $fh $$; 3916 print $fh $$;
3797} 3917}
3798 3918
3799sub main_loop { 3919sub main_loop {
3800 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3801 if (1) { 3921 if (1) {
3802 EV::loop; 3922 EV::run;
3803 } 3923 }
3804 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3805 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3806} 3926}
3807 3927
3808sub main { 3928sub main {
3809 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
… …
3818 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3819 $Coro::idle = sub { 3939 $Coro::idle = sub {
3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3821 (async { 3941 (async {
3822 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3823 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3824 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3825 }; 3945 };
3826 3946
3827 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3828 3948

Diff Legend

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