--- deliantra/server/lib/cf.pm 2010/04/12 17:13:36 1.514 +++ deliantra/server/lib/cf.pm 2011/05/01 16:58:16 1.566 @@ -1,7 +1,7 @@ # # 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 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 @@ -22,9 +22,7 @@ package cf; -use 5.10.0; -use utf8; -use strict qw(vars subs); +use common::sense; use Symbol; use List::Util; @@ -80,6 +78,8 @@ sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload +our @ORIG_INC; + our %COMMAND = (); our %COMMAND_TIME = (); @@ -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,10 +110,13 @@ our $PIDFILE = "$LOCALDIR/pid"; our $RUNTIMEFILE = "$LOCALDIR/runtime"; -our %RESOURCE; +our %RESOURCE; # unused -our $OUTPUT_RATE_MIN = 4000; -our $OUTPUT_RATE_MAX = 100000; +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 @@ -123,7 +128,7 @@ our $BDB_TRICKLE_WATCHER; our $DB_ENV; -our @EXTRA_MODULES = qw(pod match mapscript); +our @EXTRA_MODULES = qw(pod match mapscript incloader); our %CFG; @@ -167,6 +172,10 @@ sub cf::map::normalise; +sub in_main() { + $Coro::current == $Coro::main +} + ############################################################################# %REFLECT = (); @@ -228,9 +237,14 @@ =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. +=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 @@ -247,6 +261,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 "", @_; @@ -255,16 +275,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# @@ -299,6 +319,11 @@ ############################################################################# +sub fork_call(&@); +sub get_slot($;$$); + +############################################################################# + =head2 UTILITY FUNCTIONS =over 4 @@ -326,6 +351,20 @@ } || "[unable to dump $_[0]: '$@']"; } +=item $scalar = 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 $ref = cf::decode_json $json Converts a JSON string into the corresponding perl data structure. @@ -341,12 +380,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 @@ -355,6 +425,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. @@ -415,9 +502,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. @@ -507,13 +598,13 @@ sub sync_job(&) { my ($job) = @_; - if ($Coro::current == $Coro::main) { + 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; @@ -523,7 +614,7 @@ (async { $Coro::current->desc ("sync job coro"); @res = eval { $job->() }; - warn $@ if $@; + error $@ if $@; undef $busy; })->prio (Coro::PRIO_MAX); @@ -567,7 +658,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 @@ -576,6 +667,10 @@ =cut +sub post_fork { + reset_signals; +} + sub fork_call(&@) { my ($cb, @args) = @_; @@ -584,9 +679,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] } @@ -646,6 +741,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; @@ -665,20 +763,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($$$) { @@ -716,8 +813,7 @@ my $md5; for (0 .. $#$src) { - 0 <= aio_load $src->[$_], $data[$_] - or Carp::croak "$src->[$_]: $!"; + $data[$_] = load_file $src->[$_]; } # if processing is expensive, check @@ -744,7 +840,7 @@ my $data = $process->(\@data); my $t2 = Time::HiRes::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; @@ -764,7 +860,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 @@ -969,11 +1065,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"; } } } @@ -993,7 +1089,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; @@ -1062,8 +1158,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; } @@ -1152,7 +1247,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"; } } } @@ -1189,8 +1284,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; @@ -1222,7 +1318,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; @@ -1256,8 +1352,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) } @@ -1359,7 +1456,7 @@ 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; @@ -1380,6 +1477,8 @@ } sub load_extensions { + info "loading extensions..."; + cf::sync_job { my %todo; @@ -1407,7 +1506,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"; @@ -1429,21 +1528,24 @@ unless exists $done{$_}; } - warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; + trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; my $active = eval $v->{source}; if (length $@) { - warn "$v->{path}: $@\n"; + 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; - warn "$v->{base}: extension inactive.\n" + info "$v->{base}: extension inactive.\n" unless $active; } } @@ -1455,6 +1557,8 @@ cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." if exists $v->{meta}{mandatory}; } + + last; } } }; @@ -1622,11 +1726,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; @@ -1690,6 +1796,8 @@ =item $player->maps +=item cf::player::maps $login + Returns an arrayref of map paths that are private for this player. May block. @@ -1761,6 +1869,8 @@ sub find_by_path($) { my ($path) = @_; + $path =~ s/^~[^\/]*//; # skip ~login + my ($match, $specificity); for my $region (list) { @@ -1798,20 +1908,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) @@ -1826,14 +1923,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) = @_; @@ -1848,7 +1944,7 @@ sub normalise { my ($path, $base) = @_; - $path = "$path"; # make sure its a string + $path = "$path"; # make sure it's a string $path =~ s/\.map$//; @@ -1860,6 +1956,7 @@ # ?random/... random maps # /... normal maps # ~user/... per-player map of a specific user + # !up !down for quad maps, or other maps with up/down layers $path =~ s/$PATH_SEP/\//go; @@ -1870,10 +1967,23 @@ $base =~ s{[^/]+/?$}{}; $path = "$base/$path"; + + } elsif ($path eq '!up') { + $base && ref $base + or Carp::carp "normalise called with relative tile path and no base: '$path'"; + + my $uppth = $base->tile_path (cf::TILE_UP); + $path = $uppth if $uppth; + + } elsif ($path eq '!down') { + $base && ref $base + or Carp::carp "normalise called with relative tile path and no base: '$path'"; + + my $dpth = $base->tile_path (cf::TILE_DOWN); + $path = $dpth if $dpth; } for ($path) { - redo if s{//}{/}; redo if s{/\.?/}{/}; redo if s{/[^/]+/\.\./}{/}; } @@ -1897,10 +2007,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) = @_; @@ -1975,18 +2086,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) = @_; @@ -1997,6 +2111,7 @@ if $self->{instantiate_time} > $cf::RUNTIME; } +# called after loading the header from an original map sub prepare_orig { my ($self) = @_; @@ -2030,7 +2145,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"; @@ -2080,26 +2197,31 @@ $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; + $f->resolve_delayed_derefs; + } else { + $self->post_load_original + if delete $self->{load_original}; + } cf::cede_to_tick; # now do the right thing for maps @@ -2123,6 +2245,8 @@ } $self->post_load; + + 1 } # customize the map for a given player, i.e. @@ -2153,6 +2277,7 @@ or next; $neigh->load; + # now find the diagonal neighbours push @neigh, [$neigh->tile_path (($_ + 3) % 4), $neigh], [$neigh->tile_path (($_ + 1) % 4), $neigh]; @@ -2169,16 +2294,19 @@ sub find_sync { my ($path, $origin) = @_; - cf::sync_job { find $path, $origin } + 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" + 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; @@ -2187,7 +2315,7 @@ 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; @@ -2214,11 +2342,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; @@ -2247,22 +2374,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->{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->in_memory (cf::MAP_SWAPPED); + + # then atomically save + $self->_save; + + # then free the map $self->clear; } @@ -2291,7 +2428,7 @@ return if $self->players; - warn "resetting map ", $self->path, "\n"; + cf::trace "resetting map ", $self->path, "\n"; $self->in_memory (cf::MAP_SWAPPED); @@ -2325,7 +2462,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); @@ -2565,7 +2702,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. @@ -2596,12 +2733,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 { @@ -2636,13 +2775,16 @@ 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 @@ -2660,6 +2802,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; @@ -2688,11 +2836,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); } @@ -2710,7 +2858,7 @@ $self->leave_link ($map, $x, $y); } - $done->() if $done; + $done->($self) if $done; })->prio (1); } @@ -2796,7 +2944,7 @@ if $exit->slaying eq "/!"; } - my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; + my $map = cf::map::normalise $exit->slaying, $exit->map; my $x = $exit->stats->hp; my $y = $exit->stats->sp; @@ -2813,7 +2961,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); @@ -3136,7 +3284,7 @@ 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; @@ -3227,7 +3375,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; @@ -3276,9 +3423,9 @@ } 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] @@ -3322,13 +3469,9 @@ my $enc = JSON::XS->new->utf8->canonical->relaxed; - warn "loading facedata from $path\n"; - - my $facedata; - 0 < aio_load $path, $facedata - or die "$path: $!"; + trace "loading facedata from $path\n"; - $facedata = Coro::Storable::thaw $facedata; + my $facedata = decode_storable load_file $path; $facedata->{version} == 2 or cf::cleanup "$path: version mismatch, cannot proceed."; @@ -3352,6 +3495,7 @@ 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} ; cf::cede_to_tick; } @@ -3366,7 +3510,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; @@ -3394,7 +3538,7 @@ cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; cf::face::set_type $idx, $info->{type}; } else { - $RESOURCE{$name} = $info; + $RESOURCE{$name} = $info; # unused } cf::cede_to_tick; @@ -3406,26 +3550,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) = @_; @@ -3473,27 +3597,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_exp_table; + reload_materials; reload_facedata; + reload_sound; reload_archetypes; reload_regions; reload_treasures; - warn "finished reloading resource files\n"; + trace "finished reloading resource files\n"; } sub reload_config { - warn "reloading config file...\n"; - - open my $fh, "<:utf8", "$CONFDIR/config" - or return; + trace "reloading config file...\n"; - 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_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}; @@ -3505,8 +3650,6 @@ }; warn $@ if $@; } - - warn "finished reloading resource files\n"; } sub pidfile() { @@ -3529,11 +3672,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; } @@ -3541,15 +3684,10 @@ 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-2011 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 @@ -3564,8 +3702,13 @@ evthread_start IO::AIO::poll_fileno; cf::sync_job { + cf::incloader::init (); + + cf::init_anim; + cf::init_attackmess; + cf::init_dynamic; + cf::load_settings; - cf::load_materials; reload_resources; reload_config; @@ -3587,10 +3730,18 @@ 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; }; - main_loop; + 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; + undef &main; # free gobs of memory :) + }; + + goto &main_loop; } ############################################################################# @@ -3639,7 +3790,7 @@ aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE and return; - warn sprintf "runtime file written (%gs).\n", AE::time - $t0; + trace sprintf "runtime file written (%gs).\n", AE::time - $t0; 1 } @@ -3661,7 +3812,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; } @@ -3681,7 +3832,7 @@ aio_rename "$uuid~", $uuid and return; - warn "uuid file written ($value).\n"; + trace "uuid file written ($value).\n"; 1 @@ -3697,55 +3848,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"; + + cf::write_runtime_sync; # external watchdog should not bark - warn "emergency_perl_save: begin map save\n"; + 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"; - warn "emergency_perl_save: begin database checkpoint\n"; + cf::write_runtime_sync; # external watchdog should not bark + + 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; + + 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::EV::timer_once 0.01; # let the sync_job do it's thing + } - warn "emergency_perl_save: starting sync()\n"; - IO::AIO::aio_sync sub { - warn "emergency_perl_save: finished sync()\n"; + 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; @@ -3775,13 +3948,12 @@ _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; } @@ -3790,56 +3962,45 @@ 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$//; @@ -3852,11 +4013,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; @@ -3864,44 +4025,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_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 = AE::time - $t1; - warn "reload completed in ${t1}s\n"; + info "perl_reload: completed in ${t1}s\n"; }; our $RELOAD_WATCHER; # used only during reload @@ -3932,14 +4091,14 @@ } }; -unshift @INC, $LIBDIR; +############################################################################# my $bug_warning = 0; our @WAIT_FOR_TICK; our @WAIT_FOR_TICK_BEGIN; -sub wait_for_tick { +sub wait_for_tick() { return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; my $signal = new Coro::Signal; @@ -3947,7 +4106,7 @@ $signal->wait; } -sub wait_for_tick_begin { +sub wait_for_tick_begin() { return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; my $signal = new Coro::Signal; @@ -3971,7 +4130,7 @@ 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: $!"; }; } @@ -3989,7 +4148,7 @@ 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# } } } @@ -4044,15 +4203,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 { @@ -4082,7 +4246,7 @@ }; } else { LOG llevInfo, "[ABT] $msg\n"; - LOG llevInfo, "[ABT] [suppressed]\n"; + LOG llevInfo, "[ABT] [overload, suppressed]\n"; } }