… | |
… | |
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 | |
… | |
… | |
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; |
… | |
… | |
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 | |
1438 | Register a callback for execution when the client sends the user command |
1436 | Register 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 | |
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_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 | |
1913 | Expand deliantra pod fragments into protocol xml. |
1942 | Expand deliantra pod fragments into protocol xml. |
1914 | |
|
|
1915 | =item $player->ext_reply ($msgid, @msg) |
|
|
1916 | |
|
|
1917 | Sends an ext reply to the player. |
|
|
1918 | |
|
|
1919 | =cut |
|
|
1920 | |
|
|
1921 | sub 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 | |
1929 | Sends an ext event to the client. |
1946 | Sends an ext event to the client. |
1930 | |
1947 | |
… | |
… | |
2633 | |
2650 | |
2634 | 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. |
2635 | |
2652 | |
2636 | =item $ob = cf::object::deref ($refstring) |
2653 | =item $ob = cf::object::deref ($refstring) |
2637 | |
2654 | |
2638 | 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, |
2639 | even if the object actually exists. May block. |
2656 | even if the object actually exists. May block. |
2640 | |
2657 | |
2641 | =cut |
2658 | =cut |
2642 | |
2659 | |
2643 | sub deref { |
2660 | sub deref { |
… | |
… | |
3025 | |
3042 | |
3026 | =head3 cf::client |
3043 | =head3 cf::client |
3027 | |
3044 | |
3028 | =over 4 |
3045 | =over 4 |
3029 | |
3046 | |
3030 | =item $client->send_drawinfo ($text, $flags) |
|
|
3031 | |
|
|
3032 | Sends a drawinfo packet to the client. Circumvents output buffering so |
|
|
3033 | should not be used under normal circumstances. |
|
|
3034 | |
|
|
3035 | =cut |
|
|
3036 | |
|
|
3037 | sub cf::client::send_drawinfo { |
|
|
3038 | my ($self, $text, $flags) = @_; |
|
|
3039 | |
|
|
3040 | utf8::encode $text; |
|
|
3041 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
|
|
3042 | } |
|
|
3043 | |
|
|
3044 | =item $client->send_big_packet ($pkt) |
3047 | =item $client->send_big_packet ($pkt) |
3045 | |
3048 | |
3046 | 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 |
3047 | them as required. |
3050 | them as required. |
3048 | |
3051 | |
… | |
… | |
3066 | $self->send_packet ($pkt); |
3069 | $self->send_packet ($pkt); |
3067 | } |
3070 | } |
3068 | |
3071 | |
3069 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
3072 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
3070 | |
3073 | |
3071 | 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 |
3072 | 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 |
3073 | 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 |
3074 | the message unless the client supports the msg packet. |
3077 | the message unless the client supports the msg packet. |
3075 | |
3078 | |
3076 | =cut |
3079 | =cut |
3077 | |
3080 | |
3078 | # non-persistent channels (usually the info channel) |
3081 | # non-persistent channels (usually the info channel) |
… | |
… | |
3183 | id => "death", |
3186 | id => "death", |
3184 | title => "Death", |
3187 | title => "Death", |
3185 | reply => undef, |
3188 | reply => undef, |
3186 | tooltip => "Reason for and more info about your most recent death", |
3189 | tooltip => "Reason for and more info about your most recent death", |
3187 | }, |
3190 | }, |
|
|
3191 | "c/fatal" => { |
|
|
3192 | id => "fatal", |
|
|
3193 | title => "Fatal Error", |
|
|
3194 | reply => undef, |
|
|
3195 | tooltip => "Reason for the server disconnect", |
|
|
3196 | }, |
3188 | "c/say" => $SAY_CHANNEL, |
3197 | "c/say" => $SAY_CHANNEL, |
3189 | "c/chat" => $CHAT_CHANNEL, |
3198 | "c/chat" => $CHAT_CHANNEL, |
3190 | ); |
3199 | ); |
3191 | |
3200 | |
3192 | sub cf::client::send_msg { |
3201 | sub cf::client::send_msg { |
… | |
… | |
3236 | |
3245 | |
3237 | sub cf::client::ext_msg($$@) { |
3246 | sub cf::client::ext_msg($$@) { |
3238 | my ($self, $type, @msg) = @_; |
3247 | my ($self, $type, @msg) = @_; |
3239 | |
3248 | |
3240 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
3249 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
3241 | } |
|
|
3242 | |
|
|
3243 | =item $client->ext_reply ($msgid, @msg) |
|
|
3244 | |
|
|
3245 | Sends an ext reply to the client. |
|
|
3246 | |
|
|
3247 | =cut |
|
|
3248 | |
|
|
3249 | sub cf::client::ext_reply($$@) { |
|
|
3250 | my ($self, $id, @msg) = @_; |
|
|
3251 | |
|
|
3252 | $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
3253 | } |
3250 | } |
3254 | |
3251 | |
3255 | =item $success = $client->query ($flags, "text", \&cb) |
3252 | =item $success = $client->query ($flags, "text", \&cb) |
3256 | |
3253 | |
3257 | Queues a query to the client, calling the given callback with |
3254 | Queues a query to the client, calling the given callback with |
… | |
… | |
3314 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3311 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3315 | |
3312 | |
3316 | if (ref $msg) { |
3313 | if (ref $msg) { |
3317 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3314 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3318 | |
3315 | |
3319 | my @reply; |
|
|
3320 | |
|
|
3321 | if (my $cb = $EXTICMD{$type}) { |
3316 | if (my $cb = $EXTIACMD{$type}) { |
|
|
3317 | $cb->( |
|
|
3318 | $ns, |
|
|
3319 | sub { |
|
|
3320 | $ns->ext_msg ("reply-$reply", @_) |
|
|
3321 | if $reply; |
|
|
3322 | }, |
|
|
3323 | @payload |
|
|
3324 | ); |
|
|
3325 | } else { |
|
|
3326 | my @reply; |
|
|
3327 | |
|
|
3328 | if (my $cb = $EXTICMD{$type}) { |
3322 | @reply = $cb->($ns, @payload); |
3329 | @reply = $cb->($ns, @payload); |
|
|
3330 | } |
|
|
3331 | |
|
|
3332 | $ns->ext_msg ("reply-$reply", @reply) |
|
|
3333 | if $reply; |
3323 | } |
3334 | } |
3324 | |
|
|
3325 | $ns->ext_reply ($reply, @reply) |
|
|
3326 | if $reply; |
|
|
3327 | |
|
|
3328 | } else { |
3335 | } else { |
3329 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3336 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3330 | } |
3337 | } |
3331 | |
3338 | |
3332 | cf::override; |
3339 | cf::override; |
… | |
… | |
3500 | =cut |
3507 | =cut |
3501 | |
3508 | |
3502 | ############################################################################# |
3509 | ############################################################################# |
3503 | # the server's init and main functions |
3510 | # the server's init and main functions |
3504 | |
3511 | |
3505 | our %FACEHASH; # hash => idx, #d# HACK for http server |
3512 | { |
|
|
3513 | package cf::face; |
3506 | |
3514 | |
|
|
3515 | our %HASH; # hash => idx |
|
|
3516 | our @DATA; # dynamically-created facedata, only faceste 0 used |
|
|
3517 | our @FOFS; # file offset, if > 0 |
|
|
3518 | our @SIZE; # size of face, in octets |
|
|
3519 | our @META; # meta hash of face, if any |
|
|
3520 | our $DATAFH; # facedata filehandle |
|
|
3521 | |
3507 | # internal api, not fianlised |
3522 | # internal api, not finalised |
3508 | sub add_face { |
3523 | sub set { |
3509 | my ($name, $type, $data) = @_; |
3524 | my ($name, $type, $data) = @_; |
3510 | |
3525 | |
3511 | my $idx = cf::face::find $name; |
3526 | my $idx = cf::face::find $name; |
3512 | |
3527 | |
3513 | if ($idx) { |
3528 | if ($idx) { |
3514 | delete $FACEHASH{cf::face::get_chksum $idx}; |
3529 | delete $HASH{cf::face::get_csum $idx}; |
3515 | } else { |
3530 | } else { |
3516 | $idx = cf::face::alloc $name; |
3531 | $idx = cf::face::alloc $name; |
3517 | } |
3532 | } |
3518 | |
3533 | |
3519 | my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; |
3534 | my $hash = cf::face::mangle_csum Digest::MD5::md5 $data; |
3520 | |
3535 | |
3521 | cf::face::set_type $idx, $type; |
3536 | cf::face::set_type $idx, $type; |
3522 | cf::face::set_data $idx, 0, $data, $hash; |
3537 | cf::face::set_csum $idx, 0, $hash; |
3523 | cf::face::set_meta $idx, $type & 1 ? undef : undef; |
3538 | |
|
|
3539 | # we need to destroy the SV itself, not just modify it, as a running ix |
|
|
3540 | # might hold a reference to it: "delete" achieves that. |
|
|
3541 | delete $FOFS[0][$idx]; |
|
|
3542 | delete $DATA[0][$idx]; |
|
|
3543 | $DATA[0][$idx] = $data; |
|
|
3544 | $SIZE[0][$idx] = length $data; |
|
|
3545 | delete $META[$idx]; |
3524 | $FACEHASH{$hash} = $idx;#d# |
3546 | $HASH{$hash} = $idx;#d# |
3525 | |
3547 | |
3526 | $idx |
3548 | $idx |
|
|
3549 | } |
|
|
3550 | |
|
|
3551 | sub _get_data($$$) { |
|
|
3552 | my ($idx, $set, $cb) = @_; |
|
|
3553 | |
|
|
3554 | if (defined $DATA[$set][$idx]) { |
|
|
3555 | $cb->($DATA[$set][$idx]); |
|
|
3556 | } elsif (my $fofs = $FOFS[$set][$idx]) { |
|
|
3557 | my $size = $SIZE[$set][$idx]; |
|
|
3558 | my $buf; |
|
|
3559 | IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub { |
|
|
3560 | if ($_[0] == $size) { |
|
|
3561 | #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d# |
|
|
3562 | $cb->($buf); |
|
|
3563 | } else { |
|
|
3564 | cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request."; |
|
|
3565 | } |
|
|
3566 | }; |
|
|
3567 | } else { |
|
|
3568 | cf::error "requested facedata for unknown face $idx#$set, ignoring."; |
|
|
3569 | } |
|
|
3570 | } |
|
|
3571 | |
|
|
3572 | # rather ineffient |
|
|
3573 | sub cf::face::get_data($;$) { |
|
|
3574 | my ($idx, $set) = @_; |
|
|
3575 | |
|
|
3576 | _get_data $idx, $set, Coro::rouse_cb; |
|
|
3577 | Coro::rouse_wait |
|
|
3578 | } |
|
|
3579 | |
|
|
3580 | sub cf::face::ix { |
|
|
3581 | my ($ns, $set, $idx, $pri) = @_; |
|
|
3582 | |
|
|
3583 | _get_data $idx, $set, sub { |
|
|
3584 | $ns->ix_send ($idx, $pri, $_[0]); |
|
|
3585 | }; |
|
|
3586 | } |
3527 | } |
3587 | } |
3528 | |
3588 | |
3529 | sub load_facedata($) { |
3589 | sub load_facedata($) { |
3530 | my ($path) = @_; |
3590 | my ($path) = @_; |
3531 | |
3591 | |
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; |
3592 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3537 | |
3593 | |
3538 | trace "loading facedata from $path\n"; |
3594 | trace "loading facedata from $path\n"; |
3539 | |
3595 | |
3540 | my $facedata = decode_storable load_file $path; |
3596 | my $facedata = decode_storable load_file "$path/faceinfo"; |
3541 | |
3597 | |
3542 | $facedata->{version} == 2 |
3598 | $facedata->{version} == 2 |
3543 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3599 | or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; |
3544 | |
3600 | |
3545 | cf::cede_to_tick; |
3601 | my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 |
|
|
3602 | or cf::cleanup "$path/facedata: $!, cannot proceed."; |
|
|
3603 | |
|
|
3604 | get_slot 1, -100, "load_facedata"; # make sure we get a very big slot |
|
|
3605 | |
|
|
3606 | # BEGIN ATOMIC |
|
|
3607 | # from here on, everything must be atomic - no thread switch allowed |
|
|
3608 | my $t1 = EV::time; |
3546 | |
3609 | |
3547 | { |
3610 | { |
3548 | my $faces = $facedata->{faceinfo}; |
3611 | my $faces = $facedata->{faceinfo}; |
3549 | |
3612 | |
3550 | for my $face (sort keys %$faces) { |
3613 | for my $face (sort keys %$faces) { |
3551 | my $info = $faces->{$face}; |
3614 | my $info = $faces->{$face}; |
3552 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3615 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3553 | |
3616 | |
3554 | cf::face::set_visibility $idx, $info->{visibility}; |
3617 | cf::face::set_visibility $idx, $info->{visibility}; |
3555 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3618 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3556 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3619 | 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}; |
3620 | 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} ; |
3621 | cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph}; |
3559 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3622 | $cf::face::HASH{$info->{hash64}} = $idx; |
3560 | |
3623 | delete $cf::face::META[$idx]; |
3561 | cf::cede_to_tick; |
|
|
3562 | } |
3624 | } |
3563 | |
3625 | |
3564 | while (my ($face, $info) = each %$faces) { |
3626 | while (my ($face, $info) = each %$faces) { |
3565 | next unless $info->{smooth}; |
3627 | next unless $info->{smooth}; |
3566 | |
3628 | |
… | |
… | |
3571 | cf::face::set_smooth $idx, $smooth; |
3633 | cf::face::set_smooth $idx, $smooth; |
3572 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3634 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3573 | } else { |
3635 | } else { |
3574 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3636 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3575 | } |
3637 | } |
3576 | |
|
|
3577 | cf::cede_to_tick; |
|
|
3578 | } |
3638 | } |
3579 | } |
3639 | } |
3580 | |
3640 | |
3581 | { |
3641 | { |
3582 | my $anims = $facedata->{animinfo}; |
3642 | my $anims = $facedata->{animinfo}; |
3583 | |
3643 | |
3584 | while (my ($anim, $info) = each %$anims) { |
3644 | while (my ($anim, $info) = each %$anims) { |
3585 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3645 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3586 | cf::cede_to_tick; |
|
|
3587 | } |
3646 | } |
3588 | |
3647 | |
3589 | cf::anim::invalidate_all; # d'oh |
3648 | cf::anim::invalidate_all; # d'oh |
3590 | } |
3649 | } |
3591 | |
3650 | |
… | |
… | |
3596 | if (defined (my $type = $info->{type})) { |
3655 | if (defined (my $type = $info->{type})) { |
3597 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3656 | # 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; |
3657 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3599 | |
3658 | |
3600 | cf::face::set_type $idx, $type; |
3659 | cf::face::set_type $idx, $type; |
3601 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3660 | cf::face::set_csum $idx, 0, $info->{hash}; |
|
|
3661 | $cf::face::SIZE[0][$idx] = $info->{size}; |
|
|
3662 | $cf::face::FOFS[0][$idx] = $info->{fofs}; |
3602 | cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3663 | $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3603 | $FACEHASH{$info->{hash}} = $idx;#d# |
3664 | $cf::face::HASH{$info->{hash}} = $idx; |
3604 | } else { |
3665 | } else { |
3605 | # $RESOURCE{$name} = $info; # unused |
3666 | # $RESOURCE{$name} = $info; # unused |
3606 | } |
3667 | } |
3607 | |
|
|
3608 | cf::cede_to_tick; |
|
|
3609 | } |
3668 | } |
3610 | } |
3669 | } |
|
|
3670 | |
|
|
3671 | ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh); |
|
|
3672 | |
|
|
3673 | # HACK to clear player env face cache, we need some signal framework |
|
|
3674 | # for this (global event?) |
|
|
3675 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3676 | |
|
|
3677 | # END ATOMIC |
|
|
3678 | |
|
|
3679 | cf::debug "facedata atomic update time ", EV::time - $t1; |
3611 | |
3680 | |
3612 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3681 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
|
|
3682 | |
|
|
3683 | aio_close $fh if $fh; # close old facedata |
3613 | |
3684 | |
3614 | 1 |
3685 | 1 |
3615 | } |
3686 | } |
3616 | |
3687 | |
3617 | register_exticmd fx_want => sub { |
3688 | register_exticmd fx_want => sub { |
… | |
… | |
3633 | } |
3704 | } |
3634 | |
3705 | |
3635 | sub reload_exp_table { |
3706 | sub reload_exp_table { |
3636 | _reload_exp_table; |
3707 | _reload_exp_table; |
3637 | |
3708 | |
|
|
3709 | cf::face::set |
3638 | add_face "res/exp_table" => FT_RSRC, |
3710 | "res/exp_table" => FT_RSRC, |
3639 | JSON::XS->new->utf8->canonical->encode ( |
3711 | JSON::XS->new->utf8->canonical->encode ( |
3640 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3712 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3641 | ); |
3713 | ); |
3642 | } |
3714 | } |
3643 | |
3715 | |
3644 | sub reload_materials { |
3716 | sub reload_materials { |
3645 | _reload_materials; |
3717 | _reload_materials; |
3646 | } |
3718 | } |
… | |
… | |
3658 | if exists $_->{match}; |
3730 | if exists $_->{match}; |
3659 | } |
3731 | } |
3660 | } |
3732 | } |
3661 | |
3733 | |
3662 | sub reload_facedata { |
3734 | sub reload_facedata { |
3663 | load_facedata "$DATADIR/facedata" |
3735 | load_facedata $DATADIR |
3664 | or die "unable to load facedata\n"; |
3736 | or die "unable to load facedata\n"; |
3665 | } |
3737 | } |
3666 | |
3738 | |
3667 | sub reload_archetypes { |
3739 | sub reload_archetypes { |
3668 | load_resource_file "$DATADIR/archetypes" |
3740 | load_resource_file "$DATADIR/archetypes" |
3669 | or die "unable to load archetypes\n"; |
3741 | or die "unable to load archetypes\n"; |
3670 | |
3742 | |
|
|
3743 | cf::face::set |
3671 | add_face "res/skill_info" => FT_RSRC, |
3744 | "res/skill_info" => FT_RSRC, |
3672 | JSON::XS->new->utf8->canonical->encode ( |
3745 | JSON::XS->new->utf8->canonical->encode ( |
3673 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3746 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3674 | ); |
3747 | ); |
|
|
3748 | |
|
|
3749 | cf::face::set |
3675 | add_face "res/spell_paths" => FT_RSRC, |
3750 | "res/spell_paths" => FT_RSRC, |
3676 | JSON::XS->new->utf8->canonical->encode ( |
3751 | JSON::XS->new->utf8->canonical->encode ( |
3677 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3752 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3678 | ); |
3753 | ); |
3679 | } |
3754 | } |
3680 | |
3755 | |
3681 | sub reload_treasures { |
3756 | sub reload_treasures { |
3682 | load_resource_file "$DATADIR/treasures" |
3757 | load_resource_file "$DATADIR/treasures" |
3683 | or die "unable to load treasurelists\n"; |
3758 | or die "unable to load treasurelists\n"; |
… | |
… | |
3699 | |
3774 | |
3700 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3775 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3701 | my $face = cf::face::find "sound/$v"; |
3776 | my $face = cf::face::find "sound/$v"; |
3702 | cf::sound::set $k => $face; |
3777 | cf::sound::set $k => $face; |
3703 | } |
3778 | } |
3704 | } |
|
|
3705 | |
|
|
3706 | sub 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 | } |
3779 | } |
3760 | |
3780 | |
3761 | sub reload_resources { |
3781 | sub reload_resources { |
3762 | trace "reloading resource files...\n"; |
3782 | trace "reloading resource files...\n"; |
3763 | |
3783 | |
… | |
… | |
3766 | reload_exp_table; |
3786 | reload_exp_table; |
3767 | reload_sound; |
3787 | reload_sound; |
3768 | reload_archetypes; |
3788 | reload_archetypes; |
3769 | reload_regions; |
3789 | reload_regions; |
3770 | reload_treasures; |
3790 | reload_treasures; |
3771 | reload_pod; |
|
|
3772 | |
3791 | |
3773 | trace "finished reloading resource files\n"; |
3792 | trace "finished reloading resource files\n"; |
3774 | } |
3793 | } |
3775 | |
3794 | |
3776 | sub reload_config { |
3795 | sub reload_config { |