ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

… …
58use BDB (); 58use BDB ();
59use Data::Dumper; 59use Data::Dumper;
60use Fcntl; 60use Fcntl;
61use YAML::XS (); 61use YAML::XS ();
62use IO::AIO (); 62use IO::AIO ();
63use Time::HiRes;
64use Compress::LZF; 63use Compress::LZF;
65use Digest::MD5 (); 64use Digest::MD5 ();
66 65
67AnyEvent::detect; 66AnyEvent::detect;
68 67
… …
87our %COMMAND = (); 86our %COMMAND = ();
88our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
89 88
90our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
91our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
92our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
93our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
94our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
95 96
96our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
97our @EVENT; 98our @EVENT;
… …
224=item $cf::RUNTIME 225=item $cf::RUNTIME
225 226
226The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
227every server tick. 228every 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
233Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
234directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
235unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
236database environment. 237database environment.
… …
250Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
251from wherever your confdir points to. 252from wherever your confdir points to.
252 253
253=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
254 255
255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
256returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
257per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
258 260
259Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
263 265
264=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
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
1438Register a callback for execution when the client sends the user command 1440Register 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
1454Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1455extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1456received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1457the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1458has logged in successfully. 1460has logged in successfully.
1459 1461
1460If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1461called.
1462 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback 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
1465Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1466exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1467are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1468is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1469log-in. 1475log-in.
1470 1476
1471If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1472called.
1473 1478
1474=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1475 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1476sub register_extcmd { 1486sub register_extcmd($$) {
1477 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1478 1488
1479 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1480} 1490}
1481 1491
1482sub register_exticmd { 1492sub register_async_extcmd($$) {
1483 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1484 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1485 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1486} 1508}
1487 1509
1488use File::Glob (); 1510use File::Glob ();
1489 1511
1490cf::player->attach ( 1512cf::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
1913Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1914
1915=item $player->ext_reply ($msgid, @msg)
1916
1917Sends an ext reply to the player.
1918
1919=cut
1920
1921sub ext_reply($$@) {
1922 my ($self, $id, @msg) = @_;
1923
1924 $self->ns->ext_reply ($id, @msg)
1925}
1926 1947
1927=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1928 1949
1929Sends an ext event to the client. 1950Sends an ext event to the client.
1930 1951
… …
2633 2654
2634Creates and returns a persistent reference to an object that can be stored as a string. 2655Creates and returns a persistent reference to an object that can be stored as a string.
2635 2656
2636=item $ob = cf::object::deref ($refstring) 2657=item $ob = cf::object::deref ($refstring)
2637 2658
2638returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2659returns the objetc referenced by refstring. may return undef when it cannot find the object,
2639even if the object actually exists. May block. 2660even if the object actually exists. May block.
2640 2661
2641=cut 2662=cut
2642 2663
2643sub deref { 2664sub deref {
… …
3235=cut 3256=cut
3236 3257
3237sub cf::client::ext_msg($$@) { 3258sub 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
3250Sends an ext reply to the client.
3251
3252=cut
3253
3254sub 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
3264Queues a query to the client, calling the given callback with 3266Queues 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;
… …
3507=cut 3519=cut
3508 3520
3509############################################################################# 3521#############################################################################
3510# the server's init and main functions 3522# the server's init and main functions
3511 3523
3512our %FACEHASH; # hash => idx, #d# HACK for http server 3524{
3525 package cf::face;
3526
3527 our %HASH; # hash => idx
3528 our @DATA; # dynamically-created facedata, only faceste 0 used
3529 our @FOFS; # file offset, if > 0
3530 our @SIZE; # size of face, in octets
3531 our @META; # meta hash of face, if any
3532 our $DATAFH; # facedata filehandle
3533
3534 # internal api, not finalised
3535 sub set {
3536 my ($name, $type, $data) = @_;
3537
3538 my $idx = cf::face::find $name;
3539
3540 if ($idx) {
3541 delete $HASH{cf::face::get_chksum $idx};
3542 } else {
3543 $idx = cf::face::alloc $name;
3544 }
3545
3546 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3547
3548 cf::face::set_type $idx, $type;
3549 cf::face::set_csum $idx, 0, $hash;
3550
3551 # we need to destroy the SV itself, not just modify it, as a running ix
3552 # might hold a reference to it: "delete" achieves that.
3553 delete $FOFS[0][$idx];
3554 delete $DATA[0][$idx];
3555 $DATA[0][$idx] = $data;
3556 $SIZE[0][$idx] = length $data;
3557 delete $META[$idx];
3558 $HASH{$hash} = $idx;#d#
3559
3560 $idx
3561 }
3562
3563 sub _get_data($$$) {
3564 my ($idx, $set, $cb) = @_;
3565
3566 if (defined $DATA[$set][$idx]) {
3567 $cb->($DATA[$set][$idx]);
3568 } elsif (my $fofs = $FOFS[$set][$idx]) {
3569 my $size = $SIZE[$set][$idx];
3570 my $buf;
3571 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3572 if ($_[0] == $size) {
3573 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3574 $cb->($buf);
3575 } else {
3576 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3577 }
3578 };
3579 } else {
3580 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3581 }
3582 }
3583
3584 # rather ineffient
3585 sub cf::face::get_data($;$) {
3586 my ($idx, $set) = @_;
3587
3588 _get_data $idx, $set, Coro::rouse_cb;
3589 Coro::rouse_wait
3590 }
3591
3592 sub cf::face::ix {
3593 my ($ns, $set, $idx, $pri) = @_;
3594
3595 _get_data $idx, $set, sub {
3596 $ns->ix_send ($idx, $pri, $_[0]);
3597 };
3598 }
3599}
3513 3600
3514sub load_facedata($) { 3601sub load_facedata($) {
3515 my ($path) = @_; 3602 my ($path) = @_;
3516 3603
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; 3604 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3522 3605
3523 trace "loading facedata from $path\n"; 3606 trace "loading facedata from $path\n";
3524 3607
3525 my $facedata = decode_storable load_file $path; 3608 my $facedata = decode_storable load_file "$path/faceinfo";
3526 3609
3527 $facedata->{version} == 2 3610 $facedata->{version} == 2
3528 or cf::cleanup "$path: version mismatch, cannot proceed."; 3611 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3529 3612
3530 # patch in the exptable 3613 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]); 3614 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3532 $facedata->{resource}{"res/exp_table"} = { 3615
3533 type => FT_RSRC, 3616 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3534 data => $exp_table, 3617
3535 hash => (Digest::MD5::md5 $exp_table), 3618 # BEGIN ATOMIC
3536 }; 3619 # from here on, everything must be atomic - no thread switch allowed
3537 cf::cede_to_tick; 3620 my $t1 = EV::time;
3538 3621
3539 { 3622 {
3540 my $faces = $facedata->{faceinfo}; 3623 my $faces = $facedata->{faceinfo};
3541 3624
3542 for my $face (sort keys %$faces) { 3625 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face}; 3626 my $info = $faces->{$face};
3544 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3627 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3545 3628
3546 cf::face::set_visibility $idx, $info->{visibility}; 3629 cf::face::set_visibility $idx, $info->{visibility};
3547 cf::face::set_magicmap $idx, $info->{magicmap}; 3630 cf::face::set_magicmap $idx, $info->{magicmap};
3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3631 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3632 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3633 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3551 $FACEHASH{$info->{hash64}} = $idx;#d# 3634 $cf::face::HASH{$info->{hash64}} = $idx;
3552 3635 delete $cf::face::META[$idx];
3553 cf::cede_to_tick;
3554 } 3636 }
3555 3637
3556 while (my ($face, $info) = each %$faces) { 3638 while (my ($face, $info) = each %$faces) {
3557 next unless $info->{smooth}; 3639 next unless $info->{smooth};
3558 3640
… …
3563 cf::face::set_smooth $idx, $smooth; 3645 cf::face::set_smooth $idx, $smooth;
3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3646 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3565 } else { 3647 } else {
3566 error "smooth face '$info->{smooth}' not found for face '$face'"; 3648 error "smooth face '$info->{smooth}' not found for face '$face'";
3567 } 3649 }
3568
3569 cf::cede_to_tick;
3570 } 3650 }
3571 } 3651 }
3572 3652
3573 { 3653 {
3574 my $anims = $facedata->{animinfo}; 3654 my $anims = $facedata->{animinfo};
3575 3655
3576 while (my ($anim, $info) = each %$anims) { 3656 while (my ($anim, $info) = each %$anims) {
3577 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3657 cf::anim::set $anim, $info->{frames}, $info->{facings};
3578 cf::cede_to_tick;
3579 } 3658 }
3580 3659
3581 cf::anim::invalidate_all; # d'oh 3660 cf::anim::invalidate_all; # d'oh
3582 } 3661 }
3583 3662
… …
3587 while (my ($name, $info) = each %$res) { 3666 while (my ($name, $info) = each %$res) {
3588 if (defined (my $type = $info->{type})) { 3667 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue 3668 # 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; 3669 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3591 3670
3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3593 cf::face::set_type $idx, $type; 3671 cf::face::set_type $idx, $type;
3672 cf::face::set_csum $idx, 0, $info->{hash};
3673 $cf::face::SIZE[0][$idx] = $info->{size};
3674 $cf::face::FOFS[0][$idx] = $info->{fofs};
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3675 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d# 3676 $cf::face::HASH{$info->{hash}} = $idx;
3596 } else { 3677 } else {
3597# $RESOURCE{$name} = $info; # unused 3678# $RESOURCE{$name} = $info; # unused
3598 } 3679 }
3599
3600 cf::cede_to_tick;
3601 } 3680 }
3602 } 3681 }
3682
3683 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3684
3685 # HACK to clear player env face cache, we need some signal framework
3686 # for this (global event?)
3687 %ext::player_env::MUSIC_FACE_CACHE = ();
3688
3689 # END ATOMIC
3690
3691 cf::debug "facedata atomic update time ", EV::time - $t1;
3603 3692
3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3693 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3694
3695 aio_close $fh if $fh; # close old facedata
3605 3696
3606 1 3697 1
3607} 3698}
3608 3699
3609register_exticmd fx_want => sub { 3700register_exticmd fx_want => sub {
… …
3620 my $status = load_resource_file_ $_[0]; 3711 my $status = load_resource_file_ $_[0];
3621 get_slot 0.1, 100; 3712 get_slot 0.1, 100;
3622 cf::arch::commit_load; 3713 cf::arch::commit_load;
3623 3714
3624 $status 3715 $status
3716}
3717
3718sub reload_exp_table {
3719 _reload_exp_table;
3720
3721 cf::face::set
3722 "res/exp_table" => FT_RSRC,
3723 JSON::XS->new->utf8->canonical->encode (
3724 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3725 );
3726}
3727
3728sub reload_materials {
3729 _reload_materials;
3625} 3730}
3626 3731
3627sub reload_regions { 3732sub reload_regions {
3628 # HACK to clear player env face cache, we need some signal framework 3733 # HACK to clear player env face cache, we need some signal framework
3629 # for this (global event?) 3734 # for this (global event?)
… …
3637 if exists $_->{match}; 3742 if exists $_->{match};
3638 } 3743 }
3639} 3744}
3640 3745
3641sub reload_facedata { 3746sub reload_facedata {
3642 load_facedata "$DATADIR/facedata" 3747 load_facedata $DATADIR
3643 or die "unable to load facedata\n"; 3748 or die "unable to load facedata\n";
3644} 3749}
3645 3750
3646sub reload_archetypes { 3751sub reload_archetypes {
3647 load_resource_file "$DATADIR/archetypes" 3752 load_resource_file "$DATADIR/archetypes"
3648 or die "unable to load archetypes\n"; 3753 or die "unable to load archetypes\n";
3754
3755 cf::face::set
3756 "res/skill_info" => FT_RSRC,
3757 JSON::XS->new->utf8->canonical->encode (
3758 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3759 );
3760
3761 cf::face::set
3762 "res/spell_paths" => FT_RSRC,
3763 JSON::XS->new->utf8->canonical->encode (
3764 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3765 );
3649} 3766}
3650 3767
3651sub reload_treasures { 3768sub reload_treasures {
3652 load_resource_file "$DATADIR/treasures" 3769 load_resource_file "$DATADIR/treasures"
3653 or die "unable to load treasurelists\n"; 3770 or die "unable to load treasurelists\n";
… …
3674} 3791}
3675 3792
3676sub reload_resources { 3793sub reload_resources {
3677 trace "reloading resource files...\n"; 3794 trace "reloading resource files...\n";
3678 3795
3679 reload_exp_table;
3680 reload_materials; 3796 reload_materials;
3681 reload_facedata; 3797 reload_facedata;
3798 reload_exp_table;
3682 reload_sound; 3799 reload_sound;
3683 reload_archetypes; 3800 reload_archetypes;
3684 reload_regions; 3801 reload_regions;
3685 reload_treasures; 3802 reload_treasures;
3686 3803
… …
3758 evthread_start IO::AIO::poll_fileno; 3875 evthread_start IO::AIO::poll_fileno;
3759 3876
3760 cf::sync_job { 3877 cf::sync_job {
3761 cf::incloader::init (); 3878 cf::incloader::init ();
3762 3879
3880 db_init;
3881
3763 cf::init_anim; 3882 cf::init_anim;
3764 cf::init_attackmess; 3883 cf::init_attackmess;
3765 cf::init_dynamic; 3884 cf::init_dynamic;
3766 3885
3767 cf::load_settings; 3886 cf::load_settings;
3768 3887
3769 reload_resources; 3888 reload_resources;
3770 reload_config; 3889 reload_config;
3771 db_init;
3772 3890
3773 cf::init_uuid; 3891 cf::init_uuid;
3774 cf::init_signals; 3892 cf::init_signals;
3775 cf::init_skills; 3893 cf::init_skills;
3776 3894
… …
4201 } 4319 }
4202} 4320}
4203 4321
4204{ 4322{
4205 # configure BDB 4323 # configure BDB
4324 info "initialising database";
4206 4325
4207 BDB::min_parallel 16; 4326 BDB::min_parallel 16;
4208 BDB::max_poll_reqs $TICK * 0.1; 4327 BDB::max_poll_reqs $TICK * 0.1;
4209 #$AnyEvent::BDB::WATCHER->priority (1); 4328 #$AnyEvent::BDB::WATCHER->priority (1);
4210 4329
… …
4239 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4358 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4240 }; 4359 };
4241 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4360 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4242 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4361 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4243 }; 4362 };
4363
4364 info "database initialised";
4244} 4365}
4245 4366
4246{ 4367{
4247 # configure IO::AIO 4368 # configure IO::AIO
4248 4369
4370 info "initialising aio";
4249 IO::AIO::min_parallel 8; 4371 IO::AIO::min_parallel 8;
4250 IO::AIO::max_poll_time $TICK * 0.1; 4372 IO::AIO::max_poll_time $TICK * 0.1;
4251 undef $AnyEvent::AIO::WATCHER; 4373 undef $AnyEvent::AIO::WATCHER;
4374 info "aio initialised";
4252} 4375}
4253 4376
4254our $_log_backtrace; 4377our $_log_backtrace;
4255our $_log_backtrace_last; 4378our $_log_backtrace_last;
4256 4379

Diff Legend

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