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.549 by root, Tue May 11 13:19:59 2010 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 135
133our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
135our $NOW; 139our $NOW;
136 140
137our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
148 152
149our @POST_INIT; 153our @POST_INIT;
150 154
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
153 160
154binmode STDOUT; 161binmode STDOUT;
155binmode STDERR; 162binmode STDERR;
156 163
157# read virtual server time, if available 164# read virtual server time, if available
… …
191 198
192=over 4 199=over 4
193 200
194=item $cf::UPTIME 201=item $cf::UPTIME
195 202
196The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
197 219
198=item $cf::RUNTIME 220=item $cf::RUNTIME
199 221
200The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 223every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
210database environment. 232database environment.
211 233
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 234=item $cf::LOADAVG
221 235
222The current CPU load on the server (alpha-smoothed), as a value between 0 236The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 237(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
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
362=item $ref = cf::yaml_load $scalar 453=item $ref = cf::decode_yaml $scalar
363 454
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 456
366=cut 457=cut
367 458
368sub fork_call(&@); 459sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 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]
372} 474}
373 475
374=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
375 477
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
381 483
382=cut 484=cut
383 485
384sub post_init(&) { 486sub post_init(&) {
385 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 }
386} 505}
387 506
388=item cf::lock_wait $string 507=item cf::lock_wait $string
389 508
390Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
443 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
444} 563}
445 564
446=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
447 566
448Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
449This 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
450of 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.
451 574
452The 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
453used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
454 577
455Useful for short background jobs. 578Useful for short background jobs.
… …
484 } 607 }
485 } 608 }
486 609
487 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
488 # 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
489 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
490 $signal->wait;
491 } else { 613 } else {
492 $busy = 0; 614 $busy = 0;
493 Coro::schedule; 615 Coro::schedule;
494 } 616 }
495 } 617 }
… …
750 872
751 my @data; 873 my @data;
752 my $md5; 874 my $md5;
753 875
754 for (0 .. $#$src) { 876 for (0 .. $#$src) {
755 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
756 or Carp::croak "$src->[$_]: $!";
757 } 878 }
758 879
759 # if processing is expensive, check 880 # if processing is expensive, check
760 # checksum first 881 # checksum first
761 if (1) { 882 if (1) {
… …
1379 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1380 1501
1381 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1382 1503
1383 if (ref $msg) { 1504 if (ref $msg) {
1384 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1385 "ARRAY" eq ref $msg
1386 ? @$msg
1387 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1388 1506
1389 my @reply; 1507 my @reply;
1390 1508
1391 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1392 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1414 }; 1532 };
1415 1533
1416 $grp 1534 $grp
1417} 1535}
1418 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
1419sub load_extensions { 1548sub load_extensions {
1420 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1421 1552
1422 cf::sync_job { 1553 cf::sync_job {
1423 my %todo; 1554 my %todo;
1424 1555
1425 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1468 unless exists $done{$_}; 1599 unless exists $done{$_};
1469 } 1600 }
1470 1601
1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1472 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
1473 my $active = eval $v->{source}; 1613 my $active = eval $source;
1474 1614
1475 if (length $@) { 1615 if (length $@) {
1476 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1477 1617
1478 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1495 1635
1496 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1499 } 1639 }
1640
1641 last;
1500 } 1642 }
1501 } 1643 }
1502 }; 1644 };
1503} 1645}
1504 1646
… …
1844sub generate_random_map { 1986sub generate_random_map {
1845 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1846 1988
1847 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
1848 1990
1849 # mit "rum" bekleckern, nicht
1850 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854 $rmp->{exit_on_final_map},
1855 $rmp->{xsize}, $rmp->{ysize},
1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1858 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1859 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1860 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1861 (cf::region::find $rmp->{region}), $rmp->{custom}
1862 )
1863} 1992}
1864 1993
1865=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1866 1995
1867Register 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
… …
1918 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1919 $path = "$base/$path"; 2048 $path = "$base/$path";
1920 } 2049 }
1921 2050
1922 for ($path) { 2051 for ($path) {
1923 redo if s{//}{/};
1924 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1925 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1926 } 2054 }
1927 2055
1928 $path 2056 $path
… …
1946 2074
1947 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1948 () 2076 ()
1949} 2077}
1950 2078
2079# may re-bless or do other evil things
1951sub init { 2080sub init {
1952 my ($self) = @_; 2081 my ($self) = @_;
1953 2082
1954 $self 2083 $self
1955} 2084}
… …
2020 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
2021 2150
2022 1 2151 1
2023} 2152}
2024 2153
2154# used to laod the header of an original map
2025sub load_header_orig { 2155sub load_header_orig {
2026 my ($self) = @_; 2156 my ($self) = @_;
2027 2157
2028 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2029} 2159}
2030 2160
2161# used to laod the header of an instantiated map
2031sub load_header_temp { 2162sub load_header_temp {
2032 my ($self) = @_; 2163 my ($self) = @_;
2033 2164
2034 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2035} 2166}
2036 2167
2168# called after loading the header from an instantiated map
2037sub prepare_temp { 2169sub prepare_temp {
2038 my ($self) = @_; 2170 my ($self) = @_;
2039 2171
2040 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2041 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2042 # safety 2174 # safety
2043 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2044 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2045} 2177}
2046 2178
2179# called after loading the header from an original map
2047sub prepare_orig { 2180sub prepare_orig {
2048 my ($self) = @_; 2181 my ($self) = @_;
2049 2182
2050 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2051 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2077sub find { 2210sub find {
2078 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2079 2212
2080 cf::cede_to_tick; 2213 cf::cede_to_tick;
2081 2214
2082 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2083 2216
2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2086 2219
2087 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2118 2251
2119 { 2252 {
2120 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2121 2254
2122 return unless $self->valid; 2255 return unless $self->valid;
2123 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2124
2125 $self->in_memory (cf::MAP_LOADING);
2126 2257
2127 $self->alloc; 2258 $self->alloc;
2128 2259
2129 $self->pre_load; 2260 $self->pre_load;
2130 cf::cede_to_tick; 2261 cf::cede_to_tick;
2131 2262
2263 if (exists $self->{load_path}) {
2132 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2133 $f->skip_block; 2265 $f->skip_block;
2134 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2135 or return; 2267 or return;
2136 2268
2137 $self->post_load_original 2269 $self->post_load_original
2138 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2139 2271
2140 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2141 utf8::encode $uniq; 2273 utf8::encode $uniq;
2142 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2143 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2144 $self->clear_unique_items; 2276 $self->clear_unique_items;
2145 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2146 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2147 } 2280 }
2148 } 2281 }
2149 }
2150 2282
2151 $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);
2152 2290
2153 cf::cede_to_tick; 2291 cf::cede_to_tick;
2154 # now do the right thing for maps 2292 # now do the right thing for maps
2155 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2156 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2160 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2161 $self->decay_objects; 2299 $self->decay_objects;
2162 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2163 $self->update_buttons; 2301 $self->update_buttons;
2164 cf::cede_to_tick; 2302 cf::cede_to_tick;
2165 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2166 } 2304 }
2167 2305
2168 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2169 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2170
2171 $self->in_memory (cf::MAP_ACTIVE);
2172 } 2308 }
2173 2309
2174 $self->post_load; 2310 $self->post_load;
2311
2312 1
2175} 2313}
2176 2314
2177# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2187# if $self->per_party; 2325# if $self->per_party;
2188 2326
2189 $self 2327 $self
2190} 2328}
2191 2329
2192# find and load all maps in the 3x3 area around a map
2193sub load_neighbours {
2194 my ($map) = @_;
2195
2196 my @neigh; # diagonal neighbours
2197
2198 for (0 .. 3) {
2199 my $neigh = $map->tile_path ($_)
2200 or next;
2201 $neigh = find $neigh, $map
2202 or next;
2203 $neigh->load;
2204
2205 # now find the diagonal neighbours
2206 push @neigh,
2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2209 }
2210
2211 for (grep defined $_->[0], @neigh) {
2212 my ($path, $origin) = @$_;
2213 my $neigh = find $path, $origin
2214 or next;
2215 $neigh->load;
2216 }
2217}
2218
2219sub find_sync { 2330sub find_sync {
2220 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2221 2332
2333 # it's a bug to call this from the main context
2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2224 2336
2225 find $path, $origin 2337 find $path, $origin
2226} 2338}
2227 2339
2228sub do_load_sync { 2340sub do_load_sync {
2229 my ($map) = @_; 2341 my ($map) = @_;
2230 2342
2343 # it's a bug to call this from the main context
2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2233 2346
2234 $map->load; 2347 $map->load;
2235} 2348}
… …
2238our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2239 2352
2240sub find_async { 2353sub find_async {
2241 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2242 2355
2243 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2244 2357
2245 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2247 } 2360 }
2248 2361
2249 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2250 2363
2251 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2310sub swap_out { 2423sub swap_out {
2311 my ($self) = @_; 2424 my ($self) = @_;
2312 2425
2313 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314 2427
2315 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2316 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2317 return if $self->players; 2430 return if $self->players;
2318 2431
2319 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate; 2433 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2322 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2323 2436
2324 # then atomically save 2437 # then atomically save
2325 $self->_save; 2438 $self->_save;
2326 2439
2327 # then free the map 2440 # then free the map
… …
2353 2466
2354 return if $self->players; 2467 return if $self->players;
2355 2468
2356 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2357 2470
2358 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2359 2472
2360 # need to save uniques path 2473 # need to save uniques path
2361 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363 2476
… …
2693 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2694 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2695 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2696 2809
2697 $map->load; 2810 $map->load;
2698 $map->load_neighbours;
2699 2811
2700 return unless $self->contr->active; 2812 return unless $self->contr->active;
2701 2813
2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2703 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2759 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2760 } 2872 }
2761 } 2873 }
2762 2874
2763 my $map = eval { 2875 my $map = eval {
2764 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765 2877
2766 if ($map) { 2878 if ($map) {
2767 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2768 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2769 } else { 2881 } else {
… …
2859 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2860 2972
2861 unless (eval { 2973 unless (eval {
2862 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2863 2975
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2873 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2874 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 }
2875 3002
2876 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2877 3004
2878 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3121=cut 3248=cut
3122 3249
3123sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3124 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3125 3252
3126 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3127 $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]));
3128 } elsif ($self->extcmd == 1) {
3129 #TODO: version 1, remove
3130 unshift @msg, msgtype => "reply", msgid => $id;
3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3132 }
3133} 3256}
3134 3257
3135=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3136 3259
3137Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3192 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3193 3316
3194 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3195 3318
3196 if (ref $msg) { 3319 if (ref $msg) {
3197 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3198 "ARRAY" eq ref $msg
3199 ? @$msg
3200 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3201 3321
3202 my @reply; 3322 my @reply;
3203 3323
3204 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3205 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3383=cut 3503=cut
3384 3504
3385############################################################################# 3505#############################################################################
3386# the server's init and main functions 3506# the server's init and main functions
3387 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3388sub load_facedata($) { 3510sub load_facedata($) {
3389 my ($path) = @_; 3511 my ($path) = @_;
3390 3512
3391 # 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
3392 # for this (global event?) 3514 # for this (global event?)
… …
3394 3516
3395 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396 3518
3397 trace "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3398 3520
3399 0 < aio_load $path, my $facedata 3521 my $facedata = decode_storable load_file $path;
3400 or die "$path: $!";
3401
3402 $facedata = Coro::Storable::thaw $facedata;
3403 3522
3404 $facedata->{version} == 2 3523 $facedata->{version} == 2
3405 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3406 3525
3407 # patch in the exptable 3526 # patch in the exptable
… …
3421 3540
3422 cf::face::set_visibility $idx, $info->{visibility}; 3541 cf::face::set_visibility $idx, $info->{visibility};
3423 cf::face::set_magicmap $idx, $info->{magicmap}; 3542 cf::face::set_magicmap $idx, $info->{magicmap};
3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3546 $FACEHASH{$info->{hash64}} = $idx;#d#
3426 3547
3427 cf::cede_to_tick; 3548 cf::cede_to_tick;
3428 } 3549 }
3429 3550
3430 while (my ($face, $info) = each %$faces) { 3551 while (my ($face, $info) = each %$faces) {
… …
3457 3578
3458 { 3579 {
3459 my $res = $facedata->{resource}; 3580 my $res = $facedata->{resource};
3460 3581
3461 while (my ($name, $info) = each %$res) { 3582 while (my ($name, $info) = each %$res) {
3462 if (defined $info->{type}) { 3583 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue
3463 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3585 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464 3586
3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466 cf::face::set_type $idx, $info->{type}; 3588 cf::face::set_type $idx, $type;
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d#
3467 } else { 3591 } else {
3468 $RESOURCE{$name} = $info; # unused 3592# $RESOURCE{$name} = $info; # unused
3469 } 3593 }
3470 3594
3471 cf::cede_to_tick; 3595 cf::cede_to_tick;
3472 } 3596 }
3473 } 3597 }
… …
3525} 3649}
3526 3650
3527sub reload_sound { 3651sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n"; 3652 trace "loading sound config from $DATADIR/sound\n";
3529 3653
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3654 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534 3655
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3656 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_] 3657 my $sound = $soundconf->{compat}[$_]
3537 or next; 3658 or next;
3538 3659
… …
3562} 3683}
3563 3684
3564sub reload_config { 3685sub reload_config {
3565 trace "reloading config file...\n"; 3686 trace "reloading config file...\n";
3566 3687
3567 0 < aio_load "$CONFDIR/config", my $config 3688 my $config = load_file "$CONFDIR/config";
3568 or die "$CONFDIR/config: $!";
3569
3570 utf8::decode $config; 3689 utf8::decode $config;
3571 *CFG = yaml_load $config; 3690 *CFG = decode_yaml $config;
3572 3691
3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3692 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574 3693
3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3694 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3695 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3614 3733
3615sub main { 3734sub main {
3616 cf::init_globals; # initialise logging 3735 cf::init_globals; # initialise logging
3617 3736
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3737 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3738 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3739 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622 3741
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624 3743
… …
3660 3779
3661 # no (long-running) fork's whatsoever before this point(!) 3780 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX (); 3781 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3782 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664 3783
3665 (pop @POST_INIT)->(0) while @POST_INIT; 3784 cf::_post_init 0;
3666 }; 3785 };
3667 3786
3668 cf::object::thawer::errors_are_fatal 0; 3787 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n"; 3788 info "parse errors in files are no longer fatal from this point on.\n";
3670 3789
3671 my $free_main; $free_main = EV::idle sub { 3790 AE::postpone {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :) 3791 undef &main; # free gobs of memory :)
3674 }; 3792 };
3675 3793
3676 goto &main_loop; 3794 goto &main_loop;
3677} 3795}
… …
3834 3952
3835 cf::write_runtime_sync; # external watchdog should not bark 3953 cf::write_runtime_sync; # external watchdog should not bark
3836 3954
3837 trace "emergency_perl_save: flushing outstanding aio requests"; 3955 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) { 3956 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3957 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3840 } 3958 }
3841 3959
3842 cf::write_runtime_sync; # external watchdog should not bark 3960 cf::write_runtime_sync; # external watchdog should not bark
3843 }; 3961 };
3844 3962
… …
3893 4011
3894 my $t1 = AE::time; 4012 my $t1 = AE::time;
3895 4013
3896 while ($RELOAD) { 4014 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl"; 4015 cf::get_slot 0.1, -1, "reload_perl";
3898 info "reloading..."; 4016 info "perl_reload: reloading...";
3899 4017
3900 trace "entering sync_job"; 4018 trace "perl_reload: entering sync_job";
3901 4019
3902 cf::sync_job { 4020 cf::sync_job {
3903 #cf::emergency_save; 4021 #cf::emergency_save;
3904 4022
3905 trace "cancelling all extension coros"; 4023 trace "perl_reload: cancelling all extension coros";
3906 $_->cancel for values %EXT_CORO; 4024 $_->cancel for values %EXT_CORO;
3907 %EXT_CORO = (); 4025 %EXT_CORO = ();
3908 4026
3909 trace "removing commands"; 4027 trace "perl_reload: removing commands";
3910 %COMMAND = (); 4028 %COMMAND = ();
3911 4029
3912 trace "removing ext/exti commands"; 4030 trace "perl_reload: removing ext/exti commands";
3913 %EXTCMD = (); 4031 %EXTCMD = ();
3914 %EXTICMD = (); 4032 %EXTICMD = ();
3915 4033
3916 trace "unloading/nuking all extensions"; 4034 trace "perl_reload: unloading/nuking all extensions";
3917 for my $pkg (@EXTS) { 4035 for my $pkg (@EXTS) {
3918 trace "... unloading $pkg"; 4036 trace "... unloading $pkg";
3919 4037
3920 if (my $cb = $pkg->can ("unload")) { 4038 if (my $cb = $pkg->can ("unload")) {
3921 eval { 4039 eval {
… …
3926 4044
3927 trace "... clearing $pkg"; 4045 trace "... clearing $pkg";
3928 clear_package $pkg; 4046 clear_package $pkg;
3929 } 4047 }
3930 4048
3931 trace "unloading all perl modules loaded from $LIBDIR"; 4049 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932 while (my ($k, $v) = each %INC) { 4050 while (my ($k, $v) = each %INC) {
3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4051 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934 4052
3935 trace "... unloading $k"; 4053 trace "... unloading $k";
3936 delete $INC{$k}; 4054 delete $INC{$k};
… …
3943 } 4061 }
3944 4062
3945 clear_package $k; 4063 clear_package $k;
3946 } 4064 }
3947 4065
3948 trace "getting rid of safe::, as good as possible"; 4066 trace "perl_reload: getting rid of safe::, as good as possible";
3949 clear_package "safe::$_" 4067 clear_package "safe::$_"
3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4068 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951 4069
3952 trace "unloading cf.pm \"a bit\""; 4070 trace "perl_reload: unloading cf.pm \"a bit\"";
3953 delete $INC{"cf.pm"}; 4071 delete $INC{"cf.pm"};
3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4072 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955 4073
3956 # don't, removes xs symbols, too, 4074 # don't, removes xs symbols, too,
3957 # and global variables created in xs 4075 # and global variables created in xs
3958 #clear_package __PACKAGE__; 4076 #clear_package __PACKAGE__;
3959 4077
3960 info "unload completed, starting to reload now"; 4078 info "perl_reload: unload completed, starting to reload now";
3961 4079
3962 trace "reloading cf.pm"; 4080 trace "perl_reload: reloading cf.pm";
3963 require cf; 4081 require cf;
3964 cf::_connect_to_perl_1; 4082 cf::_connect_to_perl_1;
3965 4083
3966 trace "loading config and database again"; 4084 trace "perl_reload: loading config and database again";
3967 cf::reload_config; 4085 cf::reload_config;
3968 4086
3969 trace "loading extensions"; 4087 trace "perl_reload: loading extensions";
3970 cf::load_extensions; 4088 cf::load_extensions;
3971 4089
3972 if ($REATTACH_ON_RELOAD) { 4090 if ($REATTACH_ON_RELOAD) {
3973 trace "reattaching attachments to objects/players"; 4091 trace "perl_reload: reattaching attachments to objects/players";
3974 _global_reattach; # objects, sockets 4092 _global_reattach; # objects, sockets
3975 trace "reattaching attachments to maps"; 4093 trace "perl_reload: reattaching attachments to maps";
3976 reattach $_ for values %MAP; 4094 reattach $_ for values %MAP;
3977 trace "reattaching attachments to players"; 4095 trace "perl_reload: reattaching attachments to players";
3978 reattach $_ for values %PLAYER; 4096 reattach $_ for values %PLAYER;
3979 } 4097 }
3980 4098
3981 trace "running post_init jobs"; 4099 cf::_post_init 1;
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983 4100
3984 trace "leaving sync_job"; 4101 trace "perl_reload: leaving sync_job";
3985 4102
3986 1 4103 1
3987 } or do { 4104 } or do {
3988 error $@; 4105 error $@;
3989 cf::cleanup "error while reloading, exiting."; 4106 cf::cleanup "perl_reload: error, exiting.";
3990 }; 4107 };
3991 4108
3992 info "reloaded";
3993 --$RELOAD; 4109 --$RELOAD;
3994 } 4110 }
3995 4111
3996 $t1 = AE::time - $t1; 4112 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n"; 4113 info "perl_reload: completed in ${t1}s\n";
3998}; 4114};
3999 4115
4000our $RELOAD_WATCHER; # used only during reload 4116our $RELOAD_WATCHER; # used only during reload
4001 4117
4002sub reload_perl() { 4118sub reload_perl() {
… …
4027 4143
4028############################################################################# 4144#############################################################################
4029 4145
4030my $bug_warning = 0; 4146my $bug_warning = 0;
4031 4147
4032our @WAIT_FOR_TICK;
4033our @WAIT_FOR_TICK_BEGIN;
4034
4035sub wait_for_tick() { 4148sub wait_for_tick() {
4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4149 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037 4150
4038 my $signal = new Coro::Signal; 4151 $WAIT_FOR_TICK->wait;
4039 push @WAIT_FOR_TICK, $signal;
4040 $signal->wait;
4041} 4152}
4042 4153
4043sub wait_for_tick_begin() { 4154sub wait_for_tick_begin() {
4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4155 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045 4156
4046 my $signal = new Coro::Signal; 4157 my $signal = new Coro::Signal;
4047 push @WAIT_FOR_TICK_BEGIN, $signal; 4158 push @WAIT_FOR_TICK_BEGIN, $signal;
4048 $signal->wait; 4159 $signal->wait;
4049} 4160}
… …
4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4164 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4054 unless ++$bug_warning > 10; 4165 unless ++$bug_warning > 10;
4055 return; 4166 return;
4056 } 4167 }
4057 4168
4058 cf::server_tick; # one server iteration 4169 cf::one_tick; # one server iteration
4059 4170
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4171 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061 4172
4062 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4173 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4174 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4069 } 4180 }
4070 4181
4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4182 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072 $sig->send; 4183 $sig->send;
4073 } 4184 }
4074 while (my $sig = shift @WAIT_FOR_TICK) { 4185 $WAIT_FOR_TICK->broadcast;
4075 $sig->send;
4076 }
4077 4186
4078 $LOAD = ($NOW - $TICK_START) / $TICK; 4187 $LOAD = ($NOW - $TICK_START) / $TICK;
4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4188 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080 4189
4081 if (0) { 4190 if (0) {
… …
4090{ 4199{
4091 # configure BDB 4200 # configure BDB
4092 4201
4093 BDB::min_parallel 16; 4202 BDB::min_parallel 16;
4094 BDB::max_poll_reqs $TICK * 0.1; 4203 BDB::max_poll_reqs $TICK * 0.1;
4095 $AnyEvent::BDB::WATCHER->priority (1); 4204 #$AnyEvent::BDB::WATCHER->priority (1);
4096 4205
4097 unless ($DB_ENV) { 4206 unless ($DB_ENV) {
4098 $DB_ENV = BDB::db_env_create; 4207 $DB_ENV = BDB::db_env_create;
4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4208 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4209 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4135 IO::AIO::min_parallel 8; 4244 IO::AIO::min_parallel 8;
4136 IO::AIO::max_poll_time $TICK * 0.1; 4245 IO::AIO::max_poll_time $TICK * 0.1;
4137 undef $AnyEvent::AIO::WATCHER; 4246 undef $AnyEvent::AIO::WATCHER;
4138} 4247}
4139 4248
4140my $_log_backtrace; 4249our $_log_backtrace;
4250our $_log_backtrace_last;
4141 4251
4142sub _log_backtrace { 4252sub _log_backtrace {
4143 my ($msg, @addr) = @_; 4253 my ($msg, @addr) = @_;
4144 4254
4145 $msg =~ s/\n//; 4255 $msg =~ s/\n$//;
4146 4256
4257 if ($_log_backtrace_last eq $msg) {
4258 LOG llevInfo, "[ABT] $msg\n";
4259 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147 # limit the # of concurrent backtraces 4260 # limit the # of concurrent backtraces
4148 if ($_log_backtrace < 2) { 4261 } elsif ($_log_backtrace < 2) {
4262 $_log_backtrace_last = $msg;
4149 ++$_log_backtrace; 4263 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg; 4264 my $perl_bt = Carp::longmess $msg;
4151 async { 4265 async {
4152 $Coro::current->{desc} = "abt $msg"; 4266 $Coro::current->{desc} = "abt $msg";
4153 4267
… …
4173 LOG llevInfo, "[ABT] $_\n" for @bt; 4287 LOG llevInfo, "[ABT] $_\n" for @bt;
4174 --$_log_backtrace; 4288 --$_log_backtrace;
4175 }; 4289 };
4176 } else { 4290 } else {
4177 LOG llevInfo, "[ABT] $msg\n"; 4291 LOG llevInfo, "[ABT] $msg\n";
4178 LOG llevInfo, "[ABT] [suppressed]\n"; 4292 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179 } 4293 }
4180} 4294}
4181 4295
4182# load additional modules 4296# load additional modules
4183require "cf/$_.pm" for @EXTRA_MODULES; 4297require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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