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.542 by root, Wed May 5 09:05:03 2010 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 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
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 135
133our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
135our $NOW; 139our $NOW;
136 140
137our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
148 152
149our @POST_INIT; 153our @POST_INIT;
150 154
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
153 160
154binmode STDOUT; 161binmode STDOUT;
155binmode STDERR; 162binmode STDERR;
156 163
157# read virtual server time, if available 164# read virtual server time, if available
… …
191 198
192=over 4 199=over 4
193 200
194=item $cf::UPTIME 201=item $cf::UPTIME
195 202
196The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
197 219
198=item $cf::RUNTIME 220=item $cf::RUNTIME
199 221
200The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 223every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
210database environment. 232database environment.
211 233
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 234=item $cf::LOADAVG
221 235
222The current CPU load on the server (alpha-smoothed), as a value between 0 236The 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 237(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 247from wherever your confdir points to.
234 248
235=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
236 250
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These 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 process 252returns 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. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
240 271
241=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
242 273
243This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
305)) { 336)) {
306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307} 338}
308 339
309$EV::DIED = sub { 340$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 341 warn "error in event callback: $@";
311}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
312 348
313############################################################################# 349#############################################################################
314 350
315=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
316 352
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 374 $d
339 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
340} 376}
341 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
342=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
343 431
344Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
345 433
346=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 441
354sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
356 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
357=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
358 477
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
361 480
362The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 482is a reload or not.
364 483
365=cut 484=cut
366 485
367sub post_init(&) { 486sub post_init(&) {
368 push @POST_INIT, shift; 487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
369} 505}
370 506
371=item cf::lock_wait $string 507=item cf::lock_wait $string
372 508
373Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
427} 563}
428 564
429=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
430 566
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
434 574
435The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
437 577
438Useful for short background jobs. 578Useful for short background jobs.
… …
467 } 607 }
468 } 608 }
469 609
470 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 613 } else {
475 $busy = 0; 614 $busy = 0;
476 Coro::schedule; 615 Coro::schedule;
477 } 616 }
478 } 617 }
… …
578 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
579 718
580 $coro 719 $coro
581} 720}
582 721
583=item fork_call { }, $args 722=item fork_call { }, @args
584 723
585Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 727never block itself or use any form of event handling.
589 728
590=cut 729=cut
591 730
731sub post_fork {
732 reset_signals;
733}
734
592sub fork_call(&@) { 735sub fork_call(&@) {
593 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
594 737
595 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
598 741
599 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
600 reset_signals; 743 cf::post_fork;
601 &$cb 744 &$cb
602 }, @args; 745 } @args;
603 746
604 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
605} 748}
606 749
607sub objinfo { 750sub objinfo {
… …
729 872
730 my @data; 873 my @data;
731 my $md5; 874 my $md5;
732 875
733 for (0 .. $#$src) { 876 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 878 }
737 879
738 # if processing is expensive, check 880 # if processing is expensive, check
739 # checksum first 881 # checksum first
740 if (1) { 882 if (1) {
… …
1358 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1359 1501
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1503
1362 if (ref $msg) { 1504 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367 1506
1368 my @reply; 1507 my @reply;
1369 1508
1370 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1393 }; 1532 };
1394 1533
1395 $grp 1534 $grp
1396} 1535}
1397 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1398sub load_extensions { 1548sub load_extensions {
1399 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1400 1552
1401 cf::sync_job { 1553 cf::sync_job {
1402 my %todo; 1554 my %todo;
1403 1555
1404 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1447 unless exists $done{$_}; 1599 unless exists $done{$_};
1448 } 1600 }
1449 1601
1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451 1603
1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1452 my $active = eval $v->{source}; 1613 my $active = eval $source;
1453 1614
1454 if (length $@) { 1615 if (length $@) {
1455 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1456 1617
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1474 1635
1475 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1478 } 1639 }
1640
1641 last;
1479 } 1642 }
1480 } 1643 }
1481 }; 1644 };
1482} 1645}
1483 1646
… …
1641 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1642 1805
1643 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1808
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1810 $pl->deactivate;
1811
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1650 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1651 1817
1652 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1986sub generate_random_map {
1821 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1822 1988
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1990
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1992}
1840 1993
1841=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1842 1995
1843Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
… …
1869} 2022}
1870 2023
1871sub normalise { 2024sub normalise {
1872 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1873 2026
1874 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1875 2028
1876 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1877 2030
1878 # map plan: 2031 # map plan:
1879 # 2032 #
… …
1894 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 2048 $path = "$base/$path";
1896 } 2049 }
1897 2050
1898 for ($path) { 2051 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1902 } 2054 }
1903 2055
1904 $path 2056 $path
… …
1918 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1919 return $self; 2071 return $self;
1920 } 2072 }
1921 } 2073 }
1922 2074
1923 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 2076 ()
1925} 2077}
1926 2078
2079# may re-bless or do other evil things
1927sub init { 2080sub init {
1928 my ($self) = @_; 2081 my ($self) = @_;
1929 2082
1930 $self 2083 $self
1931} 2084}
… …
1996 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1997 2150
1998 1 2151 1
1999} 2152}
2000 2153
2154# used to laod the header of an original map
2001sub load_header_orig { 2155sub load_header_orig {
2002 my ($self) = @_; 2156 my ($self) = @_;
2003 2157
2004 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2005} 2159}
2006 2160
2161# used to laod the header of an instantiated map
2007sub load_header_temp { 2162sub load_header_temp {
2008 my ($self) = @_; 2163 my ($self) = @_;
2009 2164
2010 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2011} 2166}
2012 2167
2168# called after loading the header from an instantiated map
2013sub prepare_temp { 2169sub prepare_temp {
2014 my ($self) = @_; 2170 my ($self) = @_;
2015 2171
2016 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2017 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2018 # safety 2174 # safety
2019 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2020 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2021} 2177}
2022 2178
2179# called after loading the header from an original map
2023sub prepare_orig { 2180sub prepare_orig {
2024 my ($self) = @_; 2181 my ($self) = @_;
2025 2182
2026 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2027 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2051 2208
2052sub find; 2209sub find;
2053sub find { 2210sub find {
2054 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2055 2212
2213 cf::cede_to_tick;
2214
2056 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2057 2216
2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2060 2219
2061 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2092 2251
2093 { 2252 {
2094 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2095 2254
2096 return unless $self->valid; 2255 return unless $self->valid;
2097 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2098
2099 $self->in_memory (cf::MAP_LOADING);
2100 2257
2101 $self->alloc; 2258 $self->alloc;
2102 2259
2103 $self->pre_load; 2260 $self->pre_load;
2104 cf::cede_to_tick; 2261 cf::cede_to_tick;
2105 2262
2263 if (exists $self->{load_path}) {
2106 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2107 $f->skip_block; 2265 $f->skip_block;
2108 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2109 or return; 2267 or return;
2110 2268
2111 $self->post_load_original 2269 $self->post_load_original
2112 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2113 2271
2114 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2115 utf8::encode $uniq; 2273 utf8::encode $uniq;
2116 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2117 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2118 $self->clear_unique_items; 2276 $self->clear_unique_items;
2119 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2120 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2121 } 2280 }
2122 } 2281 }
2123 }
2124 2282
2125 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2126 2290
2127 cf::cede_to_tick; 2291 cf::cede_to_tick;
2128 # now do the right thing for maps 2292 # now do the right thing for maps
2129 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2130 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2134 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2135 $self->decay_objects; 2299 $self->decay_objects;
2136 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2137 $self->update_buttons; 2301 $self->update_buttons;
2138 cf::cede_to_tick; 2302 cf::cede_to_tick;
2139 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2140 } 2304 }
2141 2305
2142 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2143 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2144
2145 $self->in_memory (cf::MAP_ACTIVE);
2146 } 2308 }
2147 2309
2148 $self->post_load; 2310 $self->post_load;
2311
2312 1
2149} 2313}
2150 2314
2151# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2161# if $self->per_party; 2325# if $self->per_party;
2162 2326
2163 $self 2327 $self
2164} 2328}
2165 2329
2166# find and load all maps in the 3x3 area around a map
2167sub load_neighbours {
2168 my ($map) = @_;
2169
2170 my @neigh; # diagonal neighbours
2171
2172 for (0 .. 3) {
2173 my $neigh = $map->tile_path ($_)
2174 or next;
2175 $neigh = find $neigh, $map
2176 or next;
2177 $neigh->load;
2178
2179 # now find the diagonal neighbours
2180 push @neigh,
2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2183 }
2184
2185 for (grep defined $_->[0], @neigh) {
2186 my ($path, $origin) = @$_;
2187 my $neigh = find $path, $origin
2188 or next;
2189 $neigh->load;
2190 }
2191}
2192
2193sub find_sync { 2330sub find_sync {
2194 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2195 2332
2333 # it's a bug to call this from the main context
2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2198 2336
2199 find $path, $origin 2337 find $path, $origin
2200} 2338}
2201 2339
2202sub do_load_sync { 2340sub do_load_sync {
2203 my ($map) = @_; 2341 my ($map) = @_;
2204 2342
2343 # it's a bug to call this from the main context
2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2207 2346
2208 $map->load; 2347 $map->load;
2209} 2348}
… …
2212our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2213 2352
2214sub find_async { 2353sub find_async {
2215 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2216 2355
2217 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2218 2357
2219 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2221 } 2360 }
2222 2361
2223 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2224 2363
2225 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2284sub swap_out { 2423sub swap_out {
2285 my ($self) = @_; 2424 my ($self) = @_;
2286 2425
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2427
2289 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2290 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2291 return if $self->players; 2430 return if $self->players;
2292 2431
2293 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate; 2433 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2297 2436
2298 # then atomically save 2437 # then atomically save
2299 $self->_save; 2438 $self->_save;
2300 2439
2301 # then free the map 2440 # then free the map
… …
2327 2466
2328 return if $self->players; 2467 return if $self->players;
2329 2468
2330 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2331 2470
2332 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2333 2472
2334 # need to save uniques path 2473 # need to save uniques path
2335 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337 2476
… …
2667 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2668 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2669 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2670 2809
2671 $map->load; 2810 $map->load;
2672 $map->load_neighbours;
2673 2811
2674 return unless $self->contr->active; 2812 return unless $self->contr->active;
2675 2813
2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2677 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2733 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2734 } 2872 }
2735 } 2873 }
2736 2874
2737 my $map = eval { 2875 my $map = eval {
2738 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739 2877
2740 if ($map) { 2878 if ($map) {
2741 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2742 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2743 } else { 2881 } else {
… …
2833 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2834 2972
2835 unless (eval { 2973 unless (eval {
2836 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2837 2975
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2847 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2848 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2849 3002
2850 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2851 3004
2852 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3095=cut 3248=cut
3096 3249
3097sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3098 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3099 3252
3100 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3102 } elsif ($self->extcmd == 1) {
3103 #TODO: version 1, remove
3104 unshift @msg, msgtype => "reply", msgid => $id;
3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3106 }
3107} 3256}
3108 3257
3109=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3110 3259
3111Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3166 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3167 3316
3168 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3169 3318
3170 if (ref $msg) { 3319 if (ref $msg) {
3171 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3172 "ARRAY" eq ref $msg
3173 ? @$msg
3174 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3175 3321
3176 my @reply; 3322 my @reply;
3177 3323
3178 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3179 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3357=cut 3503=cut
3358 3504
3359############################################################################# 3505#############################################################################
3360# the server's init and main functions 3506# the server's init and main functions
3361 3507
3362# async inc loader. yay. 3508our %FACEHASH; # hash => idx, #d# HACK for http server
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3403 3509
3404sub load_facedata($) { 3510sub load_facedata($) {
3405 my ($path) = @_; 3511 my ($path) = @_;
3406 3512
3407 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
… …
3410 3516
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3518
3413 trace "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3414 3520
3415 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3416 0 < aio_load $path, $facedata
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3522
3421 $facedata->{version} == 2 3523 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3525
3424 # patch in the exptable 3526 # patch in the exptable
… …
3431 cf::cede_to_tick; 3533 cf::cede_to_tick;
3432 3534
3433 { 3535 {
3434 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3435 3537
3436 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3437 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438 3541
3439 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3547 $FACEHASH{$info->{hash64}} = $idx;#d#
3443 3548
3444 cf::cede_to_tick; 3549 cf::cede_to_tick;
3445 } 3550 }
3446 3551
3447 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
… …
3474 3579
3475 { 3580 {
3476 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3477 3582
3478 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3479 if (defined $info->{type}) { 3584 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue
3480 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481 3587
3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483 cf::face::set_type $idx, $info->{type}; 3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d#
3484 } else { 3592 } else {
3485 $RESOURCE{$name} = $info; # unused 3593# $RESOURCE{$name} = $info; # unused
3486 } 3594 }
3487 3595
3488 cf::cede_to_tick; 3596 cf::cede_to_tick;
3489 } 3597 }
3490 } 3598 }
… …
3542} 3650}
3543 3651
3544sub reload_sound { 3652sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3653 trace "loading sound config from $DATADIR/sound\n";
3546 3654
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3656
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3658 my $sound = $soundconf->{compat}[$_]
3554 or next; 3659 or next;
3555 3660
… …
3565} 3670}
3566 3671
3567sub reload_resources { 3672sub reload_resources {
3568 trace "reloading resource files...\n"; 3673 trace "reloading resource files...\n";
3569 3674
3675 reload_exp_table;
3676 reload_materials;
3570 reload_facedata; 3677 reload_facedata;
3571 reload_sound; 3678 reload_sound;
3572 reload_archetypes; 3679 reload_archetypes;
3573 reload_regions; 3680 reload_regions;
3574 reload_treasures; 3681 reload_treasures;
… …
3577} 3684}
3578 3685
3579sub reload_config { 3686sub reload_config {
3580 trace "reloading config file...\n"; 3687 trace "reloading config file...\n";
3581 3688
3582 open my $fh, "<:utf8", "$CONFDIR/config" 3689 my $config = load_file "$CONFDIR/config";
3583 or return; 3690 utf8::decode $config;
3584 3691 *CFG = decode_yaml $config;
3585 local $/;
3586 *CFG = YAML::XS::Load scalar <$fh>;
3587 3692
3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589 3694
3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3695 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3696 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3700 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596 and die "WARNING: m(un)lockall failed: $!\n"; 3701 and die "WARNING: m(un)lockall failed: $!\n";
3597 }; 3702 };
3598 warn $@ if $@; 3703 warn $@ if $@;
3599 } 3704 }
3600
3601 trace "finished reloading resource files\n";
3602} 3705}
3603 3706
3604sub pidfile() { 3707sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3708 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!"; 3709 or die "$PIDFILE: $!";
… …
3631 3734
3632sub main { 3735sub main {
3633 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3634 3737
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3739 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3742
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641 3744
… …
3649 }; 3752 };
3650 3753
3651 evthread_start IO::AIO::poll_fileno; 3754 evthread_start IO::AIO::poll_fileno;
3652 3755
3653 cf::sync_job { 3756 cf::sync_job {
3654 init_inc; 3757 cf::incloader::init ();
3655 3758
3656 cf::init_experience;
3657 cf::init_anim; 3759 cf::init_anim;
3658 cf::init_attackmess; 3760 cf::init_attackmess;
3659 cf::init_dynamic; 3761 cf::init_dynamic;
3660 3762
3661 cf::load_settings; 3763 cf::load_settings;
3662 cf::load_materials;
3663 3764
3664 reload_resources; 3765 reload_resources;
3665 reload_config; 3766 reload_config;
3666 db_init; 3767 db_init;
3667 3768
… …
3679 3780
3680 # no (long-running) fork's whatsoever before this point(!) 3781 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX (); 3782 use POSIX ();
3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3783 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683 3784
3684 (pop @POST_INIT)->(0) while @POST_INIT; 3785 cf::_post_init 0;
3685 }; 3786 };
3686 3787
3687 cf::object::thawer::errors_are_fatal 0; 3788 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n"; 3789 info "parse errors in files are no longer fatal from this point on.\n";
3689 3790
3690 my $free_main; $free_main = EV::idle sub { 3791 AE::postpone {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :) 3792 undef &main; # free gobs of memory :)
3693 }; 3793 };
3694 3794
3695 goto &main_loop; 3795 goto &main_loop;
3696} 3796}
… …
3853 3953
3854 cf::write_runtime_sync; # external watchdog should not bark 3954 cf::write_runtime_sync; # external watchdog should not bark
3855 3955
3856 trace "emergency_perl_save: flushing outstanding aio requests"; 3956 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) { 3957 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3958 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3859 } 3959 }
3860 3960
3861 cf::write_runtime_sync; # external watchdog should not bark 3961 cf::write_runtime_sync; # external watchdog should not bark
3862 }; 3962 };
3863 3963
… …
3901 } 4001 }
3902} 4002}
3903 4003
3904sub do_reload_perl() { 4004sub do_reload_perl() {
3905 # can/must only be called in main 4005 # can/must only be called in main
3906 if (in_main) { 4006 unless (in_main) {
3907 error "can only reload from main coroutine"; 4007 error "can only reload from main coroutine";
3908 return; 4008 return;
3909 } 4009 }
3910 4010
3911 return if $RELOAD++; 4011 return if $RELOAD++;
3912 4012
3913 my $t1 = AE::time; 4013 my $t1 = AE::time;
3914 4014
3915 while ($RELOAD) { 4015 while ($RELOAD) {
4016 cf::get_slot 0.1, -1, "reload_perl";
3916 info "reloading..."; 4017 info "perl_reload: reloading...";
3917 4018
3918 trace "entering sync_job"; 4019 trace "perl_reload: entering sync_job";
3919 4020
3920 cf::sync_job { 4021 cf::sync_job {
3921 cf::emergency_save; 4022 #cf::emergency_save;
3922 4023
3923 trace "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3924 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3925 %EXT_CORO = (); 4026 %EXT_CORO = ();
3926 4027
3927 trace "removing commands"; 4028 trace "perl_reload: removing commands";
3928 %COMMAND = (); 4029 %COMMAND = ();
3929 4030
3930 trace "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3931 %EXTCMD = (); 4032 %EXTCMD = ();
3932 %EXTICMD = (); 4033 %EXTICMD = ();
3933 4034
3934 trace "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3935 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3936 trace "... unloading $pkg"; 4037 trace "... unloading $pkg";
3937 4038
3938 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3939 eval { 4040 eval {
… …
3944 4045
3945 trace "... clearing $pkg"; 4046 trace "... clearing $pkg";
3946 clear_package $pkg; 4047 clear_package $pkg;
3947 } 4048 }
3948 4049
3949 trace "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952 4053
3953 trace "... unloading $k"; 4054 trace "... unloading $k";
3954 delete $INC{$k}; 4055 delete $INC{$k};
… …
3961 } 4062 }
3962 4063
3963 clear_package $k; 4064 clear_package $k;
3964 } 4065 }
3965 4066
3966 trace "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3967 clear_package "safe::$_" 4068 clear_package "safe::$_"
3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4069 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3969 4070
3970 trace "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3971 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973 4074
3974 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3975 # and global variables created in xs 4076 # and global variables created in xs
3976 #clear_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3977 4078
3978 info "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3979 4080
3980 trace "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3981 require cf; 4082 require cf;
3982 cf::_connect_to_perl_1; 4083 cf::_connect_to_perl_1;
3983 4084
3984 trace "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3985 cf::reload_config; 4086 cf::reload_config;
3986 4087
3987 trace "loading extensions"; 4088 trace "perl_reload: loading extensions";
3988 cf::load_extensions; 4089 cf::load_extensions;
3989 4090
3990 if ($REATTACH_ON_RELOAD) { 4091 if ($REATTACH_ON_RELOAD) {
3991 trace "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3992 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3993 trace "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3994 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3995 trace "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3996 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
3997 } 4098 }
3998 4099
3999 trace "running post_init jobs"; 4100 cf::_post_init 1;
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001 4101
4002 trace "leaving sync_job"; 4102 trace "perl_reload: leaving sync_job";
4003 4103
4004 1 4104 1
4005 } or do { 4105 } or do {
4006 error $@; 4106 error $@;
4007 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
4008 }; 4108 };
4009 4109
4010 info "reloaded";
4011 --$RELOAD; 4110 --$RELOAD;
4012 } 4111 }
4013 4112
4014 $t1 = AE::time - $t1; 4113 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n"; 4114 info "perl_reload: completed in ${t1}s\n";
4016}; 4115};
4017 4116
4018our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
4019 4118
4020sub reload_perl() { 4119sub reload_perl() {
… …
4045 4144
4046############################################################################# 4145#############################################################################
4047 4146
4048my $bug_warning = 0; 4147my $bug_warning = 0;
4049 4148
4050our @WAIT_FOR_TICK;
4051our @WAIT_FOR_TICK_BEGIN;
4052
4053sub wait_for_tick { 4149sub wait_for_tick() {
4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4055 4151
4056 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
4057 push @WAIT_FOR_TICK, $signal;
4058 $signal->wait;
4059} 4153}
4060 4154
4061sub wait_for_tick_begin { 4155sub wait_for_tick_begin() {
4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4063 4157
4064 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
4065 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
4066 $signal->wait; 4160 $signal->wait;
4067} 4161}
… …
4071 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4165 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4072 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
4073 return; 4167 return;
4074 } 4168 }
4075 4169
4076 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4077 4171
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079 4173
4080 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4087 } 4181 }
4088 4182
4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4090 $sig->send; 4184 $sig->send;
4091 } 4185 }
4092 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
4093 $sig->send;
4094 }
4095 4187
4096 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4098 4190
4099 if (0) { 4191 if (0) {
… …
4108{ 4200{
4109 # configure BDB 4201 # configure BDB
4110 4202
4111 BDB::min_parallel 16; 4203 BDB::min_parallel 16;
4112 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
4113 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
4114 4206
4115 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
4116 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
4117 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4118 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4210 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4153 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
4154 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
4155 undef $AnyEvent::AIO::WATCHER; 4247 undef $AnyEvent::AIO::WATCHER;
4156} 4248}
4157 4249
4158my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
4159 4252
4160sub _log_backtrace { 4253sub _log_backtrace {
4161 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
4162 4255
4163 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
4164 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
4166 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
4167 ++$_log_backtrace; 4264 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg; 4265 my $perl_bt = Carp::longmess $msg;
4169 async { 4266 async {
4170 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
4171 4268
… …
4191 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
4192 --$_log_backtrace; 4289 --$_log_backtrace;
4193 }; 4290 };
4194 } else { 4291 } else {
4195 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
4196 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197 } 4294 }
4198} 4295}
4199 4296
4200# load additional modules 4297# load additional modules
4201require "cf/$_.pm" for @EXTRA_MODULES; 4298require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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