--- deliantra/server/lib/cf.pm 2009/11/10 04:38:45 1.495 +++ deliantra/server/lib/cf.pm 2010/05/06 22:35:41 1.545 @@ -1,7 +1,7 @@ # # This file is part of Deliantra, the Roguelike Realtime MMORPG. # -# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team +# Copyright (©) 2006,2007,2008,2009,2010 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; @@ -55,7 +53,6 @@ use JSON::XS 2.01 (); use BDB (); use Data::Dumper; -use Digest::MD5; use Fcntl; use YAML::XS (); use IO::AIO (); @@ -81,6 +78,8 @@ sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload +our @ORIG_INC; + our %COMMAND = (); our %COMMAND_TIME = (); @@ -109,7 +108,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 @@ -121,7 +126,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; @@ -165,6 +170,10 @@ sub cf::map::normalise; +sub in_main() { + $Coro::current == $Coro::main +} + ############################################################################# %REFLECT = (); @@ -245,6 +254,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 "", @_; @@ -253,16 +268,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# @@ -399,7 +414,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 @@ -426,24 +441,29 @@ 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; } } @@ -452,6 +472,7 @@ push @cf::WAIT_FOR_TICK, $signal; $signal->wait; } else { + $busy = 0; Coro::schedule; } } @@ -462,7 +483,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]; @@ -498,13 +520,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; @@ -514,7 +536,7 @@ (async { $Coro::current->desc ("sync job coro"); @res = eval { $job->() }; - warn $@ if $@; + error $@ if $@; undef $busy; })->prio (Coro::PRIO_MAX); @@ -526,7 +548,7 @@ } } - my $time = EV::time - $time; + my $time = AE::time - $time; $TICK_START += $time; # do not account sync jobs to server load @@ -582,6 +604,17 @@ 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 @@ -626,6 +659,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; @@ -645,20 +681,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($$$) { @@ -724,7 +759,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; @@ -744,7 +779,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 @@ -949,11 +984,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"; } } } @@ -973,7 +1008,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; @@ -1042,8 +1077,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; } @@ -1132,7 +1166,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"; } } } @@ -1169,8 +1203,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; @@ -1202,7 +1237,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; @@ -1236,8 +1271,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) } @@ -1306,7 +1342,7 @@ use File::Glob (); cf::player->attach ( - on_command => sub { + on_unknown_command => sub { my ($pl, $name, $params) = @_; my $cb = $COMMAND{$name} @@ -1339,7 +1375,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; @@ -1360,6 +1396,8 @@ } sub load_extensions { + info "loading extensions..."; + cf::sync_job { my %todo; @@ -1387,7 +1425,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"; @@ -1395,38 +1433,50 @@ $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 $active = eval $v->{source}; + + if (length $@) { + error "$v->{path}: $@\n"; + + cf::cleanup "mandatory extension '$k' failed to load, exiting." + if exists $v->{meta}{mandatory}; - $done{$k} = delete $todo{$k}; - push @EXTS, $v->{pkg}; - $progress = 1; + 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}; + } + } } }; } @@ -1520,6 +1570,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) = @_; @@ -1535,6 +1598,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; } @@ -1580,7 +1646,6 @@ $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; $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->ns->destroy if $pl->ns; @@ -1645,6 +1710,8 @@ =item $player->maps +=item cf::player::maps $login + Returns an arrayref of map paths that are private for this player. May block. @@ -1716,6 +1783,8 @@ sub find_by_path($) { my ($path) = @_; + $path =~ s/^~[^\/]*//; # skip ~login + my ($match, $specificity); for my $region (list) { @@ -1756,7 +1825,7 @@ # 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->{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}, @@ -1781,14 +1850,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) = @_; @@ -1803,7 +1871,7 @@ sub normalise { my ($path, $base) = @_; - $path = "$path"; # make sure its a string + $path = "$path"; # make sure it's a string $path =~ s/\.map$//; @@ -1852,7 +1920,7 @@ } } - Carp::cluck "unable to resolve path '$path' (base '$base')."; + Carp::cluck "unable to resolve path '$path' (base '$base')"; () } @@ -1985,6 +2053,8 @@ sub find { my ($path, $origin) = @_; + cf::cede_to_tick; + $path = normalise $path, $origin && $origin->path; my $guard1 = cf::lock_acquire "map_data:$path";#d#remove @@ -2012,8 +2082,8 @@ } } -sub pre_load { } -sub post_load { } +sub pre_load { } +#sub post_load { } # XS sub load { my ($self) = @_; @@ -2080,6 +2150,9 @@ $self->post_load; } +# 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) = @_; @@ -2105,6 +2178,7 @@ or next; $neigh->load; + # now find the diagonal neighbours push @neigh, [$neigh->tile_path (($_ + 3) % 4), $neigh], [$neigh->tile_path (($_ + 1) % 4), $neigh]; @@ -2121,16 +2195,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; @@ -2166,11 +2243,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; @@ -2199,22 +2275,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; } @@ -2243,7 +2329,7 @@ return if $self->players; - warn "resetting map ", $self->path, "\n"; + cf::trace "resetting map ", $self->path, "\n"; $self->in_memory (cf::MAP_SWAPPED); @@ -2277,7 +2363,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); @@ -2517,7 +2603,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. @@ -2548,12 +2634,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 { @@ -2588,13 +2676,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 @@ -2612,6 +2703,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; @@ -2644,7 +2741,7 @@ 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); } @@ -2662,7 +2759,7 @@ $self->leave_link ($map, $x, $y); } - $done->() if $done; + $done->($self) if $done; })->prio (1); } @@ -2765,7 +2862,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); @@ -3088,7 +3185,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; @@ -3118,7 +3215,7 @@ } cf::client->attach ( - on_destroy => sub { + on_client_destroy => sub { my ($ns) = @_; $_->cancel for values %{ (delete $ns->{_coro}) || {} }; @@ -3144,7 +3241,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 )); @@ -3179,7 +3276,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; @@ -3206,8 +3302,8 @@ %vars = (_dummy => 0) unless %vars; + my @res; local $_; - local @safe::cf::_safe_eval_args = values %vars; my $eval = "do {\n" @@ -3217,14 +3313,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] @@ -3248,8 +3350,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 @@ -3268,7 +3370,7 @@ 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 @@ -3280,9 +3382,11 @@ or cf::cleanup "$path: version mismatch, cannot proceed."; # patch in the exptable + my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); $facedata->{resource}{"res/exp_table"} = { type => FT_RSRC, - data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), + data => $exp_table, + hash => (Digest::MD5::md5 $exp_table), }; cf::cede_to_tick; @@ -3294,8 +3398,8 @@ 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::cede_to_tick; } @@ -3310,7 +3414,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; @@ -3329,32 +3433,16 @@ } { - # TODO: for gcfclient pleasure, we should give resources - # that gcfclient doesn't grok a >10000 face index. my $res = $facedata->{resource}; while (my ($name, $info) = each %$res) { if (defined $info->{type}) { 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_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; @@ -3366,26 +3454,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) = @_; @@ -3433,19 +3501,45 @@ or die "unable to load treasurelists\n"; } +sub reload_sound { + trace "loading sound config from $DATADIR/sound\n"; + + 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data + or die "$DATADIR/sound $!"; + + my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); + + 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"; + trace "reloading config file...\n"; open my $fh, "<:utf8", "$CONFDIR/config" or return; @@ -3453,7 +3547,7 @@ local $/; *CFG = YAML::XS::Load scalar <$fh>; - $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}; @@ -3466,7 +3560,7 @@ warn $@ if $@; } - warn "finished reloading resource files\n"; + trace "finished reloading resource files\n"; } sub pidfile() { @@ -3489,11 +3583,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; } @@ -3501,15 +3595,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-2010 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 @@ -3524,8 +3613,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; @@ -3533,7 +3627,6 @@ cf::init_uuid; cf::init_signals; - cf::init_commands; cf::init_skills; cf::init_beforeplay; @@ -3551,7 +3644,15 @@ (pop @POST_INIT)->(0) while @POST_INIT; }; - 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; } ############################################################################# @@ -3561,13 +3662,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. @@ -3575,7 +3678,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; @@ -3598,7 +3701,7 @@ aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE and return; - warn "runtime file written.\n"; + trace sprintf "runtime file written (%gs).\n", AE::time - $t0; 1 } @@ -3620,7 +3723,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; } @@ -3640,7 +3743,7 @@ aio_rename "$uuid~", $uuid and return; - warn "uuid file written ($value).\n"; + trace "uuid file written ($value).\n"; 1 @@ -3656,55 +3759,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::EV::timer_once 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; @@ -3734,71 +3859,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 "reloading..."; - warn "entering sync_job"; + trace "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; + #cf::emergency_save; - # if anything goes wrong in here, we should simply crash as we already saved - - 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 "cancelling all extension coros"; $_->cancel for values %EXT_CORO; %EXT_CORO = (); - warn "removing commands"; + trace "removing commands"; %COMMAND = (); - warn "removing ext/exti commands"; + trace "removing ext/exti commands"; %EXTCMD = (); %EXTICMD = (); - warn "unloading/nuking all extensions"; + trace "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 "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$//; @@ -3811,11 +3924,11 @@ clear_package $k; } - warn "getting rid of safe::, as good as possible"; + trace "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 "unloading cf.pm \"a bit\""; delete $INC{"cf.pm"}; delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; @@ -3823,44 +3936,44 @@ # and global variables created in xs #clear_package __PACKAGE__; - warn "unload completed, starting to reload now"; + info "unload completed, starting to reload now"; - warn "reloading cf.pm"; + trace "reloading cf.pm"; require cf; cf::_connect_to_perl_1; - warn "loading config and database again"; + trace "loading config and database again"; cf::reload_config; - warn "loading extensions"; + trace "loading extensions"; cf::load_extensions; if ($REATTACH_ON_RELOAD) { - warn "reattaching attachments to objects/players"; + trace "reattaching attachments to objects/players"; _global_reattach; # objects, sockets - warn "reattaching attachments to maps"; + trace "reattaching attachments to maps"; reattach $_ for values %MAP; - warn "reattaching attachments to players"; + trace "reattaching attachments to players"; reattach $_ for values %PLAYER; } - warn "running post_init jobs"; + trace "running post_init jobs"; (pop @POST_INIT)->(1) while @POST_INIT; - warn "leaving sync_job"; + trace "leaving sync_job"; 1 } or do { - warn $@; + error $@; cf::cleanup "error while reloading, exiting."; }; - warn "reloaded"; + info "reloaded"; --$RELOAD; } - $t1 = EV::time - $t1; - warn "reload completed in ${t1}s\n"; + $t1 = AE::time - $t1; + info "reload completed in ${t1}s\n"; }; our $RELOAD_WATCHER; # used only during reload @@ -3872,7 +3985,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; }; @@ -3891,7 +4004,7 @@ } }; -unshift @INC, $LIBDIR; +############################################################################# my $bug_warning = 0; @@ -3899,7 +4012,7 @@ our @WAIT_FOR_TICK_BEGIN; sub wait_for_tick { - return if tick_inhibit || $Coro::current == $Coro::main; + return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; my $signal = new Coro::Signal; push @WAIT_FOR_TICK, $signal; @@ -3907,7 +4020,7 @@ } sub wait_for_tick_begin { - return if tick_inhibit || $Coro::current == $Coro::main; + return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; my $signal = new Coro::Signal; push @WAIT_FOR_TICK_BEGIN, $signal; @@ -3923,12 +4036,14 @@ cf::server_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: $!"; }; } @@ -3946,7 +4061,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# } } } @@ -3954,7 +4069,7 @@ { # configure BDB - BDB::min_parallel 8; + BDB::min_parallel 16; BDB::max_poll_reqs $TICK * 0.1; $AnyEvent::BDB::WATCHER->priority (1);