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.566 by root, Sun May 1 16:58:16 2011 UTC vs.
Revision 1.617 by root, Mon Aug 10 18:46:04 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; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
137our $NOW; 144our $NOW;
138 145
139our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
150 157
151our @POST_INIT; 158our @POST_INIT;
152 159
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
155 165
156binmode STDOUT; 166binmode STDOUT;
157binmode STDERR; 167binmode STDERR;
158 168
159# read virtual server time, if available 169# read virtual server time, if available
193 203
194=over 4 204=over 4
195 205
196=item $cf::UPTIME 206=item $cf::UPTIME
197 207
198The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
199 224
200=item $cf::RUNTIME 225=item $cf::RUNTIME
201 226
202The 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
203every server tick. 228every server tick.
204 229
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 233
209Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
212database environment. 237database environment.
213 238
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 239=item $cf::LOADAVG
223 240
224The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
234Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
235from wherever your confdir points to. 252from wherever your confdir points to.
236 253
237=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
238 255
239These 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.
240returns 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
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
242 272
243=cut 273=cut
244 274
245sub wait_for_tick(); 275sub wait_for_tick();
246sub wait_for_tick_begin(); 276sub wait_for_tick_begin();
312)) { 342)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 344}
315 345
316$EV::DIED = sub { 346$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
318}; 348};
319 349
320############################################################################# 350#############################################################################
321 351
322sub fork_call(&@); 352sub fork_call(&@);
349 $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;
350 $d 380 $d
351 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
352} 382}
353 383
354=item $scalar = load_file $path 384=item $scalar = cf::load_file $path
355 385
356Loads 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
357and can block. 387and can block.
358 388
359=cut 389=cut
361sub load_file($) { 391sub load_file($) {
362 0 <= aio_load $_[0], my $data 392 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 393 or Carp::croak "$_[0]: $!";
364 394
365 $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
366} 434}
367 435
368=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
369 437
370Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
505Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
506(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
507C<$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
508till the next cede. 576till the next cede.
509 577
510Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
511should use 100 or more. 579should use 100 or more.
512 580
513The 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
514used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
515 583
528 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
529 my $busy; 597 my $busy;
530 598
531 while () { 599 while () {
532 next_job: 600 next_job:
601
602 Coro::cede;
533 603
534 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
535 605
536 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
537 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0; 608 $busy = 0;
539 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
540 $job->[2]->send; 610 $job->[2]->send;
541 Coro::cede;
542 goto next_job; 611 goto next_job;
543 } else { 612 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545 } 614 }
546 } 615 }
547 616
548 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
550 push @cf::WAIT_FOR_TICK, $signal;
551 $signal->wait;
552 } else { 619 } else {
553 $busy = 0; 620 $busy = 0;
554 Coro::schedule; 621 Coro::schedule;
555 } 622 }
556 } 623 }
620 687
621 while ($busy) { 688 while ($busy) {
622 if (Coro::nready) { 689 if (Coro::nready) {
623 Coro::cede_notself; 690 Coro::cede_notself;
624 } else { 691 } else {
625 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
626 } 693 }
627 } 694 }
628 695
629 my $time = AE::time - $time; 696 my $time = AE::time - $time;
630 697
671 reset_signals; 738 reset_signals;
672} 739}
673 740
674sub fork_call(&@) { 741sub fork_call(&@) {
675 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
676
677 # we seemingly have to make a local copy of the whole thing,
678 # otherwise perl prematurely frees the stuff :/
679 # TODO: investigate and fix (likely this will be rather laborious)
680 743
681 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
682 cf::post_fork; 745 cf::post_fork;
683 &$cb 746 &$cb
684 } @args; 747 } @args;
834 897
835 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
836 } 899 }
837 } 900 }
838 901
839 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
840 my $data = $process->(\@data); 903 my $data = $process->(\@data);
841 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
842 905
843 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844 907
845 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
846 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
1366=cut 1429=cut
1367 1430
1368############################################################################# 1431#############################################################################
1369# command handling &c 1432# command handling &c
1370 1433
1371=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1372 1435
1373Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1374$name. 1437$name.
1375 1438
1376=cut 1439=cut
1382 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1383 1446
1384 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1385} 1448}
1386 1449
1387=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1388 1451
1389Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1390extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1391received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1392the 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
1393has logged in successfully. 1456has logged in successfully.
1394 1457
1395If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1396called.
1397 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
1398=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1399 1466
1400Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1401exticmd 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
1402are 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
1403is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1404log-in. 1471log-in.
1405 1472
1406If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1407called.
1408 1474
1409=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410 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
1411sub register_extcmd { 1482sub register_extcmd($$) {
1412 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1413 1484
1414 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1415} 1486}
1416 1487
1417sub register_exticmd { 1488sub register_async_extcmd($$) {
1418 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1419 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1420 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1421} 1504}
1422 1505
1423use File::Glob (); 1506use File::Glob ();
1424 1507
1425cf::player->attach ( 1508cf::player->attach (
1439 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1440 1523
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1525
1443 if (ref $msg) { 1526 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1528
1449 my @reply;
1450
1451 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}) {
1452 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1453 } 1547 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457 1548
1458 } else { 1549 } else {
1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460 } 1551 }
1461 1552
1474 }; 1565 };
1475 1566
1476 $grp 1567 $grp
1477} 1568}
1478 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
1479sub load_extensions { 1581sub load_extensions {
1480 info "loading extensions..."; 1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1481 1585
1482 cf::sync_job { 1586 cf::sync_job {
1483 my %todo; 1587 my %todo;
1484 1588
1485 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1528 unless exists $done{$_}; 1632 unless exists $done{$_};
1529 } 1633 }
1530 1634
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 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
1533 my $active = eval $v->{source}; 1646 my $active = eval $source;
1534 1647
1535 if (length $@) { 1648 if (length $@) {
1536 error "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1537 1650
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1825} 1938}
1826 1939
1827=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828 1941
1829Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1830
1831=item $player->ext_reply ($msgid, @msg)
1832
1833Sends an ext reply to the player.
1834
1835=cut
1836
1837sub ext_reply($$@) {
1838 my ($self, $id, @msg) = @_;
1839
1840 $self->ns->ext_reply ($id, @msg)
1841}
1842 1943
1843=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1844 1945
1845Sends an ext event to the client. 1946Sends an ext event to the client.
1846 1947
1954 # {... are special paths that are not being touched 2055 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 2056 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 2057 # ?random/... random maps
1957 # /... normal maps 2058 # /... normal maps
1958 # ~user/... per-player map of a specific user 2059 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 2060
1961 $path =~ s/$PATH_SEP/\//go; 2061 $path =~ s/$PATH_SEP/\//go;
1962 2062
1963 # treat it as relative path if it starts with 2063 # treat it as relative path if it starts with
1964 # something that looks reasonable 2064 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 2065 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 2066 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 2067
1968 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 2069 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1984 } 2070 }
1985 2071
1986 for ($path) { 2072 for ($path) {
1987 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
2186 2272
2187 { 2273 {
2188 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2189 2275
2190 return unless $self->valid; 2276 return unless $self->valid;
2191 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2192
2193 $self->in_memory (cf::MAP_LOADING);
2194 2278
2195 $self->alloc; 2279 $self->alloc;
2196 2280
2197 $self->pre_load; 2281 $self->pre_load;
2198 cf::cede_to_tick; 2282 cf::cede_to_tick;
2221 } else { 2305 } else {
2222 $self->post_load_original 2306 $self->post_load_original
2223 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2224 } 2308 }
2225 2309
2310 $self->state (cf::MAP_INACTIVE);
2311
2226 cf::cede_to_tick; 2312 cf::cede_to_tick;
2227 # now do the right thing for maps 2313 # now do the right thing for maps
2228 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2229 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2230 unless $self->difficulty; 2316 unless $self->difficulty;
2233 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2234 $self->decay_objects; 2320 $self->decay_objects;
2235 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2236 $self->update_buttons; 2322 $self->update_buttons;
2237 cf::cede_to_tick; 2323 cf::cede_to_tick;
2238 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2239 } 2325 }
2240 2326
2241 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2243
2244 $self->in_memory (cf::MAP_ACTIVE);
2245 } 2329 }
2246 2330
2247 $self->post_load; 2331 $self->post_load;
2248 2332
2249 1 2333 1
2262# if $self->per_party; 2346# if $self->per_party;
2263 2347
2264 $self 2348 $self
2265} 2349}
2266 2350
2267# find and load all maps in the 3x3 area around a map
2268sub load_neighbours {
2269 my ($map) = @_;
2270
2271 my @neigh; # diagonal neighbours
2272
2273 for (0 .. 3) {
2274 my $neigh = $map->tile_path ($_)
2275 or next;
2276 $neigh = find $neigh, $map
2277 or next;
2278 $neigh->load;
2279
2280 # now find the diagonal neighbours
2281 push @neigh,
2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2284 }
2285
2286 for (grep defined $_->[0], @neigh) {
2287 my ($path, $origin) = @$_;
2288 my $neigh = find $path, $origin
2289 or next;
2290 $neigh->load;
2291 }
2292}
2293
2294sub find_sync { 2351sub find_sync {
2295 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2296 2353
2354 # it's a bug to call this from the main context
2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main; 2356 if $Coro::current == $Coro::main;
2299 2357
2300 find $path, $origin 2358 find $path, $origin
2301} 2359}
2302 2360
2303sub do_load_sync { 2361sub do_load_sync {
2304 my ($map) = @_; 2362 my ($map) = @_;
2305 2363
2364 # it's a bug to call this from the main context
2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2307 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2308 2367
2309 $map->load; 2368 $map->load;
2310} 2369}
2316 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2317 2376
2318 $path = normalise $path, $origin; 2377 $path = normalise $path, $origin;
2319 2378
2320 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2322 } 2381 }
2323 2382
2324 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2325 2384
2326 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2385sub swap_out { 2444sub swap_out {
2386 my ($self) = @_; 2445 my ($self) = @_;
2387 2446
2388 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389 2448
2390 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2391 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2392 return if $self->players; 2451 return if $self->players;
2393 2452
2394 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate; 2454 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2397 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2398 2457
2399 # then atomically save 2458 # then atomically save
2400 $self->_save; 2459 $self->_save;
2401 2460
2402 # then free the map 2461 # then free the map
2428 2487
2429 return if $self->players; 2488 return if $self->players;
2430 2489
2431 cf::trace "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2432 2491
2433 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2434 2493
2435 # need to save uniques path 2494 # need to save uniques path
2436 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438 2497
2591 2650
2592Creates 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.
2593 2652
2594=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2595 2654
2596returns 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,
2597even if the object actually exists. May block. 2656even if the object actually exists. May block.
2598 2657
2599=cut 2658=cut
2600 2659
2601sub deref { 2660sub deref {
2683=item $player_object->may ("access") 2742=item $player_object->may ("access")
2684 2743
2685Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2686(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2687 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
2688=cut 2772=cut
2689 2773
2690sub cf::object::player::may { 2774sub cf::object::player::may {
2691 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2692 2776
2693 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2694 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2695 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2696 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2697} 2781}
2698 2782
2699=item $player_object->enter_link 2783=item $player_object->enter_link
2700 2784
2703The 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.
2704for 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,
2705though, 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
2706map. 2790map.
2707 2791
2708Will 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.
2709 2799
2710=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2711 2801
2712Moves 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
2713map. 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
2768 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2769 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2770 if $x <= 0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2771 2861
2772 $map->load; 2862 $map->load;
2773 $map->load_neighbours;
2774 2863
2775 return unless $self->contr->active; 2864 return unless $self->contr->active;
2776 2865
2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2778 if ($self->enter_map ($map, $x, $y)) { 2867 if ($self->enter_map ($map, $x, $y)) {
2934 $Coro::current->{desc} = "enter_exit"; 3023 $Coro::current->{desc} = "enter_exit";
2935 3024
2936 unless (eval { 3025 unless (eval {
2937 $self->deactivate_recursive; # just to be sure 3026 $self->deactivate_recursive; # just to be sure
2938 3027
2939 # random map handling
2940 {
2941 my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943 prepare_random_map $exit
2944 if $exit->slaying eq "/!";
2945 }
2946
2947 my $map = cf::map::normalise $exit->slaying, $exit->map; 3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp; 3029 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp; 3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
2950 3054
2951 $self->goto ($map, $x, $y); 3055 $self->goto ($map, $x, $y);
2952 3056
2953 # if exit is damned, update players death & WoR home-position 3057 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y) 3058 $self->contr->savebed ($map, $x, $y)
2969 3073
2970=head3 cf::client 3074=head3 cf::client
2971 3075
2972=over 4 3076=over 4
2973 3077
2974=item $client->send_drawinfo ($text, $flags)
2975
2976Sends a drawinfo packet to the client. Circumvents output buffering so
2977should not be used under normal circumstances.
2978
2979=cut
2980
2981sub cf::client::send_drawinfo {
2982 my ($self, $text, $flags) = @_;
2983
2984 utf8::encode $text;
2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
2989 3079
2990Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required. 3081them as required.
2992 3082
3010 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
3011} 3101}
3012 3102
3013=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
3014 3104
3015Send 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
3016client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
3017the 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
3018the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
3019 3109
3020=cut 3110=cut
3021 3111
3022# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
3127 id => "death", 3217 id => "death",
3128 title => "Death", 3218 title => "Death",
3129 reply => undef, 3219 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3131 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3132 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3134); 3230);
3135 3231
3136sub cf::client::send_msg { 3232sub cf::client::send_msg {
3179=cut 3275=cut
3180 3276
3181sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
3182 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
3183 3279
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
3187 push @msg, msgtype => "event_$type";
3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189 }
3190}
3191
3192=item $client->ext_reply ($msgid, @msg)
3193
3194Sends an ext reply to the client.
3195
3196=cut
3197
3198sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_;
3200
3201 if ($self->extcmd == 2) {
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
3208} 3281}
3209 3282
3210=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
3211 3284
3212Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
3232 3305
3233 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3234 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3235 3308
3236 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;
3237} 3349}
3238 3350
3239cf::client->attach ( 3351cf::client->attach (
3240 on_connect => sub { 3352 on_connect => sub {
3241 my ($ns) = @_; 3353 my ($ns) = @_;
3267 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
3268 3380
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3382
3271 if (ref $msg) { 3383 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276 3385
3277 my @reply;
3278
3279 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}) {
3280 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3281 } 3404 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
3286 } else { 3405 } else {
3287 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";
3288 } 3407 }
3289 3408
3290 cf::override; 3409 cf::override;
3458=cut 3577=cut
3459 3578
3460############################################################################# 3579#############################################################################
3461# the server's init and main functions 3580# the server's init and main functions
3462 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
3463sub load_facedata($) { 3659sub load_facedata($) {
3464 my ($path) = @_; 3660 my ($path) = @_;
3465 3661
3466 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?)
3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3469
3470 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3471 3663
3472 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3473 3665
3474 my $facedata = decode_storable load_file $path; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3475 3667
3476 $facedata->{version} == 2 3668 $facedata->{version} == 2
3477 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3478 3670
3479 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3481 $facedata->{resource}{"res/exp_table"} = { 3673
3482 type => FT_RSRC, 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3483 data => $exp_table, 3675
3484 hash => (Digest::MD5::md5 $exp_table), 3676 # BEGIN ATOMIC
3485 }; 3677 # from here on, everything must be atomic - no thread switch allowed
3486 cf::cede_to_tick; 3678 my $t1 = EV::time;
3487 3679
3488 { 3680 {
3489 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3490 3682
3491 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493 3686
3494 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3496 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};
3497 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};
3498 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};
3499 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3500 cf::cede_to_tick; 3693 delete $cf::face::META[$idx];
3501 } 3694 }
3502 3695
3503 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3504 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3505 3698
3510 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3512 } else { 3705 } else {
3513 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3514 } 3707 }
3515
3516 cf::cede_to_tick;
3517 } 3708 }
3518 } 3709 }
3519 3710
3520 { 3711 {
3521 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3522 3713
3523 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3524 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3525 cf::cede_to_tick;
3526 } 3716 }
3527 3717
3528 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3529 } 3719 }
3530 3720
3531 { 3721 {
3532 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3533 3723
3534 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3535 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
3536 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3728
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 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;
3540 } else { 3735 } else {
3541 $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3542 } 3737 }
3543
3544 cf::cede_to_tick;
3545 } 3738 }
3546 } 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;
3547 3750
3548 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
3549 3754
3550 1 3755 1
3551} 3756}
3552 3757
3553register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3564 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3566 cf::arch::commit_load; 3771 cf::arch::commit_load;
3567 3772
3568 $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;
3569} 3788}
3570 3789
3571sub reload_regions { 3790sub reload_regions {
3572 # 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
3573 # for this (global event?) 3792 # for this (global event?)
3581 if exists $_->{match}; 3800 if exists $_->{match};
3582 } 3801 }
3583} 3802}
3584 3803
3585sub reload_facedata { 3804sub reload_facedata {
3586 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3587 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3588} 3807}
3589 3808
3590sub reload_archetypes { 3809sub reload_archetypes {
3591 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3592 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;
3593} 3838}
3594 3839
3595sub reload_treasures { 3840sub reload_treasures {
3596 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3597 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3618} 3863}
3619 3864
3620sub reload_resources { 3865sub reload_resources {
3621 trace "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3622 3867
3623 reload_exp_table;
3624 reload_materials; 3868 reload_materials;
3625 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3626 reload_sound; 3871 reload_sound;
3627 reload_archetypes; 3872 reload_archetypes;
3628 reload_regions; 3873 reload_regions;
3629 reload_treasures; 3874 reload_treasures;
3630 3875
3670 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3671 print $fh $$; 3916 print $fh $$;
3672} 3917}
3673 3918
3674sub main_loop { 3919sub main_loop {
3675 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3676 if (1) { 3921 if (1) {
3677 EV::loop; 3922 EV::run;
3678 } 3923 }
3679 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3681} 3926}
3682 3927
3683sub main { 3928sub main {
3684 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
3685 3930
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 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.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3935
3691 $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
3692 3937
3693 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3694 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3695 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#
3696 (async { 3941 (async {
3697 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONESHOT;
3699 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3700 }; 3945 };
3701 3946
3702 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3703 3948
3704 cf::sync_job { 3949 cf::sync_job {
3705 cf::incloader::init (); 3950 cf::incloader::init ();
3951
3952 db_init;
3706 3953
3707 cf::init_anim; 3954 cf::init_anim;
3708 cf::init_attackmess; 3955 cf::init_attackmess;
3709 cf::init_dynamic; 3956 cf::init_dynamic;
3710 3957
3711 cf::load_settings; 3958 cf::load_settings;
3712 3959
3713 reload_resources; 3960 reload_resources;
3714 reload_config; 3961 reload_config;
3715 db_init;
3716 3962
3717 cf::init_uuid; 3963 cf::init_uuid;
3718 cf::init_signals; 3964 cf::init_signals;
3719 cf::init_skills; 3965 cf::init_skills;
3720 3966
3734 }; 3980 };
3735 3981
3736 cf::object::thawer::errors_are_fatal 0; 3982 cf::object::thawer::errors_are_fatal 0;
3737 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";
3738 3984
3739 my $free_main; $free_main = EV::idle sub { 3985 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3986 undef &main; # free gobs of memory :)
3742 }; 3987 };
3743 3988
3744 goto &main_loop; 3989 goto &main_loop;
3745} 3990}
3902 4147
3903 cf::write_runtime_sync; # external watchdog should not bark 4148 cf::write_runtime_sync; # external watchdog should not bark
3904 4149
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 4150 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 4151 while (IO::AIO::nreqs || BDB::nreqs) {
3907 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
3908 } 4153 }
3909 4154
3910 cf::write_runtime_sync; # external watchdog should not bark 4155 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 4156 };
3912 4157
4093 4338
4094############################################################################# 4339#############################################################################
4095 4340
4096my $bug_warning = 0; 4341my $bug_warning = 0;
4097 4342
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4343sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4345
4104 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4347}
4108 4348
4109sub wait_for_tick_begin() { 4349sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4351
4112 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4354 $signal->wait;
4115} 4355}
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
4121 return; 4361 return;
4122 } 4362 }
4123 4363
4124 cf::server_tick; # one server iteration 4364 cf::one_tick; # one server iteration
4125 4365
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4367
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4135 } 4375 }
4136 4376
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4378 $sig->send;
4139 } 4379 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4381
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4384
4147 if (0) { 4385 if (0) {
4153 } 4391 }
4154} 4392}
4155 4393
4156{ 4394{
4157 # configure BDB 4395 # configure BDB
4396 info "initialising database";
4158 4397
4159 BDB::min_parallel 16; 4398 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4401
4163 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $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;
4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 }; 4431 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 }; 4434 };
4435
4436 info "database initialised";
4196} 4437}
4197 4438
4198{ 4439{
4199 # configure IO::AIO 4440 # configure IO::AIO
4200 4441
4442 info "initialising aio";
4201 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
4202 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
4203 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
4204} 4447}
4205 4448
4206our $_log_backtrace; 4449our $_log_backtrace;
4207our $_log_backtrace_last; 4450our $_log_backtrace_last;
4208 4451

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines