--- deliantra/server/lib/cf.pm 2007/01/10 22:50:12 1.159 +++ deliantra/server/lib/cf.pm 2007/02/13 16:23:32 1.211 @@ -10,19 +10,23 @@ use Safe; use Safe::Hole; -use Coro 3.3 (); +use Coro 3.5 (); use Coro::Event; use Coro::Timer; use Coro::Signal; use Coro::Semaphore; use Coro::AIO; +use BDB (); use Data::Dumper; use Digest::MD5; use Fcntl; use IO::AIO 2.32 (); use YAML::Syck (); use Time::HiRes; +use Compress::LZF; + +Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later use Event; $Event::Eval = 1; # no idea why this is required, but it is @@ -39,14 +43,21 @@ 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"; our $TICK = MAX_TIME * 1e-6; our $TICK_WATCHER; +our $AIO_POLL_WATCHER; +our $WRITE_RUNTIME_WATCHER; our $NEXT_TICK; our $NOW; +our $USE_FSYNC = 1; # use fsync to write maps - default off + +our $BDB_POLL_WATCHER; +our $DB_ENV; our %CFG; @@ -55,12 +66,16 @@ our %PLAYER; # all users our %MAP; # all maps -our $LINK_MAP; # the special {link} map +our $LINK_MAP; # the special {link} map, which is always available our $RANDOM_MAPS = cf::localdir . "/random"; +our $BDB_ENV_DIR = cf::localdir . "/db"; our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; +# used to convert map paths into valid unix filenames by replacing / by ∕ +our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons + binmode STDOUT; binmode STDERR; @@ -76,11 +91,12 @@ mkdir cf::localdir . "/" . cf::tmpdir; mkdir cf::localdir . "/" . cf::uniquedir; mkdir $RANDOM_MAPS; +mkdir $BDB_ENV_DIR; -# a special map that is always available -our $LINK_MAP; our $EMERGENCY_POSITION; +sub cf::map::normalise; + ############################################################################# =head2 GLOBAL VARIABLES @@ -257,7 +273,11 @@ sub freeze_mainloop { return unless $TICK_WATCHER->is_active; - my $guard = Coro::guard { $TICK_WATCHER->start }; + my $guard = Coro::guard { + $TICK_WATCHER->start; + $WRITE_RUNTIME_WATCHER->start; + }; + $WRITE_RUNTIME_WATCHER->stop; $TICK_WATCHER->stop; $guard } @@ -338,15 +358,21 @@ } sub write_runtime { + $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1; + my $runtime = cf::localdir . "/runtime"; my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 or return; - my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock + my $value = $cf::RUNTIME + 90 + 10; + # 10 is the runtime save interval, for a monotonic clock + # 60 allows for the watchdog to kill the server. + (aio_write $fh, 0, (length $value), $value, 0) <= 0 and return; + # always fsync - this file is important aio_fsync $fh and return; @@ -365,133 +391,6 @@ ############################################################################# -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 new { - my ($class, $path, $base) = @_; - - $path = $path->as_string if ref $path; - - my $self = bless { }, $class; - - # {... 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 - - $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{^~([^/]+)?}{}) { - $self->{user_rel} = 1; - - if (defined $1) { - $self->{user} = $1; - } elsif ($base =~ m{^~([^/]+)/}) { - $self->{user} = $1; - } else { - warn "cannot resolve user-relative path without user <$path,$base>\n"; - } - } elsif ($path =~ /^\//) { - # already absolute - } else { - $base =~ s{[^/]+/?$}{}; - return $class->new ("$base/$path"); - } - - for ($path) { - redo if s{/\.?/}{/}; - redo if s{/[^/]+/\.\./}{/}; - } - } - - $self->{path} = $path; - - $self -} - -# 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->{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 -# } -} - -# escape the /'s in the path -sub _escaped_path { - (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; - $path -} - -# the original (read-only) location -sub load_path { - my ($self) = @_; - - sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} -} - -# the temporary/swap location -sub save_path { - 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, $self->{path} - : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path -} - -# the unique path, might be eq to save_path -sub uniq_path { - my ($self) = @_; - - $self->{user_rel} || $self->{random} - ? undef - : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path -} - -# return random map parameters, or undef -sub random_map_params { - my ($self) = @_; - - $self->{random} -} - -# this is somewhat ugly, but style maps do need special treatment -sub is_style_map { - $_[0]{path} =~ m{^/styles/} -} - -package cf; - -############################################################################# - =head2 ATTACHABLE OBJECTS Many objects in crossfire are so-called attachable objects. That means you can @@ -624,6 +523,12 @@ my %attachment; +sub cf::attachable::thawer_merge { + # simply override everything except _meta + local $_[0]{_meta}; + %{$_[0]} = %{$_[1]}; +} + sub _attach_cb($$$$) { my ($registry, $event, $prio, $cb) = @_; @@ -805,6 +710,8 @@ # basically do the same as instantiate, without calling instantiate my ($obj) = @_; + bless $obj, ref $obj; # re-bless in case extensions have been reloaded + my $registry = $obj->registry; @$registry = (); @@ -860,7 +767,7 @@ if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { chmod SAVE_MODE, $fh; aio_write $fh, 0, (length $$rdata), $$rdata, 0; - aio_fsync $fh; + aio_fsync $fh if $cf::USE_FSYNC; close $fh; if (@$objs) { @@ -868,7 +775,7 @@ chmod SAVE_MODE, $fh; my $data = Storable::nfreeze { version => 1, objs => $objs }; aio_write $fh, 0, (length $data), $data, 0; - aio_fsync $fh; + aio_fsync $fh if $cf::USE_FSYNC; close $fh; aio_rename "$filename.pst~", "$filename.pst"; } @@ -884,6 +791,12 @@ aio_unlink $filename; aio_unlink "$filename.pst"; } + + #d##TODO# nuke non .map-files if exist + if ($filename =~ s/\.map$//) { + aio_unlink $filename; + aio_unlink "$filename.pst"; + } } } @@ -900,6 +813,9 @@ my ($data, $av); + #d#TODO remove .map if file does not exist + aio_stat $filename and $filename =~ s/\.map$//; + (aio_load $filename, $data) >= 0 or return; @@ -989,7 +905,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,9 +916,16 @@ . (do { local $/; <$fh> }) . "\n};\n1"; - eval $source - or die $@ ? "$path: $@\n" - : "extension disabled.\n"; + unless (eval $source) { + my $msg = $@ ? "$path: $@\n" + : "extension disabled.\n"; + if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match + warn $@; + warn "mandatory extension failed to load, exiting.\n"; + exit 1; + } + die $@; + } push @EXTS, $pkg; } @@ -1018,20 +941,6 @@ } ############################################################################# -# load/save/clean perl data associated with a map - -*cf::mapsupport::on_clean = sub { - my ($map) = @_; - - my $path = $map->tmpname; - defined $path or return; - - unlink "$path.pst"; -}; - -cf::map->attach (prio => -10000, package => cf::mapsupport::); - -############################################################################# =head2 CORE EXTENSIONS @@ -1077,7 +986,7 @@ my ($login) = @_; $cf::PLAYER{$login} - or cf::sync_job { !aio_stat $login } + or cf::sync_job { !aio_stat path $login } } sub find($) { @@ -1177,7 +1086,7 @@ =item $player->maps -Returns an arrayref of cf::path's of all maps that are private for this +Returns an arrayref of map paths that are private for this player. May block. =cut @@ -1185,6 +1094,8 @@ sub maps($) { my ($pl) = @_; + $pl = ref $pl ? $pl->ob->name : $pl; + my $files = aio_readdir playerdir $pl or return; @@ -1195,7 +1106,7 @@ next if /\.(?:pl|pst)$/; next unless /^$PATH_SEP/o; - push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; + push @paths, cf::map::normalise "~$pl/$_"; } \@paths @@ -1231,15 +1142,17 @@ use Fcntl; use Coro::AIO; +use overload + '""' => \&as_string, + fallback => 1; + our $MAX_RESET = 3600; our $DEFAULT_RESET = 3000; sub generate_random_map { - my ($path, $rmp) = @_; - + my ($self, $rmp) = @_; # mit "rum" bekleckern, nicht - cf::map::_create_random_map - $path, + $self->_create_random_map ( $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, @@ -1250,7 +1163,137 @@ $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}) + (cf::region::find $rmp->{region}), $rmp->{custom} + ) +} + +=item cf::map->register ($regex, $prio) + +Register a handler for the map path matching the given regex at the +givne priority (higher is better, built-in handlers have priority 0, the +default). + +=cut + +sub register { + 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{^(?=/)}]; + +sub thawer_merge { + my ($self, $merge) = @_; + + # we have to keep some variables in memory intact + local $self->{path}; + local $self->{load_path}; + local $self->{deny_save}; + local $self->{deny_reset}; + + $self->SUPER::thawer_merge ($merge); +} + +sub normalise { + my ($path, $base) = @_; + + $path = "$path"; # make sure its a string + + $path =~ s/\.map$//; + + # map plan: + # + # /! non-realised random map exit (special hack!) + # {... are special paths that are not being touched + # ?xxx/... are special absolute paths + # ?random/... random maps + # /... normal maps + # ~user/... per-player map of a specific user + + $path =~ s/$PATH_SEP/\//go; + + # treat it as relative path if it starts with + # something that looks reasonable + if ($path =~ m{^(?:\./|\.\./|\w)}) { + $base or Carp::carp "normalise called with relative path and no base: '$path'"; + + $base =~ s{[^/]+/?$}{}; + $path = "$base/$path"; + } + + for ($path) { + redo if s{//}{/}; + redo if s{/\.?/}{/}; + redo if s{/[^/]+/\.\./}{/}; + } + + $path +} + +sub new_from_path { + my (undef, $path, $base) = @_; + + return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object + + $path = normalise $path, $base; + + for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) { + if ($path =~ $EXT_MAP{$pkg}[1]) { + my $self = bless cf::map::new, $pkg; + $self->{path} = $path; $self->path ($path); + $self->init; # pass $1 etc. + return $self; + } + } + + Carp::carp "unable to resolve path '$path' (base '$base')."; + () +} + +sub init { + my ($self) = @_; + + $self +} + +sub as_string { + my ($self) = @_; + + "$self->{path}" +} + +# the displayed name, this is a one way mapping +sub visible_name { + &as_string +} + +# the original (read-only) location +sub load_path { + my ($self) = @_; + + sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} +} + +# the temporary/swap location +sub save_path { + my ($self) = @_; + + (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; + sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path +} + +# the unique path, undef == no special unique path +sub uniq_path { + my ($self) = @_; + + (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; + sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path } # and all this just because we cannot iterate over @@ -1262,109 +1305,139 @@ for grep $_->outdoor, values %cf::MAP; } -sub try_load_header($) { - my ($path) = @_; +sub unlink_save { + my ($self) = @_; + + utf8::encode (my $save = $self->save_path); + IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; + IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; + + #d#TODO remove .map and also nuke + $save =~ s/\.map// or return;#d# + IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d# + IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d# +} + +sub load_header_from($) { + my ($self, $path) = @_; utf8::encode $path; - aio_open $path, O_RDONLY, 0 - or return; + #aio_open $path, O_RDONLY, 0 + # or return; - my $map = cf::map::new + $self->_load_header ($path) or return; - # for better error messages only, will be overwritten - $map->path ($path); + $self->{load_path} = $path; - $map->load_header ($path) - or return; + 1 +} - $map->{load_path} = $path; +sub load_header_orig { + my ($self) = @_; - $map + $self->load_header_from ($self->load_path) } -sub find; -sub find { - my ($path, $origin) = @_; +sub load_header_temp { + my ($self) = @_; - #warn "find<$path,$origin>\n";#d# + $self->load_header_from ($self->save_path) +} - $path = new cf::path $path, $origin && $origin->path; - my $key = $path->as_string; +sub prepare_temp { + my ($self) = @_; - cf::lock_wait "map_find:$key"; + $self->last_access ((delete $self->{last_access}) + || $cf::RUNTIME); #d# + # safety + $self->{instantiate_time} = $cf::RUNTIME + if $self->{instantiate_time} > $cf::RUNTIME; +} - $cf::MAP{$key} || do { - my $guard = cf::lock_acquire "map_find:$key"; +sub prepare_orig { + my ($self) = @_; - # do it the slow way - my $map = try_load_header $path->save_path; + $self->{load_original} = 1; + $self->{instantiate_time} = $cf::RUNTIME; + $self->last_access ($cf::RUNTIME); + $self->instantiate; +} - Coro::cede; +sub load_header { + my ($self) = @_; - 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; - } + if ($self->load_header_temp) { + $self->prepare_temp; + } else { + $self->load_header_orig + or return; + $self->prepare_orig; + } + + 1 +} + +sub find; +sub find { + my ($path, $origin) = @_; - $map or return; + $path = normalise $path, $origin && $origin->path; - $map->{load_original} = 1; - $map->{instantiate_time} = $cf::RUNTIME; - $map->last_access ($cf::RUNTIME); - $map->instantiate; + cf::lock_wait "map_find:$path"; - # per-player maps become, after loading, normal maps - $map->per_player (0) if $path->{user_rel}; - } + $cf::MAP{$path} || do { + my $guard = cf::lock_acquire "map_find:$path"; + my $map = new_from_path cf::map $path + or return; - $map->path ($key); - $map->{path} = $path; $map->{last_save} = $cf::RUNTIME; - Coro::cede; + $map->load_header + or return; - if ($map->should_reset) { + if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) + # doing this can freeze the server in a sync job, obviously + #$cf::WAIT_FOR_TICK->wait; $map->reset; undef $guard; - $map = find $path - or return; + return find $path; } - $cf::MAP{$key} = $map + $cf::MAP{$path} = $map } } +sub pre_load { } +sub post_load { } + sub load { my ($self) = @_; + local $self->{deny_reset} = 1; # loading can take a long time + my $path = $self->{path}; - my $guard = cf::lock_acquire "map_load:" . $path->as_string; + my $guard = cf::lock_acquire "map_load:$path"; return if $self->in_memory != cf::MAP_SWAPPED; $self->in_memory (cf::MAP_LOADING); $self->alloc; - $self->load_objects ($self->{load_path}, 1) + + $self->pre_load; + + $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) { + if (my $uniq = $self->uniq_path) { utf8::encode $uniq; if (aio_open $uniq, O_RDONLY, 0) { $self->clear_unique_items; - $self->load_objects ($uniq, 0); + $self->_load_objects ($uniq, 0); } } @@ -1373,24 +1446,32 @@ # 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; + unless ($self->{deny_activate}) { $self->decay_objects; + $self->fix_auto_apply; $self->update_buttons; + Coro::cede; $self->set_darkness_map; $self->difficulty ($self->estimate_difficulty) unless $self->difficulty; + Coro::cede; $self->activate; } - Coro::cede; + $self->post_load; $self->in_memory (cf::MAP_IN_MEMORY); } +sub customise_for { + my ($self, $ob) = @_; + + return find "~" . $ob->name . "/" . $self->{path} + if $self->per_player; + + $self +} + # find and load all maps in the 3x3 area around a map sub load_diag { my ($map) = @_; @@ -1428,33 +1509,31 @@ } 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; - } -}; +our $MAP_PREFETCHER = undef; sub find_async { my ($path, $origin) = @_; - $path = new cf::path $path, $origin && $origin->path; - my $key = $path->as_string; + $path = normalise $path, $origin && $origin->{path}; - if (my $map = $cf::MAP{$key}) { + if (my $map = $cf::MAP{$path}) { return $map if $map->in_memory == cf::MAP_IN_MEMORY; } - $MAP_PREFETCH{$key} = $path; - $MAP_PREFETCHER->ready; + undef $MAP_PREFETCH{$path}; + $MAP_PREFETCHER ||= cf::async { + while (%MAP_PREFETCH) { + for my $path (keys %MAP_PREFETCH) { + my $map = find $path + or next; + $map->load; + + delete $MAP_PREFETCH{$path}; + } + } + undef $MAP_PREFETCHER; + }; + $MAP_PREFETCHER->prio (6); () } @@ -1468,8 +1547,8 @@ return unless $self->dirty; - my $save = $self->{path}->save_path; utf8::encode $save; - my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; + my $save = $self->save_path; utf8::encode $save; + my $uniq = $self->uniq_path; utf8::encode $uniq; $self->{load_path} = $save; @@ -1482,10 +1561,10 @@ }; if ($uniq) { - $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); - $self->save_objects ($uniq, cf::IO_UNIQUES); + $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); + $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); } } @@ -1509,7 +1588,7 @@ my ($self) = @_; # TODO: safety, remove and allow resettable per-player maps - return 1e99 if $self->{path}{user_rel}; + return 1e99 if $self->isa ("ext::map_per_player");#d# return 1e99 if $self->{deny_reset}; my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; @@ -1524,39 +1603,30 @@ $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; + my $lock = cf::lock_acquire "map_data:$self->{path}"; return if $self->players; - return if $self->{path}{user_rel};#d# + return if $self->isa ("ext::map_per_player");#d# warn "resetting map ", $self->path;#d# + $self->in_memory (cf::MAP_SWAPPED); + + # need to save uniques path + unless ($self->{deny_save}) { + my $uniq = $self->uniq_path; utf8::encode $uniq; + + $self->_save_objects ($uniq, cf::IO_UNIQUES) + if $uniq; + } + delete $cf::MAP{$self->path}; + $self->clear; + $_->clear_links_to ($self) for values %cf::MAP; $self->unlink_save; @@ -1568,25 +1638,24 @@ sub nuke { my ($self) = @_; + delete $cf::MAP{$self->path}; + + $self->unlink_save; + + bless $self, "cf::map"; + delete $self->{deny_reset}; $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) = @_; + $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); - if ($map->per_player) { - return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; - } + $cf::MAP{$self->path} = $self; - $map + $self->reset; # polite request, might not happen } =item cf::map::unique_maps -Returns an arrayref of cf::path's of all shared maps that have +Returns an arrayref of paths of all shared maps that have instantiated unique items. May block. =cut @@ -1602,7 +1671,7 @@ next if /\.pst$/; next unless /^$PATH_SEP/o; - push @paths, new cf::path $_; + push @paths, cf::map::normalise $_; } \@paths @@ -1687,31 +1756,43 @@ 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 +The player should be reasonably safe there for short amounts of time. You I call C as soon as possible, though. +Will never block. + =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. +Moves the player out of the special C<{link}> map onto the specified +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 link_map { + unless ($LINK_MAP) { + $LINK_MAP = cf::map::find "{link}" + or cf::cleanup "FATAL: unable to provide {link} map, exiting."; + $LINK_MAP->load; + } + + $LINK_MAP +} + sub cf::object::player::enter_link { my ($self) = @_; $self->deactivate_recursive; - return if $self->map == $LINK_MAP; + return if UNIVERSAL::isa $self->map, "ext::map_link"; $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] if $self->map; - $self->enter_map ($LINK_MAP, 20, 20); + $self->enter_map ($LINK_MAP || link_map, 10, 10); } sub cf::object::player::leave_link { @@ -1785,18 +1866,15 @@ sub cf::object::player::goto { my ($self, $path, $x, $y) = @_; - $path = new cf::path $path; - $self->enter_link; (async { - 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 to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); + my $map = eval { + my $map = cf::map::find $path; + $map = $map->customise_for ($self) if $map; + $map + } or + $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); $self->leave_link ($map, $x, $y); })->prio (1); @@ -1810,8 +1888,10 @@ my ($spec) = @_; my $rmp = { # defaults - xsize => 10, - ysize => 10, + xsize => (cf::rndm 15, 40), + ysize => (cf::rndm 15, 40), + symmetry => (cf::rndm 1, cf::SYMMETRY_XY), + #layout => string, }; for (split /\n/, $spec) { @@ -1826,6 +1906,8 @@ sub prepare_random_map { my ($exit) = @_; + my $guard = cf::lock_acquire "exit_prepare:$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 @@ -1833,7 +1915,7 @@ my $rmp = parse_random_map_params $exit->msg; if ($exit->map) { - $rmp->{region} = $exit->map->region_name; + $rmp->{region} = $exit->region->name; $rmp->{origin_map} = $exit->map->path; $rmp->{origin_x} = $exit->x; $rmp->{origin_y} = $exit->y; @@ -1843,9 +1925,12 @@ my $data = cf::to_json $rmp; my $md5 = Digest::MD5::md5_hex $data; + my $meta = "$cf::RANDOM_MAPS/$md5.meta"; - if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { + if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { aio_write $fh, 0, (length $data), $data, 0; + undef $fh; + aio_rename "$meta~", $meta; $exit->slaying ("?random/$md5"); $exit->msg (undef); @@ -1857,16 +1942,21 @@ return unless $self->type == cf::PLAYER; + if ($exit->slaying eq "/!") { + #TODO: this should de-fi-ni-te-ly not be a sync-job + cf::sync_job { prepare_random_map $exit }; + } + + my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; + my $hp = $exit->stats->hp; + my $sp = $exit->stats->sp; + $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); + $self->goto ($slaying, $hp, $sp); 1; }) { @@ -1937,6 +2027,7 @@ or return; # be conservative, not sure how that can happen, but we saw a crash here (shift @$queue)->[1]->($msg); + return unless $ns->valid; # temporary(?) workaround for callback destroying socket push @{ $ns->{query_queue} }, @$queue; @@ -2107,98 +2198,72 @@ =over 4 -=item $hashref = cf::db_get $family - -Return a hashref for use by the extension C<$family>, which can be -modified. After modifications, you have to call C or -C. - =item $value = cf::db_get $family => $key -Returns a single value from the database - -=item cf::db_put $family => $hashref - -Stores the given family hashref into the database. Updates are delayed, if -you want the data to be synced to disk immediately, use C. +Returns a single value from the database. =item cf::db_put $family => $key => $value -Stores the given C<$value> in the family hash. Updates are delayed, if you -want the data to be synced to disk immediately, use C. - -=item cf::db_dirty - -Marks the database as dirty, to be updated at a later time. - -=item cf::db_sync - -Immediately write the database to disk I. +Stores the given C<$value> in the family. =cut our $DB; -{ - my $path = cf::localdir . "/database.pst"; +sub db_init { + unless ($DB) { + $DB = BDB::db_create $DB_ENV; + + cf::sync_job { + eval { + $DB->set_flags (BDB::CHKSUM); + + BDB::db_open $DB, undef, "db", undef, BDB::BTREE, + BDB::CREATE | BDB::AUTO_COMMIT, 0666; + cf::cleanup "db_open(db): $!" if $!; + }; + cf::cleanup "db_open(db): $@" if $@; + }; - sub db_load() { - $DB = stat $path ? Storable::retrieve $path : { }; - } + my $path = cf::localdir . "/database.pst"; + if (stat $path) { + cf::sync_job { + my $pst = Storable::retrieve $path; - my $pid; + cf::db_put (board => data => $pst->{board}); + cf::db_put (guildrules => data => $pst->{guildrules}); + cf::db_put (rent => balance => $pst->{rent}{balance}); + BDB::db_env_txn_checkpoint $DB_ENV; - sub db_save() { - waitpid $pid, 0 if $pid; - if (0 == ($pid = fork)) { - $DB->{_meta}{version} = 1; - Storable::nstore $DB, "$path~"; - rename "$path~", $path; - cf::_exit 0 if defined $pid; + unlink $path; + }; } } +} - my $dirty; - - sub db_sync() { - db_save if $dirty; - undef $dirty; - } - - my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { - db_sync; - }); - - sub db_dirty() { - $dirty = 1; - $idle->start; - } +sub db_get($$) { + my $key = "$_[0]/$_[1]"; - sub db_get($;$) { - @_ >= 2 - ? $DB->{$_[0]}{$_[1]} - : ($DB->{$_[0]} ||= { }) - } + cf::sync_job { + BDB::db_get $DB, undef, $key, my $data; - sub db_put($$;$) { - if (@_ >= 3) { - $DB->{$_[0]}{$_[1]} = $_[2]; - } else { - $DB->{$_[0]} = $_[1]; - } - db_dirty; + $! ? () + : Compress::LZF::sthaw $data } +} - cf::global->attach ( - prio => 10000, - on_cleanup => sub { - db_sync; - }, - ); +sub db_put($$$) { + BDB::dbreq_pri 4; + BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; } ############################################################################# -# the server's main() +# the server's init and main functions + +sub load_resources { + load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir + or die "unable to load regions file\n";#d# +} sub cfg_load { open my $fh, "<:utf8", cf::confdir . "/config" @@ -2221,16 +2286,24 @@ } } +sub init { + load_resources; +} + sub main { # we must not ever block the main coroutine local $Coro::idle = sub { Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# - async { Event::one_event }; + (async { + Event::one_event; + })->prio (Coro::PRIO_MAX); }; cfg_load; - db_load; + db_init; load_extensions; + + $TICK_WATCHER->start; Event::loop; } @@ -2241,9 +2314,11 @@ BEGIN { for my $signal (qw(INT HUP TERM)) { Event->signal ( - data => WF_AUTOCANCEL, - signal => $signal, - cb => sub { + reentrant => 0, + data => WF_AUTOCANCEL, + signal => $signal, + prio => 0, + cb => sub { cf::cleanup "SIG$signal"; }, ); @@ -2258,7 +2333,7 @@ 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. + # and maps saved/destroyed asynchronously. warn "begin emergency player save\n"; for my $login (keys %cf::PLAYER) { my $pl = $cf::PLAYER{$login} or next; @@ -2274,49 +2349,69 @@ $map->save; } warn "end emergency map save\n"; + + warn "begin emergency database checkpoint\n"; + BDB::db_env_txn_checkpoint $DB_ENV; + warn "end emergency database checkpoint\n"; }; warn "leave emergency perl save\n"; } +sub post_cleanup { + my ($make_core) = @_; + + warn Carp::longmess "post_cleanup backtrace" + if $make_core; +} + sub reload() { # can/must only be called in main if ($Coro::current != $Coro::main) { - warn "can only reload from main coroutine\n"; + warn "can only reload from main coroutine"; return; } warn "reloading..."; - warn "freezing server"; - my $guard = freeze_mainloop; - cf::emergency_save; + warn "cancelling server ticker"; + $TICK_WATCHER->cancel; - warn "sync database to disk"; - cf::db_sync; - IO::AIO::flush; + cf::emergency_save; eval { # if anything goes wrong in here, we should simply crash as we already saved - warn "cancel all watchers"; + warn "cancelling all WF_AUTOCANCEL watchers"; for (Event::all_watchers) { $_->cancel if $_->data & WF_AUTOCANCEL; } - warn "cancel all extension coros"; + warn "syncing database to disk"; + BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; + + warn "flushing outstanding aio requests"; + for (;;) { + BDB::flush; + IO::AIO::flush; + Coro::cede; + last unless IO::AIO::nreqs || BDB::nreqs; + warn "iterate..."; + } + + warn "cancelling all extension coros"; $_->cancel for values %EXT_CORO; %EXT_CORO = (); - warn "remove commands"; + warn "removing commands"; %COMMAND = (); - warn "remove ext commands"; + warn "removing ext commands"; %EXTCMD = (); - warn "unload/nuke all extensions"; + warn "unloading/nuking all extensions"; for my $pkg (@EXTS) { - warn "unloading <$pkg>"; + warn "... unloading $pkg"; if (my $cb = $pkg->can ("unload")) { eval { @@ -2325,14 +2420,15 @@ } or warn "$pkg unloaded, but with errors: $@"; } + warn "... nuking $pkg"; Symbol::delete_package $pkg; } - warn "unload all perl modules loaded from $LIBDIR"; + warn "unloading all perl modules loaded from $LIBDIR"; while (my ($k, $v) = each %INC) { next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; - warn "removing <$k>"; + warn "... unloading $k"; delete $INC{$k}; $k =~ s/\.pm$//; @@ -2345,32 +2441,40 @@ Symbol::delete_package $k; } - warn "get rid of safe::, as good as possible"; + warn "getting 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); - warn "unload cf.pm \"a bit\""; + warn "unloading cf.pm \"a bit\""; delete $INC{"cf.pm"}; # don't, removes xs symbols, too, # and global variables created in xs #Symbol::delete_package __PACKAGE__; + warn "unload completed, starting to reload now"; + warn "reloading cf.pm"; require cf; cf::_connect_to_perl; # nominally unnecessary, but cannot hurt - warn "load config and database again"; + warn "loading config and database again"; cf::cfg_load; - cf::db_load; - warn "load extensions"; + warn "loading extensions"; cf::load_extensions; - warn "reattach attachments to objects/players"; + warn "reattaching attachments to objects/players"; _global_reattach; - warn "reattach attachments to maps"; + warn "reattaching attachments to maps"; reattach $_ for values %MAP; + + warn "loading reloadable resources"; + load_resources; + + warn "restarting server ticker"; + + $TICK_WATCHER->start; }; if ($@) { @@ -2382,67 +2486,48 @@ warn "reloaded"; }; -############################################################################# - -unless ($LINK_MAP) { - $LINK_MAP = cf::map::new; - - $LINK_MAP->width (41); - $LINK_MAP->height (41); - $LINK_MAP->alloc; - $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; -} +our $RELOAD_WATCHER; # used only during reload register_command "reload" => sub { my ($who, $arg) = @_; if ($who->flag (FLAG_WIZ)) { - $who->message ("start of reload."); - reload; - $who->message ("end of reload."); + $who->message ("reloading server."); + + # doing reload synchronously and two reloads happen back-to-back, + # coro crashes during coro_state_free->destroy here. + + $RELOAD_WATCHER ||= Event->timer ( + reentrant => 0, + after => 0, + data => WF_AUTOCANCEL, + cb => sub { + reload; + undef $RELOAD_WATCHER; + }, + ); } }; unshift @INC, $LIBDIR; +my $bug_warning = 0; + $TICK_WATCHER = Event->timer ( reentrant => 0, + parked => 1, prio => 0, at => $NEXT_TICK || $TICK, data => WF_AUTOCANCEL, cb => sub { + if ($Coro::current != $Coro::main) { + Carp::cluck "major BUG: server tick called outside of main coro, skipping it" + unless ++$bug_warning > 10; + return; + } + + $NOW = Event::time; + cf::server_tick; # one server iteration $RUNTIME += $TICK; $NEXT_TICK += $TICK; @@ -2450,6 +2535,12 @@ $WAIT_FOR_TICK->broadcast; $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; + Event::sweep; + Coro::cede_notself; + +# my $AFTER = Event::time; +# warn $AFTER - $NOW;#d# + # if we are delayed by four ticks or more, skip them all $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; @@ -2458,25 +2549,80 @@ }, ); -IO::AIO::max_poll_time $TICK * 0.2; +{ + BDB::max_poll_time $TICK * 0.1; + $BDB_POLL_WATCHER = Event->io ( + reentrant => 0, + fd => BDB::poll_fileno, + poll => 'r', + prio => 0, + data => WF_AUTOCANCEL, + cb => \&BDB::poll_cb, + ); + BDB::min_parallel 8; -Event->io ( - fd => IO::AIO::poll_fileno, - poll => 'r', - prio => 5, - data => WF_AUTOCANCEL, - cb => \&IO::AIO::poll_cb, -); + BDB::set_sync_prepare { + my $status; + my $current = $Coro::current; + ( + sub { + $status = $!; + $current->ready; undef $current; + }, + sub { + Coro::schedule while defined $current; + $! = $status; + }, + ) + }; + + unless ($DB_ENV) { + $DB_ENV = BDB::db_env_create; + + cf::sync_job { + eval { + BDB::db_env_open + $DB_ENV, + $BDB_ENV_DIR, + BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN + | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, + 0666; + + cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; + + $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); + $DB_ENV->set_lk_detect; + }; -Event->timer ( - data => WF_AUTOCANCEL, - after => 0, - interval => 10, - cb => sub { - (Coro::unblock_sub { - write_runtime - or warn "ERROR: unable to write runtime file: $!"; - })->(); + cf::cleanup "db_env_open(db): $@" if $@; + }; + } +} + +{ + IO::AIO::min_parallel 8; + + undef $Coro::AIO::WATCHER; + IO::AIO::max_poll_time $TICK * 0.1; + $AIO_POLL_WATCHER = Event->io ( + reentrant => 0, + fd => IO::AIO::poll_fileno, + poll => 'r', + prio => 6, + data => WF_AUTOCANCEL, + cb => \&IO::AIO::poll_cb, + ); +} + +$WRITE_RUNTIME_WATCHER = Event->timer ( + reentrant => 0, + data => WF_AUTOCANCEL, + after => 1, + interval => 10, + prio => 6, # keep it lowest so it acts like a watchdog + cb => Coro::unblock_sub { + write_runtime + or warn "ERROR: unable to write runtime file: $!"; }, );