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.544 by root, Thu May 6 21:58:07 2010 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 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
… …
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 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
… …
307} 338}
308 339
309$EV::DIED = sub { 340$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "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
… …
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
… …
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;
… …
2053sub find { 2210sub find {
2054 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2055 2212
2056 cf::cede_to_tick; 2213 cf::cede_to_tick;
2057 2214
2058 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2059 2216
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2062 2219
2063 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2094 2251
2095 { 2252 {
2096 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2097 2254
2098 return unless $self->valid; 2255 return unless $self->valid;
2099 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2100
2101 $self->in_memory (cf::MAP_LOADING);
2102 2257
2103 $self->alloc; 2258 $self->alloc;
2104 2259
2105 $self->pre_load; 2260 $self->pre_load;
2106 cf::cede_to_tick; 2261 cf::cede_to_tick;
2107 2262
2263 if (exists $self->{load_path}) {
2108 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block; 2265 $f->skip_block;
2110 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2111 or return; 2267 or return;
2112 2268
2113 $self->post_load_original 2269 $self->post_load_original
2114 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2115 2271
2116 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2117 utf8::encode $uniq; 2273 utf8::encode $uniq;
2118 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2120 $self->clear_unique_items; 2276 $self->clear_unique_items;
2121 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2123 } 2280 }
2124 } 2281 }
2125 }
2126 2282
2127 $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);
2128 2290
2129 cf::cede_to_tick; 2291 cf::cede_to_tick;
2130 # now do the right thing for maps 2292 # now do the right thing for maps
2131 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2132 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2136 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2137 $self->decay_objects; 2299 $self->decay_objects;
2138 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2139 $self->update_buttons; 2301 $self->update_buttons;
2140 cf::cede_to_tick; 2302 cf::cede_to_tick;
2141 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2142 } 2304 }
2143 2305
2144 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2145 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2146
2147 $self->in_memory (cf::MAP_ACTIVE);
2148 } 2308 }
2149 2309
2150 $self->post_load; 2310 $self->post_load;
2311
2312 1
2151} 2313}
2152 2314
2153# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2163# if $self->per_party; 2325# if $self->per_party;
2164 2326
2165 $self 2327 $self
2166} 2328}
2167 2329
2168# find and load all maps in the 3x3 area around a map
2169sub load_neighbours {
2170 my ($map) = @_;
2171
2172 my @neigh; # diagonal neighbours
2173
2174 for (0 .. 3) {
2175 my $neigh = $map->tile_path ($_)
2176 or next;
2177 $neigh = find $neigh, $map
2178 or next;
2179 $neigh->load;
2180
2181 # now find the diagonal neighbours
2182 push @neigh,
2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2185 }
2186
2187 for (grep defined $_->[0], @neigh) {
2188 my ($path, $origin) = @$_;
2189 my $neigh = find $path, $origin
2190 or next;
2191 $neigh->load;
2192 }
2193}
2194
2195sub find_sync { 2330sub find_sync {
2196 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2197 2332
2333 # it's a bug to call this from the main context
2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2200 2336
2201 find $path, $origin 2337 find $path, $origin
2202} 2338}
2203 2339
2204sub do_load_sync { 2340sub do_load_sync {
2205 my ($map) = @_; 2341 my ($map) = @_;
2206 2342
2343 # it's a bug to call this from the main context
2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2209 2346
2210 $map->load; 2347 $map->load;
2211} 2348}
… …
2214our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2215 2352
2216sub find_async { 2353sub find_async {
2217 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2218 2355
2219 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2220 2357
2221 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2223 } 2360 }
2224 2361
2225 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2226 2363
2227 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2286sub swap_out { 2423sub swap_out {
2287 my ($self) = @_; 2424 my ($self) = @_;
2288 2425
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2427
2291 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2292 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2293 return if $self->players; 2430 return if $self->players;
2294 2431
2295 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate; 2433 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2299 2436
2300 # then atomically save 2437 # then atomically save
2301 $self->_save; 2438 $self->_save;
2302 2439
2303 # then free the map 2440 # then free the map
… …
2329 2466
2330 return if $self->players; 2467 return if $self->players;
2331 2468
2332 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2333 2470
2334 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2335 2472
2336 # need to save uniques path 2473 # need to save uniques path
2337 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339 2476
… …
2669 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2670 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2671 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2672 2809
2673 $map->load; 2810 $map->load;
2674 $map->load_neighbours;
2675 2811
2676 return unless $self->contr->active; 2812 return unless $self->contr->active;
2677 2813
2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2679 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2735 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2736 } 2872 }
2737 } 2873 }
2738 2874
2739 my $map = eval { 2875 my $map = eval {
2740 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741 2877
2742 if ($map) { 2878 if ($map) {
2743 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2744 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2745 } else { 2881 } else {
… …
2835 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2836 2972
2837 unless (eval { 2973 unless (eval {
2838 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2839 2975
2840 # random map handling
2841 {
2842 my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844 prepare_random_map $exit
2845 if $exit->slaying eq "/!";
2846 }
2847
2848 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2849 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2850 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 }
2851 3002
2852 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2853 3004
2854 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2855 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3097=cut 3248=cut
3098 3249
3099sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3100 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3101 3252
3102 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3103 $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]));
3104 } elsif ($self->extcmd == 1) {
3105 #TODO: version 1, remove
3106 unshift @msg, msgtype => "reply", msgid => $id;
3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108 }
3109} 3256}
3110 3257
3111=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3112 3259
3113Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3168 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3169 3316
3170 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3171 3318
3172 if (ref $msg) { 3319 if (ref $msg) {
3173 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3174 "ARRAY" eq ref $msg
3175 ? @$msg
3176 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177 3321
3178 my @reply; 3322 my @reply;
3179 3323
3180 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3181 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3359=cut 3503=cut
3360 3504
3361############################################################################# 3505#############################################################################
3362# the server's init and main functions 3506# the server's init and main functions
3363 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3364sub load_facedata($) { 3510sub load_facedata($) {
3365 my ($path) = @_; 3511 my ($path) = @_;
3366 3512
3367 # 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
3368 # for this (global event?) 3514 # for this (global event?)
… …
3370 3516
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3518
3373 trace "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3374 3520
3375 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3522
3381 $facedata->{version} == 2 3523 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3525
3384 # patch in the exptable 3526 # patch in the exptable
… …
3398 3540
3399 cf::face::set_visibility $idx, $info->{visibility}; 3541 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3542 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3546 $FACEHASH{$info->{hash64}} = $idx;#d#
3403 3547
3404 cf::cede_to_tick; 3548 cf::cede_to_tick;
3405 } 3549 }
3406 3550
3407 while (my ($face, $info) = each %$faces) { 3551 while (my ($face, $info) = each %$faces) {
… …
3434 3578
3435 { 3579 {
3436 my $res = $facedata->{resource}; 3580 my $res = $facedata->{resource};
3437 3581
3438 while (my ($name, $info) = each %$res) { 3582 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3583 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3585 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3586
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3588 cf::face::set_type $idx, $type;
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d#
3444 } else { 3591 } else {
3445 $RESOURCE{$name} = $info; # unused 3592# $RESOURCE{$name} = $info; # unused
3446 } 3593 }
3447 3594
3448 cf::cede_to_tick; 3595 cf::cede_to_tick;
3449 } 3596 }
3450 } 3597 }
… …
3499sub reload_treasures { 3646sub reload_treasures {
3500 load_resource_file "$DATADIR/treasures" 3647 load_resource_file "$DATADIR/treasures"
3501 or die "unable to load treasurelists\n"; 3648 or die "unable to load treasurelists\n";
3502} 3649}
3503 3650
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3508sub reload_sound { 3651sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n"; 3652 trace "loading sound config from $DATADIR/sound\n";
3510 3653
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3654 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515 3655
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3656 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_] 3657 my $sound = $soundconf->{compat}[$_]
3518 or next; 3658 or next;
3519 3659
… …
3529} 3669}
3530 3670
3531sub reload_resources { 3671sub reload_resources {
3532 trace "reloading resource files...\n"; 3672 trace "reloading resource files...\n";
3533 3673
3534 reload_exp; 3674 reload_exp_table;
3675 reload_materials;
3535 reload_facedata; 3676 reload_facedata;
3536 reload_sound; 3677 reload_sound;
3537 reload_archetypes; 3678 reload_archetypes;
3538 reload_regions; 3679 reload_regions;
3539 reload_treasures; 3680 reload_treasures;
… …
3542} 3683}
3543 3684
3544sub reload_config { 3685sub reload_config {
3545 trace "reloading config file...\n"; 3686 trace "reloading config file...\n";
3546 3687
3547 open my $fh, "<:utf8", "$CONFDIR/config" 3688 my $config = load_file "$CONFDIR/config";
3548 or return; 3689 utf8::decode $config;
3549 3690 *CFG = decode_yaml $config;
3550 local $/;
3551 *CFG = YAML::XS::Load scalar <$fh>;
3552 3691
3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3692 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3554 3693
3555 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3694 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3556 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3695 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3560 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3699 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3561 and die "WARNING: m(un)lockall failed: $!\n"; 3700 and die "WARNING: m(un)lockall failed: $!\n";
3562 }; 3701 };
3563 warn $@ if $@; 3702 warn $@ if $@;
3564 } 3703 }
3565
3566 trace "finished reloading resource files\n";
3567} 3704}
3568 3705
3569sub pidfile() { 3706sub pidfile() {
3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3707 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3571 or die "$PIDFILE: $!"; 3708 or die "$PIDFILE: $!";
… …
3596 3733
3597sub main { 3734sub main {
3598 cf::init_globals; # initialise logging 3735 cf::init_globals; # initialise logging
3599 3736
3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3737 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3738 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3739 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3604 3741
3605 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3606 3743
… …
3621 cf::init_anim; 3758 cf::init_anim;
3622 cf::init_attackmess; 3759 cf::init_attackmess;
3623 cf::init_dynamic; 3760 cf::init_dynamic;
3624 3761
3625 cf::load_settings; 3762 cf::load_settings;
3626 cf::load_materials;
3627 3763
3628 reload_resources; 3764 reload_resources;
3629 reload_config; 3765 reload_config;
3630 db_init; 3766 db_init;
3631 3767
… …
3643 3779
3644 # no (long-running) fork's whatsoever before this point(!) 3780 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX (); 3781 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3782 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647 3783
3648 (pop @POST_INIT)->(0) while @POST_INIT; 3784 cf::_post_init 0;
3649 }; 3785 };
3650 3786
3651 cf::object::thawer::errors_are_fatal 0; 3787 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n"; 3788 info "parse errors in files are no longer fatal from this point on.\n";
3653 3789
3654 my $free_main; $free_main = EV::idle sub { 3790 AE::postpone {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :) 3791 undef &main; # free gobs of memory :)
3657 }; 3792 };
3658 3793
3659 goto &main_loop; 3794 goto &main_loop;
3660} 3795}
… …
3817 3952
3818 cf::write_runtime_sync; # external watchdog should not bark 3953 cf::write_runtime_sync; # external watchdog should not bark
3819 3954
3820 trace "emergency_perl_save: flushing outstanding aio requests"; 3955 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) { 3956 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3957 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3823 } 3958 }
3824 3959
3825 cf::write_runtime_sync; # external watchdog should not bark 3960 cf::write_runtime_sync; # external watchdog should not bark
3826 }; 3961 };
3827 3962
… …
3876 4011
3877 my $t1 = AE::time; 4012 my $t1 = AE::time;
3878 4013
3879 while ($RELOAD) { 4014 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl"; 4015 cf::get_slot 0.1, -1, "reload_perl";
3881 info "reloading..."; 4016 info "perl_reload: reloading...";
3882 4017
3883 trace "entering sync_job"; 4018 trace "perl_reload: entering sync_job";
3884 4019
3885 cf::sync_job { 4020 cf::sync_job {
3886 #cf::emergency_save; 4021 #cf::emergency_save;
3887 4022
3888 trace "cancelling all extension coros"; 4023 trace "perl_reload: cancelling all extension coros";
3889 $_->cancel for values %EXT_CORO; 4024 $_->cancel for values %EXT_CORO;
3890 %EXT_CORO = (); 4025 %EXT_CORO = ();
3891 4026
3892 trace "removing commands"; 4027 trace "perl_reload: removing commands";
3893 %COMMAND = (); 4028 %COMMAND = ();
3894 4029
3895 trace "removing ext/exti commands"; 4030 trace "perl_reload: removing ext/exti commands";
3896 %EXTCMD = (); 4031 %EXTCMD = ();
3897 %EXTICMD = (); 4032 %EXTICMD = ();
3898 4033
3899 trace "unloading/nuking all extensions"; 4034 trace "perl_reload: unloading/nuking all extensions";
3900 for my $pkg (@EXTS) { 4035 for my $pkg (@EXTS) {
3901 trace "... unloading $pkg"; 4036 trace "... unloading $pkg";
3902 4037
3903 if (my $cb = $pkg->can ("unload")) { 4038 if (my $cb = $pkg->can ("unload")) {
3904 eval { 4039 eval {
… …
3909 4044
3910 trace "... clearing $pkg"; 4045 trace "... clearing $pkg";
3911 clear_package $pkg; 4046 clear_package $pkg;
3912 } 4047 }
3913 4048
3914 trace "unloading all perl modules loaded from $LIBDIR"; 4049 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915 while (my ($k, $v) = each %INC) { 4050 while (my ($k, $v) = each %INC) {
3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4051 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917 4052
3918 trace "... unloading $k"; 4053 trace "... unloading $k";
3919 delete $INC{$k}; 4054 delete $INC{$k};
… …
3926 } 4061 }
3927 4062
3928 clear_package $k; 4063 clear_package $k;
3929 } 4064 }
3930 4065
3931 trace "getting rid of safe::, as good as possible"; 4066 trace "perl_reload: getting rid of safe::, as good as possible";
3932 clear_package "safe::$_" 4067 clear_package "safe::$_"
3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4068 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3934 4069
3935 trace "unloading cf.pm \"a bit\""; 4070 trace "perl_reload: unloading cf.pm \"a bit\"";
3936 delete $INC{"cf.pm"}; 4071 delete $INC{"cf.pm"};
3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4072 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938 4073
3939 # don't, removes xs symbols, too, 4074 # don't, removes xs symbols, too,
3940 # and global variables created in xs 4075 # and global variables created in xs
3941 #clear_package __PACKAGE__; 4076 #clear_package __PACKAGE__;
3942 4077
3943 info "unload completed, starting to reload now"; 4078 info "perl_reload: unload completed, starting to reload now";
3944 4079
3945 trace "reloading cf.pm"; 4080 trace "perl_reload: reloading cf.pm";
3946 require cf; 4081 require cf;
3947 cf::_connect_to_perl_1; 4082 cf::_connect_to_perl_1;
3948 4083
3949 trace "loading config and database again"; 4084 trace "perl_reload: loading config and database again";
3950 cf::reload_config; 4085 cf::reload_config;
3951 4086
3952 trace "loading extensions"; 4087 trace "perl_reload: loading extensions";
3953 cf::load_extensions; 4088 cf::load_extensions;
3954 4089
3955 if ($REATTACH_ON_RELOAD) { 4090 if ($REATTACH_ON_RELOAD) {
3956 trace "reattaching attachments to objects/players"; 4091 trace "perl_reload: reattaching attachments to objects/players";
3957 _global_reattach; # objects, sockets 4092 _global_reattach; # objects, sockets
3958 trace "reattaching attachments to maps"; 4093 trace "perl_reload: reattaching attachments to maps";
3959 reattach $_ for values %MAP; 4094 reattach $_ for values %MAP;
3960 trace "reattaching attachments to players"; 4095 trace "perl_reload: reattaching attachments to players";
3961 reattach $_ for values %PLAYER; 4096 reattach $_ for values %PLAYER;
3962 } 4097 }
3963 4098
3964 trace "running post_init jobs"; 4099 cf::_post_init 1;
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966 4100
3967 trace "leaving sync_job"; 4101 trace "perl_reload: leaving sync_job";
3968 4102
3969 1 4103 1
3970 } or do { 4104 } or do {
3971 error $@; 4105 error $@;
3972 cf::cleanup "error while reloading, exiting."; 4106 cf::cleanup "perl_reload: error, exiting.";
3973 }; 4107 };
3974 4108
3975 info "reloaded";
3976 --$RELOAD; 4109 --$RELOAD;
3977 } 4110 }
3978 4111
3979 $t1 = AE::time - $t1; 4112 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n"; 4113 info "perl_reload: completed in ${t1}s\n";
3981}; 4114};
3982 4115
3983our $RELOAD_WATCHER; # used only during reload 4116our $RELOAD_WATCHER; # used only during reload
3984 4117
3985sub reload_perl() { 4118sub reload_perl() {
… …
4010 4143
4011############################################################################# 4144#############################################################################
4012 4145
4013my $bug_warning = 0; 4146my $bug_warning = 0;
4014 4147
4015our @WAIT_FOR_TICK;
4016our @WAIT_FOR_TICK_BEGIN;
4017
4018sub wait_for_tick { 4148sub wait_for_tick() {
4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4149 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020 4150
4021 my $signal = new Coro::Signal; 4151 $WAIT_FOR_TICK->wait;
4022 push @WAIT_FOR_TICK, $signal;
4023 $signal->wait;
4024} 4152}
4025 4153
4026sub wait_for_tick_begin { 4154sub wait_for_tick_begin() {
4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4155 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028 4156
4029 my $signal = new Coro::Signal; 4157 my $signal = new Coro::Signal;
4030 push @WAIT_FOR_TICK_BEGIN, $signal; 4158 push @WAIT_FOR_TICK_BEGIN, $signal;
4031 $signal->wait; 4159 $signal->wait;
4032} 4160}
… …
4036 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4164 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4037 unless ++$bug_warning > 10; 4165 unless ++$bug_warning > 10;
4038 return; 4166 return;
4039 } 4167 }
4040 4168
4041 cf::server_tick; # one server iteration 4169 cf::one_tick; # one server iteration
4042 4170
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4171 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044 4172
4045 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4173 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4174 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4052 } 4180 }
4053 4181
4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4182 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055 $sig->send; 4183 $sig->send;
4056 } 4184 }
4057 while (my $sig = shift @WAIT_FOR_TICK) { 4185 $WAIT_FOR_TICK->broadcast;
4058 $sig->send;
4059 }
4060 4186
4061 $LOAD = ($NOW - $TICK_START) / $TICK; 4187 $LOAD = ($NOW - $TICK_START) / $TICK;
4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4188 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063 4189
4064 if (0) { 4190 if (0) {
… …
4073{ 4199{
4074 # configure BDB 4200 # configure BDB
4075 4201
4076 BDB::min_parallel 16; 4202 BDB::min_parallel 16;
4077 BDB::max_poll_reqs $TICK * 0.1; 4203 BDB::max_poll_reqs $TICK * 0.1;
4078 $AnyEvent::BDB::WATCHER->priority (1); 4204 #$AnyEvent::BDB::WATCHER->priority (1);
4079 4205
4080 unless ($DB_ENV) { 4206 unless ($DB_ENV) {
4081 $DB_ENV = BDB::db_env_create; 4207 $DB_ENV = BDB::db_env_create;
4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4208 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4209 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4118 IO::AIO::min_parallel 8; 4244 IO::AIO::min_parallel 8;
4119 IO::AIO::max_poll_time $TICK * 0.1; 4245 IO::AIO::max_poll_time $TICK * 0.1;
4120 undef $AnyEvent::AIO::WATCHER; 4246 undef $AnyEvent::AIO::WATCHER;
4121} 4247}
4122 4248
4123my $_log_backtrace; 4249our $_log_backtrace;
4250our $_log_backtrace_last;
4124 4251
4125sub _log_backtrace { 4252sub _log_backtrace {
4126 my ($msg, @addr) = @_; 4253 my ($msg, @addr) = @_;
4127 4254
4128 $msg =~ s/\n//; 4255 $msg =~ s/\n$//;
4129 4256
4257 if ($_log_backtrace_last eq $msg) {
4258 LOG llevInfo, "[ABT] $msg\n";
4259 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130 # limit the # of concurrent backtraces 4260 # limit the # of concurrent backtraces
4131 if ($_log_backtrace < 2) { 4261 } elsif ($_log_backtrace < 2) {
4262 $_log_backtrace_last = $msg;
4132 ++$_log_backtrace; 4263 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg; 4264 my $perl_bt = Carp::longmess $msg;
4134 async { 4265 async {
4135 $Coro::current->{desc} = "abt $msg"; 4266 $Coro::current->{desc} = "abt $msg";
4136 4267
… …
4156 LOG llevInfo, "[ABT] $_\n" for @bt; 4287 LOG llevInfo, "[ABT] $_\n" for @bt;
4157 --$_log_backtrace; 4288 --$_log_backtrace;
4158 }; 4289 };
4159 } else { 4290 } else {
4160 LOG llevInfo, "[ABT] $msg\n"; 4291 LOG llevInfo, "[ABT] $msg\n";
4161 LOG llevInfo, "[ABT] [suppressed]\n"; 4292 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162 } 4293 }
4163} 4294}
4164 4295
4165# load additional modules 4296# load additional modules
4166require "cf/$_.pm" for @EXTRA_MODULES; 4297require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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