… | |
… | |
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; |
… | |
… | |
224 | =item $cf::RUNTIME |
225 | =item $cf::RUNTIME |
225 | |
226 | |
226 | The time this server has run, starts at 0 and is increased by $cf::TICK on |
227 | The time this server has run, starts at 0 and is increased by $cf::TICK on |
227 | every server tick. |
228 | every server tick. |
228 | |
229 | |
229 | =item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR |
230 | =item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR |
230 | $cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR |
231 | $cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR |
231 | $cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR |
232 | $cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR |
232 | |
233 | |
233 | Various directories - "/etc", read-only install directory, perl-library |
234 | Various directories - "/etc", read-only install directory, perl-library |
234 | directory, pod-directory, read-only maps directory, "/var", "/var/tmp", |
235 | directory, pod-directory, read-only maps directory, "/var", "/var/tmp", |
235 | unique-items directory, player file directory, random maps directory and |
236 | unique-items directory, player file directory, random maps directory and |
236 | database environment. |
237 | database environment. |
… | |
… | |
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 |
… | |
… | |
899 | |
901 | |
900 | return db_get cache => "$id/data"; |
902 | return db_get cache => "$id/data"; |
901 | } |
903 | } |
902 | } |
904 | } |
903 | |
905 | |
904 | my $t1 = Time::HiRes::time; |
906 | my $t1 = EV::time; |
905 | my $data = $process->(\@data); |
907 | my $data = $process->(\@data); |
906 | my $t2 = Time::HiRes::time; |
908 | my $t2 = EV::time; |
907 | |
909 | |
908 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
910 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
909 | |
911 | |
910 | db_put cache => "$id/data", $data; |
912 | db_put cache => "$id/data", $data; |
911 | db_put cache => "$id/md5" , $md5; |
913 | db_put cache => "$id/md5" , $md5; |
… | |
… | |
1431 | =cut |
1433 | =cut |
1432 | |
1434 | |
1433 | ############################################################################# |
1435 | ############################################################################# |
1434 | # command handling &c |
1436 | # command handling &c |
1435 | |
1437 | |
1436 | =item cf::register_command $name => \&callback($ob,$args); |
1438 | =item cf::register_command $name => \&callback($ob,$args) |
1437 | |
1439 | |
1438 | Register a callback for execution when the client sends the user command |
1440 | Register a callback for execution when the client sends the user command |
1439 | $name. |
1441 | $name. |
1440 | |
1442 | |
1441 | =cut |
1443 | =cut |
… | |
… | |
1447 | #warn "registering command '$name/$time' to '$caller'"; |
1449 | #warn "registering command '$name/$time' to '$caller'"; |
1448 | |
1450 | |
1449 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1451 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1450 | } |
1452 | } |
1451 | |
1453 | |
1452 | =item cf::register_extcmd $name => \&callback($pl,$packet); |
1454 | =item cf::register_extcmd $name => \&callback($pl,@args) |
1453 | |
1455 | |
1454 | Register a callback for execution when the client sends an (synchronous) |
1456 | Register a callback for execution when the client sends an (synchronous) |
1455 | extcmd packet. Ext commands will be processed in the order they are |
1457 | 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 |
1458 | 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 |
1459 | the logged-in player. Ext commands can only be processed after a player |
1458 | has logged in successfully. |
1460 | has logged in successfully. |
1459 | |
1461 | |
1460 | If the callback returns something, it is sent back as if reply was being |
1462 | The values will be sent back to the client. |
1461 | called. |
|
|
1462 | |
1463 | |
|
|
1464 | =item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args) |
|
|
1465 | |
|
|
1466 | Same as C<cf::register_extcmd>, but instead of returning values, the |
|
|
1467 | callback needs to clal the C<$reply> function. |
|
|
1468 | |
1463 | =item cf::register_exticmd $name => \&callback($ns,$packet); |
1469 | =item cf::register_exticmd $name => \&callback($ns,@args) |
1464 | |
1470 | |
1465 | Register a callback for execution when the client sends an (asynchronous) |
1471 | 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 |
1472 | 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 |
1473 | 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 |
1474 | is a client socket. Exti commands can be received anytime, even before |
1469 | log-in. |
1475 | log-in. |
1470 | |
1476 | |
1471 | If the callback returns something, it is sent back as if reply was being |
1477 | The values will be sent back to the client. |
1472 | called. |
|
|
1473 | |
1478 | |
1474 | =cut |
1479 | =item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args) |
1475 | |
1480 | |
|
|
1481 | Same as C<cf::register_extcmd>, but instead of returning values, the |
|
|
1482 | callback needs to clal the C<$reply> function. |
|
|
1483 | |
|
|
1484 | =cut |
|
|
1485 | |
1476 | sub register_extcmd { |
1486 | sub register_extcmd($$) { |
1477 | my ($name, $cb) = @_; |
1487 | my ($name, $cb) = @_; |
1478 | |
1488 | |
1479 | $EXTCMD{$name} = $cb; |
1489 | $EXTCMD{$name} = $cb; |
1480 | } |
1490 | } |
1481 | |
1491 | |
1482 | sub register_exticmd { |
1492 | sub register_async_extcmd($$) { |
1483 | my ($name, $cb) = @_; |
1493 | my ($name, $cb) = @_; |
1484 | |
1494 | |
|
|
1495 | $EXTACMD{$name} = $cb; |
|
|
1496 | } |
|
|
1497 | |
|
|
1498 | sub register_exticmd($$) { |
|
|
1499 | my ($name, $cb) = @_; |
|
|
1500 | |
1485 | $EXTICMD{$name} = $cb; |
1501 | $EXTICMD{$name} = $cb; |
|
|
1502 | } |
|
|
1503 | |
|
|
1504 | sub register_async_exticmd($$) { |
|
|
1505 | my ($name, $cb) = @_; |
|
|
1506 | |
|
|
1507 | $EXTIACMD{$name} = $cb; |
1486 | } |
1508 | } |
1487 | |
1509 | |
1488 | use File::Glob (); |
1510 | use File::Glob (); |
1489 | |
1511 | |
1490 | cf::player->attach ( |
1512 | cf::player->attach ( |
… | |
… | |
1506 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1528 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1507 | |
1529 | |
1508 | if (ref $msg) { |
1530 | if (ref $msg) { |
1509 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
1531 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
1510 | |
1532 | |
1511 | my @reply; |
|
|
1512 | |
|
|
1513 | if (my $cb = $EXTCMD{$type}) { |
1533 | if (my $cb = $EXTACMD{$type}) { |
|
|
1534 | $cb->( |
|
|
1535 | $pl, |
|
|
1536 | sub { |
|
|
1537 | $pl->ext_msg ("reply-$reply", @_) |
|
|
1538 | if $reply; |
|
|
1539 | }, |
|
|
1540 | @payload |
|
|
1541 | ); |
|
|
1542 | } else { |
|
|
1543 | my @reply; |
|
|
1544 | |
|
|
1545 | if (my $cb = $EXTCMD{$type}) { |
1514 | @reply = $cb->($pl, @payload); |
1546 | @reply = $cb->($pl, @payload); |
|
|
1547 | } |
|
|
1548 | |
|
|
1549 | $pl->ext_msg ("reply-$reply", @reply) |
|
|
1550 | if $reply; |
1515 | } |
1551 | } |
1516 | |
|
|
1517 | $pl->ext_reply ($reply, @reply) |
|
|
1518 | if $reply; |
|
|
1519 | |
1552 | |
1520 | } else { |
1553 | } else { |
1521 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1554 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1522 | } |
1555 | } |
1523 | |
1556 | |
… | |
… | |
1909 | } |
1942 | } |
1910 | |
1943 | |
1911 | =item $protocol_xml = $player->expand_cfpod ($cfpod) |
1944 | =item $protocol_xml = $player->expand_cfpod ($cfpod) |
1912 | |
1945 | |
1913 | Expand deliantra pod fragments into protocol xml. |
1946 | 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 | |
1947 | |
1927 | =item $player->ext_msg ($type, @msg) |
1948 | =item $player->ext_msg ($type, @msg) |
1928 | |
1949 | |
1929 | Sends an ext event to the client. |
1950 | Sends an ext event to the client. |
1930 | |
1951 | |
… | |
… | |
3235 | =cut |
3256 | =cut |
3236 | |
3257 | |
3237 | sub cf::client::ext_msg($$@) { |
3258 | sub cf::client::ext_msg($$@) { |
3238 | my ($self, $type, @msg) = @_; |
3259 | my ($self, $type, @msg) = @_; |
3239 | |
3260 | |
3240 | if ($self->extcmd == 2) { |
|
|
3241 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
3261 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
3242 | } elsif ($self->extcmd == 1) { # TODO: remove |
|
|
3243 | push @msg, msgtype => "event_$type"; |
|
|
3244 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
3245 | } |
|
|
3246 | } |
|
|
3247 | |
|
|
3248 | =item $client->ext_reply ($msgid, @msg) |
|
|
3249 | |
|
|
3250 | Sends an ext reply to the client. |
|
|
3251 | |
|
|
3252 | =cut |
|
|
3253 | |
|
|
3254 | sub cf::client::ext_reply($$@) { |
|
|
3255 | my ($self, $id, @msg) = @_; |
|
|
3256 | |
|
|
3257 | return unless $self->extcmd == 2; |
|
|
3258 | |
|
|
3259 | $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
3260 | } |
3262 | } |
3261 | |
3263 | |
3262 | =item $success = $client->query ($flags, "text", \&cb) |
3264 | =item $success = $client->query ($flags, "text", \&cb) |
3263 | |
3265 | |
3264 | Queues a query to the client, calling the given callback with |
3266 | Queues a query to the client, calling the given callback with |
… | |
… | |
3321 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3323 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3322 | |
3324 | |
3323 | if (ref $msg) { |
3325 | if (ref $msg) { |
3324 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3326 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3325 | |
3327 | |
3326 | my @reply; |
|
|
3327 | |
|
|
3328 | if (my $cb = $EXTICMD{$type}) { |
3328 | if (my $cb = $EXTIACMD{$type}) { |
|
|
3329 | $cb->( |
|
|
3330 | $ns, |
|
|
3331 | sub { |
|
|
3332 | $ns->ext_msg ("reply-$reply", @_) |
|
|
3333 | if $reply; |
|
|
3334 | }, |
|
|
3335 | @payload |
|
|
3336 | ); |
|
|
3337 | } else { |
|
|
3338 | my @reply; |
|
|
3339 | |
|
|
3340 | if (my $cb = $EXTICMD{$type}) { |
3329 | @reply = $cb->($ns, @payload); |
3341 | @reply = $cb->($ns, @payload); |
|
|
3342 | } |
|
|
3343 | |
|
|
3344 | $ns->ext_msg ("reply-$reply", @reply) |
|
|
3345 | if $reply; |
3330 | } |
3346 | } |
3331 | |
|
|
3332 | $ns->ext_reply ($reply, @reply) |
|
|
3333 | if $reply; |
|
|
3334 | |
|
|
3335 | } else { |
3347 | } else { |
3336 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3348 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3337 | } |
3349 | } |
3338 | |
3350 | |
3339 | cf::override; |
3351 | cf::override; |
… | |
… | |
3508 | |
3520 | |
3509 | ############################################################################# |
3521 | ############################################################################# |
3510 | # the server's init and main functions |
3522 | # the server's init and main functions |
3511 | |
3523 | |
3512 | our %FACEHASH; # hash => idx, #d# HACK for http server |
3524 | our %FACEHASH; # hash => idx, #d# HACK for http server |
|
|
3525 | our @FACEDATA; # dynamically-created facedata |
|
|
3526 | |
|
|
3527 | # internal api, not fianlised |
|
|
3528 | sub set_face { |
|
|
3529 | my ($name, $type, $data) = @_; |
|
|
3530 | |
|
|
3531 | my $idx = cf::face::find $name; |
|
|
3532 | |
|
|
3533 | if ($idx) { |
|
|
3534 | delete $FACEHASH{cf::face::get_chksum $idx}; |
|
|
3535 | } else { |
|
|
3536 | $idx = cf::face::alloc $name; |
|
|
3537 | } |
|
|
3538 | |
|
|
3539 | my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; |
|
|
3540 | |
|
|
3541 | cf::face::set_type $idx, $type; |
|
|
3542 | cf::face::set_data $idx, 0, (length $data), 0, $hash; |
|
|
3543 | cf::face::set_meta $idx, $type & 1 ? undef : undef; |
|
|
3544 | |
|
|
3545 | # we need to destroy the SV itself, not just overwrite, |
|
|
3546 | # as a running ix might hold a reference to it. |
|
|
3547 | # delete achieves that. |
|
|
3548 | delete $FACEDATA[$idx]; |
|
|
3549 | $FACEDATA[$idx] = $data; |
|
|
3550 | $FACEHASH{$hash} = $idx;#d# |
|
|
3551 | |
|
|
3552 | $idx |
|
|
3553 | } |
|
|
3554 | |
|
|
3555 | our $FACEDATA; # facedata filehandle |
|
|
3556 | |
|
|
3557 | sub _face_get_data($$$$) { |
|
|
3558 | my ($idx, $size, $fofs, $cb) = @_; |
|
|
3559 | |
|
|
3560 | if (defined $FACEDATA[$idx]) { |
|
|
3561 | $cb->($FACEDATA[$idx]); |
|
|
3562 | } elsif ($fofs) { |
|
|
3563 | my $buf; |
|
|
3564 | IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub { |
|
|
3565 | if ($_[0] == $size) { |
|
|
3566 | #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d# |
|
|
3567 | $cb->($buf); |
|
|
3568 | } else { |
|
|
3569 | cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request."; |
|
|
3570 | } |
|
|
3571 | }; |
|
|
3572 | } else { |
|
|
3573 | cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring."; |
|
|
3574 | } |
|
|
3575 | } |
|
|
3576 | |
|
|
3577 | # rather ineffient |
|
|
3578 | sub cf::face::get_data($;$) { |
|
|
3579 | my ($idx, $faceset) = @_; |
|
|
3580 | |
|
|
3581 | my $size = cf::face::get_size $idx, $faceset; |
|
|
3582 | my $fofs = cf::face::get_fofs $idx, $faceset; |
|
|
3583 | |
|
|
3584 | _face_get_data $idx, $size, $fofs, Coro::rouse_cb; |
|
|
3585 | Coro::rouse_wait |
|
|
3586 | } |
|
|
3587 | |
|
|
3588 | sub cf::face::ix { |
|
|
3589 | my ($ns, $idx, $pri, $size, $fofs) = @_; |
|
|
3590 | |
|
|
3591 | _face_get_data $idx, $size, $fofs, sub { |
|
|
3592 | $ns->ix_send ($idx, $pri, $_[0]); |
|
|
3593 | }; |
|
|
3594 | } |
3513 | |
3595 | |
3514 | sub load_facedata($) { |
3596 | sub load_facedata($) { |
3515 | my ($path) = @_; |
3597 | my ($path) = @_; |
3516 | |
3598 | |
3517 | # HACK to clear player env face cache, we need some signal framework |
|
|
3518 | # for this (global event?) |
|
|
3519 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3520 | |
|
|
3521 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3599 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3522 | |
3600 | |
3523 | trace "loading facedata from $path\n"; |
3601 | trace "loading facedata from $path\n"; |
3524 | |
3602 | |
3525 | my $facedata = decode_storable load_file $path; |
3603 | my $facedata = decode_storable load_file "$path/faceinfo"; |
3526 | |
3604 | |
3527 | $facedata->{version} == 2 |
3605 | $facedata->{version} == 2 |
3528 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3606 | or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; |
3529 | |
3607 | |
3530 | # patch in the exptable |
3608 | my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 |
3531 | my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); |
3609 | or cf::cleanup "$path/facedata: $!, cnanot proceed."; |
3532 | $facedata->{resource}{"res/exp_table"} = { |
3610 | |
3533 | type => FT_RSRC, |
3611 | get_slot 1, -100, "load_facedata"; # make sure we get a very big slot |
3534 | data => $exp_table, |
3612 | |
3535 | hash => (Digest::MD5::md5 $exp_table), |
3613 | # BEGIN ATOMIC |
3536 | }; |
3614 | # from here on, everything must be atomic - no thread switch allowed |
3537 | cf::cede_to_tick; |
3615 | my $t1 = EV::time; |
3538 | |
3616 | |
3539 | { |
3617 | { |
3540 | my $faces = $facedata->{faceinfo}; |
3618 | my $faces = $facedata->{faceinfo}; |
3541 | |
3619 | |
3542 | for my $face (sort keys %$faces) { |
3620 | for my $face (sort keys %$faces) { |
3543 | my $info = $faces->{$face}; |
3621 | my $info = $faces->{$face}; |
3544 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3622 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3545 | |
3623 | |
3546 | cf::face::set_visibility $idx, $info->{visibility}; |
3624 | cf::face::set_visibility $idx, $info->{visibility}; |
3547 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3625 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3548 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3626 | cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32}; |
3549 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3627 | cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64}; |
3550 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3628 | #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph}; # glyphs no longer downloadable via ix |
3551 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3629 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3552 | |
|
|
3553 | cf::cede_to_tick; |
|
|
3554 | } |
3630 | } |
3555 | |
3631 | |
3556 | while (my ($face, $info) = each %$faces) { |
3632 | while (my ($face, $info) = each %$faces) { |
3557 | next unless $info->{smooth}; |
3633 | next unless $info->{smooth}; |
3558 | |
3634 | |
… | |
… | |
3563 | cf::face::set_smooth $idx, $smooth; |
3639 | cf::face::set_smooth $idx, $smooth; |
3564 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3640 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3565 | } else { |
3641 | } else { |
3566 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3642 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3567 | } |
3643 | } |
3568 | |
|
|
3569 | cf::cede_to_tick; |
|
|
3570 | } |
3644 | } |
3571 | } |
3645 | } |
3572 | |
3646 | |
3573 | { |
3647 | { |
3574 | my $anims = $facedata->{animinfo}; |
3648 | my $anims = $facedata->{animinfo}; |
3575 | |
3649 | |
3576 | while (my ($anim, $info) = each %$anims) { |
3650 | while (my ($anim, $info) = each %$anims) { |
3577 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3651 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3578 | cf::cede_to_tick; |
|
|
3579 | } |
3652 | } |
3580 | |
3653 | |
3581 | cf::anim::invalidate_all; # d'oh |
3654 | cf::anim::invalidate_all; # d'oh |
3582 | } |
3655 | } |
3583 | |
3656 | |
… | |
… | |
3587 | while (my ($name, $info) = each %$res) { |
3660 | while (my ($name, $info) = each %$res) { |
3588 | if (defined (my $type = $info->{type})) { |
3661 | if (defined (my $type = $info->{type})) { |
3589 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3662 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3590 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3663 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3591 | |
3664 | |
3592 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
|
|
3593 | cf::face::set_type $idx, $type; |
3665 | cf::face::set_type $idx, $type; |
|
|
3666 | cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash}; |
3594 | cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3667 | cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3595 | $FACEHASH{$info->{hash}} = $idx;#d# |
3668 | $FACEHASH{$info->{hash}} = $idx;#d# |
3596 | } else { |
3669 | } else { |
3597 | # $RESOURCE{$name} = $info; # unused |
3670 | # $RESOURCE{$name} = $info; # unused |
3598 | } |
3671 | } |
3599 | |
|
|
3600 | cf::cede_to_tick; |
|
|
3601 | } |
3672 | } |
3602 | } |
3673 | } |
|
|
3674 | |
|
|
3675 | ($fh, $FACEDATA) = ($FACEDATA, $fh); |
|
|
3676 | |
|
|
3677 | # HACK to clear player env face cache, we need some signal framework |
|
|
3678 | # for this (global event?) |
|
|
3679 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3680 | |
|
|
3681 | # END ATOMIC |
|
|
3682 | |
|
|
3683 | cf::debug "facedata atomic update time ", EV::time - $t1; |
3603 | |
3684 | |
3604 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3685 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
|
|
3686 | |
|
|
3687 | aio_close $fh if $fh; # close old facedata |
3605 | |
3688 | |
3606 | 1 |
3689 | 1 |
3607 | } |
3690 | } |
3608 | |
3691 | |
3609 | register_exticmd fx_want => sub { |
3692 | register_exticmd fx_want => sub { |
… | |
… | |
3620 | my $status = load_resource_file_ $_[0]; |
3703 | my $status = load_resource_file_ $_[0]; |
3621 | get_slot 0.1, 100; |
3704 | get_slot 0.1, 100; |
3622 | cf::arch::commit_load; |
3705 | cf::arch::commit_load; |
3623 | |
3706 | |
3624 | $status |
3707 | $status |
|
|
3708 | } |
|
|
3709 | |
|
|
3710 | sub reload_exp_table { |
|
|
3711 | _reload_exp_table; |
|
|
3712 | |
|
|
3713 | set_face "res/exp_table" => FT_RSRC, |
|
|
3714 | JSON::XS->new->utf8->canonical->encode ( |
|
|
3715 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
|
|
3716 | ); |
|
|
3717 | } |
|
|
3718 | |
|
|
3719 | sub reload_materials { |
|
|
3720 | _reload_materials; |
3625 | } |
3721 | } |
3626 | |
3722 | |
3627 | sub reload_regions { |
3723 | sub reload_regions { |
3628 | # HACK to clear player env face cache, we need some signal framework |
3724 | # HACK to clear player env face cache, we need some signal framework |
3629 | # for this (global event?) |
3725 | # for this (global event?) |
… | |
… | |
3637 | if exists $_->{match}; |
3733 | if exists $_->{match}; |
3638 | } |
3734 | } |
3639 | } |
3735 | } |
3640 | |
3736 | |
3641 | sub reload_facedata { |
3737 | sub reload_facedata { |
3642 | load_facedata "$DATADIR/facedata" |
3738 | load_facedata $DATADIR |
3643 | or die "unable to load facedata\n"; |
3739 | or die "unable to load facedata\n"; |
3644 | } |
3740 | } |
3645 | |
3741 | |
3646 | sub reload_archetypes { |
3742 | sub reload_archetypes { |
3647 | load_resource_file "$DATADIR/archetypes" |
3743 | load_resource_file "$DATADIR/archetypes" |
3648 | or die "unable to load archetypes\n"; |
3744 | or die "unable to load archetypes\n"; |
|
|
3745 | |
|
|
3746 | set_face "res/skill_info" => FT_RSRC, |
|
|
3747 | JSON::XS->new->utf8->canonical->encode ( |
|
|
3748 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
|
|
3749 | ); |
|
|
3750 | set_face "res/spell_paths" => FT_RSRC, |
|
|
3751 | JSON::XS->new->utf8->canonical->encode ( |
|
|
3752 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
|
|
3753 | ); |
3649 | } |
3754 | } |
3650 | |
3755 | |
3651 | sub reload_treasures { |
3756 | sub reload_treasures { |
3652 | load_resource_file "$DATADIR/treasures" |
3757 | load_resource_file "$DATADIR/treasures" |
3653 | or die "unable to load treasurelists\n"; |
3758 | or die "unable to load treasurelists\n"; |
… | |
… | |
3674 | } |
3779 | } |
3675 | |
3780 | |
3676 | sub reload_resources { |
3781 | sub reload_resources { |
3677 | trace "reloading resource files...\n"; |
3782 | trace "reloading resource files...\n"; |
3678 | |
3783 | |
3679 | reload_exp_table; |
|
|
3680 | reload_materials; |
3784 | reload_materials; |
3681 | reload_facedata; |
3785 | reload_facedata; |
|
|
3786 | reload_exp_table; |
3682 | reload_sound; |
3787 | reload_sound; |
3683 | reload_archetypes; |
3788 | reload_archetypes; |
3684 | reload_regions; |
3789 | reload_regions; |
3685 | reload_treasures; |
3790 | reload_treasures; |
3686 | |
3791 | |
… | |
… | |
3758 | evthread_start IO::AIO::poll_fileno; |
3863 | evthread_start IO::AIO::poll_fileno; |
3759 | |
3864 | |
3760 | cf::sync_job { |
3865 | cf::sync_job { |
3761 | cf::incloader::init (); |
3866 | cf::incloader::init (); |
3762 | |
3867 | |
|
|
3868 | db_init; |
|
|
3869 | |
3763 | cf::init_anim; |
3870 | cf::init_anim; |
3764 | cf::init_attackmess; |
3871 | cf::init_attackmess; |
3765 | cf::init_dynamic; |
3872 | cf::init_dynamic; |
3766 | |
3873 | |
3767 | cf::load_settings; |
3874 | cf::load_settings; |
3768 | |
3875 | |
3769 | reload_resources; |
3876 | reload_resources; |
3770 | reload_config; |
3877 | reload_config; |
3771 | db_init; |
|
|
3772 | |
3878 | |
3773 | cf::init_uuid; |
3879 | cf::init_uuid; |
3774 | cf::init_signals; |
3880 | cf::init_signals; |
3775 | cf::init_skills; |
3881 | cf::init_skills; |
3776 | |
3882 | |
… | |
… | |
4201 | } |
4307 | } |
4202 | } |
4308 | } |
4203 | |
4309 | |
4204 | { |
4310 | { |
4205 | # configure BDB |
4311 | # configure BDB |
|
|
4312 | info "initialising database"; |
4206 | |
4313 | |
4207 | BDB::min_parallel 16; |
4314 | BDB::min_parallel 16; |
4208 | BDB::max_poll_reqs $TICK * 0.1; |
4315 | BDB::max_poll_reqs $TICK * 0.1; |
4209 | #$AnyEvent::BDB::WATCHER->priority (1); |
4316 | #$AnyEvent::BDB::WATCHER->priority (1); |
4210 | |
4317 | |
… | |
… | |
4239 | BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; |
4346 | BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; |
4240 | }; |
4347 | }; |
4241 | $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { |
4348 | $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { |
4242 | BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; |
4349 | BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; |
4243 | }; |
4350 | }; |
|
|
4351 | |
|
|
4352 | info "database initialised"; |
4244 | } |
4353 | } |
4245 | |
4354 | |
4246 | { |
4355 | { |
4247 | # configure IO::AIO |
4356 | # configure IO::AIO |
4248 | |
4357 | |
|
|
4358 | info "initialising aio"; |
4249 | IO::AIO::min_parallel 8; |
4359 | IO::AIO::min_parallel 8; |
4250 | IO::AIO::max_poll_time $TICK * 0.1; |
4360 | IO::AIO::max_poll_time $TICK * 0.1; |
4251 | undef $AnyEvent::AIO::WATCHER; |
4361 | undef $AnyEvent::AIO::WATCHER; |
|
|
4362 | info "aio initialised"; |
4252 | } |
4363 | } |
4253 | |
4364 | |
4254 | our $_log_backtrace; |
4365 | our $_log_backtrace; |
4255 | our $_log_backtrace_last; |
4366 | our $_log_backtrace_last; |
4256 | |
4367 | |