ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.584 by root, Tue Oct 30 17:07:50 2012 UTC vs.
Revision 1.608 by root, Sun Nov 18 09:53:57 2012 UTC

… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
… …
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
… …
220=item $cf::RUNTIME 225=item $cf::RUNTIME
221 226
222The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
223every server tick. 228every server tick.
224 229
225=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
226$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
227$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
228 233
229Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
230directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
231unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
232database environment. 237database environment.
… …
246Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
247from wherever your confdir points to. 252from wherever your confdir points to.
248 253
249=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
250 255
251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
252returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
253per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
254 260
255Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
259 265
260=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
336)) { 342)) {
337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
338} 344}
339 345
340$EV::DIED = sub { 346$EV::DIED = sub {
341 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
342}; 348};
343 349
344############################################################################# 350#############################################################################
345 351
346sub fork_call(&@); 352sub fork_call(&@);
… …
567Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
568(default: 0): This call blocks and returns only when you have at least 574(default: 0): This call blocks and returns only when you have at least
569C<$time> seconds of cpu time till the next tick. The slot is only valid 575C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede. 576till the next cede.
571 577
572Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
573should use 100 or more. 579should use 100 or more.
574 580
575The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
576used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
577 583
… …
732 reset_signals; 738 reset_signals;
733} 739}
734 740
735sub fork_call(&@) { 741sub fork_call(&@) {
736 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
737
738 # we seemingly have to make a local copy of the whole thing,
739 # otherwise perl prematurely frees the stuff :/
740 # TODO: investigate and fix (likely this will be rather laborious)
741 743
742 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
743 cf::post_fork; 745 cf::post_fork;
744 &$cb 746 &$cb
745 } @args; 747 } @args;
… …
895 897
896 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
897 } 899 }
898 } 900 }
899 901
900 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
901 my $data = $process->(\@data); 903 my $data = $process->(\@data);
902 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
903 905
904 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
905 907
906 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
907 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
… …
1427=cut 1429=cut
1428 1430
1429############################################################################# 1431#############################################################################
1430# command handling &c 1432# command handling &c
1431 1433
1432=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1433 1435
1434Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1435$name. 1437$name.
1436 1438
1437=cut 1439=cut
… …
1443 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1444 1446
1445 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1446} 1448}
1447 1449
1448=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1449 1451
1450Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1451extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1452received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1453the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1454has logged in successfully. 1456has logged in successfully.
1455 1457
1456If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1457called.
1458 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1459=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1460 1466
1461Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1462exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1463are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1464is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1465log-in. 1471log-in.
1466 1472
1467If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1468called.
1469 1474
1470=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1471 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1472sub register_extcmd { 1482sub register_extcmd($$) {
1473 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1474 1484
1475 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1476} 1486}
1477 1487
1478sub register_exticmd { 1488sub register_async_extcmd($$) {
1479 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1480 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1481 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1482} 1504}
1483 1505
1484use File::Glob (); 1506use File::Glob ();
1485 1507
1486cf::player->attach ( 1508cf::player->attach (
… …
1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1503 1525
1504 if (ref $msg) { 1526 if (ref $msg) {
1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1506 1528
1507 my @reply;
1508
1509 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1510 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1511 } 1547 }
1512
1513 $pl->ext_reply ($reply, @reply)
1514 if $reply;
1515 1548
1516 } else { 1549 } else {
1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1518 } 1551 }
1519 1552
… …
1905} 1938}
1906 1939
1907=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1908 1941
1909Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1910
1911=item $player->ext_reply ($msgid, @msg)
1912
1913Sends an ext reply to the player.
1914
1915=cut
1916
1917sub ext_reply($$@) {
1918 my ($self, $id, @msg) = @_;
1919
1920 $self->ns->ext_reply ($id, @msg)
1921}
1922 1943
1923=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1924 1945
1925Sends an ext event to the client. 1946Sends an ext event to the client.
1926 1947
… …
2629 2650
2630Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2631 2652
2632=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2633 2654
2634returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2635even if the object actually exists. May block. 2656even if the object actually exists. May block.
2636 2657
2637=cut 2658=cut
2638 2659
2639sub deref { 2660sub deref {
… …
3021 3042
3022=head3 cf::client 3043=head3 cf::client
3023 3044
3024=over 4 3045=over 4
3025 3046
3026=item $client->send_drawinfo ($text, $flags)
3027
3028Sends a drawinfo packet to the client. Circumvents output buffering so
3029should not be used under normal circumstances.
3030
3031=cut
3032
3033sub cf::client::send_drawinfo {
3034 my ($self, $text, $flags) = @_;
3035
3036 utf8::encode $text;
3037 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3038}
3039
3040=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
3041 3048
3042Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
3043them as required. 3050them as required.
3044 3051
… …
3062 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
3063} 3070}
3064 3071
3065=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
3066 3073
3067Send 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
3068client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
3069the 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
3070the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
3071 3078
3072=cut 3079=cut
3073 3080
3074# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
… …
3179 id => "death", 3186 id => "death",
3180 title => "Death", 3187 title => "Death",
3181 reply => undef, 3188 reply => undef,
3182 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3183 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3184 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3185 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3186); 3199);
3187 3200
3188sub cf::client::send_msg { 3201sub cf::client::send_msg {
… …
3231=cut 3244=cut
3232 3245
3233sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
3234 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
3235 3248
3236 if ($self->extcmd == 2) {
3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3238 } elsif ($self->extcmd == 1) { # TODO: remove
3239 push @msg, msgtype => "event_$type";
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3241 }
3242}
3243
3244=item $client->ext_reply ($msgid, @msg)
3245
3246Sends an ext reply to the client.
3247
3248=cut
3249
3250sub cf::client::ext_reply($$@) {
3251 my ($self, $id, @msg) = @_;
3252
3253 return unless $self->extcmd == 2;
3254
3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3256} 3250}
3257 3251
3258=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
3259 3253
3260Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
… …
3317 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3311 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3318 3312
3319 if (ref $msg) { 3313 if (ref $msg) {
3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3314 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3321 3315
3322 my @reply;
3323
3324 if (my $cb = $EXTICMD{$type}) { 3316 if (my $cb = $EXTIACMD{$type}) {
3317 $cb->(
3318 $ns,
3319 sub {
3320 $ns->ext_msg ("reply-$reply", @_)
3321 if $reply;
3322 },
3323 @payload
3324 );
3325 } else {
3326 my @reply;
3327
3328 if (my $cb = $EXTICMD{$type}) {
3325 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3330 }
3331
3332 $ns->ext_msg ("reply-$reply", @reply)
3333 if $reply;
3326 } 3334 }
3327
3328 $ns->ext_reply ($reply, @reply)
3329 if $reply;
3330
3331 } else { 3335 } else {
3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3333 } 3337 }
3334 3338
3335 cf::override; 3339 cf::override;
… …
3503=cut 3507=cut
3504 3508
3505############################################################################# 3509#############################################################################
3506# the server's init and main functions 3510# the server's init and main functions
3507 3511
3508our %FACEHASH; # hash => idx, #d# HACK for http server 3512{
3513 package cf::face;
3514
3515 our %HASH; # hash => idx
3516 our @DATA; # dynamically-created facedata, only faceste 0 used
3517 our @FOFS; # file offset, if > 0
3518 our @SIZE; # size of face, in octets
3519 our @META; # meta hash of face, if any
3520 our $DATAFH; # facedata filehandle
3521
3522 # internal api, not finalised
3523 sub set {
3524 my ($name, $type, $data) = @_;
3525
3526 my $idx = cf::face::find $name;
3527
3528 if ($idx) {
3529 delete $HASH{cf::face::get_csum $idx};
3530 } else {
3531 $idx = cf::face::alloc $name;
3532 }
3533
3534 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3535
3536 cf::face::set_type $idx, $type;
3537 cf::face::set_csum $idx, 0, $hash;
3538
3539 # we need to destroy the SV itself, not just modify it, as a running ix
3540 # might hold a reference to it: "delete" achieves that.
3541 delete $FOFS[0][$idx];
3542 delete $DATA[0][$idx];
3543 $DATA[0][$idx] = $data;
3544 $SIZE[0][$idx] = length $data;
3545 delete $META[$idx];
3546 $HASH{$hash} = $idx;#d#
3547
3548 $idx
3549 }
3550
3551 sub _get_data($$$) {
3552 my ($idx, $set, $cb) = @_;
3553
3554 if (defined $DATA[$set][$idx]) {
3555 $cb->($DATA[$set][$idx]);
3556 } elsif (my $fofs = $FOFS[$set][$idx]) {
3557 my $size = $SIZE[$set][$idx];
3558 my $buf;
3559 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3560 if ($_[0] == $size) {
3561 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3562 $cb->($buf);
3563 } else {
3564 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3565 }
3566 };
3567 } else {
3568 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3569 }
3570 }
3571
3572 # rather ineffient
3573 sub cf::face::get_data($;$) {
3574 my ($idx, $set) = @_;
3575
3576 _get_data $idx, $set, Coro::rouse_cb;
3577 Coro::rouse_wait
3578 }
3579
3580 sub cf::face::ix {
3581 my ($ns, $set, $idx, $pri) = @_;
3582
3583 _get_data $idx, $set, sub {
3584 $ns->ix_send ($idx, $pri, $_[0]);
3585 };
3586 }
3587}
3509 3588
3510sub load_facedata($) { 3589sub load_facedata($) {
3511 my ($path) = @_; 3590 my ($path) = @_;
3512 3591
3513 # HACK to clear player env face cache, we need some signal framework
3514 # for this (global event?)
3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3516
3517 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3592 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3518 3593
3519 trace "loading facedata from $path\n"; 3594 trace "loading facedata from $path\n";
3520 3595
3521 my $facedata = decode_storable load_file $path; 3596 my $facedata = decode_storable load_file "$path/faceinfo";
3522 3597
3523 $facedata->{version} == 2 3598 $facedata->{version} == 2
3524 or cf::cleanup "$path: version mismatch, cannot proceed."; 3599 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3525 3600
3526 # patch in the exptable 3601 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3602 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3528 $facedata->{resource}{"res/exp_table"} = { 3603
3529 type => FT_RSRC, 3604 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3530 data => $exp_table, 3605
3531 hash => (Digest::MD5::md5 $exp_table), 3606 # BEGIN ATOMIC
3532 }; 3607 # from here on, everything must be atomic - no thread switch allowed
3533 cf::cede_to_tick; 3608 my $t1 = EV::time;
3534 3609
3535 { 3610 {
3536 my $faces = $facedata->{faceinfo}; 3611 my $faces = $facedata->{faceinfo};
3537 3612
3538 while (my ($face, $info) = each %$faces) { 3613 for my $face (sort keys %$faces) {
3614 my $info = $faces->{$face};
3539 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3615 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3540 3616
3541 cf::face::set_visibility $idx, $info->{visibility}; 3617 cf::face::set_visibility $idx, $info->{visibility};
3542 cf::face::set_magicmap $idx, $info->{magicmap}; 3618 cf::face::set_magicmap $idx, $info->{magicmap};
3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3619 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3620 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3621 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3546 $FACEHASH{$info->{hash64}} = $idx;#d# 3622 $cf::face::HASH{$info->{hash64}} = $idx;
3547 3623 delete $cf::face::META[$idx];
3548 cf::cede_to_tick;
3549 } 3624 }
3550 3625
3551 while (my ($face, $info) = each %$faces) { 3626 while (my ($face, $info) = each %$faces) {
3552 next unless $info->{smooth}; 3627 next unless $info->{smooth};
3553 3628
… …
3558 cf::face::set_smooth $idx, $smooth; 3633 cf::face::set_smooth $idx, $smooth;
3559 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3634 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3560 } else { 3635 } else {
3561 error "smooth face '$info->{smooth}' not found for face '$face'"; 3636 error "smooth face '$info->{smooth}' not found for face '$face'";
3562 } 3637 }
3563
3564 cf::cede_to_tick;
3565 } 3638 }
3566 } 3639 }
3567 3640
3568 { 3641 {
3569 my $anims = $facedata->{animinfo}; 3642 my $anims = $facedata->{animinfo};
3570 3643
3571 while (my ($anim, $info) = each %$anims) { 3644 while (my ($anim, $info) = each %$anims) {
3572 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3645 cf::anim::set $anim, $info->{frames}, $info->{facings};
3573 cf::cede_to_tick;
3574 } 3646 }
3575 3647
3576 cf::anim::invalidate_all; # d'oh 3648 cf::anim::invalidate_all; # d'oh
3577 } 3649 }
3578 3650
… …
3582 while (my ($name, $info) = each %$res) { 3654 while (my ($name, $info) = each %$res) {
3583 if (defined (my $type = $info->{type})) { 3655 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue 3656 # TODO: different hash - must free and use new index, or cache ixface data queue
3585 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3657 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3586 3658
3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3588 cf::face::set_type $idx, $type; 3659 cf::face::set_type $idx, $type;
3660 cf::face::set_csum $idx, 0, $info->{hash};
3661 $cf::face::SIZE[0][$idx] = $info->{size};
3662 $cf::face::FOFS[0][$idx] = $info->{fofs};
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3663 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d# 3664 $cf::face::HASH{$info->{hash}} = $idx;
3591 } else { 3665 } else {
3592# $RESOURCE{$name} = $info; # unused 3666# $RESOURCE{$name} = $info; # unused
3593 } 3667 }
3594
3595 cf::cede_to_tick;
3596 } 3668 }
3597 } 3669 }
3670
3671 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3672
3673 # HACK to clear player env face cache, we need some signal framework
3674 # for this (global event?)
3675 %ext::player_env::MUSIC_FACE_CACHE = ();
3676
3677 # END ATOMIC
3678
3679 cf::debug "facedata atomic update time ", EV::time - $t1;
3598 3680
3599 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3681 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3682
3683 aio_close $fh if $fh; # close old facedata
3600 3684
3601 1 3685 1
3602} 3686}
3603 3687
3604register_exticmd fx_want => sub { 3688register_exticmd fx_want => sub {
… …
3615 my $status = load_resource_file_ $_[0]; 3699 my $status = load_resource_file_ $_[0];
3616 get_slot 0.1, 100; 3700 get_slot 0.1, 100;
3617 cf::arch::commit_load; 3701 cf::arch::commit_load;
3618 3702
3619 $status 3703 $status
3704}
3705
3706sub reload_exp_table {
3707 _reload_exp_table;
3708
3709 cf::face::set
3710 "res/exp_table" => FT_RSRC,
3711 JSON::XS->new->utf8->canonical->encode (
3712 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3713 );
3714}
3715
3716sub reload_materials {
3717 _reload_materials;
3620} 3718}
3621 3719
3622sub reload_regions { 3720sub reload_regions {
3623 # HACK to clear player env face cache, we need some signal framework 3721 # HACK to clear player env face cache, we need some signal framework
3624 # for this (global event?) 3722 # for this (global event?)
… …
3632 if exists $_->{match}; 3730 if exists $_->{match};
3633 } 3731 }
3634} 3732}
3635 3733
3636sub reload_facedata { 3734sub reload_facedata {
3637 load_facedata "$DATADIR/facedata" 3735 load_facedata $DATADIR
3638 or die "unable to load facedata\n"; 3736 or die "unable to load facedata\n";
3639} 3737}
3640 3738
3641sub reload_archetypes { 3739sub reload_archetypes {
3642 load_resource_file "$DATADIR/archetypes" 3740 load_resource_file "$DATADIR/archetypes"
3643 or die "unable to load archetypes\n"; 3741 or die "unable to load archetypes\n";
3742
3743 cf::face::set
3744 "res/skill_info" => FT_RSRC,
3745 JSON::XS->new->utf8->canonical->encode (
3746 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3747 );
3748
3749 cf::face::set
3750 "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 );
3644} 3754}
3645 3755
3646sub reload_treasures { 3756sub reload_treasures {
3647 load_resource_file "$DATADIR/treasures" 3757 load_resource_file "$DATADIR/treasures"
3648 or die "unable to load treasurelists\n"; 3758 or die "unable to load treasurelists\n";
… …
3669} 3779}
3670 3780
3671sub reload_resources { 3781sub reload_resources {
3672 trace "reloading resource files...\n"; 3782 trace "reloading resource files...\n";
3673 3783
3674 reload_exp_table;
3675 reload_materials; 3784 reload_materials;
3676 reload_facedata; 3785 reload_facedata;
3786 reload_exp_table;
3677 reload_sound; 3787 reload_sound;
3678 reload_archetypes; 3788 reload_archetypes;
3679 reload_regions; 3789 reload_regions;
3680 reload_treasures; 3790 reload_treasures;
3681 3791
… …
3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3850 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3741 3851
3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3852 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3743 3853
3744 # we must not ever block the main coroutine 3854 # we must not ever block the main coroutine
3745 local $Coro::idle = sub { 3855 $Coro::idle = sub {
3746 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3856 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3747 (async { 3857 (async {
3748 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3858 $Coro::current->{desc} = "IDLE BUG HANDLER";
3749 EV::loop EV::LOOP_ONESHOT; 3859 EV::loop EV::LOOP_ONESHOT;
3750 })->prio (Coro::PRIO_MAX); 3860 })->prio (Coro::PRIO_MAX);
… …
3753 evthread_start IO::AIO::poll_fileno; 3863 evthread_start IO::AIO::poll_fileno;
3754 3864
3755 cf::sync_job { 3865 cf::sync_job {
3756 cf::incloader::init (); 3866 cf::incloader::init ();
3757 3867
3868 db_init;
3869
3758 cf::init_anim; 3870 cf::init_anim;
3759 cf::init_attackmess; 3871 cf::init_attackmess;
3760 cf::init_dynamic; 3872 cf::init_dynamic;
3761 3873
3762 cf::load_settings; 3874 cf::load_settings;
3763 3875
3764 reload_resources; 3876 reload_resources;
3765 reload_config; 3877 reload_config;
3766 db_init;
3767 3878
3768 cf::init_uuid; 3879 cf::init_uuid;
3769 cf::init_signals; 3880 cf::init_signals;
3770 cf::init_skills; 3881 cf::init_skills;
3771 3882
… …
4196 } 4307 }
4197} 4308}
4198 4309
4199{ 4310{
4200 # configure BDB 4311 # configure BDB
4312 info "initialising database";
4201 4313
4202 BDB::min_parallel 16; 4314 BDB::min_parallel 16;
4203 BDB::max_poll_reqs $TICK * 0.1; 4315 BDB::max_poll_reqs $TICK * 0.1;
4204 #$AnyEvent::BDB::WATCHER->priority (1); 4316 #$AnyEvent::BDB::WATCHER->priority (1);
4205 4317
… …
4234 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4346 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4235 }; 4347 };
4236 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4348 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4237 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4349 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4238 }; 4350 };
4351
4352 info "database initialised";
4239} 4353}
4240 4354
4241{ 4355{
4242 # configure IO::AIO 4356 # configure IO::AIO
4243 4357
4358 info "initialising aio";
4244 IO::AIO::min_parallel 8; 4359 IO::AIO::min_parallel 8;
4245 IO::AIO::max_poll_time $TICK * 0.1; 4360 IO::AIO::max_poll_time $TICK * 0.1;
4246 undef $AnyEvent::AIO::WATCHER; 4361 undef $AnyEvent::AIO::WATCHER;
4362 info "aio initialised";
4247} 4363}
4248 4364
4249our $_log_backtrace; 4365our $_log_backtrace;
4250our $_log_backtrace_last; 4366our $_log_backtrace_last;
4251 4367

Diff Legend

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