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.614 by root, Mon Nov 26 15:12:16 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 {
… …
2725=item $player_object->may ("access") 2742=item $player_object->may ("access")
2726 2743
2727Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2728(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2729 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2730=cut 2772=cut
2731 2773
2732sub cf::object::player::may { 2774sub cf::object::player::may {
2733 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2734 2776
2735 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2736 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2737 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2738 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2739} 2781}
2740 2782
2741=item $player_object->enter_link 2783=item $player_object->enter_link
2742 2784
… …
3025 3067
3026=head3 cf::client 3068=head3 cf::client
3027 3069
3028=over 4 3070=over 4
3029 3071
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) 3072=item $client->send_big_packet ($pkt)
3045 3073
3046Like C<send_packet>, but tries to compress large packets, and fragments 3074Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required. 3075them as required.
3048 3076
… …
3066 $self->send_packet ($pkt); 3094 $self->send_packet ($pkt);
3067} 3095}
3068 3096
3069=item $client->send_msg ($channel, $msg, $color, [extra...]) 3097=item $client->send_msg ($channel, $msg, $color, [extra...])
3070 3098
3071Send a drawinfo or msg packet to the client, formatting the msg for the 3099Send 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 3100necessary. 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 3101message, with C<log> being the default. If C<$color> is negative, suppress
3074the message unless the client supports the msg packet. 3102the message unless the client supports the msg packet.
3075 3103
3076=cut 3104=cut
3077 3105
3078# non-persistent channels (usually the info channel) 3106# non-persistent channels (usually the info channel)
… …
3183 id => "death", 3211 id => "death",
3184 title => "Death", 3212 title => "Death",
3185 reply => undef, 3213 reply => undef,
3186 tooltip => "Reason for and more info about your most recent death", 3214 tooltip => "Reason for and more info about your most recent death",
3187 }, 3215 },
3216 "c/fatal" => {
3217 id => "fatal",
3218 title => "Fatal Error",
3219 reply => undef,
3220 tooltip => "Reason for the server disconnect",
3221 },
3188 "c/say" => $SAY_CHANNEL, 3222 "c/say" => $SAY_CHANNEL,
3189 "c/chat" => $CHAT_CHANNEL, 3223 "c/chat" => $CHAT_CHANNEL,
3190); 3224);
3191 3225
3192sub cf::client::send_msg { 3226sub cf::client::send_msg {
… …
3235=cut 3269=cut
3236 3270
3237sub cf::client::ext_msg($$@) { 3271sub cf::client::ext_msg($$@) {
3238 my ($self, $type, @msg) = @_; 3272 my ($self, $type, @msg) = @_;
3239 3273
3240 if ($self->extcmd == 2) {
3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3274 $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} 3275}
3261 3276
3262=item $success = $client->query ($flags, "text", \&cb) 3277=item $success = $client->query ($flags, "text", \&cb)
3263 3278
3264Queues a query to the client, calling the given callback with 3279Queues a query to the client, calling the given callback with
… …
3284 3299
3285 $self->send_packet ($self->{query_queue}[0][0]) 3300 $self->send_packet ($self->{query_queue}[0][0])
3286 if @{ $self->{query_queue} } == 1; 3301 if @{ $self->{query_queue} } == 1;
3287 3302
3288 1 3303 1
3304}
3305
3306=item $client->update_command_faces
3307
3308=cut
3309
3310our %COMMAND_FACE;
3311
3312sub cf::client::update_command_faces {
3313 my ($self) = @_;
3314
3315 my @faces = grep $_,
3316 $COMMAND_FACE{preferred},
3317 $COMMAND_FACE{standard},
3318 $COMMAND_FACE{skill},
3319 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3320 $COMMAND_FACE{emote},
3321 ;
3322
3323 $self->send_face ($_)
3324 for @faces;
3325 $self->flush_fx;
3326
3327 $self->ext_msg (command_list => @faces);
3328}
3329
3330=item cf::client::set_command_face $type, $commands
3331
3332=cut
3333
3334sub cf::client::set_command_face {
3335 my ($type, $list) = @_;
3336
3337 my $idx = &cf::face::set ( #d# ugly forward reference
3338 "command_list/$type" => cf::FT_RSRC,
3339 JSON::XS->new->utf8->encode ([ sort @$list ])
3340 );
3341
3342 $COMMAND_FACE{$type} = $idx;
3289} 3343}
3290 3344
3291cf::client->attach ( 3345cf::client->attach (
3292 on_connect => sub { 3346 on_connect => sub {
3293 my ($ns) = @_; 3347 my ($ns) = @_;
… …
3321 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3375 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3322 3376
3323 if (ref $msg) { 3377 if (ref $msg) {
3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3378 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3325 3379
3326 my @reply;
3327
3328 if (my $cb = $EXTICMD{$type}) { 3380 if (my $cb = $EXTIACMD{$type}) {
3381 $cb->(
3382 $ns,
3383 sub {
3384 $ns->ext_msg ("reply-$reply", @_)
3385 if $reply;
3386 },
3387 @payload
3388 );
3389 } else {
3390 my @reply;
3391
3392 if (my $cb = $EXTICMD{$type}) {
3329 @reply = $cb->($ns, @payload); 3393 @reply = $cb->($ns, @payload);
3394 }
3395
3396 $ns->ext_msg ("reply-$reply", @reply)
3397 if $reply;
3330 } 3398 }
3331
3332 $ns->ext_reply ($reply, @reply)
3333 if $reply;
3334
3335 } else { 3399 } else {
3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3400 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3337 } 3401 }
3338 3402
3339 cf::override; 3403 cf::override;
… …
3507=cut 3571=cut
3508 3572
3509############################################################################# 3573#############################################################################
3510# the server's init and main functions 3574# the server's init and main functions
3511 3575
3512our %FACEHASH; # hash => idx, #d# HACK for http server 3576{
3577 package cf::face;
3578
3579 our %HASH; # hash => idx
3580 our @DATA; # dynamically-created facedata, only faceste 0 used
3581 our @FOFS; # file offset, if > 0
3582 our @SIZE; # size of face, in octets
3583 our @META; # meta hash of face, if any
3584 our $DATAFH; # facedata filehandle
3585
3586 # internal api, not finalised
3587 sub set {
3588 my ($name, $type, $data) = @_;
3589
3590 my $idx = cf::face::find $name;
3591
3592 if ($idx) {
3593 delete $HASH{cf::face::get_csum $idx};
3594 } else {
3595 $idx = cf::face::alloc $name;
3596 }
3597
3598 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3599
3600 cf::face::set_type $idx, $type;
3601 cf::face::set_csum $idx, 0, $hash;
3602
3603 # we need to destroy the SV itself, not just modify it, as a running ix
3604 # might hold a reference to it: "delete" achieves that.
3605 delete $FOFS[0][$idx];
3606 delete $DATA[0][$idx];
3607 $DATA[0][$idx] = $data;
3608 $SIZE[0][$idx] = length $data;
3609 delete $META[$idx];
3610 $HASH{$hash} = $idx;#d#
3611
3612 $idx
3613 }
3614
3615 sub _get_data($$$) {
3616 my ($idx, $set, $cb) = @_;
3617
3618 if (defined $DATA[$set][$idx]) {
3619 $cb->($DATA[$set][$idx]);
3620 } elsif (my $fofs = $FOFS[$set][$idx]) {
3621 my $size = $SIZE[$set][$idx];
3622 my $buf;
3623 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3624 if ($_[0] == $size) {
3625 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3626 $cb->($buf);
3627 } else {
3628 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3629 }
3630 };
3631 } else {
3632 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3633 }
3634 }
3635
3636 # rather ineffient
3637 sub cf::face::get_data($;$) {
3638 my ($idx, $set) = @_;
3639
3640 _get_data $idx, $set, Coro::rouse_cb;
3641 Coro::rouse_wait
3642 }
3643
3644 sub cf::face::ix {
3645 my ($ns, $set, $idx, $pri) = @_;
3646
3647 _get_data $idx, $set, sub {
3648 $ns->ix_send ($idx, $pri, $_[0]);
3649 };
3650 }
3651}
3513 3652
3514sub load_facedata($) { 3653sub load_facedata($) {
3515 my ($path) = @_; 3654 my ($path) = @_;
3516 3655
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; 3656 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3522 3657
3523 trace "loading facedata from $path\n"; 3658 trace "loading facedata from $path\n";
3524 3659
3525 my $facedata = decode_storable load_file $path; 3660 my $facedata = decode_storable load_file "$path/faceinfo";
3526 3661
3527 $facedata->{version} == 2 3662 $facedata->{version} == 2
3528 or cf::cleanup "$path: version mismatch, cannot proceed."; 3663 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3529 3664
3530 # patch in the exptable 3665 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]); 3666 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3532 $facedata->{resource}{"res/exp_table"} = { 3667
3533 type => FT_RSRC, 3668 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3534 data => $exp_table, 3669
3535 hash => (Digest::MD5::md5 $exp_table), 3670 # BEGIN ATOMIC
3536 }; 3671 # from here on, everything must be atomic - no thread switch allowed
3537 cf::cede_to_tick; 3672 my $t1 = EV::time;
3538 3673
3539 { 3674 {
3540 my $faces = $facedata->{faceinfo}; 3675 my $faces = $facedata->{faceinfo};
3541 3676
3542 for my $face (sort keys %$faces) { 3677 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face}; 3678 my $info = $faces->{$face};
3544 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3679 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3545 3680
3546 cf::face::set_visibility $idx, $info->{visibility}; 3681 cf::face::set_visibility $idx, $info->{visibility};
3547 cf::face::set_magicmap $idx, $info->{magicmap}; 3682 cf::face::set_magicmap $idx, $info->{magicmap};
3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3683 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}; 3684 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} ; 3685 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3551 $FACEHASH{$info->{hash64}} = $idx;#d# 3686 $cf::face::HASH{$info->{hash64}} = $idx;
3552 3687 delete $cf::face::META[$idx];
3553 cf::cede_to_tick;
3554 } 3688 }
3555 3689
3556 while (my ($face, $info) = each %$faces) { 3690 while (my ($face, $info) = each %$faces) {
3557 next unless $info->{smooth}; 3691 next unless $info->{smooth};
3558 3692
… …
3563 cf::face::set_smooth $idx, $smooth; 3697 cf::face::set_smooth $idx, $smooth;
3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3698 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3565 } else { 3699 } else {
3566 error "smooth face '$info->{smooth}' not found for face '$face'"; 3700 error "smooth face '$info->{smooth}' not found for face '$face'";
3567 } 3701 }
3568
3569 cf::cede_to_tick;
3570 } 3702 }
3571 } 3703 }
3572 3704
3573 { 3705 {
3574 my $anims = $facedata->{animinfo}; 3706 my $anims = $facedata->{animinfo};
3575 3707
3576 while (my ($anim, $info) = each %$anims) { 3708 while (my ($anim, $info) = each %$anims) {
3577 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3709 cf::anim::set $anim, $info->{frames}, $info->{facings};
3578 cf::cede_to_tick;
3579 } 3710 }
3580 3711
3581 cf::anim::invalidate_all; # d'oh 3712 cf::anim::invalidate_all; # d'oh
3582 } 3713 }
3583 3714
… …
3587 while (my ($name, $info) = each %$res) { 3718 while (my ($name, $info) = each %$res) {
3588 if (defined (my $type = $info->{type})) { 3719 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue 3720 # 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; 3721 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3591 3722
3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3593 cf::face::set_type $idx, $type; 3723 cf::face::set_type $idx, $type;
3724 cf::face::set_csum $idx, 0, $info->{hash};
3725 $cf::face::SIZE[0][$idx] = $info->{size};
3726 $cf::face::FOFS[0][$idx] = $info->{fofs};
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3727 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d# 3728 $cf::face::HASH{$info->{hash}} = $idx;
3596 } else { 3729 } else {
3597# $RESOURCE{$name} = $info; # unused 3730# $RESOURCE{$name} = $info; # unused
3598 } 3731 }
3599
3600 cf::cede_to_tick;
3601 } 3732 }
3602 } 3733 }
3734
3735 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3736
3737 # HACK to clear player env face cache, we need some signal framework
3738 # for this (global event?)
3739 %ext::player_env::MUSIC_FACE_CACHE = ();
3740
3741 # END ATOMIC
3742
3743 cf::debug "facedata atomic update time ", EV::time - $t1;
3603 3744
3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3745 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3746
3747 aio_close $fh if $fh; # close old facedata
3605 3748
3606 1 3749 1
3607} 3750}
3608 3751
3609register_exticmd fx_want => sub { 3752register_exticmd fx_want => sub {
… …
3620 my $status = load_resource_file_ $_[0]; 3763 my $status = load_resource_file_ $_[0];
3621 get_slot 0.1, 100; 3764 get_slot 0.1, 100;
3622 cf::arch::commit_load; 3765 cf::arch::commit_load;
3623 3766
3624 $status 3767 $status
3768}
3769
3770sub reload_exp_table {
3771 _reload_exp_table;
3772
3773 cf::face::set
3774 "res/exp_table" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3777 );
3778}
3779
3780sub reload_materials {
3781 _reload_materials;
3625} 3782}
3626 3783
3627sub reload_regions { 3784sub reload_regions {
3628 # HACK to clear player env face cache, we need some signal framework 3785 # HACK to clear player env face cache, we need some signal framework
3629 # for this (global event?) 3786 # for this (global event?)
… …
3637 if exists $_->{match}; 3794 if exists $_->{match};
3638 } 3795 }
3639} 3796}
3640 3797
3641sub reload_facedata { 3798sub reload_facedata {
3642 load_facedata "$DATADIR/facedata" 3799 load_facedata $DATADIR
3643 or die "unable to load facedata\n"; 3800 or die "unable to load facedata\n";
3644} 3801}
3645 3802
3646sub reload_archetypes { 3803sub reload_archetypes {
3647 load_resource_file "$DATADIR/archetypes" 3804 load_resource_file "$DATADIR/archetypes"
3648 or die "unable to load archetypes\n"; 3805 or die "unable to load archetypes\n";
3806
3807 cf::face::set
3808 "res/skill_info" => FT_RSRC,
3809 JSON::XS->new->utf8->canonical->encode (
3810 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3811 );
3812
3813 cf::face::set
3814 "res/spell_paths" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3817 );
3818
3819 # command completion
3820 my @commands;
3821
3822 for (0..cf::arch::skillvec_size - 1) {
3823 my $skill = cf::arch::skillvec $_;
3824 my $name = $skill->name;
3825 my $flags = cf::skill_flags $skill->subtype;
3826
3827 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3828 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3829 }
3830
3831 cf::client::set_command_face skill => \@commands;
3649} 3832}
3650 3833
3651sub reload_treasures { 3834sub reload_treasures {
3652 load_resource_file "$DATADIR/treasures" 3835 load_resource_file "$DATADIR/treasures"
3653 or die "unable to load treasurelists\n"; 3836 or die "unable to load treasurelists\n";
… …
3674} 3857}
3675 3858
3676sub reload_resources { 3859sub reload_resources {
3677 trace "reloading resource files...\n"; 3860 trace "reloading resource files...\n";
3678 3861
3679 reload_exp_table;
3680 reload_materials; 3862 reload_materials;
3681 reload_facedata; 3863 reload_facedata;
3864 reload_exp_table;
3682 reload_sound; 3865 reload_sound;
3683 reload_archetypes; 3866 reload_archetypes;
3684 reload_regions; 3867 reload_regions;
3685 reload_treasures; 3868 reload_treasures;
3686 3869
… …
3758 evthread_start IO::AIO::poll_fileno; 3941 evthread_start IO::AIO::poll_fileno;
3759 3942
3760 cf::sync_job { 3943 cf::sync_job {
3761 cf::incloader::init (); 3944 cf::incloader::init ();
3762 3945
3946 db_init;
3947
3763 cf::init_anim; 3948 cf::init_anim;
3764 cf::init_attackmess; 3949 cf::init_attackmess;
3765 cf::init_dynamic; 3950 cf::init_dynamic;
3766 3951
3767 cf::load_settings; 3952 cf::load_settings;
3768 3953
3769 reload_resources; 3954 reload_resources;
3770 reload_config; 3955 reload_config;
3771 db_init;
3772 3956
3773 cf::init_uuid; 3957 cf::init_uuid;
3774 cf::init_signals; 3958 cf::init_signals;
3775 cf::init_skills; 3959 cf::init_skills;
3776 3960
… …
4201 } 4385 }
4202} 4386}
4203 4387
4204{ 4388{
4205 # configure BDB 4389 # configure BDB
4390 info "initialising database";
4206 4391
4207 BDB::min_parallel 16; 4392 BDB::min_parallel 16;
4208 BDB::max_poll_reqs $TICK * 0.1; 4393 BDB::max_poll_reqs $TICK * 0.1;
4209 #$AnyEvent::BDB::WATCHER->priority (1); 4394 #$AnyEvent::BDB::WATCHER->priority (1);
4210 4395
… …
4239 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4424 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4240 }; 4425 };
4241 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4426 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4242 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4427 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4243 }; 4428 };
4429
4430 info "database initialised";
4244} 4431}
4245 4432
4246{ 4433{
4247 # configure IO::AIO 4434 # configure IO::AIO
4248 4435
4436 info "initialising aio";
4249 IO::AIO::min_parallel 8; 4437 IO::AIO::min_parallel 8;
4250 IO::AIO::max_poll_time $TICK * 0.1; 4438 IO::AIO::max_poll_time $TICK * 0.1;
4251 undef $AnyEvent::AIO::WATCHER; 4439 undef $AnyEvent::AIO::WATCHER;
4440 info "aio initialised";
4252} 4441}
4253 4442
4254our $_log_backtrace; 4443our $_log_backtrace;
4255our $_log_backtrace_last; 4444our $_log_backtrace_last;
4256 4445

Diff Legend

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