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.575 by root, Sat Aug 13 20:20:30 2011 UTC vs.
Revision 1.621 by root, Fri Nov 18 20:55:00 2016 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
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;
108our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 117
113our %RESOURCE; # unused 118#our %RESOURCE; # unused
114 119
115our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
117 122
118our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
129our $DB_ENV; 134our $DB_ENV;
130 135
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 137
133our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 140
135our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0; 142our $RUNTIME = 0;
137our $SERVER_TICK = 0; 143our $SERVER_TICK = 0;
138our $NOW; 144our $NOW;
219=item $cf::RUNTIME 225=item $cf::RUNTIME
220 226
221The 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
222every server tick. 228every server tick.
223 229
224=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227 233
228Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
229directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
231database environment. 237database environment.
245Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
246from wherever your confdir points to. 252from wherever your confdir points to.
247 253
248=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
249 255
250These 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.
251returns 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
252per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
253 260
254Note 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
255ticking, 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
256when 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>
257want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
258 265
259=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
335)) { 342)) {
336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337} 344}
338 345
339$EV::DIED = sub { 346$EV::DIED = sub {
340 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
341}; 348};
342 349
343############################################################################# 350#############################################################################
344 351
345sub fork_call(&@); 352sub fork_call(&@);
372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
373 $d 380 $d
374 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
375} 382}
376 383
377=item $scalar = load_file $path 384=item $scalar = cf::load_file $path
378 385
379Loads the given file from path and returns its contents. Croaks on error 386Loads the given file from path and returns its contents. Croaks on error
380and can block. 387and can block.
381 388
382=cut 389=cut
384sub load_file($) { 391sub load_file($) {
385 0 <= aio_load $_[0], my $data 392 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!"; 393 or Carp::croak "$_[0]: $!";
387 394
388 $data 395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
389} 434}
390 435
391=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
392 437
393Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
465 } 510 }
466} 511}
467 512
468=item cf::lock_wait $string 513=item cf::lock_wait $string
469 514
470Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
471 516
472=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
473 518
474Wait until the given lock is available and then acquires it and returns 519Wait until the given lock is available and then acquires it and returns
475a L<Guard> object. If the guard object gets destroyed (goes out of scope, 520a L<Guard> object. If the guard object gets destroyed (goes out of scope,
528Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
529(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
530C<$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
531till the next cede. 576till the next cede.
532 577
533Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
534should use 100 or more. 579should use 100 or more.
535 580
536The 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
537used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
538 583
551 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
552 my $busy; 597 my $busy;
553 598
554 while () { 599 while () {
555 next_job: 600 next_job:
601
602 Coro::cede;
556 603
557 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
558 605
559 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
560 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0; 608 $busy = 0;
562 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
563 $job->[2]->send; 610 $job->[2]->send;
564 Coro::cede;
565 goto next_job; 611 goto next_job;
566 } else { 612 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568 } 614 }
569 } 615 }
570 616
571 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
572 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
573 $WAIT_FOR_TICK->wait;
574 } else { 619 } else {
575 $busy = 0; 620 $busy = 0;
576 Coro::schedule; 621 Coro::schedule;
577 } 622 }
578 } 623 }
604BEGIN { *async = \&Coro::async_pool } 649BEGIN { *async = \&Coro::async_pool }
605 650
606=item cf::sync_job { BLOCK } 651=item cf::sync_job { BLOCK }
607 652
608The design of Deliantra requires that the main coroutine ($Coro::main) 653The design of Deliantra requires that the main coroutine ($Coro::main)
609is always able to handle events or runnable, as Deliantra is only 654is always able to handle events or is runnable, as Deliantra is only
610partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 655partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
611acceptable. 656acceptable.
612 657
613If it must be done, put the blocking parts into C<sync_job>. This will run 658If it must be done, put the blocking parts into C<sync_job>. This will run
614the given BLOCK in another coroutine while waiting for the result. The 659the given BLOCK in another coroutine while waiting for the result. The
642 687
643 while ($busy) { 688 while ($busy) {
644 if (Coro::nready) { 689 if (Coro::nready) {
645 Coro::cede_notself; 690 Coro::cede_notself;
646 } else { 691 } else {
647 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
648 } 693 }
649 } 694 }
650 695
651 my $time = AE::time - $time; 696 my $time = AE::time - $time;
652 697
693 reset_signals; 738 reset_signals;
694} 739}
695 740
696sub fork_call(&@) { 741sub fork_call(&@) {
697 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
698
699 # we seemingly have to make a local copy of the whole thing,
700 # otherwise perl prematurely frees the stuff :/
701 # TODO: investigate and fix (likely this will be rather laborious)
702 743
703 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
704 cf::post_fork; 745 cf::post_fork;
705 &$cb 746 &$cb
706 } @args; 747 } @args;
856 897
857 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
858 } 899 }
859 } 900 }
860 901
861 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
862 my $data = $process->(\@data); 903 my $data = $process->(\@data);
863 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
864 905
865 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866 907
867 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
868 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
1388=cut 1429=cut
1389 1430
1390############################################################################# 1431#############################################################################
1391# command handling &c 1432# command handling &c
1392 1433
1393=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1394 1435
1395Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1396$name. 1437$name.
1397 1438
1398=cut 1439=cut
1404 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1405 1446
1406 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1407} 1448}
1408 1449
1409=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1410 1451
1411Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1412extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1413received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1414the 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
1415has logged in successfully. 1456has logged in successfully.
1416 1457
1417If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1418called.
1419 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
1420=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1421 1466
1422Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1423exticmd 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
1424are 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
1425is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1426log-in. 1471log-in.
1427 1472
1428If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1429called.
1430 1474
1431=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432 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
1433sub register_extcmd { 1482sub register_extcmd($$) {
1434 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1435 1484
1436 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1437} 1486}
1438 1487
1439sub register_exticmd { 1488sub register_async_extcmd($$) {
1440 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1441 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1442 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1443} 1504}
1444 1505
1445use File::Glob (); 1506use File::Glob ();
1446 1507
1447cf::player->attach ( 1508cf::player->attach (
1461 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1462 1523
1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464 1525
1465 if (ref $msg) { 1526 if (ref $msg) {
1466 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467 "ARRAY" eq ref $msg
1468 ? @$msg
1469 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470 1528
1471 my @reply;
1472
1473 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}) {
1474 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1475 } 1547 }
1476
1477 $pl->ext_reply ($reply, @reply)
1478 if $reply;
1479 1548
1480 } else { 1549 } else {
1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1482 } 1551 }
1483 1552
1496 }; 1565 };
1497 1566
1498 $grp 1567 $grp
1499} 1568}
1500 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1501sub load_extensions { 1581sub load_extensions {
1502 info "loading extensions..."; 1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1503 1585
1504 cf::sync_job { 1586 cf::sync_job {
1505 my %todo; 1587 my %todo;
1506 1588
1507 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1550 unless exists $done{$_}; 1632 unless exists $done{$_};
1551 } 1633 }
1552 1634
1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1555 my $active = eval $v->{source}; 1646 my $active = eval $source;
1556 1647
1557 if (length $@) { 1648 if (length $@) {
1558 error "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1559 1650
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1847} 1938}
1848 1939
1849=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850 1941
1851Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1852
1853=item $player->ext_reply ($msgid, @msg)
1854
1855Sends an ext reply to the player.
1856
1857=cut
1858
1859sub ext_reply($$@) {
1860 my ($self, $id, @msg) = @_;
1861
1862 $self->ns->ext_reply ($id, @msg)
1863}
1864 1943
1865=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1866 1945
1867Sends an ext event to the client. 1946Sends an ext event to the client.
1868 1947
2305 2384
2306 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2307 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2308 2387
2309 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2310 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2311 if (my $map = find $k) { 2390 if (my $map = find $k) {
2312 $map->load if $v; 2391 $map->load if $MAP_PREFETCH{$k};
2313 } 2392 }
2314 2393
2315 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2316 } 2395 }
2317 } 2396 }
2571 2650
2572Creates 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.
2573 2652
2574=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2575 2654
2576returns 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,
2577even if the object actually exists. May block. 2656even if the object actually exists. May block.
2578 2657
2579=cut 2658=cut
2580 2659
2581sub deref { 2660sub deref {
2663=item $player_object->may ("access") 2742=item $player_object->may ("access")
2664 2743
2665Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2666(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2667 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
2668=cut 2772=cut
2669 2773
2670sub cf::object::player::may { 2774sub cf::object::player::may {
2671 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2672 2776
2673 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2674 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2675 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2676 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2677} 2781}
2678 2782
2679=item $player_object->enter_link 2783=item $player_object->enter_link
2680 2784
2683The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2684for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2685though, as the player cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2686map. 2790map.
2687 2791
2688Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2689 2799
2690=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2691 2801
2692Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2693map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
2963 3073
2964=head3 cf::client 3074=head3 cf::client
2965 3075
2966=over 4 3076=over 4
2967 3077
2968=item $client->send_drawinfo ($text, $flags)
2969
2970Sends a drawinfo packet to the client. Circumvents output buffering so
2971should not be used under normal circumstances.
2972
2973=cut
2974
2975sub cf::client::send_drawinfo {
2976 my ($self, $text, $flags) = @_;
2977
2978 utf8::encode $text;
2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
2983 3079
2984Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required. 3081them as required.
2986 3082
3004 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
3005} 3101}
3006 3102
3007=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
3008 3104
3009Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
3010client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
3011the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
3012the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
3013 3109
3014=cut 3110=cut
3015 3111
3016# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
3121 id => "death", 3217 id => "death",
3122 title => "Death", 3218 title => "Death",
3123 reply => undef, 3219 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3125 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3126 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3128); 3230);
3129 3231
3130sub cf::client::send_msg { 3232sub cf::client::send_msg {
3173=cut 3275=cut
3174 3276
3175sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
3176 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
3177 3279
3178 if ($self->extcmd == 2) {
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3180 } elsif ($self->extcmd == 1) { # TODO: remove
3181 push @msg, msgtype => "event_$type";
3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183 }
3184}
3185
3186=item $client->ext_reply ($msgid, @msg)
3187
3188Sends an ext reply to the client.
3189
3190=cut
3191
3192sub cf::client::ext_reply($$@) {
3193 my ($self, $id, @msg) = @_;
3194
3195 if ($self->extcmd == 2) {
3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3197 } elsif ($self->extcmd == 1) {
3198 #TODO: version 1, remove
3199 unshift @msg, msgtype => "reply", msgid => $id;
3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3201 }
3202} 3281}
3203 3282
3204=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
3205 3284
3206Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
3226 3305
3227 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3228 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3229 3308
3230 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
3231} 3349}
3232 3350
3233cf::client->attach ( 3351cf::client->attach (
3234 on_connect => sub { 3352 on_connect => sub {
3235 my ($ns) = @_; 3353 my ($ns) = @_;
3261 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
3262 3380
3263 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3264 3382
3265 if (ref $msg) { 3383 if (ref $msg) {
3266 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3267 "ARRAY" eq ref $msg
3268 ? @$msg
3269 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3270 3385
3271 my @reply;
3272
3273 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
3274 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3275 } 3404 }
3276
3277 $ns->ext_reply ($reply, @reply)
3278 if $reply;
3279
3280 } else { 3405 } else {
3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3282 } 3407 }
3283 3408
3284 cf::override; 3409 cf::override;
3452=cut 3577=cut
3453 3578
3454############################################################################# 3579#############################################################################
3455# the server's init and main functions 3580# the server's init and main functions
3456 3581
3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3658
3457sub load_facedata($) { 3659sub load_facedata($) {
3458 my ($path) = @_; 3660 my ($path) = @_;
3459 3661
3460 # HACK to clear player env face cache, we need some signal framework
3461 # for this (global event?)
3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3463
3464 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3465 3663
3466 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3467 3665
3468 my $facedata = decode_storable load_file $path; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3469 3667
3470 $facedata->{version} == 2 3668 $facedata->{version} == 2
3471 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3472 3670
3473 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3475 $facedata->{resource}{"res/exp_table"} = { 3673
3476 type => FT_RSRC, 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3477 data => $exp_table, 3675
3478 hash => (Digest::MD5::md5 $exp_table), 3676 # BEGIN ATOMIC
3479 }; 3677 # from here on, everything must be atomic - no thread switch allowed
3480 cf::cede_to_tick; 3678 my $t1 = EV::time;
3481 3679
3482 { 3680 {
3483 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3484 3682
3485 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3486 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3487 3686
3488 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3489 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3493 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3494 cf::cede_to_tick; 3693 delete $cf::face::META[$idx];
3495 } 3694 }
3496 3695
3497 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3498 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3499 3698
3504 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3506 } else { 3705 } else {
3507 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3508 } 3707 }
3509
3510 cf::cede_to_tick;
3511 } 3708 }
3512 } 3709 }
3513 3710
3514 { 3711 {
3515 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3516 3713
3517 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3518 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3519 cf::cede_to_tick;
3520 } 3716 }
3521 3717
3522 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3523 } 3719 }
3524 3720
3525 { 3721 {
3526 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3527 3723
3528 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3529 if (defined $info->{type}) { 3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3530 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3531 3728
3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3533 cf::face::set_type $idx, $info->{type}; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3734 $cf::face::HASH{$info->{hash}} = $idx;
3534 } else { 3735 } else {
3535 $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3536 } 3737 }
3537
3538 cf::cede_to_tick;
3539 } 3738 }
3540 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3541 3750
3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3543 3754
3544 1 3755 1
3545} 3756}
3546 3757
3547register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3558 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3559 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3560 cf::arch::commit_load; 3771 cf::arch::commit_load;
3561 3772
3562 $status 3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3563} 3788}
3564 3789
3565sub reload_regions { 3790sub reload_regions {
3566 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3567 # for this (global event?) 3792 # for this (global event?)
3575 if exists $_->{match}; 3800 if exists $_->{match};
3576 } 3801 }
3577} 3802}
3578 3803
3579sub reload_facedata { 3804sub reload_facedata {
3580 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3581 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3582} 3807}
3583 3808
3584sub reload_archetypes { 3809sub reload_archetypes {
3585 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3586 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3812
3813 cf::face::set
3814 "res/skill_info" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3587} 3838}
3588 3839
3589sub reload_treasures { 3840sub reload_treasures {
3590 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3591 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3612} 3863}
3613 3864
3614sub reload_resources { 3865sub reload_resources {
3615 trace "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3616 3867
3617 reload_exp_table;
3618 reload_materials; 3868 reload_materials;
3619 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3620 reload_sound; 3871 reload_sound;
3621 reload_archetypes; 3872 reload_archetypes;
3622 reload_regions; 3873 reload_regions;
3623 reload_treasures; 3874 reload_treasures;
3624 3875
3664 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3665 print $fh $$; 3916 print $fh $$;
3666} 3917}
3667 3918
3668sub main_loop { 3919sub main_loop {
3669 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3670 if (1) { 3921 if (1) {
3671 EV::loop; 3922 EV::run;
3672 } 3923 }
3673 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3675} 3926}
3676 3927
3677sub main { 3928sub main {
3678 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
3679 3930
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684 3935
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686 3937
3687 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3688 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3690 (async { 3941 (async {
3691 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3692 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3693 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3694 }; 3945 };
3695 3946
3696 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3697 3948
3698 cf::sync_job { 3949 cf::sync_job {
3699 cf::incloader::init (); 3950 cf::incloader::init ();
3951
3952 db_init;
3700 3953
3701 cf::init_anim; 3954 cf::init_anim;
3702 cf::init_attackmess; 3955 cf::init_attackmess;
3703 cf::init_dynamic; 3956 cf::init_dynamic;
3704 3957
3705 cf::load_settings; 3958 cf::load_settings;
3706 3959
3707 reload_resources; 3960 reload_resources;
3708 reload_config; 3961 reload_config;
3709 db_init;
3710 3962
3711 cf::init_uuid; 3963 cf::init_uuid;
3712 cf::init_signals; 3964 cf::init_signals;
3713 cf::init_skills; 3965 cf::init_skills;
3714 3966
4139 } 4391 }
4140} 4392}
4141 4393
4142{ 4394{
4143 # configure BDB 4395 # configure BDB
4396 info "initialising database";
4144 4397
4145 BDB::min_parallel 16; 4398 BDB::min_parallel 16;
4146 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
4147 #$AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
4148 4401
4177 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4178 }; 4431 };
4179 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4180 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4181 }; 4434 };
4435
4436 info "database initialised";
4182} 4437}
4183 4438
4184{ 4439{
4185 # configure IO::AIO 4440 # configure IO::AIO
4186 4441
4442 info "initialising aio";
4187 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
4188 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
4189 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
4190} 4447}
4191 4448
4192our $_log_backtrace; 4449our $_log_backtrace;
4193our $_log_backtrace_last; 4450our $_log_backtrace_last;
4194 4451

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines