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.573 by root, Sun May 8 12:40:42 2011 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 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.
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 }
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
2267# if $self->per_party; 2346# if $self->per_party;
2268 2347
2269 $self 2348 $self
2270} 2349}
2271 2350
2272# find and load all maps in the 3x3 area around a map
2273sub load_neighbours {
2274 my ($map) = @_;
2275
2276 my @neigh; # diagonal neighbours
2277
2278 for (0 .. 3) {
2279 my $neigh = $map->tile_path ($_)
2280 or next;
2281 $neigh = find $neigh, $map
2282 or next;
2283 $neigh->load;
2284
2285 # now find the diagonal neighbours
2286 push @neigh,
2287 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2288 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2289 }
2290
2291 for (grep defined $_->[0], @neigh) {
2292 my ($path, $origin) = @$_;
2293 my $neigh = find $path, $origin
2294 or next;
2295 $neigh->load;
2296 }
2297}
2298
2299sub find_sync { 2351sub find_sync {
2300 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2301 2353
2302 # it's a bug to call this from the main context 2354 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2332 2384
2333 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2334 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2335 2387
2336 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2337 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2338 if (my $map = find $k) { 2390 if (my $map = find $k) {
2339 $map->load if $v; 2391 $map->load if $v;
2340 } 2392 }
2341 2393
2342 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2598 2650
2599Creates 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.
2600 2652
2601=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2602 2654
2603returns 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,
2604even if the object actually exists. May block. 2656even if the object actually exists. May block.
2605 2657
2606=cut 2658=cut
2607 2659
2608sub deref { 2660sub deref {
2690=item $player_object->may ("access") 2742=item $player_object->may ("access")
2691 2743
2692Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2693(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2694 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
2695=cut 2772=cut
2696 2773
2697sub cf::object::player::may { 2774sub cf::object::player::may {
2698 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2699 2776
2700 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2701 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2702 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2703 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2704} 2781}
2705 2782
2706=item $player_object->enter_link 2783=item $player_object->enter_link
2707 2784
2710The 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.
2711for 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,
2712though, 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
2713map. 2790map.
2714 2791
2715Will 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.
2716 2799
2717=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2718 2801
2719Moves 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
2720map. 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
2775 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2776 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2777 if $x <= 0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2778 2861
2779 $map->load; 2862 $map->load;
2780 $map->load_neighbours;
2781 2863
2782 return unless $self->contr->active; 2864 return unless $self->contr->active;
2783 2865
2784 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2785 if ($self->enter_map ($map, $x, $y)) { 2867 if ($self->enter_map ($map, $x, $y)) {
2991 3073
2992=head3 cf::client 3074=head3 cf::client
2993 3075
2994=over 4 3076=over 4
2995 3077
2996=item $client->send_drawinfo ($text, $flags)
2997
2998Sends a drawinfo packet to the client. Circumvents output buffering so
2999should not be used under normal circumstances.
3000
3001=cut
3002
3003sub cf::client::send_drawinfo {
3004 my ($self, $text, $flags) = @_;
3005
3006 utf8::encode $text;
3007 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3008}
3009
3010=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
3011 3079
3012Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
3013them as required. 3081them as required.
3014 3082
3032 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
3033} 3101}
3034 3102
3035=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
3036 3104
3037Send 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
3038client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
3039the 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
3040the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
3041 3109
3042=cut 3110=cut
3043 3111
3044# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
3149 id => "death", 3217 id => "death",
3150 title => "Death", 3218 title => "Death",
3151 reply => undef, 3219 reply => undef,
3152 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3153 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3154 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3155 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3156); 3230);
3157 3231
3158sub cf::client::send_msg { 3232sub cf::client::send_msg {
3201=cut 3275=cut
3202 3276
3203sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
3204 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
3205 3279
3206 if ($self->extcmd == 2) {
3207 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3208 } elsif ($self->extcmd == 1) { # TODO: remove
3209 push @msg, msgtype => "event_$type";
3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3211 }
3212}
3213
3214=item $client->ext_reply ($msgid, @msg)
3215
3216Sends an ext reply to the client.
3217
3218=cut
3219
3220sub cf::client::ext_reply($$@) {
3221 my ($self, $id, @msg) = @_;
3222
3223 if ($self->extcmd == 2) {
3224 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3225 } elsif ($self->extcmd == 1) {
3226 #TODO: version 1, remove
3227 unshift @msg, msgtype => "reply", msgid => $id;
3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3229 }
3230} 3281}
3231 3282
3232=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
3233 3284
3234Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
3254 3305
3255 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3256 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3257 3308
3258 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;
3259} 3349}
3260 3350
3261cf::client->attach ( 3351cf::client->attach (
3262 on_connect => sub { 3352 on_connect => sub {
3263 my ($ns) = @_; 3353 my ($ns) = @_;
3289 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
3290 3380
3291 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3292 3382
3293 if (ref $msg) { 3383 if (ref $msg) {
3294 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3295 "ARRAY" eq ref $msg
3296 ? @$msg
3297 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3298 3385
3299 my @reply;
3300
3301 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}) {
3302 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3303 } 3404 }
3304
3305 $ns->ext_reply ($reply, @reply)
3306 if $reply;
3307
3308 } else { 3405 } else {
3309 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";
3310 } 3407 }
3311 3408
3312 cf::override; 3409 cf::override;
3480=cut 3577=cut
3481 3578
3482############################################################################# 3579#############################################################################
3483# the server's init and main functions 3580# the server's init and main functions
3484 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
3485sub load_facedata($) { 3659sub load_facedata($) {
3486 my ($path) = @_; 3660 my ($path) = @_;
3487 3661
3488 # HACK to clear player env face cache, we need some signal framework
3489 # for this (global event?)
3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3491
3492 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3493 3663
3494 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3495 3665
3496 my $facedata = decode_storable load_file $path; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3497 3667
3498 $facedata->{version} == 2 3668 $facedata->{version} == 2
3499 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3500 3670
3501 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3503 $facedata->{resource}{"res/exp_table"} = { 3673
3504 type => FT_RSRC, 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3505 data => $exp_table, 3675
3506 hash => (Digest::MD5::md5 $exp_table), 3676 # BEGIN ATOMIC
3507 }; 3677 # from here on, everything must be atomic - no thread switch allowed
3508 cf::cede_to_tick; 3678 my $t1 = EV::time;
3509 3679
3510 { 3680 {
3511 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3512 3682
3513 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3514 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3515 3686
3516 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3517 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3518 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};
3519 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};
3520 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};
3521 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3522 cf::cede_to_tick; 3693 delete $cf::face::META[$idx];
3523 } 3694 }
3524 3695
3525 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3526 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3527 3698
3532 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3534 } else { 3705 } else {
3535 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3536 } 3707 }
3537
3538 cf::cede_to_tick;
3539 } 3708 }
3540 } 3709 }
3541 3710
3542 { 3711 {
3543 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3544 3713
3545 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3546 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3547 cf::cede_to_tick;
3548 } 3716 }
3549 3717
3550 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3551 } 3719 }
3552 3720
3553 { 3721 {
3554 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3555 3723
3556 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3557 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
3558 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3559 3728
3560 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3561 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;
3562 } else { 3735 } else {
3563 $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3564 } 3737 }
3565
3566 cf::cede_to_tick;
3567 } 3738 }
3568 } 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;
3569 3750
3570 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
3571 3754
3572 1 3755 1
3573} 3756}
3574 3757
3575register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3586 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3587 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3588 cf::arch::commit_load; 3771 cf::arch::commit_load;
3589 3772
3590 $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;
3591} 3788}
3592 3789
3593sub reload_regions { 3790sub reload_regions {
3594 # 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
3595 # for this (global event?) 3792 # for this (global event?)
3603 if exists $_->{match}; 3800 if exists $_->{match};
3604 } 3801 }
3605} 3802}
3606 3803
3607sub reload_facedata { 3804sub reload_facedata {
3608 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3609 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3610} 3807}
3611 3808
3612sub reload_archetypes { 3809sub reload_archetypes {
3613 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3614 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;
3615} 3838}
3616 3839
3617sub reload_treasures { 3840sub reload_treasures {
3618 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3619 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3640} 3863}
3641 3864
3642sub reload_resources { 3865sub reload_resources {
3643 trace "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3644 3867
3645 reload_exp_table;
3646 reload_materials; 3868 reload_materials;
3647 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3648 reload_sound; 3871 reload_sound;
3649 reload_archetypes; 3872 reload_archetypes;
3650 reload_regions; 3873 reload_regions;
3651 reload_treasures; 3874 reload_treasures;
3652 3875
3692 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3693 print $fh $$; 3916 print $fh $$;
3694} 3917}
3695 3918
3696sub main_loop { 3919sub main_loop {
3697 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3698 if (1) { 3921 if (1) {
3699 EV::loop; 3922 EV::run;
3700 } 3923 }
3701 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3702 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3703} 3926}
3704 3927
3705sub main { 3928sub main {
3706 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
3707 3930
3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3709 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.";
3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3712 3935
3713 $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
3714 3937
3715 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3716 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3717 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#
3718 (async { 3941 (async {
3719 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3720 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3721 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3722 }; 3945 };
3723 3946
3724 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3725 3948
3726 cf::sync_job { 3949 cf::sync_job {
3727 cf::incloader::init (); 3950 cf::incloader::init ();
3951
3952 db_init;
3728 3953
3729 cf::init_anim; 3954 cf::init_anim;
3730 cf::init_attackmess; 3955 cf::init_attackmess;
3731 cf::init_dynamic; 3956 cf::init_dynamic;
3732 3957
3733 cf::load_settings; 3958 cf::load_settings;
3734 3959
3735 reload_resources; 3960 reload_resources;
3736 reload_config; 3961 reload_config;
3737 db_init;
3738 3962
3739 cf::init_uuid; 3963 cf::init_uuid;
3740 cf::init_signals; 3964 cf::init_signals;
3741 cf::init_skills; 3965 cf::init_skills;
3742 3966
3756 }; 3980 };
3757 3981
3758 cf::object::thawer::errors_are_fatal 0; 3982 cf::object::thawer::errors_are_fatal 0;
3759 info "parse errors in files are no longer fatal from this point on.\n"; 3983 info "parse errors in files are no longer fatal from this point on.\n";
3760 3984
3761 my $free_main; $free_main = EV::idle sub { 3985 AE::postpone {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :) 3986 undef &main; # free gobs of memory :)
3764 }; 3987 };
3765 3988
3766 goto &main_loop; 3989 goto &main_loop;
3767} 3990}
3924 4147
3925 cf::write_runtime_sync; # external watchdog should not bark 4148 cf::write_runtime_sync; # external watchdog should not bark
3926 4149
3927 trace "emergency_perl_save: flushing outstanding aio requests"; 4150 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) { 4151 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3930 } 4153 }
3931 4154
3932 cf::write_runtime_sync; # external watchdog should not bark 4155 cf::write_runtime_sync; # external watchdog should not bark
3933 }; 4156 };
3934 4157
4168 } 4391 }
4169} 4392}
4170 4393
4171{ 4394{
4172 # configure BDB 4395 # configure BDB
4396 info "initialising database";
4173 4397
4174 BDB::min_parallel 16; 4398 BDB::min_parallel 16;
4175 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
4176 $AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
4177 4401
4178 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
4179 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
4180 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4181 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4206 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4207 }; 4431 };
4208 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4209 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4210 }; 4434 };
4435
4436 info "database initialised";
4211} 4437}
4212 4438
4213{ 4439{
4214 # configure IO::AIO 4440 # configure IO::AIO
4215 4441
4442 info "initialising aio";
4216 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
4217 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
4218 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
4219} 4447}
4220 4448
4221our $_log_backtrace; 4449our $_log_backtrace;
4222our $_log_backtrace_last; 4450our $_log_backtrace_last;
4223 4451

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines