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.588 by root, Thu Nov 1 13:02:52 2012 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 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
… …
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_FACES; # [normal commands, emotes, dm commands]
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = (
3291 $COMMAND_FACES[0],
3292 $COMMAND_FACES[1],
3293 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACES[2] : ()
3294 );
3295
3296 $self->send_face ($_)
3297 for @faces;
3298 $self->flush_fx;
3299
3300 $self->ext_msg (command_list => @faces);
3301}
3302
3303=item cf::client::set_command_faces $normal_commands, $emotes, $dm_commands
3304
3305=cut
3306
3307sub cf::client::set_command_faces {
3308 @COMMAND_FACES = @_;
3289} 3309}
3290 3310
3291cf::client->attach ( 3311cf::client->attach (
3292 on_connect => sub { 3312 on_connect => sub {
3293 my ($ns) = @_; 3313 my ($ns) = @_;
… …
3321 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3341 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3322 3342
3323 if (ref $msg) { 3343 if (ref $msg) {
3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3344 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3325 3345
3326 my @reply;
3327
3328 if (my $cb = $EXTICMD{$type}) { 3346 if (my $cb = $EXTIACMD{$type}) {
3347 $cb->(
3348 $ns,
3349 sub {
3350 $ns->ext_msg ("reply-$reply", @_)
3351 if $reply;
3352 },
3353 @payload
3354 );
3355 } else {
3356 my @reply;
3357
3358 if (my $cb = $EXTICMD{$type}) {
3329 @reply = $cb->($ns, @payload); 3359 @reply = $cb->($ns, @payload);
3360 }
3361
3362 $ns->ext_msg ("reply-$reply", @reply)
3363 if $reply;
3330 } 3364 }
3331
3332 $ns->ext_reply ($reply, @reply)
3333 if $reply;
3334
3335 } else { 3365 } else {
3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3366 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3337 } 3367 }
3338 3368
3339 cf::override; 3369 cf::override;
… …
3507=cut 3537=cut
3508 3538
3509############################################################################# 3539#############################################################################
3510# the server's init and main functions 3540# the server's init and main functions
3511 3541
3512our %FACEHASH; # hash => idx, #d# HACK for http server 3542{
3543 package cf::face;
3544
3545 our %HASH; # hash => idx
3546 our @DATA; # dynamically-created facedata, only faceste 0 used
3547 our @FOFS; # file offset, if > 0
3548 our @SIZE; # size of face, in octets
3549 our @META; # meta hash of face, if any
3550 our $DATAFH; # facedata filehandle
3551
3552 # internal api, not finalised
3553 sub set {
3554 my ($name, $type, $data) = @_;
3555
3556 my $idx = cf::face::find $name;
3557
3558 if ($idx) {
3559 delete $HASH{cf::face::get_csum $idx};
3560 } else {
3561 $idx = cf::face::alloc $name;
3562 }
3563
3564 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3565
3566 cf::face::set_type $idx, $type;
3567 cf::face::set_csum $idx, 0, $hash;
3568
3569 # we need to destroy the SV itself, not just modify it, as a running ix
3570 # might hold a reference to it: "delete" achieves that.
3571 delete $FOFS[0][$idx];
3572 delete $DATA[0][$idx];
3573 $DATA[0][$idx] = $data;
3574 $SIZE[0][$idx] = length $data;
3575 delete $META[$idx];
3576 $HASH{$hash} = $idx;#d#
3577
3578 $idx
3579 }
3580
3581 sub _get_data($$$) {
3582 my ($idx, $set, $cb) = @_;
3583
3584 if (defined $DATA[$set][$idx]) {
3585 $cb->($DATA[$set][$idx]);
3586 } elsif (my $fofs = $FOFS[$set][$idx]) {
3587 my $size = $SIZE[$set][$idx];
3588 my $buf;
3589 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3590 if ($_[0] == $size) {
3591 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3592 $cb->($buf);
3593 } else {
3594 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3595 }
3596 };
3597 } else {
3598 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3599 }
3600 }
3601
3602 # rather ineffient
3603 sub cf::face::get_data($;$) {
3604 my ($idx, $set) = @_;
3605
3606 _get_data $idx, $set, Coro::rouse_cb;
3607 Coro::rouse_wait
3608 }
3609
3610 sub cf::face::ix {
3611 my ($ns, $set, $idx, $pri) = @_;
3612
3613 _get_data $idx, $set, sub {
3614 $ns->ix_send ($idx, $pri, $_[0]);
3615 };
3616 }
3617}
3513 3618
3514sub load_facedata($) { 3619sub load_facedata($) {
3515 my ($path) = @_; 3620 my ($path) = @_;
3516 3621
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; 3622 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3522 3623
3523 trace "loading facedata from $path\n"; 3624 trace "loading facedata from $path\n";
3524 3625
3525 my $facedata = decode_storable load_file $path; 3626 my $facedata = decode_storable load_file "$path/faceinfo";
3526 3627
3527 $facedata->{version} == 2 3628 $facedata->{version} == 2
3528 or cf::cleanup "$path: version mismatch, cannot proceed."; 3629 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3529 3630
3530 # patch in the exptable 3631 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]); 3632 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3532 $facedata->{resource}{"res/exp_table"} = { 3633
3533 type => FT_RSRC, 3634 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3534 data => $exp_table, 3635
3535 hash => (cf::face::mangle_chksum Digest::MD5::md5 $exp_table), 3636 # BEGIN ATOMIC
3536 }; 3637 # from here on, everything must be atomic - no thread switch allowed
3537 cf::cede_to_tick; 3638 my $t1 = EV::time;
3538 3639
3539 { 3640 {
3540 my $faces = $facedata->{faceinfo}; 3641 my $faces = $facedata->{faceinfo};
3541 3642
3542 for my $face (sort keys %$faces) { 3643 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face}; 3644 my $info = $faces->{$face};
3544 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3645 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3545 3646
3546 cf::face::set_visibility $idx, $info->{visibility}; 3647 cf::face::set_visibility $idx, $info->{visibility};
3547 cf::face::set_magicmap $idx, $info->{magicmap}; 3648 cf::face::set_magicmap $idx, $info->{magicmap};
3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3649 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}; 3650 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} ; 3651 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3551 $FACEHASH{$info->{hash64}} = $idx;#d# 3652 $cf::face::HASH{$info->{hash64}} = $idx;
3552 3653 delete $cf::face::META[$idx];
3553 cf::cede_to_tick;
3554 } 3654 }
3555 3655
3556 while (my ($face, $info) = each %$faces) { 3656 while (my ($face, $info) = each %$faces) {
3557 next unless $info->{smooth}; 3657 next unless $info->{smooth};
3558 3658
… …
3563 cf::face::set_smooth $idx, $smooth; 3663 cf::face::set_smooth $idx, $smooth;
3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3664 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3565 } else { 3665 } else {
3566 error "smooth face '$info->{smooth}' not found for face '$face'"; 3666 error "smooth face '$info->{smooth}' not found for face '$face'";
3567 } 3667 }
3568
3569 cf::cede_to_tick;
3570 } 3668 }
3571 } 3669 }
3572 3670
3573 { 3671 {
3574 my $anims = $facedata->{animinfo}; 3672 my $anims = $facedata->{animinfo};
3575 3673
3576 while (my ($anim, $info) = each %$anims) { 3674 while (my ($anim, $info) = each %$anims) {
3577 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3675 cf::anim::set $anim, $info->{frames}, $info->{facings};
3578 cf::cede_to_tick;
3579 } 3676 }
3580 3677
3581 cf::anim::invalidate_all; # d'oh 3678 cf::anim::invalidate_all; # d'oh
3582 } 3679 }
3583 3680
… …
3587 while (my ($name, $info) = each %$res) { 3684 while (my ($name, $info) = each %$res) {
3588 if (defined (my $type = $info->{type})) { 3685 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue 3686 # 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; 3687 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3591 3688
3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3593 cf::face::set_type $idx, $type; 3689 cf::face::set_type $idx, $type;
3690 cf::face::set_csum $idx, 0, $info->{hash};
3691 $cf::face::SIZE[0][$idx] = $info->{size};
3692 $cf::face::FOFS[0][$idx] = $info->{fofs};
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3693 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d# 3694 $cf::face::HASH{$info->{hash}} = $idx;
3596 } else { 3695 } else {
3597# $RESOURCE{$name} = $info; # unused 3696# $RESOURCE{$name} = $info; # unused
3598 } 3697 }
3599
3600 cf::cede_to_tick;
3601 } 3698 }
3602 } 3699 }
3700
3701 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3702
3703 # HACK to clear player env face cache, we need some signal framework
3704 # for this (global event?)
3705 %ext::player_env::MUSIC_FACE_CACHE = ();
3706
3707 # END ATOMIC
3708
3709 cf::debug "facedata atomic update time ", EV::time - $t1;
3603 3710
3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3711 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3712
3713 aio_close $fh if $fh; # close old facedata
3605 3714
3606 1 3715 1
3607} 3716}
3608 3717
3609register_exticmd fx_want => sub { 3718register_exticmd fx_want => sub {
… …
3620 my $status = load_resource_file_ $_[0]; 3729 my $status = load_resource_file_ $_[0];
3621 get_slot 0.1, 100; 3730 get_slot 0.1, 100;
3622 cf::arch::commit_load; 3731 cf::arch::commit_load;
3623 3732
3624 $status 3733 $status
3734}
3735
3736sub reload_exp_table {
3737 _reload_exp_table;
3738
3739 cf::face::set
3740 "res/exp_table" => FT_RSRC,
3741 JSON::XS->new->utf8->canonical->encode (
3742 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3743 );
3744}
3745
3746sub reload_materials {
3747 _reload_materials;
3625} 3748}
3626 3749
3627sub reload_regions { 3750sub reload_regions {
3628 # HACK to clear player env face cache, we need some signal framework 3751 # HACK to clear player env face cache, we need some signal framework
3629 # for this (global event?) 3752 # for this (global event?)
… …
3637 if exists $_->{match}; 3760 if exists $_->{match};
3638 } 3761 }
3639} 3762}
3640 3763
3641sub reload_facedata { 3764sub reload_facedata {
3642 load_facedata "$DATADIR/facedata" 3765 load_facedata $DATADIR
3643 or die "unable to load facedata\n"; 3766 or die "unable to load facedata\n";
3644} 3767}
3645 3768
3646sub reload_archetypes { 3769sub reload_archetypes {
3647 load_resource_file "$DATADIR/archetypes" 3770 load_resource_file "$DATADIR/archetypes"
3648 or die "unable to load archetypes\n"; 3771 or die "unable to load archetypes\n";
3772
3773 cf::face::set
3774 "res/skill_info" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3777 );
3778
3779 cf::face::set
3780 "res/spell_paths" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3783 );
3649} 3784}
3650 3785
3651sub reload_treasures { 3786sub reload_treasures {
3652 load_resource_file "$DATADIR/treasures" 3787 load_resource_file "$DATADIR/treasures"
3653 or die "unable to load treasurelists\n"; 3788 or die "unable to load treasurelists\n";
… …
3674} 3809}
3675 3810
3676sub reload_resources { 3811sub reload_resources {
3677 trace "reloading resource files...\n"; 3812 trace "reloading resource files...\n";
3678 3813
3679 reload_exp_table;
3680 reload_materials; 3814 reload_materials;
3681 reload_facedata; 3815 reload_facedata;
3816 reload_exp_table;
3682 reload_sound; 3817 reload_sound;
3683 reload_archetypes; 3818 reload_archetypes;
3684 reload_regions; 3819 reload_regions;
3685 reload_treasures; 3820 reload_treasures;
3686 3821
… …
3758 evthread_start IO::AIO::poll_fileno; 3893 evthread_start IO::AIO::poll_fileno;
3759 3894
3760 cf::sync_job { 3895 cf::sync_job {
3761 cf::incloader::init (); 3896 cf::incloader::init ();
3762 3897
3898 db_init;
3899
3763 cf::init_anim; 3900 cf::init_anim;
3764 cf::init_attackmess; 3901 cf::init_attackmess;
3765 cf::init_dynamic; 3902 cf::init_dynamic;
3766 3903
3767 cf::load_settings; 3904 cf::load_settings;
3768 3905
3769 reload_resources; 3906 reload_resources;
3770 reload_config; 3907 reload_config;
3771 db_init;
3772 3908
3773 cf::init_uuid; 3909 cf::init_uuid;
3774 cf::init_signals; 3910 cf::init_signals;
3775 cf::init_skills; 3911 cf::init_skills;
3776 3912
… …
4201 } 4337 }
4202} 4338}
4203 4339
4204{ 4340{
4205 # configure BDB 4341 # configure BDB
4342 info "initialising database";
4206 4343
4207 BDB::min_parallel 16; 4344 BDB::min_parallel 16;
4208 BDB::max_poll_reqs $TICK * 0.1; 4345 BDB::max_poll_reqs $TICK * 0.1;
4209 #$AnyEvent::BDB::WATCHER->priority (1); 4346 #$AnyEvent::BDB::WATCHER->priority (1);
4210 4347
… …
4239 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4376 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4240 }; 4377 };
4241 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4378 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4242 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4379 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4243 }; 4380 };
4381
4382 info "database initialised";
4244} 4383}
4245 4384
4246{ 4385{
4247 # configure IO::AIO 4386 # configure IO::AIO
4248 4387
4388 info "initialising aio";
4249 IO::AIO::min_parallel 8; 4389 IO::AIO::min_parallel 8;
4250 IO::AIO::max_poll_time $TICK * 0.1; 4390 IO::AIO::max_poll_time $TICK * 0.1;
4251 undef $AnyEvent::AIO::WATCHER; 4391 undef $AnyEvent::AIO::WATCHER;
4392 info "aio initialised";
4252} 4393}
4253 4394
4254our $_log_backtrace; 4395our $_log_backtrace;
4255our $_log_backtrace_last; 4396our $_log_backtrace_last;
4256 4397

Diff Legend

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