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.547 by root, Sun May 9 22:51:13 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.
… …
606 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
607 741
608 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
609 cf::post_fork; 743 cf::post_fork;
610 &$cb 744 &$cb
611 }, @args; 745 } @args;
612 746
613 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
614} 748}
615 749
616sub objinfo { 750sub objinfo {
… …
738 872
739 my @data; 873 my @data;
740 my $md5; 874 my $md5;
741 875
742 for (0 .. $#$src) { 876 for (0 .. $#$src) {
743 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
744 or Carp::croak "$src->[$_]: $!";
745 } 878 }
746 879
747 # if processing is expensive, check 880 # if processing is expensive, check
748 # checksum first 881 # checksum first
749 if (1) { 882 if (1) {
… …
1367 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1368 1501
1369 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370 1503
1371 if (ref $msg) { 1504 if (ref $msg) {
1372 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373 "ARRAY" eq ref $msg
1374 ? @$msg
1375 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376 1506
1377 my @reply; 1507 my @reply;
1378 1508
1379 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1380 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1402 }; 1532 };
1403 1533
1404 $grp 1534 $grp
1405} 1535}
1406 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
1407sub load_extensions { 1548sub load_extensions {
1408 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1409 1552
1410 cf::sync_job { 1553 cf::sync_job {
1411 my %todo; 1554 my %todo;
1412 1555
1413 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1456 unless exists $done{$_}; 1599 unless exists $done{$_};
1457 } 1600 }
1458 1601
1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460 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
1461 my $active = eval $v->{source}; 1613 my $active = eval $source;
1462 1614
1463 if (length $@) { 1615 if (length $@) {
1464 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1465 1617
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1483 1635
1484 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1487 } 1639 }
1640
1641 last;
1488 } 1642 }
1489 } 1643 }
1490 }; 1644 };
1491} 1645}
1492 1646
… …
1650 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1651 1805
1652 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1653 $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
1654 1808
1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656 $pl->deactivate; 1810 $pl->deactivate;
1657 1811
1658 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;
1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659 ext::highscore::check ($pl->ob); 1814 ext::highscore::check ($pl->ob);
1660 1815
1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1662 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1663 1817
1664 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1665 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1666 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1832sub generate_random_map { 1986sub generate_random_map {
1833 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1834 1988
1835 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
1836 1990
1837 # mit "rum" bekleckern, nicht
1838 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842 $rmp->{exit_on_final_map},
1843 $rmp->{xsize}, $rmp->{ysize},
1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849 (cf::region::find $rmp->{region}), $rmp->{custom}
1850 )
1851} 1992}
1852 1993
1853=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1854 1995
1855Register 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
… …
1906 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1907 $path = "$base/$path"; 2048 $path = "$base/$path";
1908 } 2049 }
1909 2050
1910 for ($path) { 2051 for ($path) {
1911 redo if s{//}{/};
1912 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1913 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1914 } 2054 }
1915 2055
1916 $path 2056 $path
… …
1934 2074
1935 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1936 () 2076 ()
1937} 2077}
1938 2078
2079# may re-bless or do other evil things
1939sub init { 2080sub init {
1940 my ($self) = @_; 2081 my ($self) = @_;
1941 2082
1942 $self 2083 $self
1943} 2084}
… …
2008 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
2009 2150
2010 1 2151 1
2011} 2152}
2012 2153
2154# used to laod the header of an original map
2013sub load_header_orig { 2155sub load_header_orig {
2014 my ($self) = @_; 2156 my ($self) = @_;
2015 2157
2016 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2017} 2159}
2018 2160
2161# used to laod the header of an instantiated map
2019sub load_header_temp { 2162sub load_header_temp {
2020 my ($self) = @_; 2163 my ($self) = @_;
2021 2164
2022 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2023} 2166}
2024 2167
2168# called after loading the header from an instantiated map
2025sub prepare_temp { 2169sub prepare_temp {
2026 my ($self) = @_; 2170 my ($self) = @_;
2027 2171
2028 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2029 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2030 # safety 2174 # safety
2031 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2032 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2033} 2177}
2034 2178
2179# called after loading the header from an original map
2035sub prepare_orig { 2180sub prepare_orig {
2036 my ($self) = @_; 2181 my ($self) = @_;
2037 2182
2038 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2039 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2065sub find { 2210sub find {
2066 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2067 2212
2068 cf::cede_to_tick; 2213 cf::cede_to_tick;
2069 2214
2070 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2071 2216
2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2074 2219
2075 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2106 2251
2107 { 2252 {
2108 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2109 2254
2110 return unless $self->valid; 2255 return unless $self->valid;
2111 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2112
2113 $self->in_memory (cf::MAP_LOADING);
2114 2257
2115 $self->alloc; 2258 $self->alloc;
2116 2259
2117 $self->pre_load; 2260 $self->pre_load;
2118 cf::cede_to_tick; 2261 cf::cede_to_tick;
2119 2262
2263 if (exists $self->{load_path}) {
2120 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2121 $f->skip_block; 2265 $f->skip_block;
2122 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2123 or return; 2267 or return;
2124 2268
2125 $self->post_load_original 2269 $self->post_load_original
2126 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2127 2271
2128 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2129 utf8::encode $uniq; 2273 utf8::encode $uniq;
2130 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2131 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2132 $self->clear_unique_items; 2276 $self->clear_unique_items;
2133 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2134 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2135 } 2280 }
2136 } 2281 }
2137 }
2138 2282
2139 $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);
2140 2290
2141 cf::cede_to_tick; 2291 cf::cede_to_tick;
2142 # now do the right thing for maps 2292 # now do the right thing for maps
2143 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2144 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2148 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2149 $self->decay_objects; 2299 $self->decay_objects;
2150 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2151 $self->update_buttons; 2301 $self->update_buttons;
2152 cf::cede_to_tick; 2302 cf::cede_to_tick;
2153 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2154 } 2304 }
2155 2305
2156 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2157 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2158
2159 $self->in_memory (cf::MAP_ACTIVE);
2160 } 2308 }
2161 2309
2162 $self->post_load; 2310 $self->post_load;
2311
2312 1
2163} 2313}
2164 2314
2165# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2175# if $self->per_party; 2325# if $self->per_party;
2176 2326
2177 $self 2327 $self
2178} 2328}
2179 2329
2180# find and load all maps in the 3x3 area around a map
2181sub load_neighbours {
2182 my ($map) = @_;
2183
2184 my @neigh; # diagonal neighbours
2185
2186 for (0 .. 3) {
2187 my $neigh = $map->tile_path ($_)
2188 or next;
2189 $neigh = find $neigh, $map
2190 or next;
2191 $neigh->load;
2192
2193 # now find the diagonal neighbours
2194 push @neigh,
2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2197 }
2198
2199 for (grep defined $_->[0], @neigh) {
2200 my ($path, $origin) = @$_;
2201 my $neigh = find $path, $origin
2202 or next;
2203 $neigh->load;
2204 }
2205}
2206
2207sub find_sync { 2330sub find_sync {
2208 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2209 2332
2333 # it's a bug to call this from the main context
2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2212 2336
2213 find $path, $origin 2337 find $path, $origin
2214} 2338}
2215 2339
2216sub do_load_sync { 2340sub do_load_sync {
2217 my ($map) = @_; 2341 my ($map) = @_;
2218 2342
2343 # it's a bug to call this from the main context
2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2221 2346
2222 $map->load; 2347 $map->load;
2223} 2348}
… …
2226our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2227 2352
2228sub find_async { 2353sub find_async {
2229 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2230 2355
2231 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2232 2357
2233 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2235 } 2360 }
2236 2361
2237 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2238 2363
2239 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2298sub swap_out { 2423sub swap_out {
2299 my ($self) = @_; 2424 my ($self) = @_;
2300 2425
2301 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2302 2427
2303 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2304 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2305 return if $self->players; 2430 return if $self->players;
2306 2431
2307 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate; 2433 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2311 2436
2312 # then atomically save 2437 # then atomically save
2313 $self->_save; 2438 $self->_save;
2314 2439
2315 # then free the map 2440 # then free the map
… …
2341 2466
2342 return if $self->players; 2467 return if $self->players;
2343 2468
2344 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2345 2470
2346 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2347 2472
2348 # need to save uniques path 2473 # need to save uniques path
2349 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351 2476
… …
2681 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2682 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2683 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2684 2809
2685 $map->load; 2810 $map->load;
2686 $map->load_neighbours;
2687 2811
2688 return unless $self->contr->active; 2812 return unless $self->contr->active;
2689 2813
2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2747 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2748 } 2872 }
2749 } 2873 }
2750 2874
2751 my $map = eval { 2875 my $map = eval {
2752 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753 2877
2754 if ($map) { 2878 if ($map) {
2755 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2756 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2757 } else { 2881 } else {
… …
2847 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2848 2972
2849 unless (eval { 2973 unless (eval {
2850 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2851 2975
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2861 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2862 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 }
2863 3002
2864 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2865 3004
2866 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3109=cut 3248=cut
3110 3249
3111sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3112 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3113 3252
3114 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3115 $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]));
3116 } elsif ($self->extcmd == 1) {
3117 #TODO: version 1, remove
3118 unshift @msg, msgtype => "reply", msgid => $id;
3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120 }
3121} 3256}
3122 3257
3123=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3124 3259
3125Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3180 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3181 3316
3182 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183 3318
3184 if (ref $msg) { 3319 if (ref $msg) {
3185 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186 "ARRAY" eq ref $msg
3187 ? @$msg
3188 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189 3321
3190 my @reply; 3322 my @reply;
3191 3323
3192 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3193 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3371=cut 3503=cut
3372 3504
3373############################################################################# 3505#############################################################################
3374# the server's init and main functions 3506# the server's init and main functions
3375 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3376sub load_facedata($) { 3510sub load_facedata($) {
3377 my ($path) = @_; 3511 my ($path) = @_;
3378 3512
3379 # 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
3380 # for this (global event?) 3514 # for this (global event?)
… …
3382 3516
3383 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384 3518
3385 trace "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3386 3520
3387 0 < aio_load $path, my $facedata 3521 my $facedata = decode_storable load_file $path;
3388 or die "$path: $!";
3389
3390 $facedata = Coro::Storable::thaw $facedata;
3391 3522
3392 $facedata->{version} == 2 3523 $facedata->{version} == 2
3393 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3394 3525
3395 # patch in the exptable 3526 # patch in the exptable
… …
3402 cf::cede_to_tick; 3533 cf::cede_to_tick;
3403 3534
3404 { 3535 {
3405 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3406 3537
3407 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3408 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409 3541
3410 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3411 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3413 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#
3414 3548
3415 cf::cede_to_tick; 3549 cf::cede_to_tick;
3416 } 3550 }
3417 3551
3418 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
… …
3445 3579
3446 { 3580 {
3447 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3448 3582
3449 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3450 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
3451 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452 3587
3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454 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#
3455 } else { 3592 } else {
3456 $RESOURCE{$name} = $info; # unused 3593# $RESOURCE{$name} = $info; # unused
3457 } 3594 }
3458 3595
3459 cf::cede_to_tick; 3596 cf::cede_to_tick;
3460 } 3597 }
3461 } 3598 }
… …
3513} 3650}
3514 3651
3515sub reload_sound { 3652sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n"; 3653 trace "loading sound config from $DATADIR/sound\n";
3517 3654
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522 3656
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_] 3658 my $sound = $soundconf->{compat}[$_]
3525 or next; 3659 or next;
3526 3660
… …
3550} 3684}
3551 3685
3552sub reload_config { 3686sub reload_config {
3553 trace "reloading config file...\n"; 3687 trace "reloading config file...\n";
3554 3688
3555 0 < aio_load "$CONFDIR/config", my $config 3689 my $config = load_file "$CONFDIR/config";
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config; 3690 utf8::decode $config;
3559 3691 *CFG = decode_yaml $config;
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561 *CFG = YAML::XS::Load $config;
3562 3692
3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564 3694
3565 $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};
3566 $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};
… …
3604 3734
3605sub main { 3735sub main {
3606 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3607 3737
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 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.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612 3742
3613 $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
3614 3744
… …
3650 3780
3651 # no (long-running) fork's whatsoever before this point(!) 3781 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX (); 3782 use POSIX ();
3653 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};
3654 3784
3655 (pop @POST_INIT)->(0) while @POST_INIT; 3785 cf::_post_init 0;
3656 }; 3786 };
3657 3787
3658 cf::object::thawer::errors_are_fatal 0; 3788 cf::object::thawer::errors_are_fatal 0;
3659 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";
3660 3790
3661 my $free_main; $free_main = EV::idle sub { 3791 AE::postpone {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :) 3792 undef &main; # free gobs of memory :)
3664 }; 3793 };
3665 3794
3666 goto &main_loop; 3795 goto &main_loop;
3667} 3796}
… …
3824 3953
3825 cf::write_runtime_sync; # external watchdog should not bark 3954 cf::write_runtime_sync; # external watchdog should not bark
3826 3955
3827 trace "emergency_perl_save: flushing outstanding aio requests"; 3956 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) { 3957 while (IO::AIO::nreqs || BDB::nreqs) {
3829 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
3830 } 3959 }
3831 3960
3832 cf::write_runtime_sync; # external watchdog should not bark 3961 cf::write_runtime_sync; # external watchdog should not bark
3833 }; 3962 };
3834 3963
… …
3883 4012
3884 my $t1 = AE::time; 4013 my $t1 = AE::time;
3885 4014
3886 while ($RELOAD) { 4015 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl"; 4016 cf::get_slot 0.1, -1, "reload_perl";
3888 info "reloading..."; 4017 info "perl_reload: reloading...";
3889 4018
3890 trace "entering sync_job"; 4019 trace "perl_reload: entering sync_job";
3891 4020
3892 cf::sync_job { 4021 cf::sync_job {
3893 #cf::emergency_save; 4022 #cf::emergency_save;
3894 4023
3895 trace "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3896 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3897 %EXT_CORO = (); 4026 %EXT_CORO = ();
3898 4027
3899 trace "removing commands"; 4028 trace "perl_reload: removing commands";
3900 %COMMAND = (); 4029 %COMMAND = ();
3901 4030
3902 trace "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3903 %EXTCMD = (); 4032 %EXTCMD = ();
3904 %EXTICMD = (); 4033 %EXTICMD = ();
3905 4034
3906 trace "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3907 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3908 trace "... unloading $pkg"; 4037 trace "... unloading $pkg";
3909 4038
3910 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3911 eval { 4040 eval {
… …
3916 4045
3917 trace "... clearing $pkg"; 4046 trace "... clearing $pkg";
3918 clear_package $pkg; 4047 clear_package $pkg;
3919 } 4048 }
3920 4049
3921 trace "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924 4053
3925 trace "... unloading $k"; 4054 trace "... unloading $k";
3926 delete $INC{$k}; 4055 delete $INC{$k};
… …
3933 } 4062 }
3934 4063
3935 clear_package $k; 4064 clear_package $k;
3936 } 4065 }
3937 4066
3938 trace "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3939 clear_package "safe::$_" 4068 clear_package "safe::$_"
3940 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);
3941 4070
3942 trace "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3943 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945 4074
3946 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3947 # and global variables created in xs 4076 # and global variables created in xs
3948 #clear_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3949 4078
3950 info "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3951 4080
3952 trace "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3953 require cf; 4082 require cf;
3954 cf::_connect_to_perl_1; 4083 cf::_connect_to_perl_1;
3955 4084
3956 trace "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3957 cf::reload_config; 4086 cf::reload_config;
3958 4087
3959 trace "loading extensions"; 4088 trace "perl_reload: loading extensions";
3960 cf::load_extensions; 4089 cf::load_extensions;
3961 4090
3962 if ($REATTACH_ON_RELOAD) { 4091 if ($REATTACH_ON_RELOAD) {
3963 trace "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3964 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3965 trace "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3966 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3967 trace "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3968 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
3969 } 4098 }
3970 4099
3971 trace "running post_init jobs"; 4100 cf::_post_init 1;
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973 4101
3974 trace "leaving sync_job"; 4102 trace "perl_reload: leaving sync_job";
3975 4103
3976 1 4104 1
3977 } or do { 4105 } or do {
3978 error $@; 4106 error $@;
3979 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
3980 }; 4108 };
3981 4109
3982 info "reloaded";
3983 --$RELOAD; 4110 --$RELOAD;
3984 } 4111 }
3985 4112
3986 $t1 = AE::time - $t1; 4113 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n"; 4114 info "perl_reload: completed in ${t1}s\n";
3988}; 4115};
3989 4116
3990our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3991 4118
3992sub reload_perl() { 4119sub reload_perl() {
… …
4017 4144
4018############################################################################# 4145#############################################################################
4019 4146
4020my $bug_warning = 0; 4147my $bug_warning = 0;
4021 4148
4022our @WAIT_FOR_TICK;
4023our @WAIT_FOR_TICK_BEGIN;
4024
4025sub wait_for_tick() { 4149sub wait_for_tick() {
4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027 4151
4028 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
4029 push @WAIT_FOR_TICK, $signal;
4030 $signal->wait;
4031} 4153}
4032 4154
4033sub wait_for_tick_begin() { 4155sub wait_for_tick_begin() {
4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035 4157
4036 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
4037 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
4038 $signal->wait; 4160 $signal->wait;
4039} 4161}
… …
4043 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"
4044 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
4045 return; 4167 return;
4046 } 4168 }
4047 4169
4048 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4049 4171
4050 #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#
4051 4173
4052 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053 $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.;
… …
4059 } 4181 }
4060 4182
4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062 $sig->send; 4184 $sig->send;
4063 } 4185 }
4064 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
4065 $sig->send;
4066 }
4067 4187
4068 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070 4190
4071 if (0) { 4191 if (0) {
… …
4080{ 4200{
4081 # configure BDB 4201 # configure BDB
4082 4202
4083 BDB::min_parallel 16; 4203 BDB::min_parallel 16;
4084 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
4085 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
4086 4206
4087 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
4088 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090 $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;
… …
4125 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
4126 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
4127 undef $AnyEvent::AIO::WATCHER; 4247 undef $AnyEvent::AIO::WATCHER;
4128} 4248}
4129 4249
4130my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
4131 4252
4132sub _log_backtrace { 4253sub _log_backtrace {
4133 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
4134 4255
4135 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
4136 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
4138 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
4139 ++$_log_backtrace; 4264 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg; 4265 my $perl_bt = Carp::longmess $msg;
4141 async { 4266 async {
4142 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
4143 4268
… …
4163 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
4164 --$_log_backtrace; 4289 --$_log_backtrace;
4165 }; 4290 };
4166 } else { 4291 } else {
4167 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
4168 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169 } 4294 }
4170} 4295}
4171 4296
4172# load additional modules 4297# load additional modules
4173require "cf/$_.pm" for @EXTRA_MODULES; 4298require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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