--- deliantra/server/lib/cf.pm 2006/12/31 21:02:05 1.108 +++ deliantra/server/lib/cf.pm 2007/01/08 12:23:33 1.147 @@ -10,7 +10,7 @@ use Safe; use Safe::Hole; -use Coro 3.3; +use Coro 3.3 (); use Coro::Event; use Coro::Timer; use Coro::Signal; @@ -19,7 +19,7 @@ use Digest::MD5; use Fcntl; -use IO::AIO 2.31 (); +use IO::AIO 2.32 (); use YAML::Syck (); use Time::HiRes; @@ -28,7 +28,7 @@ # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? $YAML::Syck::ImplicitUnicode = 1; -$Coro::main->prio (2); # run main coroutine ("the server") with very high priority +$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload @@ -49,11 +49,11 @@ our $UPTIME; $UPTIME ||= time; our $RUNTIME; -our %MAP; # all maps +our %PLAYER; # all users +our %MAP; # all maps our $LINK_MAP; # the special {link} map -our $FREEZE; our $RANDOM_MAPS = cf::localdir . "/random"; -our %EXT_CORO; +our %EXT_CORO; # coroutines bound to extensions binmode STDOUT; binmode STDERR; @@ -73,6 +73,7 @@ # a special map that is always available our $LINK_MAP; +our $EMERGENCY_POSITION; ############################################################################# @@ -119,7 +120,7 @@ $msg .= "\n" unless $msg =~ /\n$/; - LOG llevError, "cfperl: $msg"; + LOG llevError, $msg; }; } @@ -181,6 +182,66 @@ JSON::Syck::Dump $_[0] } +=item cf::lock_wait $string + +Wait until the given lock is available. See cf::lock_acquire. + +=item my $lock = cf::lock_acquire $string + +Wait until the given lock is available and then acquires it and returns +a Coro::guard object. If the guard object gets destroyed (goes out of scope, +for example when the coroutine gets canceled), the lock is automatically +returned. + +Lock names should begin with a unique identifier (for example, cf::map::find +uses map_find and cf::map::load uses map_load). + +=cut + +our %LOCK; + +sub lock_wait($) { + my ($key) = @_; + + # wait for lock, if any + while ($LOCK{$key}) { + push @{ $LOCK{$key} }, $Coro::current; + Coro::schedule; + } +} + +sub lock_acquire($) { + my ($key) = @_; + + # wait, to be sure we are not locked + lock_wait $key; + + $LOCK{$key} = []; + + Coro::guard { + # wake up all waiters, to be on the safe side + $_->ready for @{ delete $LOCK{$key} }; + } +} + +sub freeze_mainloop { + return unless $TICK_WATCHER->is_active; + + my $guard = Coro::guard { $TICK_WATCHER->start }; + $TICK_WATCHER->stop; + $guard +} + +=item cf::async { BLOCK } + +Currently the same as Coro::async_pool, meaning you cannot use +C, C or other gimmicks on these coroutines. The only +thing you are allowed to do is call C on it. + +=cut + +BEGIN { *async = \&Coro::async_pool } + =item cf::sync_job { BLOCK } The design of crossfire+ requires that the main coro ($Coro::main) is @@ -197,47 +258,46 @@ sub sync_job(&) { my ($job) = @_; - my $busy = 1; - my @res; - - # TODO: use suspend/resume instead - local $FREEZE = 1; - - my $coro = Coro::async { - @res = eval { $job->() }; - warn $@ if $@; - undef $busy; - }; - if ($Coro::current == $Coro::main) { - $coro->prio (Coro::PRIO_MAX); + # this is the main coro, too bad, we have to block + # till the operation succeeds, freezing the server :/ + + # TODO: use suspend/resume instead + # (but this is cancel-safe) + my $freeze_guard = freeze_mainloop; + + my $busy = 1; + my @res; + + (async { + @res = eval { $job->() }; + warn $@ if $@; + undef $busy; + })->prio (Coro::PRIO_MAX); + while ($busy) { - Coro::cede_notself; - Event::one_event unless Coro::nready; + Coro::cede or Event::one_event; } + + wantarray ? @res : $res[0] } else { - $coro->join; + # we are in another coroutine, how wonderful, everything just works + + $job->() } - - wantarray ? @res : $res[0] } -=item $coro = cf::coro { BLOCK } +=item $coro = cf::async_ext { BLOCK } -Creates and returns a new coro. This coro is automcatially being canceled -when the extension calling this is being unloaded. +Like async, but this coro is automcatially being canceled when the +extension calling this is being unloaded. =cut -sub coro(&) { +sub async_ext(&) { my $cb = shift; - my $coro; $coro = async { - eval { - $cb->(); - }; - warn $@ if $@; - }; + my $coro = &Coro::async ($cb); $coro->on_destroy (sub { delete $EXT_CORO{$coro+0}; @@ -253,7 +313,7 @@ my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 or return; - my $value = $cf::RUNTIME; + my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock (aio_write $fh, 0, (length $value), $value, 0) <= 0 and return; @@ -280,10 +340,23 @@ sub new { my ($class, $path, $base) = @_; + $path = $path->as_string if ref $path; + my $self = bless { }, $class; - if ($path =~ s{^\?random/}{}) { - $self->{random} = cf::from_json $path; + # {... are special paths that are not touched + # ?xxx/... are special absolute paths + # ?random/... random maps + # /! non-realised random map exit + # /... normal maps + # ~/... per-player maps without a specific player (DO NOT USE) + # ~user/... per-player map of a specific user + + if ($path =~ /^{/) { + # fine as it is + } elsif ($path =~ s{^\?random/}{}) { + Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; + $self->{random} = cf::from_json $data; } else { if ($path =~ s{^~([^/]+)?}{}) { $self->{user_rel} = 1; @@ -326,8 +399,12 @@ sub visible_name { my ($self) = @_; - $self->{random} ? "?random/$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}/$self->{random}{dungeon_level}" - : $self->as_string +# if (my $rmp = $self->{random}) { +# # todo: be more intelligent about this +# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}" +# } else { + $self->as_string +# } } # escape the /'s in the path @@ -349,7 +426,7 @@ my ($self) = @_; $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path - : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, Digest::MD5::md5_hex $self->{path} + : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path } @@ -792,9 +869,11 @@ unless (aio_stat "$filename.pst") { (aio_load "$filename.pst", $av) >= 0 or return; - $av = eval { (Storable::thaw <$av>)->{objs} }; + $av = eval { (Storable::thaw $av)->{objs} }; } + warn sprintf "loading %s (%d)\n", + $filename, length $data, scalar @{$av || []};#d# return ($data, $av); } @@ -995,19 +1074,107 @@ Functions and methods that extend core crossfire objects. +=cut + +package cf::player; + =head3 cf::player =over 4 -=item cf::player::exists $login +=item cf::player::find $login -Returns true when the given account exists. +Returns the given player object, loading it if necessary (might block). =cut -sub cf::player::exists($) { - cf::player::find $_[0] - or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; +sub playerdir($) { + cf::localdir + . "/" + . cf::playerdir + . "/" + . (ref $_[0] ? $_[0]->ob->name : $_[0]) +} + +sub path($) { + my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; + + (playerdir $login) . "/$login.pl" +} + +sub find_active($) { + $cf::PLAYER{$_[0]} + and $cf::PLAYER{$_[0]}->active + and $cf::PLAYER{$_[0]} +} + +sub exists($) { + my ($login) = @_; + + $cf::PLAYER{$login} + or cf::sync_job { !aio_stat $login } +} + +sub find($) { + return $cf::PLAYER{$_[0]} || do { + my $login = $_[0]; + + my $guard = cf::lock_acquire "user_find:$login"; + + $cf::PLAYER{$login} ||= (load_pl path $login or return); + }; +} + +sub save($) { + my ($pl) = @_; + + return if $pl->{deny_save}; + + my $path = path $pl; + my $guard = cf::lock_acquire "user_save:$path"; + + return if $pl->{deny_save}; + + IO::AIO::aio_mkdir playerdir $pl, 0770; + $pl->{last_save} = $cf::RUNTIME; + + Coro::cede; + $pl->save_pl ($path); + Coro::cede; +} + +sub new($) { + my ($login) = @_; + + my $self = create; + + $self->ob->name ($login); + $self->{deny_save} = 1; + + $cf::PLAYER{$login} = $self; + + $self +} + +sub quit_character { + my ($pl) = @_; + + $pl->{deny_save} = 1; + $pl->password ("*"); # this should lock out the player until we nuked the dir + + $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; + $pl->deactivate; + $pl->invoke (cf::EVENT_PLAYER_QUIT); + $pl->ns->destroy if $pl->ns; + + my $path = playerdir $pl; + my $temp = "$path~$cf::RUNTIME~deleting~"; + IO::AIO::aio_rename $path, $temp, sub { + delete $cf::PLAYER{$pl->ob->name}; + $pl->destroy; + + IO::AIO::aio_rmtree $temp; + }; } =item $player->ext_reply ($msgid, $msgtype, %msg) @@ -1016,16 +1183,350 @@ =cut -sub cf::player::ext_reply($$$%) { +sub ext_reply($$$%) { my ($self, $id, %msg) = @_; $msg{msgid} = $id; - $self->send ("ext " . to_json \%msg); + $self->send ("ext " . cf::to_json \%msg); } +package cf; + =back + +=head3 cf::map + +=over 4 + +=cut + +package cf::map; + +use Fcntl; +use Coro::AIO; + +our $MAX_RESET = 3600; +our $DEFAULT_RESET = 3000; + +sub generate_random_map { + my ($path, $rmp) = @_; + + # mit "rum" bekleckern, nicht + cf::map::_create_random_map + $path, + $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}) +} + +# and all this just because we cannot iterate over +# all maps in C++... +sub change_all_map_light { + my ($change) = @_; + + $_->change_map_light ($change) + for grep $_->outdoor, values %cf::MAP; +} + +sub try_load_header($) { + my ($path) = @_; + + utf8::encode $path; + aio_open $path, O_RDONLY, 0 + or return; + + my $map = cf::map::new + or return; + + # for better error messages only, will be overwritten + $map->path ($path); + + $map->load_header ($path) + or return; + + $map->{load_path} = $path; + + $map +} + +sub find; +sub find { + my ($path, $origin) = @_; + + #warn "find<$path,$origin>\n";#d# + + $path = new cf::path $path, $origin && $origin->path; + my $key = $path->as_string; + + cf::lock_wait "map_find:$key"; + + $cf::MAP{$key} || do { + my $guard = cf::lock_acquire "map_find:$key"; + + # do it the slow way + my $map = try_load_header $path->save_path; + + Coro::cede; + + if ($map) { + $map->last_access ((delete $map->{last_access}) + || $cf::RUNTIME); #d# + # safety + $map->{instantiate_time} = $cf::RUNTIME + if $map->{instantiate_time} > $cf::RUNTIME; + } else { + if (my $rmp = $path->random_map_params) { + $map = generate_random_map $key, $rmp; + } else { + $map = try_load_header $path->load_path; + } + + $map or return; + + $map->{load_original} = 1; + $map->{instantiate_time} = $cf::RUNTIME; + $map->last_access ($cf::RUNTIME); + $map->instantiate; + + # per-player maps become, after loading, normal maps + $map->per_player (0) if $path->{user_rel}; + } + + $map->path ($key); + $map->{path} = $path; + $map->{last_save} = $cf::RUNTIME; + + Coro::cede; + + if ($map->should_reset) { + $map->reset; + undef $guard; + $map = find $path + or return; + } + + $cf::MAP{$key} = $map + } +} + +sub load { + my ($self) = @_; + + my $path = $self->{path}; + my $guard = cf::lock_acquire "map_load:" . $path->as_string; + + return if $self->in_memory != cf::MAP_SWAPPED; + + $self->in_memory (cf::MAP_LOADING); + + $self->alloc; + $self->load_objects ($self->{load_path}, 1) + or return; + + $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) + if delete $self->{load_original}; + + if (my $uniq = $path->uniq_path) { + utf8::encode $uniq; + if (aio_open $uniq, O_RDONLY, 0) { + $self->clear_unique_items; + $self->load_objects ($uniq, 0); + } + } + + Coro::cede; + + # now do the right thing for maps + $self->link_multipart_objects; + + if ($self->{path}->is_style_map) { + $self->{deny_save} = 1; + $self->{deny_reset} = 1; + } else { + $self->fix_auto_apply; + $self->decay_objects; + $self->update_buttons; + $self->set_darkness_map; + $self->difficulty ($self->estimate_difficulty) + unless $self->difficulty; + $self->activate; + } + + Coro::cede; + + $self->in_memory (cf::MAP_IN_MEMORY); +} + +sub find_sync { + my ($path, $origin) = @_; + + cf::sync_job { cf::map::find $path, $origin } +} + +sub do_load_sync { + my ($map) = @_; + + cf::sync_job { $map->load }; +} + +sub save { + my ($self) = @_; + + my $lock = cf::lock_acquire "map_data:" . $self->path; + + $self->{last_save} = $cf::RUNTIME; + + return unless $self->dirty; + + my $save = $self->{path}->save_path; utf8::encode $save; + my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; + + $self->{load_path} = $save; + + return if $self->{deny_save}; + + local $self->{last_access} = $self->last_access;#d# + + cf::async { + $_->contr->save for $self->players; + }; + + if ($uniq) { + $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); + $self->save_objects ($uniq, cf::IO_UNIQUES); + } else { + $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); + } +} + +sub swap_out { + my ($self) = @_; + + # save first because save cedes + $self->save; + + my $lock = cf::lock_acquire "map_data:" . $self->path; + + return if $self->players; + return if $self->in_memory != cf::MAP_IN_MEMORY; + return if $self->{deny_save}; + + $self->clear; + $self->in_memory (cf::MAP_SWAPPED); +} + +sub reset_at { + my ($self) = @_; + + # TODO: safety, remove and allow resettable per-player maps + return 1e99 if $self->{path}{user_rel}; + return 1e99 if $self->{deny_reset}; + + my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; + my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; + + $time + $to +} + +sub should_reset { + my ($self) = @_; + + $self->reset_at <= $cf::RUNTIME +} + +sub unlink_save { + my ($self) = @_; + + utf8::encode (my $save = $self->{path}->save_path); + aioreq_pri 3; IO::AIO::aio_unlink $save; + aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; +} + +sub rename { + my ($self, $new_path) = @_; + + $self->unlink_save; + + delete $cf::MAP{$self->path}; + $self->{path} = new cf::path $new_path; + $self->path ($self->{path}->as_string); + $cf::MAP{$self->path} = $self; + + $self->save; +} + +sub reset { + my ($self) = @_; + + my $lock = cf::lock_acquire "map_data:" . $self->path; + + return if $self->players; + return if $self->{path}{user_rel};#d# + + warn "resetting map ", $self->path;#d# + + delete $cf::MAP{$self->path}; + + $_->clear_links_to ($self) for values %cf::MAP; + + $self->unlink_save; + $self->destroy; +} + +my $nuke_counter = "aaaa"; + +sub nuke { + my ($self) = @_; + + $self->{deny_save} = 1; + $self->reset_timeout (1); + $self->rename ("{nuke}/" . ($nuke_counter++)); + $self->reset; # polite request, might not happen +} + +sub customise_for { + my ($map, $ob) = @_; + + if ($map->per_player) { + return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; + } + + $map +} + +sub emergency_save { + my $freeze_guard = cf::freeze_mainloop; + + warn "enter emergency perl save\n"; + + cf::sync_job { + warn "begin emergency player save\n"; + $_->save for values %cf::PLAYER; + warn "end emergency player save\n"; + + warn "begin emergency map save\n"; + $_->save for values %cf::MAP; + warn "end emergency map save\n"; + }; + + warn "leave emergency perl save\n"; +} + +package cf; + +=back + + =head3 cf::object::player =over 4 @@ -1070,6 +1571,203 @@ : $cf::CFG{"may_$access"}) } +=item $player_object->enter_link + +Freezes the player and moves him/her to a special map (C<{link}>). + +The player should be reaosnably safe there for short amounts of time. You +I call C as soon as possible, though. + +=item $player_object->leave_link ($map, $x, $y) + +Moves the player out of the specila link map onto the given map. If the +map is not valid (or omitted), the player will be moved back to the +location he/she was before the call to C, or, if that fails, +to the emergency map position. + +Might block. + +=cut + +sub cf::object::player::enter_link { + my ($self) = @_; + + $self->deactivate_recursive; + + return if $self->map == $LINK_MAP; + + $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] + if $self->map; + + $self->enter_map ($LINK_MAP, 20, 20); +} + +sub cf::object::player::leave_link { + my ($self, $map, $x, $y) = @_; + + my $link_pos = delete $self->{_link_pos}; + + unless ($map) { + # restore original map position + ($map, $x, $y) = @{ $link_pos || [] }; + $map = cf::map::find $map; + + unless ($map) { + ($map, $x, $y) = @$EMERGENCY_POSITION; + $map = cf::map::find $map + or die "FATAL: cannot load emergency map\n"; + } + } + + ($x, $y) = (-1, -1) + unless (defined $x) && (defined $y); + + # use -1 or undef as default coordinates, not 0, 0 + ($x, $y) = ($map->enter_x, $map->enter_y) + if $x <=0 && $y <= 0; + + $map->load; + + return unless $self->contr->active; + $self->activate_recursive; + $self->enter_map ($map, $x, $y); +} + +cf::player->attach ( + on_logout => sub { + my ($pl) = @_; + + # abort map switching before logout + if ($pl->ob->{_link_pos}) { + cf::sync_job { + $pl->ob->leave_link + }; + } + }, + on_login => sub { + my ($pl) = @_; + + # try to abort aborted map switching on player login :) + # should happen only on crashes + if ($pl->ob->{_link_pos}) { + $pl->ob->enter_link; + (async { + # we need this sleep as the login has a concurrent enter_exit running + # and this sleep increases chances of the player not ending up in scorn + $pl->ob->reply (undef, + "There was an internal problem at your last logout, " + . "the server will try to bring you to your intended destination in a second.", + cf::NDI_RED); + Coro::Timer::sleep 1; + $pl->ob->leave_link; + })->prio (2); + } + }, +); + +=item $player_object->goto ($path, $x, $y) + +=cut + +sub cf::object::player::goto { + my ($self, $path, $x, $y) = @_; + + $self->enter_link; + + (async { + $path = new cf::path $path; + + my $map = cf::map::find $path->as_string; + $map = $map->customise_for ($self) if $map; + +# warn "entering ", $map->path, " at ($x, $y)\n" +# if $map; + + $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); + + $self->leave_link ($map, $x, $y); + })->prio (1); +} + +=item $player_object->enter_exit ($exit_object) + +=cut + +sub parse_random_map_params { + my ($spec) = @_; + + my $rmp = { # defaults + xsize => 10, + ysize => 10, + }; + + for (split /\n/, $spec) { + my ($k, $v) = split /\s+/, $_, 2; + + $rmp->{lc $k} = $v if (length $k) && (length $v); + } + + $rmp +} + +sub prepare_random_map { + my ($exit) = @_; + + # all this does is basically replace the /! path by + # a new random map path (?random/...) with a seed + # that depends on the exit object + + my $rmp = parse_random_map_params $exit->msg; + + if ($exit->map) { + $rmp->{region} = $exit->map->region_name; + $rmp->{origin_map} = $exit->map->path; + $rmp->{origin_x} = $exit->x; + $rmp->{origin_y} = $exit->y; + } + + $rmp->{random_seed} ||= $exit->random_seed; + + my $data = cf::to_json $rmp; + my $md5 = Digest::MD5::md5_hex $data; + + if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { + aio_write $fh, 0, (length $data), $data, 0; + + $exit->slaying ("?random/$md5"); + $exit->msg (undef); + } +} + +sub cf::object::player::enter_exit { + my ($self, $exit) = @_; + + return unless $self->type == cf::PLAYER; + + $self->enter_link; + + (async { + $self->deactivate_recursive; # just to be sure + unless (eval { + prepare_random_map $exit + if $exit->slaying eq "/!"; + + my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; + $self->goto ($path, $exit->stats->hp, $exit->stats->sp); + + 1; + }) { + $self->message ("Something went wrong deep within the crossfire server. " + . "I'll try to bring you back to the map you were before. " + . "Please report this to the dungeon master", + cf::NDI_UNIQUE | cf::NDI_RED); + + warn "ERROR in enter_exit: $@"; + $self->leave_link; + } + })->prio (1); +} + =head3 cf::client =over 4 @@ -1122,7 +1820,8 @@ # this weird shuffling is so that direct followup queries # get handled first - my $queue = delete $ns->{query_queue}; + my $queue = delete $ns->{query_queue} + or return; # be conservative, not sure how that can happen, but we saw a crash here (shift @$queue)->[1]->($msg); @@ -1138,7 +1837,7 @@ }, ); -=item $client->coro (\&cb) +=item $client->async (\&cb) Create a new coroutine, running the specified callback. The coroutine will be automatically cancelled when the client gets destroyed (e.g. on logout, @@ -1146,15 +1845,10 @@ =cut -sub cf::client::coro { +sub cf::client::async { my ($self, $cb) = @_; - my $coro; $coro = async { - eval { - $cb->(); - }; - warn $@ if $@; - }; + my $coro = &Coro::async ($cb); $coro->on_destroy (sub { delete $self->{_coro}{$coro+0}; @@ -1336,14 +2030,12 @@ my $path = cf::localdir . "/database.pst"; sub db_load() { - warn "loading database $path\n";#d# remove later $DB = stat $path ? Storable::retrieve $path : { }; } my $pid; sub db_save() { - warn "saving database $path\n";#d# remove later waitpid $pid, 0 if $pid; if (0 == ($pid = fork)) { $DB->{_meta}{version} = 1; @@ -1401,15 +2093,26 @@ local $/; *CFG = YAML::Syck::Load <$fh>; + + $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; + + $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}; + + if (exists $CFG{mlockall}) { + eval { + $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" + and die "WARNING: m(un)lockall failed: $!\n"; + }; + warn $@ if $@; + } } sub main { # we must not ever block the main coroutine local $Coro::idle = sub { - Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# - (Coro::unblock_sub { - Event::one_event; - })->(); + Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# + async { Event::one_event }; }; cfg_load; @@ -1421,7 +2124,7 @@ ############################################################################# # initialisation -sub perl_reload() { +sub reload() { # can/must only be called in main if ($Coro::current != $Coro::main) { warn "can only reload from main coroutine\n"; @@ -1430,7 +2133,7 @@ warn "reloading..."; - local $FREEZE = 1; + my $guard = freeze_mainloop; cf::emergency_save; eval { @@ -1502,6 +2205,7 @@ # reattach attachments to objects warn "reattach"; _global_reattach; + reattach $_ for values %MAP; }; if ($@) { @@ -1524,16 +2228,46 @@ $LINK_MAP->path ("{link}"); $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; $LINK_MAP->in_memory (MAP_IN_MEMORY); + + # dirty hack because... archetypes are not yet loaded + Event->timer ( + after => 10, + cb => sub { + $_[0]->w->cancel; + + # provide some exits "home" + my $exit = cf::object::new "exit"; + + $exit->slaying ($EMERGENCY_POSITION->[0]); + $exit->stats->hp ($EMERGENCY_POSITION->[1]); + $exit->stats->sp ($EMERGENCY_POSITION->[2]); + + $LINK_MAP->insert ($exit->clone, 19, 19); + $LINK_MAP->insert ($exit->clone, 19, 20); + $LINK_MAP->insert ($exit->clone, 19, 21); + $LINK_MAP->insert ($exit->clone, 20, 19); + $LINK_MAP->insert ($exit->clone, 20, 21); + $LINK_MAP->insert ($exit->clone, 21, 19); + $LINK_MAP->insert ($exit->clone, 21, 20); + $LINK_MAP->insert ($exit->clone, 21, 21); + + $exit->destroy; + }); + + $LINK_MAP->{deny_save} = 1; + $LINK_MAP->{deny_reset} = 1; + + $cf::MAP{$LINK_MAP->path} = $LINK_MAP; } register "", __PACKAGE__; -register_command "perl-reload" => sub { +register_command "reload" => sub { my ($who, $arg) = @_; if ($who->flag (FLAG_WIZ)) { $who->message ("start of reload."); - perl_reload; + reload; $who->message ("end of reload."); } }; @@ -1546,11 +2280,8 @@ at => $NEXT_TICK || $TICK, data => WF_AUTOCANCEL, cb => sub { - unless ($FREEZE) { - cf::server_tick; # one server iteration - $RUNTIME += $TICK; - } - + cf::server_tick; # one server iteration + $RUNTIME += $TICK; $NEXT_TICK += $TICK; # if we are delayed by four ticks or more, skip them all @@ -1583,5 +2314,7 @@ }, ); +END { cf::emergency_save } + 1