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.589 by root, Sun Nov 4 01:01:13 2012 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 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
… …
571Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
572(default: 0): This call blocks and returns only when you have at least 574(default: 0): This call blocks and returns only when you have at least
573C<$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
574till the next cede. 576till the next cede.
575 577
576Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
577should use 100 or more. 579should use 100 or more.
578 580
579The 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
580used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
581 583
… …
594 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
595 my $busy; 597 my $busy;
596 598
597 while () { 599 while () {
598 next_job: 600 next_job:
601
602 Coro::cede;
599 603
600 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
601 605
602 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
603 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0; 608 $busy = 0;
605 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
606 $job->[2]->send; 610 $job->[2]->send;
607 Coro::cede;
608 goto next_job; 611 goto next_job;
609 } else { 612 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
611 } 614 }
612 } 615 }
613 616
614 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
615 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
616 $WAIT_FOR_TICK->wait;
617 } else { 619 } else {
618 $busy = 0; 620 $busy = 0;
619 Coro::schedule; 621 Coro::schedule;
620 } 622 }
621 } 623 }
… …
736 reset_signals; 738 reset_signals;
737} 739}
738 740
739sub fork_call(&@) { 741sub fork_call(&@) {
740 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
741
742 # we seemingly have to make a local copy of the whole thing,
743 # otherwise perl prematurely frees the stuff :/
744 # TODO: investigate and fix (likely this will be rather laborious)
745 743
746 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
747 cf::post_fork; 745 cf::post_fork;
748 &$cb 746 &$cb
749 } @args; 747 } @args;
… …
899 897
900 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
901 } 899 }
902 } 900 }
903 901
904 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
905 my $data = $process->(\@data); 903 my $data = $process->(\@data);
906 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
907 905
908 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
909 907
910 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
911 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
… …
1431=cut 1429=cut
1432 1430
1433############################################################################# 1431#############################################################################
1434# command handling &c 1432# command handling &c
1435 1433
1436=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1437 1435
1438Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1439$name. 1437$name.
1440 1438
1441=cut 1439=cut
… …
1447 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1448 1446
1449 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1450} 1448}
1451 1449
1452=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1453 1451
1454Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1455extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1456received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1457the 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
1458has logged in successfully. 1456has logged in successfully.
1459 1457
1460If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1461called.
1462 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
1463=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1464 1466
1465Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1466exticmd 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
1467are 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
1468is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1469log-in. 1471log-in.
1470 1472
1471If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1472called.
1473 1474
1474=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1475 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
1476sub register_extcmd { 1482sub register_extcmd($$) {
1477 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1478 1484
1479 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1480} 1486}
1481 1487
1482sub register_exticmd { 1488sub register_async_extcmd($$) {
1483 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1484 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1485 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1486} 1504}
1487 1505
1488use File::Glob (); 1506use File::Glob ();
1489 1507
1490cf::player->attach ( 1508cf::player->attach (
… …
1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1507 1525
1508 if (ref $msg) { 1526 if (ref $msg) {
1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1510 1528
1511 my @reply;
1512
1513 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1514 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1515 } 1547 }
1516
1517 $pl->ext_reply ($reply, @reply)
1518 if $reply;
1519 1548
1520 } else { 1549 } else {
1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1522 } 1551 }
1523 1552
… …
1909} 1938}
1910 1939
1911=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1912 1941
1913Expand deliantra pod fragments into protocol xml. 1942Expand 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 1943
1927=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1928 1945
1929Sends an ext event to the client. 1946Sends an ext event to the client.
1930 1947
… …
2633 2650
2634Creates 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.
2635 2652
2636=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2637 2654
2638returns 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,
2639even if the object actually exists. May block. 2656even if the object actually exists. May block.
2640 2657
2641=cut 2658=cut
2642 2659
2643sub deref { 2660sub deref {
… …
3025 3042
3026=head3 cf::client 3043=head3 cf::client
3027 3044
3028=over 4 3045=over 4
3029 3046
3030=item $client->send_drawinfo ($text, $flags)
3031
3032Sends a drawinfo packet to the client. Circumvents output buffering so
3033should not be used under normal circumstances.
3034
3035=cut
3036
3037sub cf::client::send_drawinfo {
3038 my ($self, $text, $flags) = @_;
3039
3040 utf8::encode $text;
3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
3045 3048
3046Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required. 3050them as required.
3048 3051
… …
3066 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
3067} 3070}
3068 3071
3069=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
3070 3073
3071Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
3072client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
3073the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
3074the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
3075 3078
3076=cut 3079=cut
3077 3080
3078# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
… …
3183 id => "death", 3186 id => "death",
3184 title => "Death", 3187 title => "Death",
3185 reply => undef, 3188 reply => undef,
3186 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3187 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3188 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3189 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3190); 3199);
3191 3200
3192sub cf::client::send_msg { 3201sub cf::client::send_msg {
… …
3235=cut 3244=cut
3236 3245
3237sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
3238 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
3239 3248
3240 if ($self->extcmd == 2) {
3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $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} 3250}
3261 3251
3262=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
3263 3253
3264Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
… …
3284 3274
3285 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3286 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3287 3277
3288 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our %COMMAND_FACE;
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = grep $_,
3291 $COMMAND_FACE{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 ;
3296
3297 $self->send_face ($_)
3298 for @faces;
3299 $self->flush_fx;
3300
3301 $self->ext_msg (command_list => @faces);
3302}
3303
3304=item cf::client::set_command_face $type, $commands
3305
3306=cut
3307
3308sub cf::client::set_command_face {
3309 my ($type, $list) = @_;
3310
3311 my $idx = &cf::face::set ( #d# ugly forward reference
3312 "command_list/$type" => cf::FT_RSRC,
3313 JSON::XS->new->utf8->encode ([ sort @$list ])
3314 );
3315
3316 $COMMAND_FACE{$type} = $idx;
3289} 3317}
3290 3318
3291cf::client->attach ( 3319cf::client->attach (
3292 on_connect => sub { 3320 on_connect => sub {
3293 my ($ns) = @_; 3321 my ($ns) = @_;
… …
3321 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3349 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3322 3350
3323 if (ref $msg) { 3351 if (ref $msg) {
3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3352 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3325 3353
3326 my @reply;
3327
3328 if (my $cb = $EXTICMD{$type}) { 3354 if (my $cb = $EXTIACMD{$type}) {
3355 $cb->(
3356 $ns,
3357 sub {
3358 $ns->ext_msg ("reply-$reply", @_)
3359 if $reply;
3360 },
3361 @payload
3362 );
3363 } else {
3364 my @reply;
3365
3366 if (my $cb = $EXTICMD{$type}) {
3329 @reply = $cb->($ns, @payload); 3367 @reply = $cb->($ns, @payload);
3368 }
3369
3370 $ns->ext_msg ("reply-$reply", @reply)
3371 if $reply;
3330 } 3372 }
3331
3332 $ns->ext_reply ($reply, @reply)
3333 if $reply;
3334
3335 } else { 3373 } else {
3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3374 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3337 } 3375 }
3338 3376
3339 cf::override; 3377 cf::override;
… …
3507=cut 3545=cut
3508 3546
3509############################################################################# 3547#############################################################################
3510# the server's init and main functions 3548# the server's init and main functions
3511 3549
3512our %FACEHASH; # hash => idx, #d# HACK for http server 3550{
3551 package cf::face;
3513 3552
3553 our %HASH; # hash => idx
3554 our @DATA; # dynamically-created facedata, only faceste 0 used
3555 our @FOFS; # file offset, if > 0
3556 our @SIZE; # size of face, in octets
3557 our @META; # meta hash of face, if any
3558 our $DATAFH; # facedata filehandle
3559
3514# internal api, not fianlised 3560 # internal api, not finalised
3515sub add_face { 3561 sub set {
3516 my ($name, $type, $data) = @_; 3562 my ($name, $type, $data) = @_;
3517 3563
3518 my $idx = cf::face::find $name; 3564 my $idx = cf::face::find $name;
3519 3565
3520 if ($idx) { 3566 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx}; 3567 delete $HASH{cf::face::get_csum $idx};
3522 } else { 3568 } else {
3523 $idx = cf::face::alloc $name; 3569 $idx = cf::face::alloc $name;
3524 } 3570 }
3525 3571
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3572 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3527 3573
3528 cf::face::set_type $idx, $type; 3574 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash; 3575 cf::face::set_csum $idx, 0, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3576
3577 # we need to destroy the SV itself, not just modify it, as a running ix
3578 # might hold a reference to it: "delete" achieves that.
3579 delete $FOFS[0][$idx];
3580 delete $DATA[0][$idx];
3581 $DATA[0][$idx] = $data;
3582 $SIZE[0][$idx] = length $data;
3583 delete $META[$idx];
3531 $FACEHASH{$hash} = $idx;#d# 3584 $HASH{$hash} = $idx;#d#
3532 3585
3533 $idx 3586 $idx
3587 }
3588
3589 sub _get_data($$$) {
3590 my ($idx, $set, $cb) = @_;
3591
3592 if (defined $DATA[$set][$idx]) {
3593 $cb->($DATA[$set][$idx]);
3594 } elsif (my $fofs = $FOFS[$set][$idx]) {
3595 my $size = $SIZE[$set][$idx];
3596 my $buf;
3597 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3598 if ($_[0] == $size) {
3599 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3600 $cb->($buf);
3601 } else {
3602 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3603 }
3604 };
3605 } else {
3606 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3607 }
3608 }
3609
3610 # rather ineffient
3611 sub cf::face::get_data($;$) {
3612 my ($idx, $set) = @_;
3613
3614 _get_data $idx, $set, Coro::rouse_cb;
3615 Coro::rouse_wait
3616 }
3617
3618 sub cf::face::ix {
3619 my ($ns, $set, $idx, $pri) = @_;
3620
3621 _get_data $idx, $set, sub {
3622 $ns->ix_send ($idx, $pri, $_[0]);
3623 };
3624 }
3534} 3625}
3535 3626
3536sub load_facedata($) { 3627sub load_facedata($) {
3537 my ($path) = @_; 3628 my ($path) = @_;
3538 3629
3539 # HACK to clear player env face cache, we need some signal framework
3540 # for this (global event?)
3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3542
3543 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3630 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3544 3631
3545 trace "loading facedata from $path\n"; 3632 trace "loading facedata from $path\n";
3546 3633
3547 my $facedata = decode_storable load_file $path; 3634 my $facedata = decode_storable load_file "$path/faceinfo";
3548 3635
3549 $facedata->{version} == 2 3636 $facedata->{version} == 2
3550 or cf::cleanup "$path: version mismatch, cannot proceed."; 3637 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3551 3638
3552 cf::cede_to_tick; 3639 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3640 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3641
3642 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3643
3644 # BEGIN ATOMIC
3645 # from here on, everything must be atomic - no thread switch allowed
3646 my $t1 = EV::time;
3553 3647
3554 { 3648 {
3555 my $faces = $facedata->{faceinfo}; 3649 my $faces = $facedata->{faceinfo};
3556 3650
3557 for my $face (sort keys %$faces) { 3651 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face}; 3652 my $info = $faces->{$face};
3559 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3653 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3560 3654
3561 cf::face::set_visibility $idx, $info->{visibility}; 3655 cf::face::set_visibility $idx, $info->{visibility};
3562 cf::face::set_magicmap $idx, $info->{magicmap}; 3656 cf::face::set_magicmap $idx, $info->{magicmap};
3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3657 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3564 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3658 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3565 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3659 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3566 $FACEHASH{$info->{hash64}} = $idx;#d# 3660 $cf::face::HASH{$info->{hash64}} = $idx;
3567 3661 delete $cf::face::META[$idx];
3568 cf::cede_to_tick;
3569 } 3662 }
3570 3663
3571 while (my ($face, $info) = each %$faces) { 3664 while (my ($face, $info) = each %$faces) {
3572 next unless $info->{smooth}; 3665 next unless $info->{smooth};
3573 3666
… …
3578 cf::face::set_smooth $idx, $smooth; 3671 cf::face::set_smooth $idx, $smooth;
3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3672 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3580 } else { 3673 } else {
3581 error "smooth face '$info->{smooth}' not found for face '$face'"; 3674 error "smooth face '$info->{smooth}' not found for face '$face'";
3582 } 3675 }
3583
3584 cf::cede_to_tick;
3585 } 3676 }
3586 } 3677 }
3587 3678
3588 { 3679 {
3589 my $anims = $facedata->{animinfo}; 3680 my $anims = $facedata->{animinfo};
3590 3681
3591 while (my ($anim, $info) = each %$anims) { 3682 while (my ($anim, $info) = each %$anims) {
3592 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3683 cf::anim::set $anim, $info->{frames}, $info->{facings};
3593 cf::cede_to_tick;
3594 } 3684 }
3595 3685
3596 cf::anim::invalidate_all; # d'oh 3686 cf::anim::invalidate_all; # d'oh
3597 } 3687 }
3598 3688
… …
3603 if (defined (my $type = $info->{type})) { 3693 if (defined (my $type = $info->{type})) {
3604 # TODO: different hash - must free and use new index, or cache ixface data queue 3694 # TODO: different hash - must free and use new index, or cache ixface data queue
3605 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3695 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3606 3696
3607 cf::face::set_type $idx, $type; 3697 cf::face::set_type $idx, $type;
3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3698 cf::face::set_csum $idx, 0, $info->{hash};
3699 $cf::face::SIZE[0][$idx] = $info->{size};
3700 $cf::face::FOFS[0][$idx] = $info->{fofs};
3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3701 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610 $FACEHASH{$info->{hash}} = $idx;#d# 3702 $cf::face::HASH{$info->{hash}} = $idx;
3611 } else { 3703 } else {
3612# $RESOURCE{$name} = $info; # unused 3704# $RESOURCE{$name} = $info; # unused
3613 } 3705 }
3614
3615 cf::cede_to_tick;
3616 } 3706 }
3617 } 3707 }
3708
3709 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3710
3711 # HACK to clear player env face cache, we need some signal framework
3712 # for this (global event?)
3713 %ext::player_env::MUSIC_FACE_CACHE = ();
3714
3715 # END ATOMIC
3716
3717 cf::debug "facedata atomic update time ", EV::time - $t1;
3618 3718
3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3719 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3720
3721 aio_close $fh if $fh; # close old facedata
3620 3722
3621 1 3723 1
3622} 3724}
3623 3725
3624register_exticmd fx_want => sub { 3726register_exticmd fx_want => sub {
… …
3640} 3742}
3641 3743
3642sub reload_exp_table { 3744sub reload_exp_table {
3643 _reload_exp_table; 3745 _reload_exp_table;
3644 3746
3747 cf::face::set
3645 add_face "res/exp_table" => FT_RSRC, 3748 "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode ( 3749 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3750 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 ); 3751 );
3649} 3752}
3650 3753
3651sub reload_materials { 3754sub reload_materials {
3652 _reload_materials; 3755 _reload_materials;
3653} 3756}
… …
3665 if exists $_->{match}; 3768 if exists $_->{match};
3666 } 3769 }
3667} 3770}
3668 3771
3669sub reload_facedata { 3772sub reload_facedata {
3670 load_facedata "$DATADIR/facedata" 3773 load_facedata $DATADIR
3671 or die "unable to load facedata\n"; 3774 or die "unable to load facedata\n";
3672} 3775}
3673 3776
3674sub reload_archetypes { 3777sub reload_archetypes {
3675 load_resource_file "$DATADIR/archetypes" 3778 load_resource_file "$DATADIR/archetypes"
3676 or die "unable to load archetypes\n"; 3779 or die "unable to load archetypes\n";
3677 3780
3781 cf::face::set
3678 add_face "res/skill_info" => FT_RSRC, 3782 "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode ( 3783 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3784 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 ); 3785 );
3786
3787 cf::face::set
3682 add_face "res/spell_paths" => FT_RSRC, 3788 "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode ( 3789 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3790 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 ); 3791 );
3792
3793 # command completion
3794 my @commands;
3795
3796 for (0..cf::arch::skillvec_size - 1) {
3797 my $skill = cf::arch::skillvec $_;
3798 my $name = $skill->name;
3799 my $flags = cf::skill_flags $skill->subtype;
3800
3801 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3802 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3803 }
3804
3805 cf::client::set_command_face skill => \@commands;
3686} 3806}
3687 3807
3688sub reload_treasures { 3808sub reload_treasures {
3689 load_resource_file "$DATADIR/treasures" 3809 load_resource_file "$DATADIR/treasures"
3690 or die "unable to load treasurelists\n"; 3810 or die "unable to load treasurelists\n";
… …
3795 evthread_start IO::AIO::poll_fileno; 3915 evthread_start IO::AIO::poll_fileno;
3796 3916
3797 cf::sync_job { 3917 cf::sync_job {
3798 cf::incloader::init (); 3918 cf::incloader::init ();
3799 3919
3920 db_init;
3921
3800 cf::init_anim; 3922 cf::init_anim;
3801 cf::init_attackmess; 3923 cf::init_attackmess;
3802 cf::init_dynamic; 3924 cf::init_dynamic;
3803 3925
3804 cf::load_settings; 3926 cf::load_settings;
3805 3927
3806 reload_resources; 3928 reload_resources;
3807 reload_config; 3929 reload_config;
3808 db_init;
3809 3930
3810 cf::init_uuid; 3931 cf::init_uuid;
3811 cf::init_signals; 3932 cf::init_signals;
3812 cf::init_skills; 3933 cf::init_skills;
3813 3934
… …
4238 } 4359 }
4239} 4360}
4240 4361
4241{ 4362{
4242 # configure BDB 4363 # configure BDB
4364 info "initialising database";
4243 4365
4244 BDB::min_parallel 16; 4366 BDB::min_parallel 16;
4245 BDB::max_poll_reqs $TICK * 0.1; 4367 BDB::max_poll_reqs $TICK * 0.1;
4246 #$AnyEvent::BDB::WATCHER->priority (1); 4368 #$AnyEvent::BDB::WATCHER->priority (1);
4247 4369
… …
4276 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4398 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4277 }; 4399 };
4278 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4400 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4279 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4401 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4280 }; 4402 };
4403
4404 info "database initialised";
4281} 4405}
4282 4406
4283{ 4407{
4284 # configure IO::AIO 4408 # configure IO::AIO
4285 4409
4410 info "initialising aio";
4286 IO::AIO::min_parallel 8; 4411 IO::AIO::min_parallel 8;
4287 IO::AIO::max_poll_time $TICK * 0.1; 4412 IO::AIO::max_poll_time $TICK * 0.1;
4288 undef $AnyEvent::AIO::WATCHER; 4413 undef $AnyEvent::AIO::WATCHER;
4414 info "aio initialised";
4289} 4415}
4290 4416
4291our $_log_backtrace; 4417our $_log_backtrace;
4292our $_log_backtrace_last; 4418our $_log_backtrace_last;
4293 4419

Diff Legend

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