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.585 by root, Tue Oct 30 20:18:00 2012 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 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(&@);
… …
567Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
568(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
569C<$time> seconds of cpu time till the next tick. The slot is only valid 575C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede. 576till the next cede.
571 577
572Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
573should use 100 or more. 579should use 100 or more.
574 580
575The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
576used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
577 583
… …
732 reset_signals; 738 reset_signals;
733} 739}
734 740
735sub fork_call(&@) { 741sub fork_call(&@) {
736 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
737
738 # we seemingly have to make a local copy of the whole thing,
739 # otherwise perl prematurely frees the stuff :/
740 # TODO: investigate and fix (likely this will be rather laborious)
741 743
742 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
743 cf::post_fork; 745 cf::post_fork;
744 &$cb 746 &$cb
745 } @args; 747 } @args;
… …
895 897
896 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
897 } 899 }
898 } 900 }
899 901
900 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
901 my $data = $process->(\@data); 903 my $data = $process->(\@data);
902 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
903 905
904 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
905 907
906 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
907 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
… …
1427=cut 1429=cut
1428 1430
1429############################################################################# 1431#############################################################################
1430# command handling &c 1432# command handling &c
1431 1433
1432=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1433 1435
1434Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1435$name. 1437$name.
1436 1438
1437=cut 1439=cut
… …
1443 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1444 1446
1445 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1446} 1448}
1447 1449
1448=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1449 1451
1450Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1451extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1452received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1453the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1454has logged in successfully. 1456has logged in successfully.
1455 1457
1456If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1457called.
1458 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1459=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1460 1466
1461Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1462exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd 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 1469are 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 1470is a client socket. Exti commands can be received anytime, even before
1465log-in. 1471log-in.
1466 1472
1467If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1468called.
1469 1474
1470=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1471 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1472sub register_extcmd { 1482sub register_extcmd($$) {
1473 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1474 1484
1475 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1476} 1486}
1477 1487
1478sub register_exticmd { 1488sub register_async_extcmd($$) {
1479 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1480 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1481 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1482} 1504}
1483 1505
1484use File::Glob (); 1506use File::Glob ();
1485 1507
1486cf::player->attach ( 1508cf::player->attach (
… …
1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1503 1525
1504 if (ref $msg) { 1526 if (ref $msg) {
1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1506 1528
1507 my @reply;
1508
1509 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}) {
1510 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1511 } 1547 }
1512
1513 $pl->ext_reply ($reply, @reply)
1514 if $reply;
1515 1548
1516 } else { 1549 } else {
1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1518 } 1551 }
1519 1552
… …
1905} 1938}
1906 1939
1907=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1908 1941
1909Expand deliantra pod fragments into protocol xml. 1942Expand 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 1943
1923=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1924 1945
1925Sends an ext event to the client. 1946Sends an ext event to the client.
1926 1947
… …
2629 2650
2630Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2631 2652
2632=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2633 2654
2634returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2635even if the object actually exists. May block. 2656even if the object actually exists. May block.
2636 2657
2637=cut 2658=cut
2638 2659
2639sub deref { 2660sub deref {
… …
3231=cut 3252=cut
3232 3253
3233sub cf::client::ext_msg($$@) { 3254sub cf::client::ext_msg($$@) {
3234 my ($self, $type, @msg) = @_; 3255 my ($self, $type, @msg) = @_;
3235 3256
3236 if ($self->extcmd == 2) {
3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3257 $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} 3258}
3257 3259
3258=item $success = $client->query ($flags, "text", \&cb) 3260=item $success = $client->query ($flags, "text", \&cb)
3259 3261
3260Queues a query to the client, calling the given callback with 3262Queues a query to the client, calling the given callback with
… …
3317 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3319 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3318 3320
3319 if (ref $msg) { 3321 if (ref $msg) {
3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3322 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3321 3323
3322 my @reply;
3323
3324 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTIACMD{$type}) {
3325 $cb->(
3326 $ns,
3327 sub {
3328 $ns->ext_msg ("reply-$reply", @_)
3329 if $reply;
3330 },
3331 @payload
3332 );
3333 } else {
3334 my @reply;
3335
3336 if (my $cb = $EXTICMD{$type}) {
3325 @reply = $cb->($ns, @payload); 3337 @reply = $cb->($ns, @payload);
3338 }
3339
3340 $ns->ext_msg ("reply-$reply", @reply)
3341 if $reply;
3326 } 3342 }
3327
3328 $ns->ext_reply ($reply, @reply)
3329 if $reply;
3330
3331 } else { 3343 } else {
3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3344 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3333 } 3345 }
3334 3346
3335 cf::override; 3347 cf::override;
… …
3503=cut 3515=cut
3504 3516
3505############################################################################# 3517#############################################################################
3506# the server's init and main functions 3518# the server's init and main functions
3507 3519
3508our %FACEHASH; # hash => idx, #d# HACK for http server 3520{
3521 package cf::face;
3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3530 # internal api, not finalised
3531 sub set {
3532 my ($name, $type, $data) = @_;
3533
3534 my $idx = cf::face::find $name;
3535
3536 if ($idx) {
3537 delete $HASH{cf::face::get_chksum $idx};
3538 } else {
3539 $idx = cf::face::alloc $name;
3540 }
3541
3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3543
3544 cf::face::set_type $idx, $type;
3545 cf::face::set_csum $idx, 0, $hash;
3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3554 $HASH{$hash} = $idx;#d#
3555
3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3595}
3509 3596
3510sub load_facedata($) { 3597sub load_facedata($) {
3511 my ($path) = @_; 3598 my ($path) = @_;
3512 3599
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; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3518 3601
3519 trace "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3520 3603
3521 my $facedata = decode_storable load_file $path; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3522 3605
3523 $facedata->{version} == 2 3606 $facedata->{version} == 2
3524 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3525 3608
3526 # patch in the exptable 3609 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]); 3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3528 $facedata->{resource}{"res/exp_table"} = { 3611
3529 type => FT_RSRC, 3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3530 data => $exp_table, 3613
3531 hash => (Digest::MD5::md5 $exp_table), 3614 # BEGIN ATOMIC
3532 }; 3615 # from here on, everything must be atomic - no thread switch allowed
3533 cf::cede_to_tick; 3616 my $t1 = EV::time;
3534 3617
3535 { 3618 {
3536 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3537 3620
3538 for my $face (sort keys %$faces) { 3621 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face}; 3622 my $info = $faces->{$face};
3540 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3541 3624
3542 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3543 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3627 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3628 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3547 $FACEHASH{$info->{hash64}} = $idx;#d# 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3548 3631 delete $cf::face::META[$idx];
3549 cf::cede_to_tick;
3550 } 3632 }
3551 3633
3552 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3553 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3554 3636
… …
3559 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3560 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3561 } else { 3643 } else {
3562 error "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3563 } 3645 }
3564
3565 cf::cede_to_tick;
3566 } 3646 }
3567 } 3647 }
3568 3648
3569 { 3649 {
3570 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3571 3651
3572 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3573 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3574 cf::cede_to_tick;
3575 } 3654 }
3576 3655
3577 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3578 } 3657 }
3579 3658
… …
3583 while (my ($name, $info) = each %$res) { 3662 while (my ($name, $info) = each %$res) {
3584 if (defined (my $type = $info->{type})) { 3663 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue 3664 # TODO: different hash - must free and use new index, or cache ixface data queue
3586 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3587 3666
3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3589 cf::face::set_type $idx, $type; 3667 cf::face::set_type $idx, $type;
3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d# 3672 $cf::face::HASH{$info->{hash}} = $idx;
3592 } else { 3673 } else {
3593# $RESOURCE{$name} = $info; # unused 3674# $RESOURCE{$name} = $info; # unused
3594 } 3675 }
3595
3596 cf::cede_to_tick;
3597 } 3676 }
3598 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3599 3688
3600 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3690
3691 aio_close $fh if $fh; # close old facedata
3601 3692
3602 1 3693 1
3603} 3694}
3604 3695
3605register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
… …
3616 my $status = load_resource_file_ $_[0]; 3707 my $status = load_resource_file_ $_[0];
3617 get_slot 0.1, 100; 3708 get_slot 0.1, 100;
3618 cf::arch::commit_load; 3709 cf::arch::commit_load;
3619 3710
3620 $status 3711 $status
3712}
3713
3714sub reload_exp_table {
3715 _reload_exp_table;
3716
3717 cf::face::set
3718 "res/exp_table" => FT_RSRC,
3719 JSON::XS->new->utf8->canonical->encode (
3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3721 );
3722}
3723
3724sub reload_materials {
3725 _reload_materials;
3621} 3726}
3622 3727
3623sub reload_regions { 3728sub reload_regions {
3624 # HACK to clear player env face cache, we need some signal framework 3729 # HACK to clear player env face cache, we need some signal framework
3625 # for this (global event?) 3730 # for this (global event?)
… …
3633 if exists $_->{match}; 3738 if exists $_->{match};
3634 } 3739 }
3635} 3740}
3636 3741
3637sub reload_facedata { 3742sub reload_facedata {
3638 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3639 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3640} 3745}
3641 3746
3642sub reload_archetypes { 3747sub reload_archetypes {
3643 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3644 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3750
3751 cf::face::set
3752 "res/skill_info" => FT_RSRC,
3753 JSON::XS->new->utf8->canonical->encode (
3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3755 );
3756
3757 cf::face::set
3758 "res/spell_paths" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3761 );
3645} 3762}
3646 3763
3647sub reload_treasures { 3764sub reload_treasures {
3648 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3649 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
… …
3670} 3787}
3671 3788
3672sub reload_resources { 3789sub reload_resources {
3673 trace "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3674 3791
3675 reload_exp_table;
3676 reload_materials; 3792 reload_materials;
3677 reload_facedata; 3793 reload_facedata;
3794 reload_exp_table;
3678 reload_sound; 3795 reload_sound;
3679 reload_archetypes; 3796 reload_archetypes;
3680 reload_regions; 3797 reload_regions;
3681 reload_treasures; 3798 reload_treasures;
3682 3799
… …
3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3858 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3742 3859
3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3860 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3744 3861
3745 # we must not ever block the main coroutine 3862 # we must not ever block the main coroutine
3746 local $Coro::idle = sub { 3863 $Coro::idle = sub {
3747 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3864 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3748 (async { 3865 (async {
3749 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3866 $Coro::current->{desc} = "IDLE BUG HANDLER";
3750 EV::loop EV::LOOP_ONESHOT; 3867 EV::loop EV::LOOP_ONESHOT;
3751 })->prio (Coro::PRIO_MAX); 3868 })->prio (Coro::PRIO_MAX);
… …
3754 evthread_start IO::AIO::poll_fileno; 3871 evthread_start IO::AIO::poll_fileno;
3755 3872
3756 cf::sync_job { 3873 cf::sync_job {
3757 cf::incloader::init (); 3874 cf::incloader::init ();
3758 3875
3876 db_init;
3877
3759 cf::init_anim; 3878 cf::init_anim;
3760 cf::init_attackmess; 3879 cf::init_attackmess;
3761 cf::init_dynamic; 3880 cf::init_dynamic;
3762 3881
3763 cf::load_settings; 3882 cf::load_settings;
3764 3883
3765 reload_resources; 3884 reload_resources;
3766 reload_config; 3885 reload_config;
3767 db_init;
3768 3886
3769 cf::init_uuid; 3887 cf::init_uuid;
3770 cf::init_signals; 3888 cf::init_signals;
3771 cf::init_skills; 3889 cf::init_skills;
3772 3890
… …
4197 } 4315 }
4198} 4316}
4199 4317
4200{ 4318{
4201 # configure BDB 4319 # configure BDB
4320 info "initialising database";
4202 4321
4203 BDB::min_parallel 16; 4322 BDB::min_parallel 16;
4204 BDB::max_poll_reqs $TICK * 0.1; 4323 BDB::max_poll_reqs $TICK * 0.1;
4205 #$AnyEvent::BDB::WATCHER->priority (1); 4324 #$AnyEvent::BDB::WATCHER->priority (1);
4206 4325
… …
4235 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4354 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4236 }; 4355 };
4237 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4356 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4238 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4357 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4239 }; 4358 };
4359
4360 info "database initialised";
4240} 4361}
4241 4362
4242{ 4363{
4243 # configure IO::AIO 4364 # configure IO::AIO
4244 4365
4366 info "initialising aio";
4245 IO::AIO::min_parallel 8; 4367 IO::AIO::min_parallel 8;
4246 IO::AIO::max_poll_time $TICK * 0.1; 4368 IO::AIO::max_poll_time $TICK * 0.1;
4247 undef $AnyEvent::AIO::WATCHER; 4369 undef $AnyEvent::AIO::WATCHER;
4370 info "aio initialised";
4248} 4371}
4249 4372
4250our $_log_backtrace; 4373our $_log_backtrace;
4251our $_log_backtrace_last; 4374our $_log_backtrace_last;
4252 4375

Diff Legend

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