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.622 by root, Wed Nov 23 06:05:33 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 ();
62use CBOR::XS ();
58use IO::AIO (); 63use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 64use Compress::LZF;
61use Digest::MD5 (); 65use Digest::MD5 ();
62 66
63AnyEvent::detect; 67AnyEvent::detect;
64 68
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
108our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 118
113our %RESOURCE; # unused 119#our %RESOURCE; # unused
114 120
115our $OUTPUT_RATE_MIN = 3000; 121our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 122our $OUTPUT_RATE_MAX = 1000000;
117 123
118our $MAX_LINKS = 32; # how many chained exits to follow 124our $MAX_LINKS = 32; # how many chained exits to follow
129our $DB_ENV; 135our $DB_ENV;
130 136
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 138
133our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 141
135our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0; 143our $RUNTIME = 0;
137our $SERVER_TICK = 0; 144our $SERVER_TICK = 0;
138our $NOW; 145our $NOW;
219=item $cf::RUNTIME 226=item $cf::RUNTIME
220 227
221The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
222every server tick. 229every server tick.
223 230
224=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227 234
228Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
229directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
231database environment. 238database environment.
245Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
246from wherever your confdir points to. 253from wherever your confdir points to.
247 254
248=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
249 256
250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick.
251returns directly I<after> the tick processing (and consequently, can only wake one thread 258cf::wait_for_tick_begin only returns directly I<after> the tick
259processing (and consequently, can only wake one thread per tick), while
252per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 260cf::wait_for_tick wakes up all waiters after tick processing.
253 261
254Note that cf::Wait_for_tick will immediately return when the server is not 262Note 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 263ticking, 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> 264when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>). 265want to wait, use C<$cf::WAIT_FOR_TICK>).
258 266
259=item $cf::WAIT_FOR_TICK 267=item $cf::WAIT_FOR_TICK
335)) { 343)) {
336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337} 345}
338 346
339$EV::DIED = sub { 347$EV::DIED = sub {
340 Carp::cluck "error in event callback: @_"; 348 warn "error in event callback: $@";
341}; 349};
342 350
343############################################################################# 351#############################################################################
344 352
345sub fork_call(&@); 353sub fork_call(&@);
372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 380 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
373 $d 381 $d
374 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
375} 383}
376 384
377=item $scalar = load_file $path 385=item $scalar = cf::load_file $path
378 386
379Loads the given file from path and returns its contents. Croaks on error 387Loads the given file from path and returns its contents. Croaks on error
380and can block. 388and can block.
381 389
382=cut 390=cut
386 or Carp::croak "$_[0]: $!"; 394 or Carp::croak "$_[0]: $!";
387 395
388 $data 396 $data
389} 397}
390 398
399=item $success = cf::replace_file $path, $data, $sync
400
401Atomically replaces the file at the given $path with new $data, and
402optionally $sync the data to disk before replacing the file.
403
404=cut
405
406sub replace_file($$;$) {
407 my ($path, $data, $sync) = @_;
408
409 my $lock = cf::lock_acquire ("replace_file:$path");
410
411 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
412 or return;
413
414 $data = $data->() if ref $data;
415
416 length $data == aio_write $fh, 0, (length $data), $data, 0
417 or return;
418
419 !$sync
420 or !aio_fsync $fh
421 or return;
422
423 aio_close $fh
424 and return;
425
426 aio_rename "$path~", $path
427 and return;
428
429 if ($sync) {
430 $path =~ s%/[^/]*$%%;
431 aio_pathsync $path;
432 }
433
434 1
435}
436
391=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
392 438
393Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
394 440
395=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
417 463
418=cut 464=cut
419 465
420sub decode_yaml($) { 466sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_ 467 fork_call { YAML::XS::Load $_[0] } @_
468}
469
470=item $scalar = cf::decode_cbor $scalar
471
472Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
473blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
474alternative.
475
476=cut
477
478sub decode_cbor($) {
479 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
480 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
481 CBOR::XS::decode_cbor $_[0]
422} 482}
423 483
424=item $scalar = cf::unlzf $scalar 484=item $scalar = cf::unlzf $scalar
425 485
426Same as Compress::LZF::compress, but takes server ticks into account, so 486Same as Compress::LZF::compress, but takes server ticks into account, so
465 } 525 }
466} 526}
467 527
468=item cf::lock_wait $string 528=item cf::lock_wait $string
469 529
470Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
471 531
472=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
473 533
474Wait until the given lock is available and then acquires it and returns 534Wait 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, 535a L<Guard> object. If the guard object gets destroyed (goes out of scope,
528Allocate $time seconds of blocking CPU time at priority C<$priority> 588Allocate $time seconds of blocking CPU time at priority C<$priority>
529(default: 0): This call blocks and returns only when you have at least 589(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 590C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede. 591till the next cede.
532 592
533Background jobs should use a priority les than zero, interactive jobs 593Background jobs should use a priority less than zero, interactive jobs
534should use 100 or more. 594should use 100 or more.
535 595
536The optional C<$name> can be used to identify the job to run. It might be 596The 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. 597used for statistical purposes and should identify the same time-class.
538 598
551 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
552 my $busy; 612 my $busy;
553 613
554 while () { 614 while () {
555 next_job: 615 next_job:
616
617 Coro::cede;
556 618
557 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
558 620
559 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
560 if ($SLOT_QUEUE[$_][0] <= $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0; 623 $busy = 0;
562 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
563 $job->[2]->send; 625 $job->[2]->send;
564 Coro::cede;
565 goto next_job; 626 goto next_job;
566 } else { 627 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568 } 629 }
569 } 630 }
570 631
571 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
572 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
573 $WAIT_FOR_TICK->wait;
574 } else { 634 } else {
575 $busy = 0; 635 $busy = 0;
576 Coro::schedule; 636 Coro::schedule;
577 } 637 }
578 } 638 }
604BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
605 665
606=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
607 667
608The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
609is always able to handle events or runnable, as Deliantra is only 669is 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 670partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
611acceptable. 671acceptable.
612 672
613If it must be done, put the blocking parts into C<sync_job>. This will run 673If 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 674the given BLOCK in another coroutine while waiting for the result. The
642 702
643 while ($busy) { 703 while ($busy) {
644 if (Coro::nready) { 704 if (Coro::nready) {
645 Coro::cede_notself; 705 Coro::cede_notself;
646 } else { 706 } else {
647 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
648 } 708 }
649 } 709 }
650 710
651 my $time = AE::time - $time; 711 my $time = AE::time - $time;
652 712
693 reset_signals; 753 reset_signals;
694} 754}
695 755
696sub fork_call(&@) { 756sub fork_call(&@) {
697 my ($cb, @args) = @_; 757 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 758
703 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
704 cf::post_fork; 760 cf::post_fork;
705 &$cb 761 &$cb
706 } @args; 762 } @args;
856 912
857 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
858 } 914 }
859 } 915 }
860 916
861 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
862 my $data = $process->(\@data); 918 my $data = $process->(\@data);
863 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
864 920
865 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866 922
867 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
868 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
1388=cut 1444=cut
1389 1445
1390############################################################################# 1446#############################################################################
1391# command handling &c 1447# command handling &c
1392 1448
1393=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1394 1450
1395Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1396$name. 1452$name.
1397 1453
1398=cut 1454=cut
1404 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1405 1461
1406 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1407} 1463}
1408 1464
1409=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1410 1466
1411Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1412extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1413received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1414the logged-in player. Ext commands can only be processed after a player 1470the logged-in player. Ext commands can only be processed after a player
1415has logged in successfully. 1471has logged in successfully.
1416 1472
1417If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1418called.
1419 1474
1475=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1420=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1421 1481
1422Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1423exticmd packet. Exti commands are processed by the server as soon as they 1483exticmd 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 1484are 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 1485is a client socket. Exti commands can be received anytime, even before
1426log-in. 1486log-in.
1427 1487
1428If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1429called.
1430 1489
1431=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432 1491
1492Same as C<cf::register_extcmd>, but instead of returning values, the
1493callback needs to clal the C<$reply> function.
1494
1495=cut
1496
1433sub register_extcmd { 1497sub register_extcmd($$) {
1434 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1435 1499
1436 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1437} 1501}
1438 1502
1439sub register_exticmd { 1503sub register_async_extcmd($$) {
1440 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1441 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1442 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1513}
1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1443} 1519}
1444 1520
1445use File::Glob (); 1521use File::Glob ();
1446 1522
1447cf::player->attach ( 1523cf::player->attach (
1461 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1462 1538
1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464 1540
1465 if (ref $msg) { 1541 if (ref $msg) {
1466 my ($type, $reply, @payload) = 1542 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 1543
1471 my @reply;
1472
1473 if (my $cb = $EXTCMD{$type}) { 1544 if (my $cb = $EXTACMD{$type}) {
1545 $cb->(
1546 $pl,
1547 sub {
1548 $pl->ext_msg ("reply-$reply", @_)
1549 if $reply;
1550 },
1551 @payload
1552 );
1553 } else {
1554 my @reply;
1555
1556 if (my $cb = $EXTCMD{$type}) {
1474 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1475 } 1562 }
1476
1477 $pl->ext_reply ($reply, @reply)
1478 if $reply;
1479 1563
1480 } else { 1564 } else {
1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1482 } 1566 }
1483 1567
1496 }; 1580 };
1497 1581
1498 $grp 1582 $grp
1499} 1583}
1500 1584
1585sub _ext_cfg_reg($$$$) {
1586 my ($rvar, $varname, $cfgname, $default) = @_;
1587
1588 $cfgname = lc $varname
1589 unless length $cfgname;
1590
1591 $EXT_CFG{$cfgname} = [$rvar, $default];
1592
1593 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1594}
1595
1501sub load_extensions { 1596sub load_extensions {
1502 info "loading extensions..."; 1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1503 1600
1504 cf::sync_job { 1601 cf::sync_job {
1505 my %todo; 1602 my %todo;
1506 1603
1507 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1550 unless exists $done{$_}; 1647 unless exists $done{$_};
1551 } 1648 }
1552 1649
1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554 1651
1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1555 my $active = eval $v->{source}; 1661 my $active = eval $source;
1556 1662
1557 if (length $@) { 1663 if (length $@) {
1558 error "$v->{path}: $@\n"; 1664 error "$v->{path}: $@\n";
1559 1665
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1847} 1953}
1848 1954
1849=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850 1956
1851Expand deliantra pod fragments into protocol xml. 1957Expand 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 1958
1865=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1866 1960
1867Sends an ext event to the client. 1961Sends an ext event to the client.
1868 1962
2305 2399
2306 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2307 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2308 2402
2309 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2310 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2311 if (my $map = find $k) { 2405 if (my $map = find $k) {
2312 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2313 } 2407 }
2314 2408
2315 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2316 } 2410 }
2317 } 2411 }
2571 2665
2572Creates and returns a persistent reference to an object that can be stored as a string. 2666Creates and returns a persistent reference to an object that can be stored as a string.
2573 2667
2574=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2575 2669
2576returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2670returns the objetc referenced by refstring. may return undef when it cannot find the object,
2577even if the object actually exists. May block. 2671even if the object actually exists. May block.
2578 2672
2579=cut 2673=cut
2580 2674
2581sub deref { 2675sub deref {
2663=item $player_object->may ("access") 2757=item $player_object->may ("access")
2664 2758
2665Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2666(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2667 2761
2762This is implemented by checking a config setting of C<may_access> where
2763C<access> is replaced by the access string. The following alternatives are
2764possible (and are tested in order):
2765
2766=over 4
2767
2768=item * Player is DM
2769
2770The request will succeed.
2771
2772=item * may_access is an array reference
2773
2774If either the player nickname or UUID is in the array, the request will
2775succeed, otherwise it will fail.
2776
2777=item * may_access is a true value
2778
2779The request will succeed.
2780
2781=item * may_access is missing or false
2782
2783The request will fail.
2784
2785=back
2786
2668=cut 2787=cut
2669 2788
2670sub cf::object::player::may { 2789sub cf::object::player::may {
2671 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2672 2791
2673 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2674 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2675 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2676 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2677} 2796}
2678 2797
2679=item $player_object->enter_link 2798=item $player_object->enter_link
2680 2799
2683The player should be reasonably safe there for short amounts of time (e.g. 2802The 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, 2803for 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 2804though, as the player cannot control the character while it is on the link
2686map. 2805map.
2687 2806
2688Will never block. 2807This method will never block, which is the whole reaosn for it's
2808existance: you can I<always> put a player onto the link map, which is the
2809only place to put objects that is guaranteed to exist.
2810
2811A typical usage pattern is to call C<enter_link> synchronously from the
2812server, then start a new thread, do your blocking stuff there and then
2813call C<leave_link> from that thread.
2689 2814
2690=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2691 2816
2692Moves the player out of the special C<{link}> map onto the specified 2817Moves 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 2818map. If the map is not valid (or omitted), the player will be moved back
2963 3088
2964=head3 cf::client 3089=head3 cf::client
2965 3090
2966=over 4 3091=over 4
2967 3092
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) 3093=item $client->send_big_packet ($pkt)
2983 3094
2984Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required. 3096them as required.
2986 3097
3004 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
3005} 3116}
3006 3117
3007=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
3008 3119
3009Send a drawinfo or msg packet to the client, formatting the msg for the 3120Send 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 3121necessary. 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 3122message, with C<log> being the default. If C<$color> is negative, suppress
3012the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
3013 3124
3014=cut 3125=cut
3015 3126
3016# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
3121 id => "death", 3232 id => "death",
3122 title => "Death", 3233 title => "Death",
3123 reply => undef, 3234 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
3125 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
3126 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
3128); 3245);
3129 3246
3130sub cf::client::send_msg { 3247sub cf::client::send_msg {
3173=cut 3290=cut
3174 3291
3175sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
3176 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
3177 3294
3178 if ($self->extcmd == 2) {
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $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} 3296}
3203 3297
3204=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3205 3299
3206Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3226 3320
3227 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3228 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3229 3323
3230 1 3324 1
3325}
3326
3327=item $client->update_command_faces
3328
3329=cut
3330
3331our %COMMAND_FACE;
3332
3333sub cf::client::update_command_faces {
3334 my ($self) = @_;
3335
3336 my @faces = grep $_,
3337 $COMMAND_FACE{preferred},
3338 $COMMAND_FACE{standard},
3339 $COMMAND_FACE{skill},
3340 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3341 $COMMAND_FACE{emote},
3342 ;
3343
3344 $self->send_face ($_)
3345 for @faces;
3346 $self->flush_fx;
3347
3348 $self->ext_msg (command_list => @faces);
3349}
3350
3351=item cf::client::set_command_face $type, $commands
3352
3353=cut
3354
3355sub cf::client::set_command_face {
3356 my ($type, $list) = @_;
3357
3358 my $idx = &cf::face::set ( #d# ugly forward reference
3359 "command_list/$type" => cf::FT_RSRC,
3360 JSON::XS->new->utf8->encode ([ sort @$list ])
3361 );
3362
3363 $COMMAND_FACE{$type} = $idx;
3231} 3364}
3232 3365
3233cf::client->attach ( 3366cf::client->attach (
3234 on_connect => sub { 3367 on_connect => sub {
3235 my ($ns) = @_; 3368 my ($ns) = @_;
3261 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3262 3395
3263 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3264 3397
3265 if (ref $msg) { 3398 if (ref $msg) {
3266 my ($type, $reply, @payload) = 3399 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 3400
3271 my @reply;
3272
3273 if (my $cb = $EXTICMD{$type}) { 3401 if (my $cb = $EXTIACMD{$type}) {
3402 $cb->(
3403 $ns,
3404 sub {
3405 $ns->ext_msg ("reply-$reply", @_)
3406 if $reply;
3407 },
3408 @payload
3409 );
3410 } else {
3411 my @reply;
3412
3413 if (my $cb = $EXTICMD{$type}) {
3274 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3275 } 3419 }
3276
3277 $ns->ext_reply ($reply, @reply)
3278 if $reply;
3279
3280 } else { 3420 } else {
3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3421 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3282 } 3422 }
3283 3423
3284 cf::override; 3424 cf::override;
3452=cut 3592=cut
3453 3593
3454############################################################################# 3594#############################################################################
3455# the server's init and main functions 3595# the server's init and main functions
3456 3596
3597{
3598 package cf::face;
3599
3600 our %HASH; # hash => idx
3601 our @DATA; # dynamically-created facedata, only faceste 0 used
3602 our @FOFS; # file offset, if > 0
3603 our @SIZE; # size of face, in octets
3604 our @META; # meta hash of face, if any
3605 our $DATAFH; # facedata filehandle
3606
3607 # internal api, not finalised
3608 sub set {
3609 my ($name, $type, $data) = @_;
3610
3611 my $idx = cf::face::find $name;
3612
3613 if ($idx) {
3614 delete $HASH{cf::face::get_csum $idx};
3615 } else {
3616 $idx = cf::face::alloc $name;
3617 }
3618
3619 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3620
3621 cf::face::set_type $idx, $type;
3622 cf::face::set_csum $idx, 0, $hash;
3623
3624 # we need to destroy the SV itself, not just modify it, as a running ix
3625 # might hold a reference to it: "delete" achieves that.
3626 delete $FOFS[0][$idx];
3627 delete $DATA[0][$idx];
3628 $DATA[0][$idx] = $data;
3629 $SIZE[0][$idx] = length $data;
3630 delete $META[$idx];
3631 $HASH{$hash} = $idx;#d#
3632
3633 $idx
3634 }
3635
3636 sub _get_data($$$) {
3637 my ($idx, $set, $cb) = @_;
3638
3639 if (defined $DATA[$set][$idx]) {
3640 $cb->($DATA[$set][$idx]);
3641 } elsif (my $fofs = $FOFS[$set][$idx]) {
3642 my $size = $SIZE[$set][$idx];
3643 my $buf;
3644 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3645 if ($_[0] == $size) {
3646 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3647 $cb->($buf);
3648 } else {
3649 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3650 }
3651 };
3652 } else {
3653 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3654 }
3655 }
3656
3657 # rather ineffient
3658 sub cf::face::get_data($;$) {
3659 my ($idx, $set) = @_;
3660
3661 _get_data $idx, $set, Coro::rouse_cb;
3662 Coro::rouse_wait
3663 }
3664
3665 sub cf::face::ix {
3666 my ($ns, $set, $idx, $pri) = @_;
3667
3668 _get_data $idx, $set, sub {
3669 $ns->ix_send ($idx, $pri, $_[0]);
3670 };
3671 }
3672}
3673
3457sub load_facedata($) { 3674sub load_facedata($) {
3458 my ($path) = @_; 3675 my ($path) = @_;
3459 3676
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; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3465 3678
3466 trace "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3467 3680
3468 my $facedata = decode_storable load_file $path; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3469 3682
3470 $facedata->{version} == 2 3683 $facedata->{version} == 2
3471 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3472 3685
3473 # patch in the exptable 3686 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]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3475 $facedata->{resource}{"res/exp_table"} = { 3688
3476 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3477 data => $exp_table, 3690
3478 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3479 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3480 cf::cede_to_tick; 3693 my $t1 = EV::time;
3481 3694
3482 { 3695 {
3483 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3484 3697
3485 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3486 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3487 3701
3488 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3489 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3704 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}; 3705 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} ; 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3493 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3494 cf::cede_to_tick; 3708 delete $cf::face::META[$idx];
3495 } 3709 }
3496 3710
3497 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3498 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3499 3713
3504 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3506 } else { 3720 } else {
3507 error "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3508 } 3722 }
3509
3510 cf::cede_to_tick;
3511 } 3723 }
3512 } 3724 }
3513 3725
3514 { 3726 {
3515 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3516 3728
3517 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3518 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3519 cf::cede_to_tick;
3520 } 3731 }
3521 3732
3522 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3523 } 3734 }
3524 3735
3525 { 3736 {
3526 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3527 3738
3528 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3529 if (defined $info->{type}) { 3740 if (defined (my $type = $info->{type})) {
3741 # 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; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3531 3743
3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3533 cf::face::set_type $idx, $info->{type}; 3744 cf::face::set_type $idx, $type;
3745 cf::face::set_csum $idx, 0, $info->{hash};
3746 $cf::face::SIZE[0][$idx] = $info->{size};
3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3749 $cf::face::HASH{$info->{hash}} = $idx;
3534 } else { 3750 } else {
3535 $RESOURCE{$name} = $info; # unused 3751# $RESOURCE{$name} = $info; # unused
3536 } 3752 }
3537
3538 cf::cede_to_tick;
3539 } 3753 }
3540 } 3754 }
3755
3756 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3757
3758 # HACK to clear player env face cache, we need some signal framework
3759 # for this (global event?)
3760 %ext::player_env::MUSIC_FACE_CACHE = ();
3761
3762 # END ATOMIC
3763
3764 cf::debug "facedata atomic update time ", EV::time - $t1;
3541 3765
3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3767
3768 aio_close $fh if $fh; # close old facedata
3543 3769
3544 1 3770 1
3545} 3771}
3546 3772
3547register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3558 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3559 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3560 cf::arch::commit_load; 3786 cf::arch::commit_load;
3561 3787
3562 $status 3788 $status
3789}
3790
3791sub reload_exp_table {
3792 _reload_exp_table;
3793
3794 cf::face::set
3795 "res/exp_table" => FT_RSRC,
3796 JSON::XS->new->utf8->canonical->encode (
3797 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3798 );
3799}
3800
3801sub reload_materials {
3802 _reload_materials;
3563} 3803}
3564 3804
3565sub reload_regions { 3805sub reload_regions {
3566 # HACK to clear player env face cache, we need some signal framework 3806 # HACK to clear player env face cache, we need some signal framework
3567 # for this (global event?) 3807 # for this (global event?)
3575 if exists $_->{match}; 3815 if exists $_->{match};
3576 } 3816 }
3577} 3817}
3578 3818
3579sub reload_facedata { 3819sub reload_facedata {
3580 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3581 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3582} 3822}
3583 3823
3584sub reload_archetypes { 3824sub reload_archetypes {
3585 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3586 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3827
3828 cf::face::set
3829 "res/skill_info" => FT_RSRC,
3830 JSON::XS->new->utf8->canonical->encode (
3831 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3832 );
3833
3834 cf::face::set
3835 "res/spell_paths" => FT_RSRC,
3836 JSON::XS->new->utf8->canonical->encode (
3837 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3838 );
3839
3840 # command completion
3841 my @commands;
3842
3843 for (0..cf::arch::skillvec_size - 1) {
3844 my $skill = cf::arch::skillvec $_;
3845 my $name = $skill->name;
3846 my $flags = cf::skill_flags $skill->subtype;
3847
3848 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3849 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3850 }
3851
3852 cf::client::set_command_face skill => \@commands;
3587} 3853}
3588 3854
3589sub reload_treasures { 3855sub reload_treasures {
3590 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3591 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3612} 3878}
3613 3879
3614sub reload_resources { 3880sub reload_resources {
3615 trace "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3616 3882
3617 reload_exp_table;
3618 reload_materials; 3883 reload_materials;
3619 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3620 reload_sound; 3886 reload_sound;
3621 reload_archetypes; 3887 reload_archetypes;
3622 reload_regions; 3888 reload_regions;
3623 reload_treasures; 3889 reload_treasures;
3624 3890
3664 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3665 print $fh $$; 3931 print $fh $$;
3666} 3932}
3667 3933
3668sub main_loop { 3934sub main_loop {
3669 trace "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3670 if (1) { 3936 if (1) {
3671 EV::loop; 3937 EV::run;
3672 } 3938 }
3673 trace "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3675} 3941}
3676 3942
3677sub main { 3943sub main {
3678 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3679 3945
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684 3950
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686 3952
3687 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3688 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3955 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3690 (async { 3956 (async {
3691 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3692 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3693 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3694 }; 3960 };
3695 3961
3696 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3697 3963
3698 cf::sync_job { 3964 cf::sync_job {
3699 cf::incloader::init (); 3965 cf::incloader::init ();
3966
3967 db_init;
3700 3968
3701 cf::init_anim; 3969 cf::init_anim;
3702 cf::init_attackmess; 3970 cf::init_attackmess;
3703 cf::init_dynamic; 3971 cf::init_dynamic;
3704 3972
3705 cf::load_settings; 3973 cf::load_settings;
3706 3974
3707 reload_resources; 3975 reload_resources;
3708 reload_config; 3976 reload_config;
3709 db_init;
3710 3977
3711 cf::init_uuid; 3978 cf::init_uuid;
3712 cf::init_signals; 3979 cf::init_signals;
3713 cf::init_skills; 3980 cf::init_skills;
3714 3981
4139 } 4406 }
4140} 4407}
4141 4408
4142{ 4409{
4143 # configure BDB 4410 # configure BDB
4411 info "initialising database";
4144 4412
4145 BDB::min_parallel 16; 4413 BDB::min_parallel 16;
4146 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
4147 #$AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
4148 4416
4177 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4178 }; 4446 };
4179 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4180 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4181 }; 4449 };
4450
4451 info "database initialised";
4182} 4452}
4183 4453
4184{ 4454{
4185 # configure IO::AIO 4455 # configure IO::AIO
4186 4456
4457 info "initialising aio";
4187 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
4188 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
4189 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
4190} 4462}
4191 4463
4192our $_log_backtrace; 4464our $_log_backtrace;
4193our $_log_backtrace_last; 4465our $_log_backtrace_last;
4194 4466

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines