--- deliantra/server/lib/cf.pm 2007/01/09 15:36:19 1.154 +++ deliantra/server/lib/cf.pm 2007/01/11 00:16:58 1.161 @@ -26,16 +26,20 @@ use Event; $Event::Eval = 1; # no idea why this is required, but it is +sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload + # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? $YAML::Syck::ImplicitUnicode = 1; $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 - our %COMMAND = (); our %COMMAND_TIME = (); + +our @EXTS = (); # list of extension package names our %EXTCMD = (); +our %EXT_CORO = (); # coroutines bound to extensions +our %EXT_MAP = (); # pluggable maps our @EVENT; our $LIBDIR = datadir . "/ext"; @@ -54,7 +58,9 @@ our %MAP; # all maps our $LINK_MAP; # the special {link} map our $RANDOM_MAPS = cf::localdir . "/random"; -our %EXT_CORO; # coroutines bound to extensions + +our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; +our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; binmode STDOUT; binmode STDERR; @@ -109,6 +115,13 @@ Configuration for the server, loaded from C, or from wherever your confdir points to. +=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE + +These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) +or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick +processing has been done. Call C<< ->wait >> on them to maximise the +window of cpu time available, or simply to synchronise to the server tick. + =back =cut @@ -149,10 +162,6 @@ warn "error in event callback: @_"; }; -my %ext_pkg; -my @exts; -my @hook; - =head2 UTILITY FUNCTIONS =over 4 @@ -311,7 +320,7 @@ =item $coro = cf::async_ext { BLOCK } -Like async, but this coro is automcatially being canceled when the +Like async, but this coro is automatically being canceled when the extension calling this is being unloaded. =cut @@ -359,17 +368,26 @@ package cf::path; +use overload + '""' => \&as_string; + # used to convert map paths into valid unix filenames by repalcing / by ∕ our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons +sub register { + my ($pkg, $prefix) = @_; + + $EXT_MAP{$prefix} = $pkg; +} + sub new { my ($class, $path, $base) = @_; - $path = $path->as_string if ref $path; + return $path if ref $path; - my $self = bless { }, $class; + my $self = {}; - # {... are special paths that are not touched + # {... are special paths that are not being touched # ?xxx/... are special absolute paths # ?random/... random maps # /! non-realised random map exit @@ -377,13 +395,13 @@ # ~/... per-player maps without a specific player (DO NOT USE) # ~user/... per-player map of a specific user + $path =~ s/$PATH_SEP/\//go; + 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{^~([^/]+)?}{}) { + # ~user $self->{user_rel} = 1; if (defined $1) { @@ -393,9 +411,17 @@ } else { warn "cannot resolve user-relative path without user <$path,$base>\n"; } + } elsif ($path =~ s{^\?([^/]+)/}{}) { + # ?... + $self->{ext} = $1; + if (my $ext = $EXT_MAP{$1}) { + bless $self, $ext; + } } elsif ($path =~ /^\//) { + # /... # already absolute } else { + # relative $base =~ s{[^/]+/?$}{}; return $class->new ("$base/$path"); } @@ -408,28 +434,41 @@ $self->{path} = $path; + if ("HASH" eq ref $self) { + bless $self, $class; + } else { + $self->init; + } + + for my $ext (values %EXT_MAP) { + if (my $subst = $ext->substitute ($self)) { + return $subst; + } + } + $self } +sub init { + # nop +} + +sub substitute { + () +} + # the name / primary key / in-game path sub as_string { my ($self) = @_; $self->{user_rel} ? "~$self->{user}$self->{path}" - : $self->{random} ? "?random/$self->{path}" + : $self->{ext} ? "?$self->{ext}/$self->{path}" : $self->{path} } # the displayed name, this is a one way mapping sub visible_name { - my ($self) = @_; - -# 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 -# } + &as_string } # escape the /'s in the path @@ -454,25 +493,28 @@ : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path } -# the unique path, might be eq to save_path +# the unique path, undef == no special unique path sub uniq_path { my ($self) = @_; - $self->{user_rel} || $self->{random} - ? undef - : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path + sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path } -# return random map parameters, or undef -sub random_map_params { +# this is somewhat ugly, but style maps do need special treatment +sub is_style_map { + $_[0]{path} =~ m{^/styles/} +} + +sub load_orig { my ($self) = @_; - $self->{random} + &cf::map::load_map_header ($self->load_path) } -# this is somewhat ugly, but style maps do need special treatment -sub is_style_map { - $_[0]{path} =~ m{^/styles/} +sub load_temp { + my ($self) = @_; + + &cf::map::load_map_header ($self->save_path) } package cf; @@ -932,10 +974,7 @@ sub register_extcmd { my ($name, $cb) = @_; - my $caller = caller; - #warn "registering extcmd '$name' to '$caller'"; - - $EXTCMD{$name} = [$cb, $caller]; + $EXTCMD{$name} = $cb; } cf::player->attach ( @@ -958,7 +997,7 @@ if (ref $msg) { if (my $cb = $EXTCMD{$msg->{msgtype}}) { - if (my %reply = $cb->[0]->($pl, $msg)) { + if (my %reply = $cb->($pl, $msg)) { $pl->ext_reply ($msg->{msgid}, %reply); } } @@ -970,12 +1009,6 @@ }, ); -sub register { - my ($base, $pkg) = @_; - - #TODO -} - sub load_extension { my ($path) = @_; @@ -985,7 +1018,7 @@ $pkg =~ s/[^[:word:]]/_/g; $pkg = "ext::$pkg"; - warn "loading '$path' into '$pkg'\n"; + warn "... loading '$path' into '$pkg'\n"; open my $fh, "<:utf8", $path or die "$path: $!"; @@ -1000,50 +1033,7 @@ or die $@ ? "$path: $@\n" : "extension disabled.\n"; - push @exts, $pkg; - $ext_pkg{$base} = $pkg; - -# no strict 'refs'; -# @{"$pkg\::ISA"} = ext::; - - register $base, $pkg; -} - -sub unload_extension { - my ($pkg) = @_; - - warn "removing extension $pkg\n"; - - # remove hooks - #TODO -# for my $idx (0 .. $#PLUGIN_EVENT) { -# delete $hook[$idx]{$pkg}; -# } - - # remove commands - for my $name (keys %COMMAND) { - my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} }; - - if (@cb) { - $COMMAND{$name} = \@cb; - } else { - delete $COMMAND{$name}; - } - } - - # remove extcmds - for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) { - delete $EXTCMD{$name}; - } - - if (my $cb = $pkg->can ("unload")) { - eval { - $cb->($pkg); - 1 - } or warn "$pkg unloaded, but with errors: $@"; - } - - Symbol::delete_package $pkg; + push @EXTS, $pkg; } sub load_extensions { @@ -1071,28 +1061,6 @@ cf::map->attach (prio => -10000, package => cf::mapsupport::); ############################################################################# -# load/save perl data associated with player->ob objects - -sub all_objects(@) { - @_, map all_objects ($_->inv), @_ -} - -# TODO: compatibility cruft, remove when no longer needed -cf::player->attach ( - on_load => sub { - my ($pl, $path) = @_; - - for my $o (all_objects $pl->ob) { - if (my $value = $o->get_ob_key_value ("_perl_data")) { - $o->set_ob_key_value ("_perl_data"); - - %$o = %{ Storable::thaw pack "H*", $value }; - } - } - }, -); - -############################################################################# =head2 CORE EXTENSIONS @@ -1227,7 +1195,7 @@ for my $login (@$dirs) { my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; aio_read $fh, 0, 512, my $buf, 0 or next; - $buf !~ /^password -------------$/ or next; # official not-valid tag + $buf !~ /^password -------------$/m or next; # official not-valid tag utf8::decode $login; push @logins, $login; @@ -1254,9 +1222,8 @@ for (@$files) { utf8::decode $_; next if /\.(?:pl|pst)$/; - next unless /^$PATH_SEP/; + next unless /^$PATH_SEP/o; - s/$PATH_SEP/\//g; push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; } @@ -1324,7 +1291,7 @@ for grep $_->outdoor, values %cf::MAP; } -sub try_load_header($) { +sub load_map_header($) { my ($path) = @_; utf8::encode $path; @@ -1334,7 +1301,7 @@ my $map = cf::map::new or return; - # for better error messages only, will be overwritten + # for better error messages only, will be overwritten later $map->path ($path); $map->load_header ($path) @@ -1360,7 +1327,7 @@ my $guard = cf::lock_acquire "map_find:$key"; # do it the slow way - my $map = try_load_header $path->save_path; + my $map = $path->load_temp; Coro::cede; @@ -1371,13 +1338,8 @@ $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 = $path->load_orig + or return; $map->{load_original} = 1; $map->{instantiate_time} = $cf::RUNTIME; @@ -1453,10 +1415,34 @@ $self->in_memory (cf::MAP_IN_MEMORY); } +# find and load all maps in the 3x3 area around a map +sub load_diag { + my ($map) = @_; + + my @diag; # diagonal neighbours + + for (0 .. 3) { + my $neigh = $map->tile_path ($_) + or next; + $neigh = find $neigh, $map + or next; + $neigh->load; + + push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], + [$neigh->tile_path (($_ + 1) % 4), $neigh]; + } + + for (@diag) { + my $neigh = find @$_ + or next; + $neigh->load; + } +} + sub find_sync { my ($path, $origin) = @_; - cf::sync_job { cf::map::find $path, $origin } + cf::sync_job { find $path, $origin } } sub do_load_sync { @@ -1465,6 +1451,38 @@ cf::sync_job { $map->load }; } +our %MAP_PREFETCH; +our $MAP_PREFETCHER = Coro::async { + while () { + while (%MAP_PREFETCH) { + my $key = each %MAP_PREFETCH + or next; + my $path = delete $MAP_PREFETCH{$key}; + + my $map = find $path + or next; + $map->load; + } + Coro::schedule; + } +}; + +sub find_async { + my ($path, $origin) = @_; + + $path = new cf::path $path, $origin && $origin->path; + my $key = $path->as_string; + + if (my $map = $cf::MAP{$key}) { + return $map if $map->in_memory == cf::MAP_IN_MEMORY; + } + + $MAP_PREFETCH{$key} = $path; + $MAP_PREFETCHER->ready; + + () +} + sub save { my ($self) = @_; @@ -1590,28 +1608,60 @@ $map } -sub emergency_save { - my $freeze_guard = cf::freeze_mainloop; +=item cf::map::unique_maps - warn "enter emergency perl save\n"; +Returns an arrayref of cf::path's of all shared maps that have +instantiated unique items. May block. - cf::sync_job { - warn "begin emergency player save\n"; - $_->save for values %cf::PLAYER; - warn "end emergency player save\n"; +=cut - warn "begin emergency map save\n"; - $_->save for values %cf::MAP; - warn "end emergency map save\n"; - }; +sub unique_maps() { + my $files = aio_readdir cf::localdir . "/" . cf::uniquedir + or return; - warn "leave emergency perl save\n"; + my @paths; + + for (@$files) { + utf8::decode $_; + next if /\.pst$/; + next unless /^$PATH_SEP/o; + + push @paths, new cf::path $_; + } + + \@paths } package cf; =back +=head3 cf::object + +=cut + +package cf::object; + +=over 4 + +=item $ob->inv_recursive + +Returns the inventory of the object _and_ their inventories, recursively. + +=cut + +sub inv_recursive_; +sub inv_recursive_ { + map { $_, inv_recursive_ $_->inv } @_ +} + +sub inv_recursive { + inv_recursive_ inv $_[0] +} + +package cf; + +=back =head3 cf::object::player @@ -1713,6 +1763,7 @@ if $x <=0 && $y <= 0; $map->load; + $map->load_diag; return unless $self->contr->active; $self->activate_recursive; @@ -1759,7 +1810,6 @@ my ($self, $path, $x, $y) = @_; $path = new cf::path $path; - $path ne "/" or Carp::cluck ("oy");#d# $self->enter_link; @@ -1846,7 +1896,7 @@ }) { $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", + . "Please report this to the dungeon master!", cf::NDI_UNIQUE | cf::NDI_RED); warn "ERROR in enter_exit: $@"; @@ -2209,7 +2259,49 @@ } ############################################################################# -# initialisation +# initialisation and cleanup + +# install some emergency cleanup handlers +BEGIN { + for my $signal (qw(INT HUP TERM)) { + Event->signal ( + data => WF_AUTOCANCEL, + signal => $signal, + cb => sub { + cf::cleanup "SIG$signal"; + }, + ); + } +} + +sub emergency_save() { + my $freeze_guard = cf::freeze_mainloop; + + warn "enter emergency perl save\n"; + + cf::sync_job { + # 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 "begin emergency player save\n"; + for my $login (keys %cf::PLAYER) { + my $pl = $cf::PLAYER{$login} or next; + $pl->valid or next; + $pl->save; + } + warn "end emergency player save\n"; + + warn "begin emergency map save\n"; + for my $path (keys %cf::MAP) { + my $map = $cf::MAP{$path} or next; + $map->valid or next; + $map->save; + } + warn "end emergency map save\n"; + }; + + warn "leave emergency perl save\n"; +} sub reload() { # can/must only be called in main @@ -2220,28 +2312,48 @@ warn "reloading..."; + warn "freezing server"; my $guard = freeze_mainloop; cf::emergency_save; + warn "sync database to disk"; + cf::db_sync; + IO::AIO::flush; + eval { # if anything goes wrong in here, we should simply crash as we already saved - # cancel all watchers + warn "cancel all watchers"; for (Event::all_watchers) { $_->cancel if $_->data & WF_AUTOCANCEL; } - # cancel all extension coros + warn "cancel all extension coros"; $_->cancel for values %EXT_CORO; %EXT_CORO = (); - # unload all extensions - for (@exts) { - warn "unloading <$_>"; - unload_extension $_; + warn "remove commands"; + %COMMAND = (); + + warn "remove ext commands"; + %EXTCMD = (); + + warn "unload/nuke all extensions"; + for my $pkg (@EXTS) { + warn "... unloading $pkg"; + + if (my $cb = $pkg->can ("unload")) { + eval { + $cb->($pkg); + 1 + } or warn "$pkg unloaded, but with errors: $@"; + } + + warn "... nuking $pkg"; + Symbol::delete_package $pkg; } - # unload all modules loaded from $LIBDIR + warn "unload all perl modules loaded from $LIBDIR"; while (my ($k, $v) = each %INC) { next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; @@ -2258,40 +2370,31 @@ Symbol::delete_package $k; } - # sync database to disk - cf::db_sync; - IO::AIO::flush; - - # get rid of safe::, as good as possible + warn "get rid of safe::, as good as possible"; Symbol::delete_package "safe::$_" for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); - # remove register_script_function callbacks - # TODO - - # unload cf.pm "a bit" + warn "unload cf.pm \"a bit\""; delete $INC{"cf.pm"}; # don't, removes xs symbols, too, # and global variables created in xs #Symbol::delete_package __PACKAGE__; - # reload cf.pm warn "reloading cf.pm"; require cf; cf::_connect_to_perl; # nominally unnecessary, but cannot hurt - # load config and database again + warn "load config and database again"; cf::cfg_load; cf::db_load; - # load extensions warn "load extensions"; cf::load_extensions; - # reattach attachments to objects - warn "reattach"; + warn "reattach attachments to objects/players"; _global_reattach; + warn "reattach attachments to maps"; reattach $_ for values %MAP; }; @@ -2301,7 +2404,7 @@ exit 1; } - warn "reloaded successfully"; + warn "reloaded"; }; ############################################################################# @@ -2347,8 +2450,6 @@ $cf::MAP{$LINK_MAP->path} = $LINK_MAP; } -register "", __PACKAGE__; - register_command "reload" => sub { my ($who, $arg) = @_; @@ -2371,6 +2472,9 @@ $RUNTIME += $TICK; $NEXT_TICK += $TICK; + $WAIT_FOR_TICK->broadcast; + $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; + # if we are delayed by four ticks or more, skip them all $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;