… | |
… | |
58 | use BDB (); |
58 | use BDB (); |
59 | use Data::Dumper; |
59 | use Data::Dumper; |
60 | use Fcntl; |
60 | use Fcntl; |
61 | use YAML::XS (); |
61 | use YAML::XS (); |
62 | use IO::AIO (); |
62 | use IO::AIO (); |
63 | use Time::HiRes; |
|
|
64 | use Compress::LZF; |
63 | use Compress::LZF; |
65 | use Digest::MD5 (); |
64 | use Digest::MD5 (); |
66 | |
65 | |
67 | AnyEvent::detect; |
66 | AnyEvent::detect; |
68 | |
67 | |
… | |
… | |
87 | our %COMMAND = (); |
86 | our %COMMAND = (); |
88 | our %COMMAND_TIME = (); |
87 | our %COMMAND_TIME = (); |
89 | |
88 | |
90 | our @EXTS = (); # list of extension package names |
89 | our @EXTS = (); # list of extension package names |
91 | our %EXTCMD = (); |
90 | our %EXTCMD = (); |
|
|
91 | our %EXTACMD = (); |
92 | our %EXTICMD = (); |
92 | our %EXTICMD = (); |
|
|
93 | our %EXTIACMD = (); |
93 | our %EXT_CORO = (); # coroutines bound to extensions |
94 | our %EXT_CORO = (); # coroutines bound to extensions |
94 | our %EXT_MAP = (); # pluggable maps |
95 | our %EXT_MAP = (); # pluggable maps |
95 | |
96 | |
96 | our $RELOAD; # number of reloads so far, non-zero while in reload |
97 | our $RELOAD; # number of reloads so far, non-zero while in reload |
97 | our @EVENT; |
98 | our @EVENT; |
… | |
… | |
250 | Configuration for the server, loaded from C</etc/deliantra-server/config>, or |
251 | Configuration for the server, loaded from C</etc/deliantra-server/config>, or |
251 | from wherever your confdir points to. |
252 | from 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 | |
255 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
256 | These are functions that inhibit the current coroutine one tick. |
256 | returns directly I<after> the tick processing (and consequently, can only wake one thread |
257 | cf::wait_for_tick_begin only returns directly I<after> the tick |
|
|
258 | processing (and consequently, can only wake one thread per tick), while |
257 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
259 | cf::wait_for_tick wakes up all waiters after tick processing. |
258 | |
260 | |
259 | Note that cf::Wait_for_tick will immediately return when the server is not |
261 | Note that cf::wait_for_tick will immediately return when the server is not |
260 | ticking, making it suitable for small pauses in threads that need to run |
262 | ticking, making it suitable for small pauses in threads that need to run |
261 | when the server is paused. If that is not applicable (i.e. you I<really> |
263 | when the server is paused. If that is not applicable (i.e. you I<really> |
262 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
264 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
263 | |
265 | |
264 | =item $cf::WAIT_FOR_TICK |
266 | =item $cf::WAIT_FOR_TICK |
… | |
… | |
571 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
573 | Allocate $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 |
573 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
575 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
574 | till the next cede. |
576 | till the next cede. |
575 | |
577 | |
576 | Background jobs should use a priority les than zero, interactive jobs |
578 | Background jobs should use a priority less than zero, interactive jobs |
577 | should use 100 or more. |
579 | should use 100 or more. |
578 | |
580 | |
579 | The optional C<$name> can be used to identify the job to run. It might be |
581 | The optional C<$name> can be used to identify the job to run. It might be |
580 | used for statistical purposes and should identify the same time-class. |
582 | used 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 | } |
… | |
… | |
736 | reset_signals; |
738 | reset_signals; |
737 | } |
739 | } |
738 | |
740 | |
739 | sub fork_call(&@) { |
741 | sub 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 | |
1454 | Register a callback for execution when the client sends an (synchronous) |
1452 | Register a callback for execution when the client sends an (synchronous) |
1455 | extcmd packet. Ext commands will be processed in the order they are |
1453 | extcmd packet. Ext commands will be processed in the order they are |
1456 | received by the server, like other user commands. The first argument is |
1454 | received by the server, like other user commands. The first argument is |
1457 | the logged-in player. Ext commands can only be processed after a player |
1455 | the logged-in player. Ext commands can only be processed after a player |
1458 | has logged in successfully. |
1456 | has logged in successfully. |
1459 | |
1457 | |
1460 | If the callback returns something, it is sent back as if reply was being |
1458 | The values will be sent back to the client. |
1461 | called. |
|
|
1462 | |
1459 | |
|
|
1460 | =item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args) |
|
|
1461 | |
|
|
1462 | Same as C<cf::register_extcmd>, but instead of returning values, the |
|
|
1463 | callback 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 | |
1465 | Register a callback for execution when the client sends an (asynchronous) |
1467 | Register a callback for execution when the client sends an (asynchronous) |
1466 | exticmd packet. Exti commands are processed by the server as soon as they |
1468 | exticmd packet. Exti commands are processed by the server as soon as they |
1467 | are received, i.e. out of order w.r.t. other commands. The first argument |
1469 | are received, i.e. out of order w.r.t. other commands. The first argument |
1468 | is a client socket. Exti commands can be received anytime, even before |
1470 | is a client socket. Exti commands can be received anytime, even before |
1469 | log-in. |
1471 | log-in. |
1470 | |
1472 | |
1471 | If the callback returns something, it is sent back as if reply was being |
1473 | The values will be sent back to the client. |
1472 | called. |
|
|
1473 | |
1474 | |
1474 | =cut |
1475 | =item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args) |
1475 | |
1476 | |
|
|
1477 | Same as C<cf::register_extcmd>, but instead of returning values, the |
|
|
1478 | callback needs to clal the C<$reply> function. |
|
|
1479 | |
|
|
1480 | =cut |
|
|
1481 | |
1476 | sub register_extcmd { |
1482 | sub register_extcmd($$) { |
1477 | my ($name, $cb) = @_; |
1483 | my ($name, $cb) = @_; |
1478 | |
1484 | |
1479 | $EXTCMD{$name} = $cb; |
1485 | $EXTCMD{$name} = $cb; |
1480 | } |
1486 | } |
1481 | |
1487 | |
1482 | sub register_exticmd { |
1488 | sub register_async_extcmd($$) { |
1483 | my ($name, $cb) = @_; |
1489 | my ($name, $cb) = @_; |
1484 | |
1490 | |
|
|
1491 | $EXTACMD{$name} = $cb; |
|
|
1492 | } |
|
|
1493 | |
|
|
1494 | sub register_exticmd($$) { |
|
|
1495 | my ($name, $cb) = @_; |
|
|
1496 | |
1485 | $EXTICMD{$name} = $cb; |
1497 | $EXTICMD{$name} = $cb; |
|
|
1498 | } |
|
|
1499 | |
|
|
1500 | sub register_async_exticmd($$) { |
|
|
1501 | my ($name, $cb) = @_; |
|
|
1502 | |
|
|
1503 | $EXTIACMD{$name} = $cb; |
1486 | } |
1504 | } |
1487 | |
1505 | |
1488 | use File::Glob (); |
1506 | use File::Glob (); |
1489 | |
1507 | |
1490 | cf::player->attach ( |
1508 | cf::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 | |
… | |
… | |
2621 | |
2650 | |
2622 | Creates and returns a persistent reference to an object that can be stored as a string. |
2651 | Creates 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 | |
2626 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
2655 | returns the objetc referenced by refstring. may return undef when it cannot find the object, |
2627 | even if the object actually exists. May block. |
2656 | even if the object actually exists. May block. |
2628 | |
2657 | |
2629 | =cut |
2658 | =cut |
2630 | |
2659 | |
2631 | sub deref { |
2660 | sub deref { |
… | |
… | |
3013 | |
3042 | |
3014 | =head3 cf::client |
3043 | =head3 cf::client |
3015 | |
3044 | |
3016 | =over 4 |
3045 | =over 4 |
3017 | |
3046 | |
3018 | =item $client->send_drawinfo ($text, $flags) |
|
|
3019 | |
|
|
3020 | Sends a drawinfo packet to the client. Circumvents output buffering so |
|
|
3021 | should not be used under normal circumstances. |
|
|
3022 | |
|
|
3023 | =cut |
|
|
3024 | |
|
|
3025 | sub 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) |
3047 | =item $client->send_big_packet ($pkt) |
3033 | |
3048 | |
3034 | Like C<send_packet>, but tries to compress large packets, and fragments |
3049 | Like C<send_packet>, but tries to compress large packets, and fragments |
3035 | them as required. |
3050 | them as required. |
3036 | |
3051 | |
… | |
… | |
3054 | $self->send_packet ($pkt); |
3069 | $self->send_packet ($pkt); |
3055 | } |
3070 | } |
3056 | |
3071 | |
3057 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
3072 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
3058 | |
3073 | |
3059 | Send a drawinfo or msg packet to the client, formatting the msg for the |
3074 | Send a msg packet to the client, formatting the msg for the client if |
3060 | client if neccessary. C<$type> should be a string identifying the type of |
3075 | necessary. C<$type> should be a string identifying the type of the |
3061 | the message, with C<log> being the default. If C<$color> is negative, suppress |
3076 | message, with C<log> being the default. If C<$color> is negative, suppress |
3062 | the message unless the client supports the msg packet. |
3077 | the message unless the client supports the msg packet. |
3063 | |
3078 | |
3064 | =cut |
3079 | =cut |
3065 | |
3080 | |
3066 | # non-persistent channels (usually the info channel) |
3081 | # non-persistent channels (usually the info channel) |
… | |
… | |
3171 | id => "death", |
3186 | id => "death", |
3172 | title => "Death", |
3187 | title => "Death", |
3173 | reply => undef, |
3188 | reply => undef, |
3174 | tooltip => "Reason for and more info about your most recent death", |
3189 | tooltip => "Reason for and more info about your most recent death", |
3175 | }, |
3190 | }, |
|
|
3191 | "c/fatal" => { |
|
|
3192 | id => "fatal", |
|
|
3193 | title => "Fatal Error", |
|
|
3194 | reply => undef, |
|
|
3195 | tooltip => "Reason for the server disconnect", |
|
|
3196 | }, |
3176 | "c/say" => $SAY_CHANNEL, |
3197 | "c/say" => $SAY_CHANNEL, |
3177 | "c/chat" => $CHAT_CHANNEL, |
3198 | "c/chat" => $CHAT_CHANNEL, |
3178 | ); |
3199 | ); |
3179 | |
3200 | |
3180 | sub cf::client::send_msg { |
3201 | sub cf::client::send_msg { |
… | |
… | |
3253 | |
3274 | |
3254 | $self->send_packet ($self->{query_queue}[0][0]) |
3275 | $self->send_packet ($self->{query_queue}[0][0]) |
3255 | if @{ $self->{query_queue} } == 1; |
3276 | if @{ $self->{query_queue} } == 1; |
3256 | |
3277 | |
3257 | 1 |
3278 | 1 |
|
|
3279 | } |
|
|
3280 | |
|
|
3281 | =item $client->update_command_faces |
|
|
3282 | |
|
|
3283 | =cut |
|
|
3284 | |
|
|
3285 | our %COMMAND_FACE; |
|
|
3286 | |
|
|
3287 | sub cf::client::update_command_faces { |
|
|
3288 | my ($self) = @_; |
|
|
3289 | |
|
|
3290 | my @faces = grep $_, |
|
|
3291 | $COMMAND_FACE{preferred}, |
|
|
3292 | $COMMAND_FACE{standard}, |
|
|
3293 | $COMMAND_FACE{skill}, |
|
|
3294 | $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (), |
|
|
3295 | $COMMAND_FACE{emote}, |
|
|
3296 | ; |
|
|
3297 | |
|
|
3298 | $self->send_face ($_) |
|
|
3299 | for @faces; |
|
|
3300 | $self->flush_fx; |
|
|
3301 | |
|
|
3302 | $self->ext_msg (command_list => @faces); |
|
|
3303 | } |
|
|
3304 | |
|
|
3305 | =item cf::client::set_command_face $type, $commands |
|
|
3306 | |
|
|
3307 | =cut |
|
|
3308 | |
|
|
3309 | sub cf::client::set_command_face { |
|
|
3310 | my ($type, $list) = @_; |
|
|
3311 | |
|
|
3312 | my $idx = &cf::face::set ( #d# ugly forward reference |
|
|
3313 | "command_list/$type" => cf::FT_RSRC, |
|
|
3314 | JSON::XS->new->utf8->encode ([ sort @$list ]) |
|
|
3315 | ); |
|
|
3316 | |
|
|
3317 | $COMMAND_FACE{$type} = $idx; |
3258 | } |
3318 | } |
3259 | |
3319 | |
3260 | cf::client->attach ( |
3320 | cf::client->attach ( |
3261 | on_connect => sub { |
3321 | on_connect => sub { |
3262 | my ($ns) = @_; |
3322 | my ($ns) = @_; |
… | |
… | |
3290 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3350 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3291 | |
3351 | |
3292 | if (ref $msg) { |
3352 | if (ref $msg) { |
3293 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3353 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3294 | |
3354 | |
3295 | my @reply; |
|
|
3296 | |
|
|
3297 | if (my $cb = $EXTICMD{$type}) { |
3355 | if (my $cb = $EXTIACMD{$type}) { |
|
|
3356 | $cb->( |
|
|
3357 | $ns, |
|
|
3358 | sub { |
|
|
3359 | $ns->ext_msg ("reply-$reply", @_) |
|
|
3360 | if $reply; |
|
|
3361 | }, |
|
|
3362 | @payload |
|
|
3363 | ); |
|
|
3364 | } else { |
|
|
3365 | my @reply; |
|
|
3366 | |
|
|
3367 | if (my $cb = $EXTICMD{$type}) { |
3298 | @reply = $cb->($ns, @payload); |
3368 | @reply = $cb->($ns, @payload); |
|
|
3369 | } |
|
|
3370 | |
|
|
3371 | $ns->ext_msg ("reply-$reply", @reply) |
|
|
3372 | if $reply; |
3299 | } |
3373 | } |
3300 | |
|
|
3301 | $ns->ext_msg ("reply-$reply", @reply) |
|
|
3302 | if $reply; |
|
|
3303 | |
|
|
3304 | } else { |
3374 | } else { |
3305 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3375 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3306 | } |
3376 | } |
3307 | |
3377 | |
3308 | cf::override; |
3378 | cf::override; |
… | |
… | |
3476 | =cut |
3546 | =cut |
3477 | |
3547 | |
3478 | ############################################################################# |
3548 | ############################################################################# |
3479 | # the server's init and main functions |
3549 | # the server's init and main functions |
3480 | |
3550 | |
3481 | our %FACEHASH; # hash => idx, #d# HACK for http server |
3551 | { |
|
|
3552 | package cf::face; |
3482 | |
3553 | |
|
|
3554 | our %HASH; # hash => idx |
|
|
3555 | our @DATA; # dynamically-created facedata, only faceste 0 used |
|
|
3556 | our @FOFS; # file offset, if > 0 |
|
|
3557 | our @SIZE; # size of face, in octets |
|
|
3558 | our @META; # meta hash of face, if any |
|
|
3559 | our $DATAFH; # facedata filehandle |
|
|
3560 | |
3483 | # internal api, not fianlised |
3561 | # internal api, not finalised |
3484 | sub add_face { |
3562 | sub set { |
3485 | my ($name, $type, $data) = @_; |
3563 | my ($name, $type, $data) = @_; |
3486 | |
3564 | |
3487 | my $idx = cf::face::find $name; |
3565 | my $idx = cf::face::find $name; |
3488 | |
3566 | |
3489 | if ($idx) { |
3567 | if ($idx) { |
3490 | delete $FACEHASH{cf::face::get_chksum $idx}; |
3568 | delete $HASH{cf::face::get_csum $idx}; |
3491 | } else { |
3569 | } else { |
3492 | $idx = cf::face::alloc $name; |
3570 | $idx = cf::face::alloc $name; |
3493 | } |
3571 | } |
3494 | |
3572 | |
3495 | my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; |
3573 | my $hash = cf::face::mangle_csum Digest::MD5::md5 $data; |
3496 | |
3574 | |
3497 | cf::face::set_type $idx, $type; |
3575 | cf::face::set_type $idx, $type; |
3498 | cf::face::set_data $idx, 0, $data, $hash; |
3576 | cf::face::set_csum $idx, 0, $hash; |
3499 | cf::face::set_meta $idx, $type & 1 ? undef : undef; |
3577 | |
|
|
3578 | # we need to destroy the SV itself, not just modify it, as a running ix |
|
|
3579 | # might hold a reference to it: "delete" achieves that. |
|
|
3580 | delete $FOFS[0][$idx]; |
|
|
3581 | delete $DATA[0][$idx]; |
|
|
3582 | $DATA[0][$idx] = $data; |
|
|
3583 | $SIZE[0][$idx] = length $data; |
|
|
3584 | delete $META[$idx]; |
3500 | $FACEHASH{$hash} = $idx;#d# |
3585 | $HASH{$hash} = $idx;#d# |
3501 | |
3586 | |
3502 | $idx |
3587 | $idx |
|
|
3588 | } |
|
|
3589 | |
|
|
3590 | sub _get_data($$$) { |
|
|
3591 | my ($idx, $set, $cb) = @_; |
|
|
3592 | |
|
|
3593 | if (defined $DATA[$set][$idx]) { |
|
|
3594 | $cb->($DATA[$set][$idx]); |
|
|
3595 | } elsif (my $fofs = $FOFS[$set][$idx]) { |
|
|
3596 | my $size = $SIZE[$set][$idx]; |
|
|
3597 | my $buf; |
|
|
3598 | IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub { |
|
|
3599 | if ($_[0] == $size) { |
|
|
3600 | #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d# |
|
|
3601 | $cb->($buf); |
|
|
3602 | } else { |
|
|
3603 | cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request."; |
|
|
3604 | } |
|
|
3605 | }; |
|
|
3606 | } else { |
|
|
3607 | cf::error "requested facedata for unknown face $idx#$set, ignoring."; |
|
|
3608 | } |
|
|
3609 | } |
|
|
3610 | |
|
|
3611 | # rather ineffient |
|
|
3612 | sub cf::face::get_data($;$) { |
|
|
3613 | my ($idx, $set) = @_; |
|
|
3614 | |
|
|
3615 | _get_data $idx, $set, Coro::rouse_cb; |
|
|
3616 | Coro::rouse_wait |
|
|
3617 | } |
|
|
3618 | |
|
|
3619 | sub cf::face::ix { |
|
|
3620 | my ($ns, $set, $idx, $pri) = @_; |
|
|
3621 | |
|
|
3622 | _get_data $idx, $set, sub { |
|
|
3623 | $ns->ix_send ($idx, $pri, $_[0]); |
|
|
3624 | }; |
|
|
3625 | } |
3503 | } |
3626 | } |
3504 | |
3627 | |
3505 | sub load_facedata($) { |
3628 | sub load_facedata($) { |
3506 | my ($path) = @_; |
3629 | my ($path) = @_; |
3507 | |
3630 | |
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; |
3631 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3513 | |
3632 | |
3514 | trace "loading facedata from $path\n"; |
3633 | trace "loading facedata from $path\n"; |
3515 | |
3634 | |
3516 | my $facedata = decode_storable load_file $path; |
3635 | my $facedata = decode_storable load_file "$path/faceinfo"; |
3517 | |
3636 | |
3518 | $facedata->{version} == 2 |
3637 | $facedata->{version} == 2 |
3519 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3638 | or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; |
3520 | |
3639 | |
3521 | cf::cede_to_tick; |
3640 | my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 |
|
|
3641 | or cf::cleanup "$path/facedata: $!, cannot proceed."; |
|
|
3642 | |
|
|
3643 | get_slot 1, -100, "load_facedata"; # make sure we get a very big slot |
|
|
3644 | |
|
|
3645 | # BEGIN ATOMIC |
|
|
3646 | # from here on, everything must be atomic - no thread switch allowed |
|
|
3647 | my $t1 = EV::time; |
3522 | |
3648 | |
3523 | { |
3649 | { |
3524 | my $faces = $facedata->{faceinfo}; |
3650 | my $faces = $facedata->{faceinfo}; |
3525 | |
3651 | |
3526 | for my $face (sort keys %$faces) { |
3652 | for my $face (sort keys %$faces) { |
3527 | my $info = $faces->{$face}; |
3653 | my $info = $faces->{$face}; |
3528 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3654 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3529 | |
3655 | |
3530 | cf::face::set_visibility $idx, $info->{visibility}; |
3656 | cf::face::set_visibility $idx, $info->{visibility}; |
3531 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3657 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3532 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3658 | 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}; |
3659 | 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} ; |
3660 | cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph}; |
3535 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3661 | $cf::face::HASH{$info->{hash64}} = $idx; |
3536 | |
3662 | delete $cf::face::META[$idx]; |
3537 | cf::cede_to_tick; |
|
|
3538 | } |
3663 | } |
3539 | |
3664 | |
3540 | while (my ($face, $info) = each %$faces) { |
3665 | while (my ($face, $info) = each %$faces) { |
3541 | next unless $info->{smooth}; |
3666 | next unless $info->{smooth}; |
3542 | |
3667 | |
… | |
… | |
3547 | cf::face::set_smooth $idx, $smooth; |
3672 | cf::face::set_smooth $idx, $smooth; |
3548 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3673 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3549 | } else { |
3674 | } else { |
3550 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3675 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3551 | } |
3676 | } |
3552 | |
|
|
3553 | cf::cede_to_tick; |
|
|
3554 | } |
3677 | } |
3555 | } |
3678 | } |
3556 | |
3679 | |
3557 | { |
3680 | { |
3558 | my $anims = $facedata->{animinfo}; |
3681 | my $anims = $facedata->{animinfo}; |
3559 | |
3682 | |
3560 | while (my ($anim, $info) = each %$anims) { |
3683 | while (my ($anim, $info) = each %$anims) { |
3561 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3684 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3562 | cf::cede_to_tick; |
|
|
3563 | } |
3685 | } |
3564 | |
3686 | |
3565 | cf::anim::invalidate_all; # d'oh |
3687 | cf::anim::invalidate_all; # d'oh |
3566 | } |
3688 | } |
3567 | |
3689 | |
… | |
… | |
3572 | if (defined (my $type = $info->{type})) { |
3694 | if (defined (my $type = $info->{type})) { |
3573 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3695 | # 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; |
3696 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3575 | |
3697 | |
3576 | cf::face::set_type $idx, $type; |
3698 | cf::face::set_type $idx, $type; |
3577 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3699 | cf::face::set_csum $idx, 0, $info->{hash}; |
|
|
3700 | $cf::face::SIZE[0][$idx] = $info->{size}; |
|
|
3701 | $cf::face::FOFS[0][$idx] = $info->{fofs}; |
3578 | cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3702 | $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3579 | $FACEHASH{$info->{hash}} = $idx;#d# |
3703 | $cf::face::HASH{$info->{hash}} = $idx; |
3580 | } else { |
3704 | } else { |
3581 | # $RESOURCE{$name} = $info; # unused |
3705 | # $RESOURCE{$name} = $info; # unused |
3582 | } |
3706 | } |
3583 | |
|
|
3584 | cf::cede_to_tick; |
|
|
3585 | } |
3707 | } |
3586 | } |
3708 | } |
|
|
3709 | |
|
|
3710 | ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh); |
|
|
3711 | |
|
|
3712 | # HACK to clear player env face cache, we need some signal framework |
|
|
3713 | # for this (global event?) |
|
|
3714 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3715 | |
|
|
3716 | # END ATOMIC |
|
|
3717 | |
|
|
3718 | cf::debug "facedata atomic update time ", EV::time - $t1; |
3587 | |
3719 | |
3588 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3720 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
|
|
3721 | |
|
|
3722 | aio_close $fh if $fh; # close old facedata |
3589 | |
3723 | |
3590 | 1 |
3724 | 1 |
3591 | } |
3725 | } |
3592 | |
3726 | |
3593 | register_exticmd fx_want => sub { |
3727 | register_exticmd fx_want => sub { |
… | |
… | |
3609 | } |
3743 | } |
3610 | |
3744 | |
3611 | sub reload_exp_table { |
3745 | sub reload_exp_table { |
3612 | _reload_exp_table; |
3746 | _reload_exp_table; |
3613 | |
3747 | |
|
|
3748 | cf::face::set |
3614 | add_face "res/exp_table" => FT_RSRC, |
3749 | "res/exp_table" => FT_RSRC, |
3615 | JSON::XS->new->utf8->canonical->encode ( |
3750 | JSON::XS->new->utf8->canonical->encode ( |
3616 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3751 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3617 | ); |
3752 | ); |
3618 | } |
3753 | } |
3619 | |
3754 | |
3620 | sub reload_materials { |
3755 | sub reload_materials { |
3621 | _reload_materials; |
3756 | _reload_materials; |
3622 | } |
3757 | } |
… | |
… | |
3634 | if exists $_->{match}; |
3769 | if exists $_->{match}; |
3635 | } |
3770 | } |
3636 | } |
3771 | } |
3637 | |
3772 | |
3638 | sub reload_facedata { |
3773 | sub reload_facedata { |
3639 | load_facedata "$DATADIR/facedata" |
3774 | load_facedata $DATADIR |
3640 | or die "unable to load facedata\n"; |
3775 | or die "unable to load facedata\n"; |
3641 | } |
3776 | } |
3642 | |
3777 | |
3643 | sub reload_archetypes { |
3778 | sub reload_archetypes { |
3644 | load_resource_file "$DATADIR/archetypes" |
3779 | load_resource_file "$DATADIR/archetypes" |
3645 | or die "unable to load archetypes\n"; |
3780 | or die "unable to load archetypes\n"; |
3646 | |
3781 | |
|
|
3782 | cf::face::set |
3647 | add_face "res/skill_info" => FT_RSRC, |
3783 | "res/skill_info" => FT_RSRC, |
3648 | JSON::XS->new->utf8->canonical->encode ( |
3784 | JSON::XS->new->utf8->canonical->encode ( |
3649 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3785 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3650 | ); |
3786 | ); |
|
|
3787 | |
|
|
3788 | cf::face::set |
3651 | add_face "res/spell_paths" => FT_RSRC, |
3789 | "res/spell_paths" => FT_RSRC, |
3652 | JSON::XS->new->utf8->canonical->encode ( |
3790 | JSON::XS->new->utf8->canonical->encode ( |
3653 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3791 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3654 | ); |
3792 | ); |
|
|
3793 | |
|
|
3794 | # command completion |
|
|
3795 | my @commands; |
|
|
3796 | |
|
|
3797 | for (0..cf::arch::skillvec_size - 1) { |
|
|
3798 | my $skill = cf::arch::skillvec $_; |
|
|
3799 | my $name = $skill->name; |
|
|
3800 | my $flags = cf::skill_flags $skill->subtype; |
|
|
3801 | |
|
|
3802 | push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE); |
|
|
3803 | push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE); |
|
|
3804 | } |
|
|
3805 | |
|
|
3806 | cf::client::set_command_face skill => \@commands; |
3655 | } |
3807 | } |
3656 | |
3808 | |
3657 | sub reload_treasures { |
3809 | sub reload_treasures { |
3658 | load_resource_file "$DATADIR/treasures" |
3810 | load_resource_file "$DATADIR/treasures" |
3659 | or die "unable to load treasurelists\n"; |
3811 | or die "unable to load treasurelists\n"; |
… | |
… | |
3675 | |
3827 | |
3676 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3828 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3677 | my $face = cf::face::find "sound/$v"; |
3829 | my $face = cf::face::find "sound/$v"; |
3678 | cf::sound::set $k => $face; |
3830 | cf::sound::set $k => $face; |
3679 | } |
3831 | } |
3680 | } |
|
|
3681 | |
|
|
3682 | #d# move docstuff to help or so |
|
|
3683 | our %DOCSTRING; |
|
|
3684 | |
|
|
3685 | sub 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 | } |
3832 | } |
3743 | |
3833 | |
3744 | sub reload_resources { |
3834 | sub reload_resources { |
3745 | trace "reloading resource files...\n"; |
3835 | trace "reloading resource files...\n"; |
3746 | |
3836 | |
… | |
… | |
3749 | reload_exp_table; |
3839 | reload_exp_table; |
3750 | reload_sound; |
3840 | reload_sound; |
3751 | reload_archetypes; |
3841 | reload_archetypes; |
3752 | reload_regions; |
3842 | reload_regions; |
3753 | reload_treasures; |
3843 | reload_treasures; |
3754 | reload_pod; |
|
|
3755 | |
3844 | |
3756 | trace "finished reloading resource files\n"; |
3845 | trace "finished reloading resource files\n"; |
3757 | } |
3846 | } |
3758 | |
3847 | |
3759 | sub reload_config { |
3848 | sub reload_config { |