--- deliantra/server/lib/cf.pm 2010/05/06 21:58:07 1.544
+++ deliantra/server/lib/cf.pm 2012/10/30 17:07:50 1.584
@@ -1,22 +1,22 @@
#
# This file is part of Deliantra, the Roguelike Realtime MMORPG.
-#
-# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
-#
+#
+# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+#
# Deliantra is free software: you can redistribute it and/or modify it under
# the terms of the Affero GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the Affero GNU General Public License
# and the GNU General Public License along with this program. If not, see
# .
-#
+#
# The authors can be reached via e-mail to
#
@@ -95,10 +95,12 @@
our %REFLECT; # set by us
our $CONFDIR = confdir;
+
our $DATADIR = datadir;
our $LIBDIR = "$DATADIR/ext";
our $PODDIR = "$DATADIR/pod";
our $MAPDIR = "$DATADIR/" . mapdir;
+
our $LOCALDIR = localdir;
our $TMPDIR = "$LOCALDIR/" . tmpdir;
our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
@@ -108,7 +110,7 @@
our $PIDFILE = "$LOCALDIR/pid";
our $RUNTIMEFILE = "$LOCALDIR/runtime";
-our %RESOURCE; # unused
+#our %RESOURCE; # unused
our $OUTPUT_RATE_MIN = 3000;
our $OUTPUT_RATE_MAX = 1000000;
@@ -129,9 +131,11 @@
our @EXTRA_MODULES = qw(pod match mapscript incloader);
our %CFG;
+our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
our $UPTIME; $UPTIME ||= time;
-our $RUNTIME;
+our $RUNTIME = 0;
+our $SERVER_TICK = 0;
our $NOW;
our (%PLAYER, %PLAYER_LOADING); # all users
@@ -151,6 +155,9 @@
our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
our $REALLY_UNLOOP; # never set to true, please :)
+our $WAIT_FOR_TICK = new Coro::Signal;
+our @WAIT_FOR_TICK_BEGIN;
+
binmode STDOUT;
binmode STDERR;
@@ -193,7 +200,22 @@
=item $cf::UPTIME
-The timestamp of the server start (so not actually an uptime).
+The timestamp of the server start (so not actually an "uptime").
+
+=item $cf::SERVER_TICK
+
+An unsigned integer that starts at zero when the server is started and is
+incremented on every tick.
+
+=item $cf::NOW
+
+The (real) time of the last (current) server tick - updated before and
+after tick processing, so this is useful only as a rough "what time is it
+now" estimate.
+
+=item $cf::TICK
+
+The interval between each server tick, in seconds.
=item $cf::RUNTIME
@@ -209,14 +231,6 @@
unique-items directory, player file directory, random maps directory and
database environment.
-=item $cf::NOW
-
-The time of the last (current) server tick.
-
-=item $cf::TICK
-
-The interval between server ticks, in seconds.
-
=item $cf::LOADAVG
The current CPU load on the server (alpha-smoothed), as a value between 0
@@ -235,9 +249,26 @@
=item cf::wait_for_tick, cf::wait_for_tick_begin
These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
-returns directly I the tick processing (and consequently, can only wake one process
+returns directly I the tick processing (and consequently, can only wake one thread
per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
+Note that cf::Wait_for_tick will immediately return when the server is not
+ticking, making it suitable for small pauses in threads that need to run
+when the server is paused. If that is not applicable (i.e. you I
+want to wait, use C<$cf::WAIT_FOR_TICK>).
+
+=item $cf::WAIT_FOR_TICK
+
+Note that C is probably the correct thing to use. This
+variable contains a L that is broadcats after every server
+tick. Calling C<< ->wait >> on it will suspend the caller until after the
+next server tick.
+
+=cut
+
+sub wait_for_tick();
+sub wait_for_tick_begin();
+
=item @cf::INVOKE_RESULTS
This array contains the results of the last C call. When
@@ -312,6 +343,11 @@
#############################################################################
+sub fork_call(&@);
+sub get_slot($;$$);
+
+#############################################################################
+
=head2 UTILITY FUNCTIONS
=over 4
@@ -339,6 +375,58 @@
} || "[unable to dump $_[0]: '$@']";
}
+=item $scalar = cf::load_file $path
+
+Loads the given file from path and returns its contents. Croaks on error
+and can block.
+
+=cut
+
+sub load_file($) {
+ 0 <= aio_load $_[0], my $data
+ or Carp::croak "$_[0]: $!";
+
+ $data
+}
+
+=item $success = cf::replace_file $path, $data, $sync
+
+Atomically replaces the file at the given $path with new $data, and
+optionally $sync the data to disk before replacing the file.
+
+=cut
+
+sub replace_file($$;$) {
+ my ($path, $data, $sync) = @_;
+
+ my $lock = cf::lock_acquire ("replace_file:$path");
+
+ my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
+ or return;
+
+ $data = $data->() if ref $data;
+
+ length $data == aio_write $fh, 0, (length $data), $data, 0
+ or return;
+
+ !$sync
+ or !aio_fsync $fh
+ or return;
+
+ aio_close $fh
+ and return;
+
+ aio_rename "$path~", $path
+ and return;
+
+ if ($sync) {
+ $path =~ s%/[^/]*$%%;
+ aio_pathsync $path;
+ }
+
+ 1
+}
+
=item $ref = cf::decode_json $json
Converts a JSON string into the corresponding perl data structure.
@@ -354,12 +442,43 @@
sub encode_json($) { $json_coder->encode ($_[0]) }
sub decode_json($) { $json_coder->decode ($_[0]) }
+=item $ref = cf::decode_storable $scalar
+
+Same as Coro::Storable::thaw, so blocks.
+
+=cut
+
+BEGIN { *decode_storable = \&Coro::Storable::thaw }
+
+=item $ref = cf::decode_yaml $scalar
+
+Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
+
+=cut
+
+sub decode_yaml($) {
+ fork_call { YAML::XS::Load $_[0] } @_
+}
+
+=item $scalar = cf::unlzf $scalar
+
+Same as Compress::LZF::compress, but takes server ticks into account, so
+blocks.
+
+=cut
+
+sub unlzf($) {
+ # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
+ cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
+ Compress::LZF::decompress $_[0]
+}
+
=item cf::post_init { BLOCK }
Execute the given codeblock, I all extensions have been (re-)loaded,
but I the server starts ticking again.
-The cdoeblock will have a single boolean argument to indicate whether this
+The codeblock will have a single boolean argument to indicate whether this
is a reload or not.
=cut
@@ -368,6 +487,23 @@
push @POST_INIT, shift;
}
+sub _post_init {
+ trace "running post_init jobs";
+
+ # run them in parallel...
+
+ my @join;
+
+ while () {
+ push @join, map &Coro::async ($_, 0), @POST_INIT;
+ @POST_INIT = ();
+
+ @join or last;
+
+ (pop @join)->join;
+ }
+}
+
=item cf::lock_wait $string
Wait until the given lock is available. See cf::lock_acquire.
@@ -428,9 +564,13 @@
=item cf::get_slot $time[, $priority[, $name]]
-Allocate $time seconds of blocking CPU time at priority C<$priority>:
-This call blocks and returns only when you have at least C<$time> seconds
-of cpu time till the next tick. The slot is only valid till the next cede.
+Allocate $time seconds of blocking CPU time at priority C<$priority>
+(default: 0): This call blocks and returns only when you have at least
+C<$time> seconds of cpu time till the next tick. The slot is only valid
+till the next cede.
+
+Background jobs should use a priority les than zero, interactive jobs
+should use 100 or more.
The optional C<$name> can be used to identify the job to run. It might be
used for statistical purposes and should identify the same time-class.
@@ -469,8 +609,7 @@
if (@SLOT_QUEUE) {
# we do not use wait_for_tick() as it returns immediately when tick is inactive
- push @cf::WAIT_FOR_TICK, $signal;
- $signal->wait;
+ $WAIT_FOR_TICK->wait;
} else {
$busy = 0;
Coro::schedule;
@@ -580,7 +719,7 @@
$coro
}
-=item fork_call { }, $args
+=item fork_call { }, @args
Executes the given code block with the given arguments in a seperate
process, returning the results. Everything must be serialisable with
@@ -589,6 +728,10 @@
=cut
+sub post_fork {
+ reset_signals;
+}
+
sub fork_call(&@) {
my ($cb, @args) = @_;
@@ -597,9 +740,9 @@
# TODO: investigate and fix (likely this will be rather laborious)
my @res = Coro::Util::fork_eval {
- reset_signals;
+ cf::post_fork;
&$cb
- }, @args;
+ } @args;
wantarray ? @res : $res[-1]
}
@@ -731,8 +874,7 @@
my $md5;
for (0 .. $#$src) {
- 0 <= aio_load $src->[$_], $data[$_]
- or Carp::croak "$src->[$_]: $!";
+ $data[$_] = load_file $src->[$_];
}
# if processing is expensive, check
@@ -1360,10 +1502,7 @@
my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
if (ref $msg) {
- my ($type, $reply, @payload) =
- "ARRAY" eq ref $msg
- ? @$msg
- : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
+ my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
my @reply;
@@ -1395,9 +1534,22 @@
$grp
}
+sub _ext_cfg_reg($$$$) {
+ my ($rvar, $varname, $cfgname, $default) = @_;
+
+ $cfgname = lc $varname
+ unless length $cfgname;
+
+ $EXT_CFG{$cfgname} = [$rvar, $default];
+
+ $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
+}
+
sub load_extensions {
info "loading extensions...";
+ %EXT_CFG = ();
+
cf::sync_job {
my %todo;
@@ -1449,7 +1601,16 @@
trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
- my $active = eval $v->{source};
+ my $source = $v->{source};
+
+ # support "CONF varname :confname = default" pseudo-statements
+ $source =~ s{
+ ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
+ }{
+ "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
+ }gmxe;
+
+ my $active = eval $source;
if (length $@) {
error "$v->{path}: $@\n";
@@ -1476,6 +1637,8 @@
cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
if exists $v->{meta}{mandatory};
}
+
+ last;
}
}
};
@@ -1643,10 +1806,13 @@
$pl->{deny_save} = 1;
$pl->password ("*"); # this should lock out the player until we have nuked the dir
- $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
+ $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
$pl->deactivate;
+
my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
- $pl->invoke (cf::EVENT_PLAYER_QUIT);
+ $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
+ ext::highscore::check ($pl->ob);
+
$pl->ns->destroy if $pl->ns;
my $path = playerdir $pl;
@@ -1822,20 +1988,7 @@
my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
- # mit "rum" bekleckern, nicht
- $self->_create_random_map (
- $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
- $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
- $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
- $rmp->{exit_on_final_map},
- $rmp->{xsize}, $rmp->{ysize},
- $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
- $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
- $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
- $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
- $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
- (cf::region::find $rmp->{region}), $rmp->{custom}
- )
+ $self->_create_random_map ($rmp);
}
=item cf::map->register ($regex, $prio)
@@ -1896,7 +2049,6 @@
}
for ($path) {
- redo if s{//}{/};
redo if s{/\.?/}{/};
redo if s{/[^/]+/\.\./}{/};
}
@@ -1924,6 +2076,7 @@
()
}
+# may re-bless or do other evil things
sub init {
my ($self) = @_;
@@ -1998,18 +2151,21 @@
1
}
+# used to laod the header of an original map
sub load_header_orig {
my ($self) = @_;
$self->load_header_from ($self->load_path)
}
+# used to laod the header of an instantiated map
sub load_header_temp {
my ($self) = @_;
$self->load_header_from ($self->save_path)
}
+# called after loading the header from an instantiated map
sub prepare_temp {
my ($self) = @_;
@@ -2020,6 +2176,7 @@
if $self->{instantiate_time} > $cf::RUNTIME;
}
+# called after loading the header from an original map
sub prepare_orig {
my ($self) = @_;
@@ -2055,7 +2212,7 @@
cf::cede_to_tick;
- $path = normalise $path, $origin && $origin->path;
+ $path = normalise $path, $origin;
my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
my $guard2 = cf::lock_acquire "map_find:$path";
@@ -2096,35 +2253,40 @@
my $guard = cf::lock_acquire "map_data:$path";
return unless $self->valid;
- return unless $self->in_memory == cf::MAP_SWAPPED;
-
- $self->in_memory (cf::MAP_LOADING);
+ return unless $self->state == cf::MAP_SWAPPED;
$self->alloc;
$self->pre_load;
cf::cede_to_tick;
- my $f = new_from_file cf::object::thawer $self->{load_path};
- $f->skip_block;
- $self->_load_objects ($f)
- or return;
+ if (exists $self->{load_path}) {
+ my $f = new_from_file cf::object::thawer $self->{load_path};
+ $f->skip_block;
+ $self->_load_objects ($f)
+ or return;
- $self->post_load_original
- if delete $self->{load_original};
+ $self->post_load_original
+ if delete $self->{load_original};
- if (my $uniq = $self->uniq_path) {
- utf8::encode $uniq;
- unless (aio_stat $uniq) {
- if (my $f = new_from_file cf::object::thawer $uniq) {
- $self->clear_unique_items;
- $self->_load_objects ($f);
- $f->resolve_delayed_derefs;
+ if (my $uniq = $self->uniq_path) {
+ utf8::encode $uniq;
+ unless (aio_stat $uniq) {
+ if (my $f = new_from_file cf::object::thawer $uniq) {
+ $self->clear_unique_items;
+ $self->_load_objects ($f);
+ $f->resolve_delayed_derefs;
+ }
}
}
+
+ $f->resolve_delayed_derefs;
+ } else {
+ $self->post_load_original
+ if delete $self->{load_original};
}
- $f->resolve_delayed_derefs;
+ $self->state (cf::MAP_INACTIVE);
cf::cede_to_tick;
# now do the right thing for maps
@@ -2138,16 +2300,16 @@
$self->fix_auto_apply;
$self->update_buttons;
cf::cede_to_tick;
- $self->activate;
+ #$self->activate; # no longer activate maps automatically
}
$self->{last_save} = $cf::RUNTIME;
$self->last_access ($cf::RUNTIME);
-
- $self->in_memory (cf::MAP_ACTIVE);
}
$self->post_load;
+
+ 1
}
# customize the map for a given player, i.e.
@@ -2165,36 +2327,10 @@
$self
}
-# find and load all maps in the 3x3 area around a map
-sub load_neighbours {
- my ($map) = @_;
-
- my @neigh; # diagonal neighbours
-
- for (0 .. 3) {
- my $neigh = $map->tile_path ($_)
- or next;
- $neigh = find $neigh, $map
- or next;
- $neigh->load;
-
- # now find the diagonal neighbours
- push @neigh,
- [$neigh->tile_path (($_ + 3) % 4), $neigh],
- [$neigh->tile_path (($_ + 1) % 4), $neigh];
- }
-
- for (grep defined $_->[0], @neigh) {
- my ($path, $origin) = @$_;
- my $neigh = find $path, $origin
- or next;
- $neigh->load;
- }
-}
-
sub find_sync {
my ($path, $origin) = @_;
+ # it's a bug to call this from the main context
return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
if $Coro::current == $Coro::main;
@@ -2204,6 +2340,7 @@
sub do_load_sync {
my ($map) = @_;
+ # it's a bug to call this from the main context
return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
if $Coro::current == $Coro::main;
@@ -2216,10 +2353,10 @@
sub find_async {
my ($path, $origin, $load) = @_;
- $path = normalise $path, $origin && $origin->{path};
+ $path = normalise $path, $origin;
if (my $map = $cf::MAP{$path}) {
- return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
+ return $map if !$load || $map->linkable;
}
$MAP_PREFETCH{$path} |= $load;
@@ -2288,14 +2425,14 @@
my $lock = cf::lock_acquire "map_data:$self->{path}";
- return if $self->in_memory != cf::MAP_ACTIVE;
+ return if !$self->linkable;
return if $self->{deny_save};
return if $self->players;
# first deactivate the map and "unlink" it from the core
$self->deactivate;
$_->clear_links_to ($self) for values %cf::MAP;
- $self->in_memory (cf::MAP_SWAPPED);
+ $self->state (cf::MAP_SWAPPED);
# then atomically save
$self->_save;
@@ -2331,7 +2468,7 @@
cf::trace "resetting map ", $self->path, "\n";
- $self->in_memory (cf::MAP_SWAPPED);
+ $self->state (cf::MAP_SWAPPED);
# need to save uniques path
unless ($self->{deny_save}) {
@@ -2671,7 +2808,6 @@
if $x <= 0 && $y <= 0;
$map->load;
- $map->load_neighbours;
return unless $self->contr->active;
@@ -2737,7 +2873,7 @@
}
my $map = eval {
- my $map = defined $path ? cf::map::find $path : undef;
+ my $map = defined $path ? cf::map::find $path, $self->map : undef;
if ($map) {
$map = $map->customise_for ($self);
@@ -2837,17 +2973,32 @@
unless (eval {
$self->deactivate_recursive; # just to be sure
- # random map handling
- {
+ my $map = cf::map::normalise $exit->slaying, $exit->map;
+ my $x = $exit->stats->hp;
+ my $y = $exit->stats->sp;
+
+ # special map handling
+ my $slaying = $exit->slaying;
+
+ # special map handling
+ if ($slaying eq "/!") {
my $guard = cf::lock_acquire "exit_prepare:$exit";
prepare_random_map $exit
- if $exit->slaying eq "/!";
- }
+ if $exit->slaying eq "/!"; # need to re-check after getting the lock
- my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
- my $x = $exit->stats->hp;
- my $y = $exit->stats->sp;
+ $map = $exit->slaying;
+
+ } elsif ($slaying eq '!up') {
+ $map = $exit->map->tile_path (cf::TILE_UP);
+ $x = $exit->x;
+ $y = $exit->y;
+
+ } elsif ($slaying eq '!down') {
+ $map = $exit->map->tile_path (cf::TILE_DOWN);
+ $x = $exit->x;
+ $y = $exit->y;
+ }
$self->goto ($map, $x, $y);
@@ -3099,13 +3250,9 @@
sub cf::client::ext_reply($$@) {
my ($self, $id, @msg) = @_;
- if ($self->extcmd == 2) {
- $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
- } elsif ($self->extcmd == 1) {
- #TODO: version 1, remove
- unshift @msg, msgtype => "reply", msgid => $id;
- $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
- }
+ return unless $self->extcmd == 2;
+
+ $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
}
=item $success = $client->query ($flags, "text", \&cb)
@@ -3170,10 +3317,7 @@
my $msg = eval { $ns->{json_coder}->decode ($buf) };
if (ref $msg) {
- my ($type, $reply, @payload) =
- "ARRAY" eq ref $msg
- ? @$msg
- : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
+ my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
my @reply;
@@ -3361,6 +3505,8 @@
#############################################################################
# the server's init and main functions
+our %FACEHASH; # hash => idx, #d# HACK for http server
+
sub load_facedata($) {
my ($path) = @_;
@@ -3372,11 +3518,7 @@
trace "loading facedata from $path\n";
- my $facedata;
- 0 < aio_load $path, $facedata
- or die "$path: $!";
-
- $facedata = Coro::Storable::thaw $facedata;
+ my $facedata = decode_storable load_file $path;
$facedata->{version} == 2
or cf::cleanup "$path: version mismatch, cannot proceed.";
@@ -3400,6 +3542,8 @@
cf::face::set_magicmap $idx, $info->{magicmap};
cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
+ cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
+ $FACEHASH{$info->{hash64}} = $idx;#d#
cf::cede_to_tick;
}
@@ -3436,13 +3580,16 @@
my $res = $facedata->{resource};
while (my ($name, $info) = each %$res) {
- if (defined $info->{type}) {
+ if (defined (my $type = $info->{type})) {
+ # TODO: different hash - must free and use new index, or cache ixface data queue
my $idx = (cf::face::find $name) || cf::face::alloc $name;
cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
- cf::face::set_type $idx, $info->{type};
+ cf::face::set_type $idx, $type;
+ cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
+ $FACEHASH{$info->{hash}} = $idx;#d#
} else {
- $RESOURCE{$name} = $info; # unused
+# $RESOURCE{$name} = $info; # unused
}
cf::cede_to_tick;
@@ -3501,17 +3648,10 @@
or die "unable to load treasurelists\n";
}
-sub reload_exp {
- cf::init_experience;
-}
-
sub reload_sound {
trace "loading sound config from $DATADIR/sound\n";
- 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
- or die "$DATADIR/sound $!";
-
- my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
+ my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
for (0 .. SOUND_CAST_SPELL_0 - 1) {
my $sound = $soundconf->{compat}[$_]
@@ -3531,7 +3671,8 @@
sub reload_resources {
trace "reloading resource files...\n";
- reload_exp;
+ reload_exp_table;
+ reload_materials;
reload_facedata;
reload_sound;
reload_archetypes;
@@ -3544,11 +3685,9 @@
sub reload_config {
trace "reloading config file...\n";
- open my $fh, "<:utf8", "$CONFDIR/config"
- or return;
-
- local $/;
- *CFG = YAML::XS::Load scalar <$fh>;
+ my $config = load_file "$CONFDIR/config";
+ utf8::decode $config;
+ *CFG = decode_yaml $config;
$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
@@ -3562,8 +3701,6 @@
};
warn $@ if $@;
}
-
- trace "finished reloading resource files\n";
}
sub pidfile() {
@@ -3598,7 +3735,7 @@
cf::init_globals; # initialise logging
LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
- LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
+ LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
@@ -3623,7 +3760,6 @@
cf::init_dynamic;
cf::load_settings;
- cf::load_materials;
reload_resources;
reload_config;
@@ -3645,14 +3781,13 @@
use POSIX ();
POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
- (pop @POST_INIT)->(0) while @POST_INIT;
+ cf::_post_init 0;
};
cf::object::thawer::errors_are_fatal 0;
info "parse errors in files are no longer fatal from this point on.\n";
- my $free_main; $free_main = EV::idle sub {
- undef $free_main;
+ AE::postpone {
undef &main; # free gobs of memory :)
};
@@ -3819,7 +3954,7 @@
trace "emergency_perl_save: flushing outstanding aio requests";
while (IO::AIO::nreqs || BDB::nreqs) {
- Coro::EV::timer_once 0.01; # let the sync_job do it's thing
+ Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
}
cf::write_runtime_sync; # external watchdog should not bark
@@ -3878,25 +4013,25 @@
while ($RELOAD) {
cf::get_slot 0.1, -1, "reload_perl";
- info "reloading...";
+ info "perl_reload: reloading...";
- trace "entering sync_job";
+ trace "perl_reload: entering sync_job";
cf::sync_job {
#cf::emergency_save;
- trace "cancelling all extension coros";
+ trace "perl_reload: cancelling all extension coros";
$_->cancel for values %EXT_CORO;
%EXT_CORO = ();
- trace "removing commands";
+ trace "perl_reload: removing commands";
%COMMAND = ();
- trace "removing ext/exti commands";
+ trace "perl_reload: removing ext/exti commands";
%EXTCMD = ();
%EXTICMD = ();
- trace "unloading/nuking all extensions";
+ trace "perl_reload: unloading/nuking all extensions";
for my $pkg (@EXTS) {
trace "... unloading $pkg";
@@ -3911,7 +4046,7 @@
clear_package $pkg;
}
- trace "unloading all perl modules loaded from $LIBDIR";
+ trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
while (my ($k, $v) = each %INC) {
next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
@@ -3928,11 +4063,11 @@
clear_package $k;
}
- trace "getting rid of safe::, as good as possible";
+ trace "perl_reload: getting rid of safe::, as good as possible";
clear_package "safe::$_"
for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
- trace "unloading cf.pm \"a bit\"";
+ trace "perl_reload: unloading cf.pm \"a bit\"";
delete $INC{"cf.pm"};
delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
@@ -3940,44 +4075,42 @@
# and global variables created in xs
#clear_package __PACKAGE__;
- info "unload completed, starting to reload now";
+ info "perl_reload: unload completed, starting to reload now";
- trace "reloading cf.pm";
+ trace "perl_reload: reloading cf.pm";
require cf;
cf::_connect_to_perl_1;
- trace "loading config and database again";
+ trace "perl_reload: loading config and database again";
cf::reload_config;
- trace "loading extensions";
+ trace "perl_reload: loading extensions";
cf::load_extensions;
if ($REATTACH_ON_RELOAD) {
- trace "reattaching attachments to objects/players";
+ trace "perl_reload: reattaching attachments to objects/players";
_global_reattach; # objects, sockets
- trace "reattaching attachments to maps";
+ trace "perl_reload: reattaching attachments to maps";
reattach $_ for values %MAP;
- trace "reattaching attachments to players";
+ trace "perl_reload: reattaching attachments to players";
reattach $_ for values %PLAYER;
}
- trace "running post_init jobs";
- (pop @POST_INIT)->(1) while @POST_INIT;
+ cf::_post_init 1;
- trace "leaving sync_job";
+ trace "perl_reload: leaving sync_job";
1
} or do {
error $@;
- cf::cleanup "error while reloading, exiting.";
+ cf::cleanup "perl_reload: error, exiting.";
};
- info "reloaded";
--$RELOAD;
}
$t1 = AE::time - $t1;
- info "reload completed in ${t1}s\n";
+ info "perl_reload: completed in ${t1}s\n";
};
our $RELOAD_WATCHER; # used only during reload
@@ -4012,19 +4145,14 @@
my $bug_warning = 0;
-our @WAIT_FOR_TICK;
-our @WAIT_FOR_TICK_BEGIN;
+sub wait_for_tick() {
+ return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
-sub wait_for_tick {
- return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
-
- my $signal = new Coro::Signal;
- push @WAIT_FOR_TICK, $signal;
- $signal->wait;
+ $WAIT_FOR_TICK->wait;
}
-sub wait_for_tick_begin {
- return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
+sub wait_for_tick_begin() {
+ return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
my $signal = new Coro::Signal;
push @WAIT_FOR_TICK_BEGIN, $signal;
@@ -4038,7 +4166,7 @@
return;
}
- cf::server_tick; # one server iteration
+ cf::one_tick; # one server iteration
#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
@@ -4054,9 +4182,7 @@
if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
$sig->send;
}
- while (my $sig = shift @WAIT_FOR_TICK) {
- $sig->send;
- }
+ $WAIT_FOR_TICK->broadcast;
$LOAD = ($NOW - $TICK_START) / $TICK;
$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
@@ -4075,7 +4201,7 @@
BDB::min_parallel 16;
BDB::max_poll_reqs $TICK * 0.1;
- $AnyEvent::BDB::WATCHER->priority (1);
+ #$AnyEvent::BDB::WATCHER->priority (1);
unless ($DB_ENV) {
$DB_ENV = BDB::db_env_create;
@@ -4120,15 +4246,20 @@
undef $AnyEvent::AIO::WATCHER;
}
-my $_log_backtrace;
+our $_log_backtrace;
+our $_log_backtrace_last;
sub _log_backtrace {
my ($msg, @addr) = @_;
- $msg =~ s/\n//;
+ $msg =~ s/\n$//;
+ if ($_log_backtrace_last eq $msg) {
+ LOG llevInfo, "[ABT] $msg\n";
+ LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
# limit the # of concurrent backtraces
- if ($_log_backtrace < 2) {
+ } elsif ($_log_backtrace < 2) {
+ $_log_backtrace_last = $msg;
++$_log_backtrace;
my $perl_bt = Carp::longmess $msg;
async {
@@ -4158,7 +4289,7 @@
};
} else {
LOG llevInfo, "[ABT] $msg\n";
- LOG llevInfo, "[ABT] [suppressed]\n";
+ LOG llevInfo, "[ABT] [overload, suppressed]\n";
}
}