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.558 by root, Tue Oct 5 22:35:30 2010 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 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 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 ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; # unused 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
115 121
116our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
127our $DB_ENV; 133our $DB_ENV;
128 134
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 136
131our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 139
133our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
135our $NOW; 143our $NOW;
136 144
137our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
148 156
149our @POST_INIT; 157our @POST_INIT;
150 158
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
153 164
154binmode STDOUT; 165binmode STDOUT;
155binmode STDERR; 166binmode STDERR;
156 167
157# read virtual server time, if available 168# read virtual server time, if available
… …
191 202
192=over 4 203=over 4
193 204
194=item $cf::UPTIME 205=item $cf::UPTIME
195 206
196The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
197 223
198=item $cf::RUNTIME 224=item $cf::RUNTIME
199 225
200The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 227every server tick.
202 228
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 232
207Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
210database environment. 236database environment.
211 237
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 238=item $cf::LOADAVG
221 239
222The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
236 254
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one thread 256returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
240 270
241=cut 271=cut
242 272
243sub wait_for_tick(); 273sub wait_for_tick();
244sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
310)) { 340)) {
311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312} 342}
313 343
314$EV::DIED = sub { 344$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
316}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
317 352
318############################################################################# 353#############################################################################
319 354
320=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
321 356
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 378 $d
344 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
345} 380}
346 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
347=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
348 435
349Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
350 437
351=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 445
359sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
361 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
362=item $ref = cf::yaml_load $scalar 457=item $ref = cf::decode_yaml $scalar
363 458
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 460
366=cut 461=cut
367 462
368sub fork_call(&@); 463sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
372} 478}
373 479
374=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
375 481
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
461} 567}
462 568
463=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
464 570
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
466This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
467of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
468 578
469The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
471 581
472Useful for short background jobs. 582Useful for short background jobs.
… …
501 } 611 }
502 } 612 }
503 613
504 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
507 $signal->wait;
508 } else { 617 } else {
509 $busy = 0; 618 $busy = 0;
510 Coro::schedule; 619 Coro::schedule;
511 } 620 }
512 } 621 }
… …
767 876
768 my @data; 877 my @data;
769 my $md5; 878 my $md5;
770 879
771 for (0 .. $#$src) { 880 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 882 }
775 883
776 # if processing is expensive, check 884 # if processing is expensive, check
777 # checksum first 885 # checksum first
778 if (1) { 886 if (1) {
… …
1323=cut 1431=cut
1324 1432
1325############################################################################# 1433#############################################################################
1326# command handling &c 1434# command handling &c
1327 1435
1328=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1329 1437
1330Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1331$name. 1439$name.
1332 1440
1333=cut 1441=cut
… …
1339 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1340 1448
1341 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1342} 1450}
1343 1451
1344=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1345 1453
1346Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1347extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1348received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1349the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1350has logged in successfully. 1458has logged in successfully.
1351 1459
1352If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1353called. 1461called.
1354 1462
1355=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1356 1464
1357Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1358exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1359are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1360is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
… …
1396 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1397 1505
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1507
1400 if (ref $msg) { 1508 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405 1510
1406 my @reply; 1511 my @reply;
1407 1512
1408 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1409 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1410 } 1515 }
1411 1516
1412 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1413 if $reply; 1518 if $reply;
1414 1519
1415 } else { 1520 } else {
1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417 } 1522 }
… …
1431 }; 1536 };
1432 1537
1433 $grp 1538 $grp
1434} 1539}
1435 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1436sub load_extensions { 1552sub load_extensions {
1437 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1438 1556
1439 cf::sync_job { 1557 cf::sync_job {
1440 my %todo; 1558 my %todo;
1441 1559
1442 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1485 unless exists $done{$_}; 1603 unless exists $done{$_};
1486 } 1604 }
1487 1605
1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1490 my $active = eval $v->{source}; 1617 my $active = eval $source;
1491 1618
1492 if (length $@) { 1619 if (length $@) {
1493 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1494 1621
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1512 1639
1513 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1516 } 1643 }
1644
1645 last;
1517 } 1646 }
1518 } 1647 }
1519 }; 1648 };
1520} 1649}
1521 1650
… …
1780} 1909}
1781 1910
1782=item $protocol_xml = $player->expand_cfpod ($cfpod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783 1912
1784Expand deliantra pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1785
1786=item $player->ext_reply ($msgid, @msg)
1787
1788Sends an ext reply to the player.
1789
1790=cut
1791
1792sub ext_reply($$@) {
1793 my ($self, $id, @msg) = @_;
1794
1795 $self->ns->ext_reply ($id, @msg)
1796}
1797 1914
1798=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1799 1916
1800Sends an ext event to the client. 1917Sends an ext event to the client.
1801 1918
… …
1949 2066
1950 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1951 () 2068 ()
1952} 2069}
1953 2070
2071# may re-bless or do other evil things
1954sub init { 2072sub init {
1955 my ($self) = @_; 2073 my ($self) = @_;
1956 2074
1957 $self 2075 $self
1958} 2076}
… …
2023 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
2024 2142
2025 1 2143 1
2026} 2144}
2027 2145
2146# used to laod the header of an original map
2028sub load_header_orig { 2147sub load_header_orig {
2029 my ($self) = @_; 2148 my ($self) = @_;
2030 2149
2031 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
2032} 2151}
2033 2152
2153# used to laod the header of an instantiated map
2034sub load_header_temp { 2154sub load_header_temp {
2035 my ($self) = @_; 2155 my ($self) = @_;
2036 2156
2037 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
2038} 2158}
2039 2159
2160# called after loading the header from an instantiated map
2040sub prepare_temp { 2161sub prepare_temp {
2041 my ($self) = @_; 2162 my ($self) = @_;
2042 2163
2043 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
2044 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
2045 # safety 2166 # safety
2046 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
2047 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
2048} 2169}
2049 2170
2171# called after loading the header from an original map
2050sub prepare_orig { 2172sub prepare_orig {
2051 my ($self) = @_; 2173 my ($self) = @_;
2052 2174
2053 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
2054 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
… …
2080sub find { 2202sub find {
2081 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
2082 2204
2083 cf::cede_to_tick; 2205 cf::cede_to_tick;
2084 2206
2085 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
2086 2208
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088 my $guard2 = cf::lock_acquire "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
2089 2211
2090 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
… …
2121 2243
2122 { 2244 {
2123 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2124 2246
2125 return unless $self->valid; 2247 return unless $self->valid;
2126 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2127
2128 $self->in_memory (cf::MAP_LOADING);
2129 2249
2130 $self->alloc; 2250 $self->alloc;
2131 2251
2132 $self->pre_load; 2252 $self->pre_load;
2133 cf::cede_to_tick; 2253 cf::cede_to_tick;
2134 2254
2255 if (exists $self->{load_path}) {
2135 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block; 2257 $f->skip_block;
2137 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2138 or return; 2259 or return;
2139 2260
2140 $self->post_load_original 2261 $self->post_load_original
2141 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2142 2263
2143 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2144 utf8::encode $uniq; 2265 utf8::encode $uniq;
2145 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2147 $self->clear_unique_items; 2268 $self->clear_unique_items;
2148 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2150 } 2272 }
2151 } 2273 }
2152 }
2153 2274
2154 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2155 2282
2156 cf::cede_to_tick; 2283 cf::cede_to_tick;
2157 # now do the right thing for maps 2284 # now do the right thing for maps
2158 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2159 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
… …
2163 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2164 $self->decay_objects; 2291 $self->decay_objects;
2165 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2166 $self->update_buttons; 2293 $self->update_buttons;
2167 cf::cede_to_tick; 2294 cf::cede_to_tick;
2168 $self->activate; 2295 #$self->activate; # no longer activate maps automatically
2169 } 2296 }
2170 2297
2171 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2173
2174 $self->in_memory (cf::MAP_ACTIVE);
2175 } 2300 }
2176 2301
2177 $self->post_load; 2302 $self->post_load;
2178 2303
2179 1 2304 1
… …
2192# if $self->per_party; 2317# if $self->per_party;
2193 2318
2194 $self 2319 $self
2195} 2320}
2196 2321
2197# find and load all maps in the 3x3 area around a map
2198sub load_neighbours {
2199 my ($map) = @_;
2200
2201 my @neigh; # diagonal neighbours
2202
2203 for (0 .. 3) {
2204 my $neigh = $map->tile_path ($_)
2205 or next;
2206 $neigh = find $neigh, $map
2207 or next;
2208 $neigh->load;
2209
2210 # now find the diagonal neighbours
2211 push @neigh,
2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2214 }
2215
2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
2218 my $neigh = find $path, $origin
2219 or next;
2220 $neigh->load;
2221 }
2222}
2223
2224sub find_sync { 2322sub find_sync {
2225 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2226 2324
2325 # it's a bug to call this from the main context
2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main; 2327 if $Coro::current == $Coro::main;
2229 2328
2230 find $path, $origin 2329 find $path, $origin
2231} 2330}
2232 2331
2233sub do_load_sync { 2332sub do_load_sync {
2234 my ($map) = @_; 2333 my ($map) = @_;
2235 2334
2335 # it's a bug to call this from the main context
2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2238 2338
2239 $map->load; 2339 $map->load;
2240} 2340}
… …
2243our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2244 2344
2245sub find_async { 2345sub find_async {
2246 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2247 2347
2248 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2249 2349
2250 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2252 } 2352 }
2253 2353
2254 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2255 2355
2256 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
… …
2315sub swap_out { 2415sub swap_out {
2316 my ($self) = @_; 2416 my ($self) = @_;
2317 2417
2318 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2319 2419
2320 return if $self->in_memory != cf::MAP_ACTIVE; 2420 return if !$self->linkable;
2321 return if $self->{deny_save}; 2421 return if $self->{deny_save};
2322 return if $self->players; 2422 return if $self->players;
2323 2423
2324 # first deactivate the map and "unlink" it from the core 2424 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate; 2425 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED); 2427 $self->state (cf::MAP_SWAPPED);
2328 2428
2329 # then atomically save 2429 # then atomically save
2330 $self->_save; 2430 $self->_save;
2331 2431
2332 # then free the map 2432 # then free the map
… …
2358 2458
2359 return if $self->players; 2459 return if $self->players;
2360 2460
2361 cf::trace "resetting map ", $self->path, "\n"; 2461 cf::trace "resetting map ", $self->path, "\n";
2362 2462
2363 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2364 2464
2365 # need to save uniques path 2465 # need to save uniques path
2366 unless ($self->{deny_save}) { 2466 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq; 2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368 2468
… …
2698 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2699 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2700 if $x <= 0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2701 2801
2702 $map->load; 2802 $map->load;
2703 $map->load_neighbours;
2704 2803
2705 return unless $self->contr->active; 2804 return unless $self->contr->active;
2706 2805
2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708 if ($self->enter_map ($map, $x, $y)) { 2807 if ($self->enter_map ($map, $x, $y)) {
… …
2764 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2765 } 2864 }
2766 } 2865 }
2767 2866
2768 my $map = eval { 2867 my $map = eval {
2769 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770 2869
2771 if ($map) { 2870 if ($map) {
2772 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2773 $map = $check->($map, $x, $y, $self) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2774 } else { 2873 } else {
… …
2864 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2865 2964
2866 unless (eval { 2965 unless (eval {
2867 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2868 2967
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2878 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2880 2994
2881 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2882 2996
2883 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
… …
3109=cut 3223=cut
3110 3224
3111sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
3112 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
3113 3227
3114 if ($self->extcmd == 2) {
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116 } elsif ($self->extcmd == 1) { # TODO: remove
3117 push @msg, msgtype => "event_$type";
3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120}
3121
3122=item $client->ext_reply ($msgid, @msg)
3123
3124Sends an ext reply to the client.
3125
3126=cut
3127
3128sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_;
3130
3131 if ($self->extcmd == 2) {
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
3138} 3229}
3139 3230
3140=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
3141 3232
3142Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
… …
3197 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
3198 3289
3199 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200 3291
3201 if (ref $msg) { 3292 if (ref $msg) {
3202 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206 3294
3207 my @reply; 3295 my @reply;
3208 3296
3209 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3210 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3211 } 3299 }
3212 3300
3213 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3214 if $reply; 3302 if $reply;
3215 3303
3216 } else { 3304 } else {
3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3218 } 3306 }
… …
3388=cut 3476=cut
3389 3477
3390############################################################################# 3478#############################################################################
3391# the server's init and main functions 3479# the server's init and main functions
3392 3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3504
3393sub load_facedata($) { 3505sub load_facedata($) {
3394 my ($path) = @_; 3506 my ($path) = @_;
3395 3507
3396 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3397 # for this (global event?) 3509 # for this (global event?)
… …
3399 3511
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401 3513
3402 trace "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3403 3515
3404 0 < aio_load $path, my $facedata 3516 my $facedata = decode_storable load_file $path;
3405 or die "$path: $!";
3406
3407 $facedata = Coro::Storable::thaw $facedata;
3408 3517
3409 $facedata->{version} == 2 3518 $facedata->{version} == 2
3410 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3411 3520
3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414 $facedata->{resource}{"res/exp_table"} = {
3415 type => FT_RSRC,
3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3418 };
3419 cf::cede_to_tick; 3521 cf::cede_to_tick;
3420 3522
3421 { 3523 {
3422 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3423 3525
3424 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3425 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426 3529
3427 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3428 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3432 3536
3433 cf::cede_to_tick; 3537 cf::cede_to_tick;
3434 } 3538 }
3435 3539
3436 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
… …
3463 3567
3464 { 3568 {
3465 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3466 3570
3467 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3468 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3469 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3470 3575
3576 cf::face::set_type $idx, $type;
3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3472 cf::face::set_type $idx, $info->{type}; 3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3473 } else { 3580 } else {
3474 $RESOURCE{$name} = $info; # unused 3581# $RESOURCE{$name} = $info; # unused
3475 } 3582 }
3476 3583
3477 cf::cede_to_tick; 3584 cf::cede_to_tick;
3478 } 3585 }
3479 } 3586 }
… …
3497 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3499 cf::arch::commit_load; 3606 cf::arch::commit_load;
3500 3607
3501 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3502} 3622}
3503 3623
3504sub reload_regions { 3624sub reload_regions {
3505 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3506 # for this (global event?) 3626 # for this (global event?)
… …
3521} 3641}
3522 3642
3523sub reload_archetypes { 3643sub reload_archetypes {
3524 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3525 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3526} 3655}
3527 3656
3528sub reload_treasures { 3657sub reload_treasures {
3529 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3530 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3531} 3660}
3532 3661
3533sub reload_sound { 3662sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n"; 3663 trace "loading sound config from $DATADIR/sound\n";
3535 3664
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3540 3666
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_] 3668 my $sound = $soundconf->{compat}[$_]
3543 or next; 3669 or next;
3544 3670
… …
3551 my $face = cf::face::find "sound/$v"; 3677 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face; 3678 cf::sound::set $k => $face;
3553 } 3679 }
3554} 3680}
3555 3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3556sub reload_resources { 3744sub reload_resources {
3557 trace "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3558 3746
3559 reload_exp_table;
3560 reload_materials; 3747 reload_materials;
3561 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3562 reload_sound; 3750 reload_sound;
3563 reload_archetypes; 3751 reload_archetypes;
3564 reload_regions; 3752 reload_regions;
3565 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3566 3755
3567 trace "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3568} 3757}
3569 3758
3570sub reload_config { 3759sub reload_config {
3571 trace "reloading config file...\n"; 3760 trace "reloading config file...\n";
3572 3761
3573 0 < aio_load "$CONFDIR/config", my $config 3762 my $config = load_file "$CONFDIR/config";
3574 or die "$CONFDIR/config: $!";
3575
3576 utf8::decode $config; 3763 utf8::decode $config;
3577 *CFG = yaml_load $config; 3764 *CFG = decode_yaml $config;
3578 3765
3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3580 3767
3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3620 3807
3621sub main { 3808sub main {
3622 cf::init_globals; # initialise logging 3809 cf::init_globals; # initialise logging
3623 3810
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628 3815
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630 3817
3631 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3632 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3634 (async { 3821 (async {
3635 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3637 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
… …
3640 evthread_start IO::AIO::poll_fileno; 3827 evthread_start IO::AIO::poll_fileno;
3641 3828
3642 cf::sync_job { 3829 cf::sync_job {
3643 cf::incloader::init (); 3830 cf::incloader::init ();
3644 3831
3832 db_init;
3833
3645 cf::init_anim; 3834 cf::init_anim;
3646 cf::init_attackmess; 3835 cf::init_attackmess;
3647 cf::init_dynamic; 3836 cf::init_dynamic;
3648 3837
3649 cf::load_settings; 3838 cf::load_settings;
3650 3839
3651 reload_resources; 3840 reload_resources;
3652 reload_config; 3841 reload_config;
3653 db_init;
3654 3842
3655 cf::init_uuid; 3843 cf::init_uuid;
3656 cf::init_signals; 3844 cf::init_signals;
3657 cf::init_skills; 3845 cf::init_skills;
3658 3846
… …
3672 }; 3860 };
3673 3861
3674 cf::object::thawer::errors_are_fatal 0; 3862 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n"; 3863 info "parse errors in files are no longer fatal from this point on.\n";
3676 3864
3677 my $free_main; $free_main = EV::idle sub { 3865 AE::postpone {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :) 3866 undef &main; # free gobs of memory :)
3680 }; 3867 };
3681 3868
3682 goto &main_loop; 3869 goto &main_loop;
3683} 3870}
… …
3840 4027
3841 cf::write_runtime_sync; # external watchdog should not bark 4028 cf::write_runtime_sync; # external watchdog should not bark
3842 4029
3843 trace "emergency_perl_save: flushing outstanding aio requests"; 4030 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) { 4031 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3846 } 4033 }
3847 4034
3848 cf::write_runtime_sync; # external watchdog should not bark 4035 cf::write_runtime_sync; # external watchdog should not bark
3849 }; 4036 };
3850 4037
… …
4031 4218
4032############################################################################# 4219#############################################################################
4033 4220
4034my $bug_warning = 0; 4221my $bug_warning = 0;
4035 4222
4036our @WAIT_FOR_TICK;
4037our @WAIT_FOR_TICK_BEGIN;
4038
4039sub wait_for_tick() { 4223sub wait_for_tick() {
4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4041 4225
4042 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
4043 push @WAIT_FOR_TICK, $signal;
4044 $signal->wait;
4045} 4227}
4046 4228
4047sub wait_for_tick_begin() { 4229sub wait_for_tick_begin() {
4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4049 4231
4050 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
4051 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
4052 $signal->wait; 4234 $signal->wait;
4053} 4235}
… …
4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4058 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
4059 return; 4241 return;
4060 } 4242 }
4061 4243
4062 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
4063 4245
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065 4247
4066 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4073 } 4255 }
4074 4256
4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4076 $sig->send; 4258 $sig->send;
4077 } 4259 }
4078 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
4079 $sig->send;
4080 }
4081 4261
4082 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4084 4264
4085 if (0) { 4265 if (0) {
… …
4091 } 4271 }
4092} 4272}
4093 4273
4094{ 4274{
4095 # configure BDB 4275 # configure BDB
4276 info "initialising database";
4096 4277
4097 BDB::min_parallel 16; 4278 BDB::min_parallel 16;
4098 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
4099 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
4100 4281
4101 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
4102 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130 }; 4311 };
4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133 }; 4314 };
4315
4316 info "database initialised";
4134} 4317}
4135 4318
4136{ 4319{
4137 # configure IO::AIO 4320 # configure IO::AIO
4138 4321
4322 info "initialising aio";
4139 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
4140 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
4141 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
4142} 4327}
4143 4328
4144our $_log_backtrace; 4329our $_log_backtrace;
4145our $_log_backtrace_last; 4330our $_log_backtrace_last;
4146 4331

Diff Legend

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