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.584 by root, Tue Oct 30 17:07:50 2012 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 2012 UTC

… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
… …
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
… …
220=item $cf::RUNTIME 225=item $cf::RUNTIME
221 226
222The 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
223every server tick. 228every server tick.
224 229
225=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
226$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
227$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
228 233
229Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
230directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
231unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
232database environment. 237database environment.
… …
246Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
247from wherever your confdir points to. 252from wherever your confdir points to.
248 253
249=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
250 255
251These 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.
252returns 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
253per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
254 260
255Note 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
256ticking, 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
257when 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>
258want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
259 265
260=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
336)) { 342)) {
337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
338} 344}
339 345
340$EV::DIED = sub { 346$EV::DIED = sub {
341 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
342}; 348};
343 349
344############################################################################# 350#############################################################################
345 351
346sub fork_call(&@); 352sub fork_call(&@);
… …
895 901
896 return db_get cache => "$id/data"; 902 return db_get cache => "$id/data";
897 } 903 }
898 } 904 }
899 905
900 my $t1 = Time::HiRes::time; 906 my $t1 = EV::time;
901 my $data = $process->(\@data); 907 my $data = $process->(\@data);
902 my $t2 = Time::HiRes::time; 908 my $t2 = EV::time;
903 909
904 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
905 911
906 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
907 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
… …
1427=cut 1433=cut
1428 1434
1429############################################################################# 1435#############################################################################
1430# command handling &c 1436# command handling &c
1431 1437
1432=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1433 1439
1434Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1435$name. 1441$name.
1436 1442
1437=cut 1443=cut
… …
1443 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1444 1450
1445 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1446} 1452}
1447 1453
1448=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1449 1455
1450Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1451extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1452received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1453the 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
1454has logged in successfully. 1460has logged in successfully.
1455 1461
1456If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1457called.
1458 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
1459=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1460 1470
1461Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1462exticmd 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
1463are 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
1464is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1465log-in. 1475log-in.
1466 1476
1467If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1468called.
1469 1478
1470=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1471 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
1472sub register_extcmd { 1486sub register_extcmd($$) {
1473 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1474 1488
1475 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1476} 1490}
1477 1491
1478sub register_exticmd { 1492sub register_async_extcmd($$) {
1479 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1480 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1481 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1482} 1508}
1483 1509
1484use File::Glob (); 1510use File::Glob ();
1485 1511
1486cf::player->attach ( 1512cf::player->attach (
… …
1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1503 1529
1504 if (ref $msg) { 1530 if (ref $msg) {
1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1506 1532
1507 my @reply;
1508
1509 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}) {
1510 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1511 } 1551 }
1512
1513 $pl->ext_reply ($reply, @reply)
1514 if $reply;
1515 1552
1516 } else { 1553 } else {
1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1518 } 1555 }
1519 1556
… …
1905} 1942}
1906 1943
1907=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1908 1945
1909Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1910
1911=item $player->ext_reply ($msgid, @msg)
1912
1913Sends an ext reply to the player.
1914
1915=cut
1916
1917sub ext_reply($$@) {
1918 my ($self, $id, @msg) = @_;
1919
1920 $self->ns->ext_reply ($id, @msg)
1921}
1922 1947
1923=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1924 1949
1925Sends an ext event to the client. 1950Sends an ext event to the client.
1926 1951
… …
3231=cut 3256=cut
3232 3257
3233sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
3234 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3235 3260
3236 if ($self->extcmd == 2) {
3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3238 } elsif ($self->extcmd == 1) { # TODO: remove
3239 push @msg, msgtype => "event_$type";
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3241 }
3242}
3243
3244=item $client->ext_reply ($msgid, @msg)
3245
3246Sends an ext reply to the client.
3247
3248=cut
3249
3250sub cf::client::ext_reply($$@) {
3251 my ($self, $id, @msg) = @_;
3252
3253 return unless $self->extcmd == 2;
3254
3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3256} 3262}
3257 3263
3258=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3259 3265
3260Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
… …
3317 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3318 3324
3319 if (ref $msg) { 3325 if (ref $msg) {
3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3321 3327
3322 my @reply;
3323
3324 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}) {
3325 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3326 } 3346 }
3327
3328 $ns->ext_reply ($reply, @reply)
3329 if $reply;
3330
3331 } else { 3347 } else {
3332 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";
3333 } 3349 }
3334 3350
3335 cf::override; 3351 cf::override;
… …
3504 3520
3505############################################################################# 3521#############################################################################
3506# the server's init and main functions 3522# the server's init and main functions
3507 3523
3508our %FACEHASH; # hash => idx, #d# HACK for http server 3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525our @FACEDATA; # dynamically-created facedata
3526
3527# internal api, not fianlised
3528sub 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
3555our $FACEDATA; # facedata filehandle
3556
3557sub _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
3578sub 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
3588sub 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}
3509 3595
3510sub load_facedata($) { 3596sub load_facedata($) {
3511 my ($path) = @_; 3597 my ($path) = @_;
3512 3598
3513 # HACK to clear player env face cache, we need some signal framework
3514 # for this (global event?)
3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3516
3517 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3599 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3518 3600
3519 trace "loading facedata from $path\n"; 3601 trace "loading facedata from $path\n";
3520 3602
3521 my $facedata = decode_storable load_file $path; 3603 my $facedata = decode_storable load_file "$path/faceinfo";
3522 3604
3523 $facedata->{version} == 2 3605 $facedata->{version} == 2
3524 or cf::cleanup "$path: version mismatch, cannot proceed."; 3606 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3525 3607
3526 # patch in the exptable 3608 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3609 or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3528 $facedata->{resource}{"res/exp_table"} = { 3610
3529 type => FT_RSRC, 3611 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3530 data => $exp_table, 3612
3531 hash => (Digest::MD5::md5 $exp_table), 3613 # BEGIN ATOMIC
3532 }; 3614 # from here on, everything must be atomic - no thread switch allowed
3533 cf::cede_to_tick; 3615 my $t1 = EV::time;
3534 3616
3535 { 3617 {
3536 my $faces = $facedata->{faceinfo}; 3618 my $faces = $facedata->{faceinfo};
3537 3619
3538 while (my ($face, $info) = each %$faces) { 3620 for my $face (sort keys %$faces) {
3621 my $info = $faces->{$face};
3539 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3622 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3540 3623
3541 cf::face::set_visibility $idx, $info->{visibility}; 3624 cf::face::set_visibility $idx, $info->{visibility};
3542 cf::face::set_magicmap $idx, $info->{magicmap}; 3625 cf::face::set_magicmap $idx, $info->{magicmap};
3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3626 cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3627 cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3628 #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3546 $FACEHASH{$info->{hash64}} = $idx;#d# 3629 $FACEHASH{$info->{hash64}} = $idx;#d#
3547
3548 cf::cede_to_tick;
3549 } 3630 }
3550 3631
3551 while (my ($face, $info) = each %$faces) { 3632 while (my ($face, $info) = each %$faces) {
3552 next unless $info->{smooth}; 3633 next unless $info->{smooth};
3553 3634
… …
3558 cf::face::set_smooth $idx, $smooth; 3639 cf::face::set_smooth $idx, $smooth;
3559 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3640 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3560 } else { 3641 } else {
3561 error "smooth face '$info->{smooth}' not found for face '$face'"; 3642 error "smooth face '$info->{smooth}' not found for face '$face'";
3562 } 3643 }
3563
3564 cf::cede_to_tick;
3565 } 3644 }
3566 } 3645 }
3567 3646
3568 { 3647 {
3569 my $anims = $facedata->{animinfo}; 3648 my $anims = $facedata->{animinfo};
3570 3649
3571 while (my ($anim, $info) = each %$anims) { 3650 while (my ($anim, $info) = each %$anims) {
3572 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3651 cf::anim::set $anim, $info->{frames}, $info->{facings};
3573 cf::cede_to_tick;
3574 } 3652 }
3575 3653
3576 cf::anim::invalidate_all; # d'oh 3654 cf::anim::invalidate_all; # d'oh
3577 } 3655 }
3578 3656
… …
3582 while (my ($name, $info) = each %$res) { 3660 while (my ($name, $info) = each %$res) {
3583 if (defined (my $type = $info->{type})) { 3661 if (defined (my $type = $info->{type})) {
3584 # 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
3585 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3663 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3586 3664
3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3588 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};
3589 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
3590 $FACEHASH{$info->{hash}} = $idx;#d# 3668 $FACEHASH{$info->{hash}} = $idx;#d#
3591 } else { 3669 } else {
3592# $RESOURCE{$name} = $info; # unused 3670# $RESOURCE{$name} = $info; # unused
3593 } 3671 }
3594
3595 cf::cede_to_tick;
3596 } 3672 }
3597 } 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;
3598 3684
3599 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
3600 3688
3601 1 3689 1
3602} 3690}
3603 3691
3604register_exticmd fx_want => sub { 3692register_exticmd fx_want => sub {
… …
3615 my $status = load_resource_file_ $_[0]; 3703 my $status = load_resource_file_ $_[0];
3616 get_slot 0.1, 100; 3704 get_slot 0.1, 100;
3617 cf::arch::commit_load; 3705 cf::arch::commit_load;
3618 3706
3619 $status 3707 $status
3708}
3709
3710sub 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
3719sub reload_materials {
3720 _reload_materials;
3620} 3721}
3621 3722
3622sub reload_regions { 3723sub reload_regions {
3623 # 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
3624 # for this (global event?) 3725 # for this (global event?)
… …
3632 if exists $_->{match}; 3733 if exists $_->{match};
3633 } 3734 }
3634} 3735}
3635 3736
3636sub reload_facedata { 3737sub reload_facedata {
3637 load_facedata "$DATADIR/facedata" 3738 load_facedata $DATADIR
3638 or die "unable to load facedata\n"; 3739 or die "unable to load facedata\n";
3639} 3740}
3640 3741
3641sub reload_archetypes { 3742sub reload_archetypes {
3642 load_resource_file "$DATADIR/archetypes" 3743 load_resource_file "$DATADIR/archetypes"
3643 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 );
3644} 3754}
3645 3755
3646sub reload_treasures { 3756sub reload_treasures {
3647 load_resource_file "$DATADIR/treasures" 3757 load_resource_file "$DATADIR/treasures"
3648 or die "unable to load treasurelists\n"; 3758 or die "unable to load treasurelists\n";
… …
3669} 3779}
3670 3780
3671sub reload_resources { 3781sub reload_resources {
3672 trace "reloading resource files...\n"; 3782 trace "reloading resource files...\n";
3673 3783
3674 reload_exp_table;
3675 reload_materials; 3784 reload_materials;
3676 reload_facedata; 3785 reload_facedata;
3786 reload_exp_table;
3677 reload_sound; 3787 reload_sound;
3678 reload_archetypes; 3788 reload_archetypes;
3679 reload_regions; 3789 reload_regions;
3680 reload_treasures; 3790 reload_treasures;
3681 3791
… …
3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3850 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3741 3851
3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3852 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3743 3853
3744 # we must not ever block the main coroutine 3854 # we must not ever block the main coroutine
3745 local $Coro::idle = sub { 3855 $Coro::idle = sub {
3746 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3856 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3747 (async { 3857 (async {
3748 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3858 $Coro::current->{desc} = "IDLE BUG HANDLER";
3749 EV::loop EV::LOOP_ONESHOT; 3859 EV::loop EV::LOOP_ONESHOT;
3750 })->prio (Coro::PRIO_MAX); 3860 })->prio (Coro::PRIO_MAX);
… …
3753 evthread_start IO::AIO::poll_fileno; 3863 evthread_start IO::AIO::poll_fileno;
3754 3864
3755 cf::sync_job { 3865 cf::sync_job {
3756 cf::incloader::init (); 3866 cf::incloader::init ();
3757 3867
3868 db_init;
3869
3758 cf::init_anim; 3870 cf::init_anim;
3759 cf::init_attackmess; 3871 cf::init_attackmess;
3760 cf::init_dynamic; 3872 cf::init_dynamic;
3761 3873
3762 cf::load_settings; 3874 cf::load_settings;
3763 3875
3764 reload_resources; 3876 reload_resources;
3765 reload_config; 3877 reload_config;
3766 db_init;
3767 3878
3768 cf::init_uuid; 3879 cf::init_uuid;
3769 cf::init_signals; 3880 cf::init_signals;
3770 cf::init_skills; 3881 cf::init_skills;
3771 3882
… …
4196 } 4307 }
4197} 4308}
4198 4309
4199{ 4310{
4200 # configure BDB 4311 # configure BDB
4312 info "initialising database";
4201 4313
4202 BDB::min_parallel 16; 4314 BDB::min_parallel 16;
4203 BDB::max_poll_reqs $TICK * 0.1; 4315 BDB::max_poll_reqs $TICK * 0.1;
4204 #$AnyEvent::BDB::WATCHER->priority (1); 4316 #$AnyEvent::BDB::WATCHER->priority (1);
4205 4317
… …
4234 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4346 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4235 }; 4347 };
4236 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4348 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4237 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4349 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4238 }; 4350 };
4351
4352 info "database initialised";
4239} 4353}
4240 4354
4241{ 4355{
4242 # configure IO::AIO 4356 # configure IO::AIO
4243 4357
4358 info "initialising aio";
4244 IO::AIO::min_parallel 8; 4359 IO::AIO::min_parallel 8;
4245 IO::AIO::max_poll_time $TICK * 0.1; 4360 IO::AIO::max_poll_time $TICK * 0.1;
4246 undef $AnyEvent::AIO::WATCHER; 4361 undef $AnyEvent::AIO::WATCHER;
4362 info "aio initialised";
4247} 4363}
4248 4364
4249our $_log_backtrace; 4365our $_log_backtrace;
4250our $_log_backtrace_last; 4366our $_log_backtrace_last;
4251 4367

Diff Legend

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