--- deliantra/server/lib/cf.pm 2009/10/11 00:24:35 1.481 +++ deliantra/server/lib/cf.pm 2012/11/11 02:38:10 1.598 @@ -1,29 +1,28 @@ -# +# # This file is part of Deliantra, the Roguelike Realtime MMORPG. -# -# Copyright (©) 2006,2007,2008 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 GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# +# +# 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 GNU General Public License -# along with this program. If not, see . -# +# +# 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 -# +# package cf; -use 5.10.0; -use utf8; -use strict qw(vars subs); +use common::sense; use Symbol; use List::Util; @@ -33,8 +32,12 @@ use Safe; use Safe::Hole; use Storable (); +use Carp (); + +use AnyEvent (); +use AnyEvent::IO (); +use AnyEvent::DNS (); -use Guard (); use Coro (); use Coro::State; use Coro::Handle; @@ -50,14 +53,13 @@ use Coro::Storable; use Coro::Util (); +use Guard (); use JSON::XS 2.01 (); use BDB (); use Data::Dumper; -use Digest::MD5; use Fcntl; -use YAML (); +use YAML::XS (); use IO::AIO (); -use Time::HiRes; use Compress::LZF; use Digest::MD5 (); @@ -79,12 +81,16 @@ sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload +our @ORIG_INC; + our %COMMAND = (); our %COMMAND_TIME = (); our @EXTS = (); # list of extension package names our %EXTCMD = (); +our %EXTACMD = (); our %EXTICMD = (); +our %EXTIACMD = (); our %EXT_CORO = (); # coroutines bound to extensions our %EXT_MAP = (); # pluggable maps @@ -94,10 +100,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; @@ -107,7 +115,13 @@ our $PIDFILE = "$LOCALDIR/pid"; our $RUNTIMEFILE = "$LOCALDIR/runtime"; -our %RESOURCE; +#our %RESOURCE; # unused + +our $OUTPUT_RATE_MIN = 3000; +our $OUTPUT_RATE_MAX = 1000000; + +our $MAX_LINKS = 32; # how many chained exits to follow +our $VERBOSE_IO = 1; our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) our $NEXT_RUNTIME_WRITE; # when should the runtime file be written @@ -119,12 +133,14 @@ our $BDB_TRICKLE_WATCHER; our $DB_ENV; -our @EXTRA_MODULES = qw(pod match mapscript); +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 @@ -144,6 +160,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; @@ -163,6 +182,10 @@ sub cf::map::normalise; +sub in_main() { + $Coro::current == $Coro::main +} + ############################################################################# %REFLECT = (); @@ -172,7 +195,7 @@ } # this is decidedly evil -$REFLECT{object}{flags} = { map $_ => undef, grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} }; +$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} }; ############################################################################# @@ -182,30 +205,37 @@ =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 The time this server has run, starts at 0 and is increased by $cf::TICK on every server tick. -=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR +=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR $cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR -$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR +$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR Various directories - "/etc", read-only install directory, perl-library directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 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 @@ -224,12 +254,29 @@ =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 +This array contains the results of the last C call. When C is called C<@cf::INVOKE_RESULTS> is set to the parameters of that call. @@ -243,6 +290,12 @@ =cut +sub error(@) { LOG llevError, join "", @_ } +sub warn (@) { LOG llevWarn , join "", @_ } +sub info (@) { LOG llevInfo , join "", @_ } +sub debug(@) { LOG llevDebug, join "", @_ } +sub trace(@) { LOG llevTrace, join "", @_ } + $Coro::State::WARNHOOK = sub { my $msg = join "", @_; @@ -251,16 +304,16 @@ $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; - LOG llevError, $msg; + LOG llevWarn, $msg; }; $Coro::State::DIEHOOK = sub { return unless $^S eq 0; # "eq", not "==" - warn Carp::longmess $_[0]; + error Carp::longmess $_[0]; - if ($Coro::current == $Coro::main) {#d# - warn "DIEHOOK called in main context, Coro bug?\n";#d# + if (in_main) {#d# + error "DIEHOOK called in main context, Coro bug?\n";#d# return;#d# }#d# @@ -290,11 +343,16 @@ } $EV::DIED = sub { - warn "error in event callback: @_"; + warn "error in event callback: $@"; }; ############################################################################# +sub fork_call(&@); +sub get_slot($;$$); + +############################################################################# + =head2 UTILITY FUNCTIONS =over 4 @@ -322,6 +380,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. @@ -337,12 +447,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 @@ -351,6 +492,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. @@ -397,7 +555,7 @@ =item cf::periodic $interval, $cb Like EV::periodic, but randomly selects a starting point so that the actions -get spread over timer. +get spread over time. =cut @@ -411,9 +569,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. @@ -424,32 +586,37 @@ our @SLOT_QUEUE; our $SLOT_QUEUE; +our $SLOT_DECAY = 0.9; $SLOT_QUEUE->cancel if $SLOT_QUEUE; $SLOT_QUEUE = Coro::async { $Coro::current->desc ("timeslot manager"); my $signal = new Coro::Signal; + my $busy; while () { next_job: + my $avail = cf::till_tick; - if ($avail > 0.01) { - for (0 .. $#SLOT_QUEUE) { - if ($SLOT_QUEUE[$_][0] < $avail) { - my $job = splice @SLOT_QUEUE, $_, 1, (); - $job->[2]->send; - Coro::cede; - goto next_job; - } + + for (0 .. $#SLOT_QUEUE) { + if ($SLOT_QUEUE[$_][0] <= $avail) { + $busy = 0; + my $job = splice @SLOT_QUEUE, $_, 1, (); + $job->[2]->send; + Coro::cede; + goto next_job; + } else { + $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; } } 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; } } @@ -460,7 +627,8 @@ my ($time, $pri, $name) = @_; - $time = $TICK * .6 if $time > $TICK * .6; + $time = clamp $time, 0.01, $TICK * .6; + my $sig = new Coro::Signal; push @SLOT_QUEUE, [$time, $pri, $sig, $name]; @@ -496,13 +664,13 @@ sub sync_job(&) { my ($job) = @_; - if ($Coro::current == $Coro::main) { - my $time = EV::time; + if (in_main) { + my $time = AE::time; # this is the main coro, too bad, we have to block # till the operation succeeds, freezing the server :/ - LOG llevError, Carp::longmess "sync job";#d# + #LOG llevError, Carp::longmess "sync job";#d# my $freeze_guard = freeze_mainloop; @@ -512,7 +680,7 @@ (async { $Coro::current->desc ("sync job coro"); @res = eval { $job->() }; - warn $@ if $@; + error $@ if $@; undef $busy; })->prio (Coro::PRIO_MAX); @@ -524,7 +692,7 @@ } } - my $time = EV::time - $time; + my $time = AE::time - $time; $TICK_START += $time; # do not account sync jobs to server load @@ -556,7 +724,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 @@ -565,6 +733,10 @@ =cut +sub post_fork { + reset_signals; +} + sub fork_call(&@) { my ($cb, @args) = @_; @@ -573,13 +745,24 @@ # 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] } +sub objinfo { + ( + "counter value" => cf::object::object_count, + "objects created" => cf::object::create_count, + "objects destroyed" => cf::object::destroy_count, + "freelist size" => cf::object::free_count, + "allocated objects" => cf::object::objects_size, + "active objects" => cf::object::actives_size, + ) +} + =item $coin = coin_from_name $name =cut @@ -624,6 +807,9 @@ =cut sub db_table($) { + cf::error "db_get called from main context" + if $Coro::current == $Coro::main; + my ($name) = @_; my $db = BDB::db_create $DB_ENV; @@ -643,20 +829,19 @@ our $DB; sub db_init { - cf::sync_job { - $DB ||= db_table "db"; - }; + $DB ||= db_table "db"; } sub db_get($$) { my $key = "$_[0]/$_[1]"; - cf::sync_job { - BDB::db_get $DB, undef, $key, my $data; + cf::error "db_get called from main context" + if $Coro::current == $Coro::main; - $! ? () - : $data - } + BDB::db_get $DB, undef, $key, my $data; + + $! ? () + : $data } sub db_put($$$) { @@ -694,8 +879,7 @@ my $md5; for (0 .. $#$src) { - 0 <= aio_load $src->[$_], $data[$_] - or Carp::croak "$src->[$_]: $!"; + $data[$_] = load_file $src->[$_]; } # if processing is expensive, check @@ -718,11 +902,11 @@ } } - my $t1 = Time::HiRes::time; + my $t1 = EV::time; my $data = $process->(\@data); - my $t2 = Time::HiRes::time; + my $t2 = EV::time; - warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; + info "cache: '$id' processed in ", $t2 - $t1, "s\n"; db_put cache => "$id/data", $data; db_put cache => "$id/md5" , $md5; @@ -742,7 +926,7 @@ sub datalog($@) { my ($type, %kv) = @_; - warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); + info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); } =back @@ -947,11 +1131,11 @@ _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; } elsif (ref $type) { - warn "attaching objects not supported, ignoring.\n"; + error "attaching objects not supported, ignoring.\n"; } else { shift @arg; - warn "attach argument '$type' not supported, ignoring.\n"; + error "attach argument '$type' not supported, ignoring.\n"; } } } @@ -971,7 +1155,7 @@ $obj->{$name} = \%arg; } else { - warn "object uses attachment '$name' which is not available, postponing.\n"; + info "object uses attachment '$name' which is not available, postponing.\n"; } $obj->{_attachment}{$name} = undef; @@ -1040,8 +1224,7 @@ eval { &{$_->[1]} }; if ($@) { - warn "$@"; - warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; + error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; override; } @@ -1130,7 +1313,7 @@ _attach $registry, $klass, @attach; } } else { - warn "object uses attachment '$name' that is not available, postponing.\n"; + info "object uses attachment '$name' that is not available, postponing.\n"; } } } @@ -1167,8 +1350,9 @@ sync_job { if (length $$rdata) { utf8::decode (my $decname = $filename); - warn sprintf "saving %s (%d,%d)\n", - $decname, length $$rdata, scalar @$objs; + trace sprintf "saving %s (%d,%d)\n", + $decname, length $$rdata, scalar @$objs + if $VERBOSE_IO; if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { aio_chmod $fh, SAVE_MODE; @@ -1200,7 +1384,7 @@ $filename =~ s%/[^/]+$%%; aio_pathsync $filename if $cf::USE_FSYNC; } else { - warn "unable to save objects: $filename~: $!\n"; + error "unable to save objects: $filename~: $!\n"; } } else { aio_unlink $filename; @@ -1234,8 +1418,9 @@ } utf8::decode (my $decname = $filename); - warn sprintf "loading %s (%d,%d)\n", - $decname, length $data, scalar @{$av || []}; + trace sprintf "loading %s (%d,%d)\n", + $decname, length $data, scalar @{$av || []} + if $VERBOSE_IO; ($data, $av) } @@ -1249,7 +1434,7 @@ ############################################################################# # command handling &c -=item cf::register_command $name => \&callback($ob,$args); +=item cf::register_command $name => \&callback($ob,$args) Register a callback for execution when the client sends the user command $name. @@ -1265,7 +1450,7 @@ push @{ $COMMAND{$name} }, [$caller, $cb]; } -=item cf::register_extcmd $name => \&callback($pl,$packet); +=item cf::register_extcmd $name => \&callback($pl,@args) Register a callback for execution when the client sends an (synchronous) extcmd packet. Ext commands will be processed in the order they are @@ -1273,10 +1458,14 @@ the logged-in player. Ext commands can only be processed after a player has logged in successfully. -If the callback returns something, it is sent back as if reply was being -called. +The values will be sent back to the client. -=item cf::register_exticmd $name => \&callback($ns,$packet); +=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args) + +Same as C, but instead of returning values, the +callback needs to clal the C<$reply> function. + +=item cf::register_exticmd $name => \&callback($ns,@args) Register a callback for execution when the client sends an (asynchronous) exticmd packet. Exti commands are processed by the server as soon as they @@ -1284,27 +1473,43 @@ is a client socket. Exti commands can be received anytime, even before log-in. -If the callback returns something, it is sent back as if reply was being -called. +The values will be sent back to the client. + +=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args) + +Same as C, but instead of returning values, the +callback needs to clal the C<$reply> function. =cut -sub register_extcmd { +sub register_extcmd($$) { my ($name, $cb) = @_; $EXTCMD{$name} = $cb; } -sub register_exticmd { +sub register_async_extcmd($$) { + my ($name, $cb) = @_; + + $EXTACMD{$name} = $cb; +} + +sub register_exticmd($$) { my ($name, $cb) = @_; $EXTICMD{$name} = $cb; } +sub register_async_exticmd($$) { + my ($name, $cb) = @_; + + $EXTIACMD{$name} = $cb; +} + use File::Glob (); cf::player->attach ( - on_command => sub { + on_unknown_command => sub { my ($pl, $name, $params) = @_; my $cb = $COMMAND{$name} @@ -1322,22 +1527,30 @@ 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; + if (my $cb = $EXTACMD{$type}) { + $cb->( + $pl, + sub { + $pl->ext_msg ("reply-$reply", @_) + if $reply; + }, + @payload + ); + } else { + my @reply; - if (my $cb = $EXTCMD{$type}) { - @reply = $cb->($pl, @payload); - } + if (my $cb = $EXTCMD{$type}) { + @reply = $cb->($pl, @payload); + } - $pl->ext_reply ($reply, @reply) - if $reply; + $pl->ext_msg ("reply-$reply", @reply) + if $reply; + } } else { - warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; + error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; } cf::override; @@ -1357,7 +1570,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; @@ -1385,7 +1613,7 @@ if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; $ext{source} = - "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" + "package $pkg; use common::sense;\n" . "#line 1 \"$path\"\n{\n" . $source . "\n};\n1"; @@ -1393,38 +1621,61 @@ $todo{$base} = \%ext; } + my $pass = 0; my %done; while (%todo) { my $progress; + ++$pass; + + ext: while (my ($k, $v) = each %todo) { for (split /,\s*/, $v->{meta}{depends}) { - goto skip + next ext unless exists $done{$_}; } - warn "... loading '$k' into '$v->{pkg}'\n"; + trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; - unless (eval $v->{source}) { - my $msg = $@ ? "$v->{path}: $@\n" - : "$v->{base}: extension inactive.\n"; - - if (exists $v->{meta}{mandatory}) { - warn $msg; - cf::cleanup "mandatory extension failed to load, exiting."; - } - - warn $msg; - } + my $source = $v->{source}; - $done{$k} = delete $todo{$k}; - push @EXTS, $v->{pkg}; - $progress = 1; + # 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"; + + cf::cleanup "mandatory extension '$k' failed to load, exiting." + if exists $v->{meta}{mandatory}; + + warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; + delete $todo{$k}; + } else { + $done{$k} = delete $todo{$k}; + push @EXTS, $v->{pkg}; + $progress = 1; + + info "$v->{base}: extension inactive.\n" + unless $active; + } } - skip: - die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" - unless $progress; + unless ($progress) { + warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"; + + while (my ($k, $v) = each %todo) { + cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." + if exists $v->{meta}{mandatory}; + } + + last; + } } }; } @@ -1518,6 +1769,19 @@ } } +cf::player->attach ( + on_load => sub { + my ($pl, $path) = @_; + + # restore slots saved in save, below + my $slots = delete $pl->{_slots}; + + $pl->ob->current_weapon ($slots->[0]); + $pl->combat_ob ($slots->[1]); + $pl->ranged_ob ($slots->[2]); + }, +); + sub save($) { my ($pl) = @_; @@ -1533,6 +1797,9 @@ cf::get_slot 0.01; + # save slots, to be restored later + local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob]; + $pl->save_pl ($path); cf::cede_to_tick; } @@ -1575,11 +1842,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->ob->check_score; - $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; @@ -1643,6 +1912,8 @@ =item $player->maps +=item cf::player::maps $login + Returns an arrayref of map paths that are private for this player. May block. @@ -1673,18 +1944,6 @@ Expand deliantra pod fragments into protocol xml. -=item $player->ext_reply ($msgid, @msg) - -Sends an ext reply to the player. - -=cut - -sub ext_reply($$@) { - my ($self, $id, @msg) = @_; - - $self->ns->ext_reply ($id, @msg) -} - =item $player->ext_msg ($type, @msg) Sends an ext event to the client. @@ -1714,6 +1973,8 @@ sub find_by_path($) { my ($path) = @_; + $path =~ s/^~[^\/]*//; # skip ~login + my ($match, $specificity); for my $region (list) { @@ -1751,20 +2012,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->{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) @@ -1779,14 +2027,13 @@ my (undef, $regex, $prio) = @_; my $pkg = caller; - no strict; push @{"$pkg\::ISA"}, __PACKAGE__; $EXT_MAP{$pkg} = [$prio, qr<$regex>]; } # also paths starting with '/' -$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; +$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}]; sub thawer_merge { my ($self, $merge) = @_; @@ -1801,7 +2048,7 @@ sub normalise { my ($path, $base) = @_; - $path = "$path"; # make sure its a string + $path = "$path"; # make sure it's a string $path =~ s/\.map$//; @@ -1826,7 +2073,6 @@ } for ($path) { - redo if s{//}{/}; redo if s{/\.?/}{/}; redo if s{/[^/]+/\.\./}{/}; } @@ -1850,10 +2096,11 @@ } } - Carp::cluck "unable to resolve path '$path' (base '$base')."; + Carp::cluck "unable to resolve path '$path' (base '$base')"; () } +# may re-bless or do other evil things sub init { my ($self) = @_; @@ -1928,18 +2175,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) = @_; @@ -1950,6 +2200,7 @@ if $self->{instantiate_time} > $cf::RUNTIME; } +# called after loading the header from an original map sub prepare_orig { my ($self) = @_; @@ -1983,7 +2234,9 @@ sub find { my ($path, $origin) = @_; - $path = normalise $path, $origin && $origin->path; + cf::cede_to_tick; + + $path = normalise $path, $origin; my $guard1 = cf::lock_acquire "map_data:$path";#d#remove my $guard2 = cf::lock_acquire "map_find:$path"; @@ -2010,8 +2263,8 @@ } } -sub pre_load { } -sub post_load { } +sub pre_load { } +#sub post_load { } # XS sub load { my ($self) = @_; @@ -2024,35 +2277,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 @@ -2066,18 +2324,21 @@ $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. +# return the _real_ map. used by e.g. per-player +# maps to change the path to ~playername/mappath sub customise_for { my ($self, $ob) = @_; @@ -2090,45 +2351,24 @@ $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; - - 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) = @_; - cf::sync_job { find $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; + + find $path, $origin } sub do_load_sync { my ($map) = @_; - cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" + # 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; - cf::sync_job { $map->load }; + $map->load; } our %MAP_PREFETCH; @@ -2137,10 +2377,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; @@ -2164,11 +2404,10 @@ () } -sub save { +# common code, used by both ->save and ->swapout +sub _save { my ($self) = @_; - my $lock = cf::lock_acquire "map_data:$self->{path}"; - $self->{last_save} = $cf::RUNTIME; return unless $self->dirty; @@ -2197,22 +2436,32 @@ } } -sub swap_out { +sub save { my ($self) = @_; - # save first because save cedes - $self->save; + my $lock = cf::lock_acquire "map_data:$self->{path}"; + + $self->_save; +} + +sub swap_out { + my ($self) = @_; my $lock = cf::lock_acquire "map_data:$self->{path}"; - return if $self->players; - return if $self->in_memory != cf::MAP_ACTIVE; + return if !$self->linkable; return if $self->{deny_save}; + return if $self->players; - $self->in_memory (cf::MAP_SWAPPED); - + # first deactivate the map and "unlink" it from the core $self->deactivate; $_->clear_links_to ($self) for values %cf::MAP; + $self->state (cf::MAP_SWAPPED); + + # then atomically save + $self->_save; + + # then free the map $self->clear; } @@ -2241,9 +2490,9 @@ return if $self->players; - warn "resetting map ", $self->path, "\n"; + 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}) { @@ -2275,7 +2524,7 @@ $self->unlink_save; - bless $self, "cf::map"; + bless $self, "cf::map::wrap"; delete $self->{deny_reset}; $self->{deny_save} = 1; $self->reset_timeout (1); @@ -2342,6 +2591,38 @@ ] } +=item cf::map::static_maps + +Returns an arrayref if paths of all static maps (all preinstalled F<.map> +file in the shared directory excluding F and F). May +block. + +=cut + +sub static_maps() { + my @dirs = ""; + my @maps; + + while (@dirs) { + my $dir = shift @dirs; + + next if $dir eq "/styles" || $dir eq "/editor"; + + my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2 + or return; + + for (@$files) { + s/\.map$// or next; + utf8::decode $_; + push @maps, "$dir/$_"; + } + + push @dirs, map "$dir/$_", @$dirs; + } + + \@maps +} + =back =head3 cf::object @@ -2483,7 +2764,7 @@ The player should be reasonably safe there for short amounts of time (e.g. for loading a map). You I call C as soon as possible, -though, as the palyer cannot control the character while it is on the link +though, as the player cannot control the character while it is on the link map. Will never block. @@ -2514,12 +2795,14 @@ $self->deactivate_recursive; + ++$self->{_link_recursion}; + return if UNIVERSAL::isa $self->map, "ext::map_link"; $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] if $self->map && $self->map->{path} ne "{link}"; - $self->enter_map ($LINK_MAP || link_map, 10, 10); + $self->enter_map ($LINK_MAP || link_map, 3, 3); } sub cf::object::player::leave_link { @@ -2546,21 +2829,23 @@ # use -1 or undef as default coordinates, not 0, 0 ($x, $y) = ($map->enter_x, $map->enter_y) - if $x <=0 && $y <= 0; + if $x <= 0 && $y <= 0; $map->load; - $map->load_neighbours; return unless $self->contr->active; local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext - $self->enter_map ($map, $x, $y); + if ($self->enter_map ($map, $x, $y)) { + # entering was successful + delete $self->{_link_recursion}; + # only activate afterwards, to support waiting in hooks + $self->activate_recursive; + } - # only activate afterwards, to support waiting in hooks - $self->activate_recursive; } -=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) +=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]]) Moves the player to the given map-path and coordinates by first freezing her, loading and preparing them map, calling the provided $check callback @@ -2578,6 +2863,12 @@ sub cf::object::player::goto { my ($self, $path, $x, $y, $check, $done) = @_; + if ($self->{_link_recursion} >= $MAX_LINKS) { + error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; + $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); + ($path, $x, $y) = @$EMERGENCY_POSITION; + } + # do generation counting so two concurrent goto's will be executed in-order my $gen = $self->{_goto_generation} = ++$GOTOGEN; @@ -2606,11 +2897,11 @@ } 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); - $map = $check->($map) if $check && $map; + $map = $check->($map, $x, $y, $self) if $check && $map; } else { $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); } @@ -2628,7 +2919,7 @@ $self->leave_link ($map, $x, $y); } - $done->() if $done; + $done->($self) if $done; })->prio (1); } @@ -2706,17 +2997,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); @@ -2731,7 +3037,7 @@ . "Please report this to the dungeon master!", cf::NDI_UNIQUE | cf::NDI_RED); - warn "ERROR in enter_exit: $@"; + error "ERROR in enter_exit: $@"; $self->leave_link; } })->prio (1); @@ -2755,6 +3061,31 @@ $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); } +=item $client->send_big_packet ($pkt) + +Like C, but tries to compress large packets, and fragments +them as required. + +=cut + +our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64; + +sub cf::client::send_big_packet { + my ($self, $pkt) = @_; + + # try lzf for large packets + $pkt = "lzf " . Compress::LZF::compress $pkt + if 1024 <= length $pkt and $self->{can_lzf}; + + # split very large packets + if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) { + $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt; + $pkt = "frag"; + } + + $self->send_packet ($pkt); +} + =item $client->send_msg ($channel, $msg, $color, [extra...]) Send a drawinfo or msg packet to the client, formatting the msg for the @@ -2766,6 +3097,12 @@ # non-persistent channels (usually the info channel) our %CHANNEL = ( + "c/motd" => { + id => "infobox", + title => "MOTD", + reply => undef, + tooltip => "The message of the day", + }, "c/identify" => { id => "infobox", title => "Identify", @@ -2778,6 +3115,12 @@ reply => undef, tooltip => "Signs and other items you examined", }, + "c/shopinfo" => { + id => "infobox", + title => "Shop Info", + reply => undef, + tooltip => "What your bargaining skill tells you about the shop", + }, "c/book" => { id => "infobox", title => "Book", @@ -2902,17 +3245,7 @@ [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] ); - # try lzf for large packets - $pkt = "lzf " . Compress::LZF::compress $pkt - if 1024 <= length $pkt and $self->{can_lzf}; - - # split very large packets - if (8192 < length $pkt and $self->{can_lzf}) { - $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; - $pkt = "frag"; - } - - $self->send_packet ($pkt); + $self->send_big_packet ($pkt); } =item $client->ext_msg ($type, @msg) @@ -2924,30 +3257,7 @@ sub cf::client::ext_msg($$@) { my ($self, $type, @msg) = @_; - if ($self->extcmd == 2) { - $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); - } elsif ($self->extcmd == 1) { # TODO: remove - push @msg, msgtype => "event_$type"; - $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); - } -} - -=item $client->ext_reply ($msgid, @msg) - -Sends an ext reply to the client. - -=cut - -sub cf::client::ext_reply($$@) { - my ($self, $id, @msg) = @_; - - if ($self->extcmd == 2) { - $self->send_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_packet ("ext " . $self->{json_coder}->encode ({@msg})); - } + $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); } =item $success = $client->query ($flags, "text", \&cb) @@ -3012,22 +3322,29 @@ 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 @reply; + my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash - if (my $cb = $EXTICMD{$type}) { - @reply = $cb->($ns, @payload); - } + if (my $cb = $EXTIACMD{$type}) { + $cb->( + $ns, + sub { + $ns->ext_msg ("reply-$reply", @_) + if $reply; + }, + @payload + ); + } else { + my @reply; - $ns->ext_reply ($reply, @reply) - if $reply; + if (my $cb = $EXTICMD{$type}) { + @reply = $cb->($ns, @payload); + } + $ns->ext_msg ("reply-$reply", @reply) + if $reply; + } } else { - warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; + error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; } cf::override; @@ -3057,7 +3374,7 @@ } cf::client->attach ( - on_destroy => sub { + on_client_destroy => sub { my ($ns) = @_; $_->cancel for values %{ (delete $ns->{_coro}) || {} }; @@ -3083,7 +3400,7 @@ $SIG{FPE} = 'IGNORE'; $safe->permit_only (Opcode::opset qw( - :base_core :base_mem :base_orig :base_math + :base_core :base_mem :base_orig :base_math :base_loop grepstart grepwhile mapstart mapwhile sort time )); @@ -3118,7 +3435,6 @@ ["cf::player" => qw(peaceful send_msg)], ["cf::map" => qw(trigger)], ) { - no strict 'refs'; my ($pkg, @funs) = @$_; *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) for @funs; @@ -3145,8 +3461,8 @@ %vars = (_dummy => 0) unless %vars; + my @res; local $_; - local @safe::cf::_safe_eval_args = values %vars; my $eval = "do {\n" @@ -3156,14 +3472,20 @@ . "\n}" ; - sub_generation_inc; - my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); - sub_generation_inc; + if ($CFG{safe_eval}) { + sub_generation_inc; + local @safe::cf::_safe_eval_args = values %vars; + @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); + sub_generation_inc; + } else { + local @cf::_safe_eval_args = values %vars; + @res = wantarray ? eval eval : scalar eval $eval; + } if ($@) { - warn "$@"; - warn "while executing safe code '$code'\n"; - warn "with arguments " . (join " ", %vars) . "\n"; + warn "$@", + "while executing safe code '$code'\n", + "with arguments " . (join " ", %vars) . "\n"; } wantarray ? @res : $res[0] @@ -3187,8 +3509,8 @@ sub register_script_function { my ($fun, $cb) = @_; - no strict 'refs'; - *{"safe::$fun"} = $safe_hole->wrap ($cb); + $fun = "safe::$fun" if $CFG{safe_eval}; + *$fun = $safe_hole->wrap ($cb); } =back @@ -3198,6 +3520,30 @@ ############################################################################# # the server's init and main functions +our %FACEHASH; # hash => idx, #d# HACK for http server + +# internal api, not fianlised +sub set_face { + my ($name, $type, $data) = @_; + + my $idx = cf::face::find $name; + + if ($idx) { + delete $FACEHASH{cf::face::get_chksum $idx}; + } else { + $idx = cf::face::alloc $name; + } + + my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; + + cf::face::set_type $idx, $type; + cf::face::set_data $idx, 0, $data, $hash; + cf::face::set_meta $idx, $type & 1 ? undef : undef; + $FACEHASH{$hash} = $idx;#d# + + $idx +} + sub load_facedata($) { my ($path) = @_; @@ -3207,35 +3553,29 @@ my $enc = JSON::XS->new->utf8->canonical->relaxed; - warn "loading facedata from $path\n"; + 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."; - # patch in the exptable - $facedata->{resource}{"res/exp_table"} = { - type => FT_RSRC, - data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), - }; cf::cede_to_tick; { - my $faces = $facedata->{faceinfo}; + my $faces = delete $facedata->{faceinfo}; - while (my ($face, $info) = each %$faces) { + for my $face (sort keys %$faces) { + my $info = $faces->{$face}; my $idx = (cf::face::find $face) || cf::face::alloc $face; cf::face::set_visibility $idx, $info->{visibility}; cf::face::set_magicmap $idx, $info->{magicmap}; - cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; - cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; - + 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; } @@ -3249,7 +3589,7 @@ cf::face::set_smooth $idx, $smooth; cf::face::set_smoothlevel $idx, $info->{smoothlevel}; } else { - warn "smooth face '$info->{smooth}' not found for face '$face'"; + error "smooth face '$info->{smooth}' not found for face '$face'"; } cf::cede_to_tick; @@ -3257,7 +3597,7 @@ } { - my $anims = $facedata->{animinfo}; + my $anims = delete $facedata->{animinfo}; while (my ($anim, $info) = each %$anims) { cf::anim::set $anim, $info->{frames}, $info->{facings}; @@ -3268,32 +3608,19 @@ } { - # TODO: for gcfclient pleasure, we should give resources - # that gcfclient doesn't grok a >10000 face index. - my $res = $facedata->{resource}; + my $res = delete $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; - my $data; - - if ($info->{type} & 1) { - # prepend meta info - - my $meta = $enc->encode ({ - name => $name, - %{ $info->{meta} || {} }, - }); - $data = pack "(w/a*)*", $meta, $info->{data}; - } else { - $data = $info->{data}; - } - - cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; - cf::face::set_type $idx, $info->{type}; + cf::face::set_type $idx, $type; + cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; + cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already + $FACEHASH{$info->{hash}} = $idx;#d# } else { - $RESOURCE{$name} = $info; +# $RESOURCE{$name} = $info; # unused } cf::cede_to_tick; @@ -3305,26 +3632,6 @@ 1 } -cf::global->attach (on_resource_update => sub { - if (my $soundconf = $RESOURCE{"res/sound.conf"}) { - $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data}); - - for (0 .. SOUND_CAST_SPELL_0 - 1) { - my $sound = $soundconf->{compat}[$_] - or next; - - my $face = cf::face::find "sound/$sound->[1]"; - cf::sound::set $sound->[0] => $face; - cf::sound::old_sound_index $_, $face; # gcfclient-compat - } - - while (my ($k, $v) = each %{$soundconf->{event}}) { - my $face = cf::face::find "sound/$v"; - cf::sound::set $k => $face; - } - } -}); - register_exticmd fx_want => sub { my ($ns, $want) = @_; @@ -3343,6 +3650,19 @@ $status } +sub reload_exp_table { + _reload_exp_table; + + set_face "res/exp_table" => FT_RSRC, + JSON::XS->new->utf8->canonical->encode ( + [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] + ); +} + +sub reload_materials { + _reload_materials; +} + sub reload_regions { # HACK to clear player env face cache, we need some signal framework # for this (global event?) @@ -3365,6 +3685,15 @@ sub reload_archetypes { load_resource_file "$DATADIR/archetypes" or die "unable to load archetypes\n"; + + set_face "res/skill_info" => FT_RSRC, + JSON::XS->new->utf8->canonical->encode ( + [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] + ); + set_face "res/spell_paths" => FT_RSRC, + JSON::XS->new->utf8->canonical->encode ( + [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] + ); } sub reload_treasures { @@ -3372,25 +3701,48 @@ or die "unable to load treasurelists\n"; } +sub reload_sound { + trace "loading sound config from $DATADIR/sound\n"; + + my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound"); + + for (0 .. SOUND_CAST_SPELL_0 - 1) { + my $sound = $soundconf->{compat}[$_] + or next; + + my $face = cf::face::find "sound/$sound->[1]"; + cf::sound::set $sound->[0] => $face; + cf::sound::old_sound_index $_, $face; # gcfclient-compat + } + + while (my ($k, $v) = each %{$soundconf->{event}}) { + my $face = cf::face::find "sound/$v"; + cf::sound::set $k => $face; + } +} + sub reload_resources { - warn "reloading resource files...\n"; + trace "reloading resource files...\n"; + reload_materials; reload_facedata; + reload_exp_table; + reload_sound; reload_archetypes; reload_regions; reload_treasures; - warn "finished reloading resource files\n"; + trace "finished reloading resource files\n"; } sub reload_config { - open my $fh, "<:utf8", "$CONFDIR/config" - or return; + trace "reloading config file...\n"; - local $/; - *CFG = YAML::Load <$fh>; + my $config = load_file "$CONFDIR/config"; + utf8::decode $config; + *CFG = decode_yaml $config; - $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; + $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; @@ -3424,11 +3776,11 @@ } sub main_loop { - warn "EV::loop starting\n"; + trace "EV::loop starting\n"; if (1) { EV::loop; } - warn "EV::loop returned\n"; + trace "EV::loop returned\n"; goto &main_loop unless $REALLY_UNLOOP; } @@ -3436,19 +3788,14 @@ cf::init_globals; # initialise logging LOG llevInfo, "Welcome to Deliantra, v" . VERSION; - LOG llevInfo, "Copyright (C) 2005-2008 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."; - cf::init_experience; - cf::init_anim; - cf::init_attackmess; - cf::init_dynamic; - $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority # we must not ever block the main coroutine - local $Coro::idle = sub { + $Coro::idle = sub { Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# (async { $Coro::current->{desc} = "IDLE BUG HANDLER"; @@ -3459,15 +3806,21 @@ evthread_start IO::AIO::poll_fileno; cf::sync_job { - reload_resources; - reload_config; + cf::incloader::init (); + db_init; + cf::init_anim; + cf::init_attackmess; + cf::init_dynamic; + cf::load_settings; - cf::load_materials; + + reload_resources; + reload_config; + cf::init_uuid; cf::init_signals; - cf::init_commands; cf::init_skills; cf::init_beforeplay; @@ -3482,10 +3835,17 @@ 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"; + + AE::postpone { + undef &main; # free gobs of memory :) }; - main_loop; + goto &main_loop; } ############################################################################# @@ -3495,13 +3855,15 @@ BEGIN { our %SIGWATCHER = (); for my $signal (qw(INT HUP TERM)) { - $SIGWATCHER{$signal} = EV::signal $signal, sub { + $SIGWATCHER{$signal} = AE::signal $signal, sub { cf::cleanup "SIG$signal"; }; } } sub write_runtime_sync { + my $t0 = AE::time; + # first touch the runtime file to show we are still running: # the fsync below can take a very very long time. @@ -3509,7 +3871,7 @@ my $guard = cf::lock_acquire "write_runtime"; - my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 + my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644 or return; my $value = $cf::RUNTIME + 90 + 10; @@ -3532,7 +3894,7 @@ aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE and return; - warn "runtime file written.\n"; + trace sprintf "runtime file written (%gs).\n", AE::time - $t0; 1 } @@ -3554,7 +3916,7 @@ my $value = uuid_seq uuid_cur; unless ($value) { - warn "cowardly refusing to write zero uuid value!\n"; + info "cowardly refusing to write zero uuid value!\n"; return; } @@ -3574,7 +3936,7 @@ aio_rename "$uuid~", $uuid and return; - warn "uuid file written ($value).\n"; + trace "uuid file written ($value).\n"; 1 @@ -3590,55 +3952,77 @@ sub emergency_save() { my $freeze_guard = cf::freeze_mainloop; - warn "emergency_perl_save: enter\n"; + info "emergency_perl_save: enter\n"; + + # this is a trade-off: we want to be very quick here, so + # save all maps without fsync, and later call a global sync + # (which in turn might be very very slow) + local $USE_FSYNC = 0; cf::sync_job { - # this is a trade-off: we want to be very quick here, so - # save all maps without fsync, and later call a global sync - # (which in turn might be very very slow) - local $USE_FSYNC = 0; + cf::write_runtime_sync; # external watchdog should not bark # use a peculiar iteration method to avoid tripping on perl # refcount bugs in for. also avoids problems with players # and maps saved/destroyed asynchronously. - warn "emergency_perl_save: begin player save\n"; + info "emergency_perl_save: begin player save\n"; for my $login (keys %cf::PLAYER) { my $pl = $cf::PLAYER{$login} or next; $pl->valid or next; delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt $pl->save; } - warn "emergency_perl_save: end player save\n"; + info "emergency_perl_save: end player save\n"; - warn "emergency_perl_save: begin map save\n"; + cf::write_runtime_sync; # external watchdog should not bark + + info "emergency_perl_save: begin map save\n"; for my $path (keys %cf::MAP) { my $map = $cf::MAP{$path} or next; $map->valid or next; $map->save; } - warn "emergency_perl_save: end map save\n"; + info "emergency_perl_save: end map save\n"; + + cf::write_runtime_sync; # external watchdog should not bark - warn "emergency_perl_save: begin database checkpoint\n"; + info "emergency_perl_save: begin database checkpoint\n"; BDB::db_env_txn_checkpoint $DB_ENV; - warn "emergency_perl_save: end database checkpoint\n"; + info "emergency_perl_save: end database checkpoint\n"; - warn "emergency_perl_save: begin write uuid\n"; + info "emergency_perl_save: begin write uuid\n"; write_uuid_sync 1; - warn "emergency_perl_save: end write uuid\n"; - }; + info "emergency_perl_save: end write uuid\n"; + + cf::write_runtime_sync; # external watchdog should not bark + + trace "emergency_perl_save: syncing database to disk"; + BDB::db_env_txn_checkpoint $DB_ENV; - warn "emergency_perl_save: starting sync()\n"; - IO::AIO::aio_sync sub { - warn "emergency_perl_save: finished sync()\n"; + info "emergency_perl_save: starting sync\n"; + IO::AIO::aio_sync sub { + info "emergency_perl_save: finished sync\n"; + }; + + cf::write_runtime_sync; # external watchdog should not bark + + trace "emergency_perl_save: flushing outstanding aio requests"; + while (IO::AIO::nreqs || BDB::nreqs) { + Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing + } + + cf::write_runtime_sync; # external watchdog should not bark }; - warn "emergency_perl_save: leave\n"; + info "emergency_perl_save: leave\n"; } sub post_cleanup { my ($make_core) = @_; - warn Carp::longmess "post_cleanup backtrace" + IO::AIO::flush; + + error Carp::longmess "post_cleanup backtrace" if $make_core; my $fh = pidfile; @@ -3668,71 +4052,59 @@ _gv_clear *{"$pkg$name"}; # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; } - warn "cleared package $pkg\n";#d# } sub do_reload_perl() { # can/must only be called in main - if ($Coro::current != $Coro::main) { - warn "can only reload from main coroutine"; + unless (in_main) { + error "can only reload from main coroutine"; return; } return if $RELOAD++; - my $t1 = EV::time; + my $t1 = AE::time; while ($RELOAD) { - warn "reloading..."; + cf::get_slot 0.1, -1, "reload_perl"; + info "perl_reload: reloading..."; - warn "entering sync_job"; + trace "perl_reload: entering sync_job"; cf::sync_job { - cf::write_runtime_sync; # external watchdog should not bark - cf::emergency_save; - cf::write_runtime_sync; # external watchdog should not bark - - warn "syncing database to disk"; - BDB::db_env_txn_checkpoint $DB_ENV; - - # if anything goes wrong in here, we should simply crash as we already saved + #cf::emergency_save; - warn "flushing outstanding aio requests"; - while (IO::AIO::nreqs || BDB::nreqs) { - Coro::EV::timer_once 0.01; # let the sync_job do it's thing - } - - warn "cancelling all extension coros"; + trace "perl_reload: cancelling all extension coros"; $_->cancel for values %EXT_CORO; %EXT_CORO = (); - warn "removing commands"; + trace "perl_reload: removing commands"; %COMMAND = (); - warn "removing ext/exti commands"; + trace "perl_reload: removing ext/exti commands"; %EXTCMD = (); %EXTICMD = (); - warn "unloading/nuking all extensions"; + trace "perl_reload: unloading/nuking all extensions"; for my $pkg (@EXTS) { - warn "... unloading $pkg"; + trace "... unloading $pkg"; if (my $cb = $pkg->can ("unload")) { eval { $cb->($pkg); 1 - } or warn "$pkg unloaded, but with errors: $@"; + } or error "$pkg unloaded, but with errors: $@"; } - warn "... clearing $pkg"; + trace "... clearing $pkg"; clear_package $pkg; } - warn "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$/; - warn "... unloading $k"; + trace "... unloading $k"; delete $INC{$k}; $k =~ s/\.pm$//; @@ -3745,11 +4117,11 @@ clear_package $k; } - warn "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); - warn "unloading cf.pm \"a bit\""; + trace "perl_reload: unloading cf.pm \"a bit\""; delete $INC{"cf.pm"}; delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; @@ -3757,44 +4129,42 @@ # and global variables created in xs #clear_package __PACKAGE__; - warn "unload completed, starting to reload now"; + info "perl_reload: unload completed, starting to reload now"; - warn "reloading cf.pm"; + trace "perl_reload: reloading cf.pm"; require cf; - cf::_connect_to_perl; # nominally unnecessary, but cannot hurt + cf::_connect_to_perl_1; - warn "loading config and database again"; + trace "perl_reload: loading config and database again"; cf::reload_config; - warn "loading extensions"; + trace "perl_reload: loading extensions"; cf::load_extensions; if ($REATTACH_ON_RELOAD) { - warn "reattaching attachments to objects/players"; + trace "perl_reload: reattaching attachments to objects/players"; _global_reattach; # objects, sockets - warn "reattaching attachments to maps"; + trace "perl_reload: reattaching attachments to maps"; reattach $_ for values %MAP; - warn "reattaching attachments to players"; + trace "perl_reload: reattaching attachments to players"; reattach $_ for values %PLAYER; } - warn "running post_init jobs"; - (pop @POST_INIT)->(1) while @POST_INIT; + cf::_post_init 1; - warn "leaving sync_job"; + trace "perl_reload: leaving sync_job"; 1 } or do { - warn $@; - cf::cleanup "error while reloading, exiting."; + error $@; + cf::cleanup "perl_reload: error, exiting."; }; - warn "reloaded"; --$RELOAD; } - $t1 = EV::time - $t1; - warn "reload completed in ${t1}s\n"; + $t1 = AE::time - $t1; + info "perl_reload: completed in ${t1}s\n"; }; our $RELOAD_WATCHER; # used only during reload @@ -3806,7 +4176,7 @@ $RELOAD_WATCHER ||= cf::async { Coro::AIO::aio_wait cache_extensions; - $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { + $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub { do_reload_perl; undef $RELOAD_WATCHER; }; @@ -3825,23 +4195,18 @@ } }; -unshift @INC, $LIBDIR; +############################################################################# my $bug_warning = 0; -our @WAIT_FOR_TICK; -our @WAIT_FOR_TICK_BEGIN; - -sub wait_for_tick { - return if tick_inhibit || $Coro::current == $Coro::main; +sub wait_for_tick() { + return Coro::AnyEvent::poll 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 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; @@ -3855,23 +4220,23 @@ 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# if ($NOW >= $NEXT_RUNTIME_WRITE) { $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; Coro::async_pool { $Coro::current->{desc} = "runtime saver"; write_runtime_sync - or warn "ERROR: unable to write runtime file: $!"; + or error "ERROR: unable to write runtime file: $!"; }; } 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; @@ -3880,17 +4245,18 @@ if ($NEXT_TICK) { my $jitter = $TICK_START - $NEXT_TICK; $JITTER = $JITTER * 0.75 + $jitter * 0.25; - warn "jitter $JITTER\n";#d# + debug "jitter $JITTER\n";#d# } } } { # configure BDB + info "initialising database"; - BDB::min_parallel 8; + 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; @@ -3925,25 +4291,34 @@ $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; }; + + info "database initialised"; } { # configure IO::AIO + info "initialising aio"; IO::AIO::min_parallel 8; IO::AIO::max_poll_time $TICK * 0.1; undef $AnyEvent::AIO::WATCHER; + info "aio initialised"; } -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 { @@ -3973,12 +4348,13 @@ }; } else { LOG llevInfo, "[ABT] $msg\n"; - LOG llevInfo, "[ABT] [suppressed]\n"; + LOG llevInfo, "[ABT] [overload, suppressed]\n"; } } # load additional modules require "cf/$_.pm" for @EXTRA_MODULES; +cf::_connect_to_perl_2; END { cf::emergency_save }