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.546 by root, Thu May 6 22:57:49 2010 UTC vs.
Revision 1.585 by root, Tue Oct 30 20:18:00 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.
… …
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 thread 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.
240 266
241=cut 267=cut
242 268
243sub wait_for_tick(); 269sub wait_for_tick();
244sub wait_for_tick_begin(); 270sub wait_for_tick_begin();
… …
312} 338}
313 339
314$EV::DIED = sub { 340$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
316}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
317 348
318############################################################################# 349#############################################################################
319 350
320=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
321 352
… …
342 $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;
343 $d 374 $d
344 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
345} 376}
346 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
347=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
348 431
349Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
350 433
351=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
357our $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
358 441
359sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
361 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
362=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
363 477
364Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
366 480
367The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
368is a reload or not. 482is a reload or not.
369 483
370=cut 484=cut
371 485
372sub post_init(&) { 486sub post_init(&) {
373 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 }
374} 505}
375 506
376=item cf::lock_wait $string 507=item cf::lock_wait $string
377 508
378Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
431 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
432} 563}
433 564
434=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
435 566
436Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
437This 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
438of 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.
439 574
440The 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
441used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
442 577
443Useful for short background jobs. 578Useful for short background jobs.
… …
472 } 607 }
473 } 608 }
474 609
475 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
476 # 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
477 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
478 $signal->wait;
479 } else { 613 } else {
480 $busy = 0; 614 $busy = 0;
481 Coro::schedule; 615 Coro::schedule;
482 } 616 }
483 } 617 }
… …
583 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
584 718
585 $coro 719 $coro
586} 720}
587 721
588=item fork_call { }, $args 722=item fork_call { }, @args
589 723
590Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
591process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
592Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
593never block itself or use any form of event handling. 727never block itself or use any form of event handling.
594 728
595=cut 729=cut
596 730
731sub post_fork {
732 reset_signals;
733}
734
597sub fork_call(&@) { 735sub fork_call(&@) {
598 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
599 737
600 # 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,
601 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
602 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
603 741
604 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
605 reset_signals; 743 cf::post_fork;
606 &$cb 744 &$cb
607 }, @args; 745 } @args;
608 746
609 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
610} 748}
611 749
612sub objinfo { 750sub objinfo {
… …
734 872
735 my @data; 873 my @data;
736 my $md5; 874 my $md5;
737 875
738 for (0 .. $#$src) { 876 for (0 .. $#$src) {
739 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
740 or Carp::croak "$src->[$_]: $!";
741 } 878 }
742 879
743 # if processing is expensive, check 880 # if processing is expensive, check
744 # checksum first 881 # checksum first
745 if (1) { 882 if (1) {
… …
1363 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1364 1501
1365 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1366 1503
1367 if (ref $msg) { 1504 if (ref $msg) {
1368 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1369 "ARRAY" eq ref $msg
1370 ? @$msg
1371 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1372 1506
1373 my @reply; 1507 my @reply;
1374 1508
1375 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1376 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1398 }; 1532 };
1399 1533
1400 $grp 1534 $grp
1401} 1535}
1402 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
1403sub load_extensions { 1548sub load_extensions {
1404 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1405 1552
1406 cf::sync_job { 1553 cf::sync_job {
1407 my %todo; 1554 my %todo;
1408 1555
1409 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1452 unless exists $done{$_}; 1599 unless exists $done{$_};
1453 } 1600 }
1454 1601
1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1456 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
1457 my $active = eval $v->{source}; 1613 my $active = eval $source;
1458 1614
1459 if (length $@) { 1615 if (length $@) {
1460 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1461 1617
1462 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1479 1635
1480 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1483 } 1639 }
1640
1641 last;
1484 } 1642 }
1485 } 1643 }
1486 }; 1644 };
1487} 1645}
1488 1646
… …
1646 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1647 1805
1648 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1649 $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
1650 1808
1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1652 $pl->deactivate; 1810 $pl->deactivate;
1811
1653 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;
1654 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1655 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1656 1817
1657 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1658 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1659 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1825sub generate_random_map { 1986sub generate_random_map {
1826 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1827 1988
1828 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
1829 1990
1830 # mit "rum" bekleckern, nicht
1831 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1835 $rmp->{exit_on_final_map},
1836 $rmp->{xsize}, $rmp->{ysize},
1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1839 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1840 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1841 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1842 (cf::region::find $rmp->{region}), $rmp->{custom}
1843 )
1844} 1992}
1845 1993
1846=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1847 1995
1848Register 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
… …
1899 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1900 $path = "$base/$path"; 2048 $path = "$base/$path";
1901 } 2049 }
1902 2050
1903 for ($path) { 2051 for ($path) {
1904 redo if s{//}{/};
1905 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1906 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1907 } 2054 }
1908 2055
1909 $path 2056 $path
… …
1927 2074
1928 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1929 () 2076 ()
1930} 2077}
1931 2078
2079# may re-bless or do other evil things
1932sub init { 2080sub init {
1933 my ($self) = @_; 2081 my ($self) = @_;
1934 2082
1935 $self 2083 $self
1936} 2084}
… …
2001 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
2002 2150
2003 1 2151 1
2004} 2152}
2005 2153
2154# used to laod the header of an original map
2006sub load_header_orig { 2155sub load_header_orig {
2007 my ($self) = @_; 2156 my ($self) = @_;
2008 2157
2009 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2010} 2159}
2011 2160
2161# used to laod the header of an instantiated map
2012sub load_header_temp { 2162sub load_header_temp {
2013 my ($self) = @_; 2163 my ($self) = @_;
2014 2164
2015 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2016} 2166}
2017 2167
2168# called after loading the header from an instantiated map
2018sub prepare_temp { 2169sub prepare_temp {
2019 my ($self) = @_; 2170 my ($self) = @_;
2020 2171
2021 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2022 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2023 # safety 2174 # safety
2024 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2025 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2026} 2177}
2027 2178
2179# called after loading the header from an original map
2028sub prepare_orig { 2180sub prepare_orig {
2029 my ($self) = @_; 2181 my ($self) = @_;
2030 2182
2031 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2032 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2058sub find { 2210sub find {
2059 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2060 2212
2061 cf::cede_to_tick; 2213 cf::cede_to_tick;
2062 2214
2063 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2064 2216
2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2066 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2067 2219
2068 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2099 2251
2100 { 2252 {
2101 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2102 2254
2103 return unless $self->valid; 2255 return unless $self->valid;
2104 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2105
2106 $self->in_memory (cf::MAP_LOADING);
2107 2257
2108 $self->alloc; 2258 $self->alloc;
2109 2259
2110 $self->pre_load; 2260 $self->pre_load;
2111 cf::cede_to_tick; 2261 cf::cede_to_tick;
2112 2262
2263 if (exists $self->{load_path}) {
2113 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2114 $f->skip_block; 2265 $f->skip_block;
2115 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2116 or return; 2267 or return;
2117 2268
2118 $self->post_load_original 2269 $self->post_load_original
2119 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2120 2271
2121 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2122 utf8::encode $uniq; 2273 utf8::encode $uniq;
2123 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2124 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2125 $self->clear_unique_items; 2276 $self->clear_unique_items;
2126 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2127 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2128 } 2280 }
2129 } 2281 }
2130 }
2131 2282
2132 $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);
2133 2290
2134 cf::cede_to_tick; 2291 cf::cede_to_tick;
2135 # now do the right thing for maps 2292 # now do the right thing for maps
2136 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2137 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2141 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2142 $self->decay_objects; 2299 $self->decay_objects;
2143 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2144 $self->update_buttons; 2301 $self->update_buttons;
2145 cf::cede_to_tick; 2302 cf::cede_to_tick;
2146 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2147 } 2304 }
2148 2305
2149 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2150 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2151
2152 $self->in_memory (cf::MAP_ACTIVE);
2153 } 2308 }
2154 2309
2155 $self->post_load; 2310 $self->post_load;
2311
2312 1
2156} 2313}
2157 2314
2158# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2168# if $self->per_party; 2325# if $self->per_party;
2169 2326
2170 $self 2327 $self
2171} 2328}
2172 2329
2173# find and load all maps in the 3x3 area around a map
2174sub load_neighbours {
2175 my ($map) = @_;
2176
2177 my @neigh; # diagonal neighbours
2178
2179 for (0 .. 3) {
2180 my $neigh = $map->tile_path ($_)
2181 or next;
2182 $neigh = find $neigh, $map
2183 or next;
2184 $neigh->load;
2185
2186 # now find the diagonal neighbours
2187 push @neigh,
2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2190 }
2191
2192 for (grep defined $_->[0], @neigh) {
2193 my ($path, $origin) = @$_;
2194 my $neigh = find $path, $origin
2195 or next;
2196 $neigh->load;
2197 }
2198}
2199
2200sub find_sync { 2330sub find_sync {
2201 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2202 2332
2333 # it's a bug to call this from the main context
2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2205 2336
2206 find $path, $origin 2337 find $path, $origin
2207} 2338}
2208 2339
2209sub do_load_sync { 2340sub do_load_sync {
2210 my ($map) = @_; 2341 my ($map) = @_;
2211 2342
2343 # it's a bug to call this from the main context
2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2213 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2214 2346
2215 $map->load; 2347 $map->load;
2216} 2348}
… …
2219our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2220 2352
2221sub find_async { 2353sub find_async {
2222 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2223 2355
2224 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2225 2357
2226 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2227 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2228 } 2360 }
2229 2361
2230 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2231 2363
2232 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2291sub swap_out { 2423sub swap_out {
2292 my ($self) = @_; 2424 my ($self) = @_;
2293 2425
2294 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295 2427
2296 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2297 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2298 return if $self->players; 2430 return if $self->players;
2299 2431
2300 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate; 2433 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2303 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2304 2436
2305 # then atomically save 2437 # then atomically save
2306 $self->_save; 2438 $self->_save;
2307 2439
2308 # then free the map 2440 # then free the map
… …
2334 2466
2335 return if $self->players; 2467 return if $self->players;
2336 2468
2337 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2338 2470
2339 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2340 2472
2341 # need to save uniques path 2473 # need to save uniques path
2342 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344 2476
… …
2674 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2675 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2676 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2677 2809
2678 $map->load; 2810 $map->load;
2679 $map->load_neighbours;
2680 2811
2681 return unless $self->contr->active; 2812 return unless $self->contr->active;
2682 2813
2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2684 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2740 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2741 } 2872 }
2742 } 2873 }
2743 2874
2744 my $map = eval { 2875 my $map = eval {
2745 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2746 2877
2747 if ($map) { 2878 if ($map) {
2748 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2749 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2750 } else { 2881 } else {
… …
2840 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2841 2972
2842 unless (eval { 2973 unless (eval {
2843 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2844 2975
2845 # random map handling
2846 {
2847 my $guard = cf::lock_acquire "exit_prepare:$exit";
2848
2849 prepare_random_map $exit
2850 if $exit->slaying eq "/!";
2851 }
2852
2853 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2854 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2855 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 }
2856 3002
2857 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2858 3004
2859 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2860 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3102=cut 3248=cut
3103 3249
3104sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3105 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3106 3252
3107 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3108 $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]));
3109 } elsif ($self->extcmd == 1) {
3110 #TODO: version 1, remove
3111 unshift @msg, msgtype => "reply", msgid => $id;
3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3113 }
3114} 3256}
3115 3257
3116=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3117 3259
3118Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3173 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3174 3316
3175 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3176 3318
3177 if (ref $msg) { 3319 if (ref $msg) {
3178 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3179 "ARRAY" eq ref $msg
3180 ? @$msg
3181 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3182 3321
3183 my @reply; 3322 my @reply;
3184 3323
3185 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3186 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3364=cut 3503=cut
3365 3504
3366############################################################################# 3505#############################################################################
3367# the server's init and main functions 3506# the server's init and main functions
3368 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3369sub load_facedata($) { 3510sub load_facedata($) {
3370 my ($path) = @_; 3511 my ($path) = @_;
3371 3512
3372 # 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
3373 # for this (global event?) 3514 # for this (global event?)
… …
3375 3516
3376 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3377 3518
3378 trace "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3379 3520
3380 0 < aio_load $path, my $facedata 3521 my $facedata = decode_storable load_file $path;
3381 or die "$path: $!";
3382
3383 $facedata = Coro::Storable::thaw $facedata;
3384 3522
3385 $facedata->{version} == 2 3523 $facedata->{version} == 2
3386 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3387 3525
3388 # patch in the exptable 3526 # patch in the exptable
… …
3395 cf::cede_to_tick; 3533 cf::cede_to_tick;
3396 3534
3397 { 3535 {
3398 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3399 3537
3400 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3401 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3402 3541
3403 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3404 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3406 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#
3407 3548
3408 cf::cede_to_tick; 3549 cf::cede_to_tick;
3409 } 3550 }
3410 3551
3411 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
… …
3438 3579
3439 { 3580 {
3440 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3441 3582
3442 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3443 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
3444 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3445 3587
3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3447 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#
3448 } else { 3592 } else {
3449 $RESOURCE{$name} = $info; # unused 3593# $RESOURCE{$name} = $info; # unused
3450 } 3594 }
3451 3595
3452 cf::cede_to_tick; 3596 cf::cede_to_tick;
3453 } 3597 }
3454 } 3598 }
… …
3506} 3650}
3507 3651
3508sub reload_sound { 3652sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n"; 3653 trace "loading sound config from $DATADIR/sound\n";
3510 3654
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); 3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515 3656
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_] 3658 my $sound = $soundconf->{compat}[$_]
3518 or next; 3659 or next;
3519 3660
… …
3543} 3684}
3544 3685
3545sub reload_config { 3686sub reload_config {
3546 trace "reloading config file...\n"; 3687 trace "reloading config file...\n";
3547 3688
3548 0 < aio_load "$CONFDIR/config", my $config 3689 my $config = load_file "$CONFDIR/config";
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config; 3690 utf8::decode $config;
3552 3691 *CFG = decode_yaml $config;
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3554 *CFG = YAML::XS::Load $config;
3555 3692
3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3557 3694
3558 $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};
3559 $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};
… …
3597 3734
3598sub main { 3735sub main {
3599 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3600 3737
3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3602 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.";
3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3605 3742
3606 $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
3607 3744
… …
3643 3780
3644 # no (long-running) fork's whatsoever before this point(!) 3781 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX (); 3782 use POSIX ();
3646 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};
3647 3784
3648 (pop @POST_INIT)->(0) while @POST_INIT; 3785 cf::_post_init 0;
3649 }; 3786 };
3650 3787
3651 cf::object::thawer::errors_are_fatal 0; 3788 cf::object::thawer::errors_are_fatal 0;
3652 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";
3653 3790
3654 my $free_main; $free_main = EV::idle sub { 3791 AE::postpone {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :) 3792 undef &main; # free gobs of memory :)
3657 }; 3793 };
3658 3794
3659 goto &main_loop; 3795 goto &main_loop;
3660} 3796}
… …
3817 3953
3818 cf::write_runtime_sync; # external watchdog should not bark 3954 cf::write_runtime_sync; # external watchdog should not bark
3819 3955
3820 trace "emergency_perl_save: flushing outstanding aio requests"; 3956 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) { 3957 while (IO::AIO::nreqs || BDB::nreqs) {
3822 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
3823 } 3959 }
3824 3960
3825 cf::write_runtime_sync; # external watchdog should not bark 3961 cf::write_runtime_sync; # external watchdog should not bark
3826 }; 3962 };
3827 3963
… …
3876 4012
3877 my $t1 = AE::time; 4013 my $t1 = AE::time;
3878 4014
3879 while ($RELOAD) { 4015 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl"; 4016 cf::get_slot 0.1, -1, "reload_perl";
3881 info "reloading..."; 4017 info "perl_reload: reloading...";
3882 4018
3883 trace "entering sync_job"; 4019 trace "perl_reload: entering sync_job";
3884 4020
3885 cf::sync_job { 4021 cf::sync_job {
3886 #cf::emergency_save; 4022 #cf::emergency_save;
3887 4023
3888 trace "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3889 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3890 %EXT_CORO = (); 4026 %EXT_CORO = ();
3891 4027
3892 trace "removing commands"; 4028 trace "perl_reload: removing commands";
3893 %COMMAND = (); 4029 %COMMAND = ();
3894 4030
3895 trace "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3896 %EXTCMD = (); 4032 %EXTCMD = ();
3897 %EXTICMD = (); 4033 %EXTICMD = ();
3898 4034
3899 trace "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3900 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3901 trace "... unloading $pkg"; 4037 trace "... unloading $pkg";
3902 4038
3903 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3904 eval { 4040 eval {
… …
3909 4045
3910 trace "... clearing $pkg"; 4046 trace "... clearing $pkg";
3911 clear_package $pkg; 4047 clear_package $pkg;
3912 } 4048 }
3913 4049
3914 trace "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917 4053
3918 trace "... unloading $k"; 4054 trace "... unloading $k";
3919 delete $INC{$k}; 4055 delete $INC{$k};
… …
3926 } 4062 }
3927 4063
3928 clear_package $k; 4064 clear_package $k;
3929 } 4065 }
3930 4066
3931 trace "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3932 clear_package "safe::$_" 4068 clear_package "safe::$_"
3933 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);
3934 4070
3935 trace "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3936 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938 4074
3939 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3940 # and global variables created in xs 4076 # and global variables created in xs
3941 #clear_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3942 4078
3943 info "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3944 4080
3945 trace "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3946 require cf; 4082 require cf;
3947 cf::_connect_to_perl_1; 4083 cf::_connect_to_perl_1;
3948 4084
3949 trace "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3950 cf::reload_config; 4086 cf::reload_config;
3951 4087
3952 trace "loading extensions"; 4088 trace "perl_reload: loading extensions";
3953 cf::load_extensions; 4089 cf::load_extensions;
3954 4090
3955 if ($REATTACH_ON_RELOAD) { 4091 if ($REATTACH_ON_RELOAD) {
3956 trace "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3957 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3958 trace "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3959 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3960 trace "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3961 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
3962 } 4098 }
3963 4099
3964 trace "running post_init jobs"; 4100 cf::_post_init 1;
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966 4101
3967 trace "leaving sync_job"; 4102 trace "perl_reload: leaving sync_job";
3968 4103
3969 1 4104 1
3970 } or do { 4105 } or do {
3971 error $@; 4106 error $@;
3972 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
3973 }; 4108 };
3974 4109
3975 info "reloaded";
3976 --$RELOAD; 4110 --$RELOAD;
3977 } 4111 }
3978 4112
3979 $t1 = AE::time - $t1; 4113 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n"; 4114 info "perl_reload: completed in ${t1}s\n";
3981}; 4115};
3982 4116
3983our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3984 4118
3985sub reload_perl() { 4119sub reload_perl() {
… …
4010 4144
4011############################################################################# 4145#############################################################################
4012 4146
4013my $bug_warning = 0; 4147my $bug_warning = 0;
4014 4148
4015our @WAIT_FOR_TICK;
4016our @WAIT_FOR_TICK_BEGIN;
4017
4018sub wait_for_tick() { 4149sub wait_for_tick() {
4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020 4151
4021 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
4022 push @WAIT_FOR_TICK, $signal;
4023 $signal->wait;
4024} 4153}
4025 4154
4026sub wait_for_tick_begin() { 4155sub wait_for_tick_begin() {
4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028 4157
4029 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
4030 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
4031 $signal->wait; 4160 $signal->wait;
4032} 4161}
… …
4036 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"
4037 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
4038 return; 4167 return;
4039 } 4168 }
4040 4169
4041 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4042 4171
4043 #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#
4044 4173
4045 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046 $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.;
… …
4052 } 4181 }
4053 4182
4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055 $sig->send; 4184 $sig->send;
4056 } 4185 }
4057 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
4058 $sig->send;
4059 }
4060 4187
4061 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063 4190
4064 if (0) { 4191 if (0) {
… …
4073{ 4200{
4074 # configure BDB 4201 # configure BDB
4075 4202
4076 BDB::min_parallel 16; 4203 BDB::min_parallel 16;
4077 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
4078 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
4079 4206
4080 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
4081 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083 $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;
… …
4118 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
4119 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
4120 undef $AnyEvent::AIO::WATCHER; 4247 undef $AnyEvent::AIO::WATCHER;
4121} 4248}
4122 4249
4123my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
4124 4252
4125sub _log_backtrace { 4253sub _log_backtrace {
4126 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
4127 4255
4128 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
4129 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
4131 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
4132 ++$_log_backtrace; 4264 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg; 4265 my $perl_bt = Carp::longmess $msg;
4134 async { 4266 async {
4135 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
4136 4268
… …
4156 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
4157 --$_log_backtrace; 4289 --$_log_backtrace;
4158 }; 4290 };
4159 } else { 4291 } else {
4160 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
4161 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162 } 4294 }
4163} 4295}
4164 4296
4165# load additional modules 4297# load additional modules
4166require "cf/$_.pm" for @EXTRA_MODULES; 4298require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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