--- deliantra/server/lib/cf.pm 2007/12/17 07:09:18 1.403
+++ deliantra/server/lib/cf.pm 2008/05/04 14:12:37 1.430
@@ -1,3 +1,24 @@
+#
+# This file is part of Deliantra, the Roguelike Realtime MMORPG.
+#
+# Copyright (©) 2006,2007,2008 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 GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+# The authors can be reached via e-mail to
+#
+
package cf;
use utf8;
@@ -6,13 +27,13 @@
use Symbol;
use List::Util;
use Socket;
-use EV;
+use EV 3.2;
use Opcode;
use Safe;
use Safe::Hole;
use Storable ();
-use Coro 4.32 ();
+use Coro 4.50 ();
use Coro::State;
use Coro::Handle;
use Coro::EV;
@@ -29,7 +50,7 @@
use Data::Dumper;
use Digest::MD5;
use Fcntl;
-use YAML::Syck ();
+use YAML ();
use IO::AIO 2.51 ();
use Time::HiRes;
use Compress::LZF;
@@ -41,9 +62,6 @@
Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
-# 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
@@ -71,9 +89,9 @@
our $PLAYERDIR = "$LOCALDIR/" . playerdir;
our $RANDOMDIR = "$LOCALDIR/random";
our $BDBDIR = "$LOCALDIR/db";
+our %RESOURCE;
our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
-our $TICK_WATCHER;
our $AIO_POLL_WATCHER;
our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
our $NEXT_TICK;
@@ -100,7 +118,8 @@
our $LOAD; # a number between 0 (idle) and 1 (too many objects)
our $LOADAVG; # same thing, but with alpha-smoothing
-our $tick_start; # for load detecting purposes
+our $JITTER; # average jitter
+our $TICK_START; # for load detecting purposes
binmode STDOUT;
binmode STDERR;
@@ -195,6 +214,21 @@
};
}
+$Coro::State::DIEHOOK = sub {
+ return unless $^S eq 0; # "eq", not "=="
+
+ if ($Coro::current == $Coro::main) {#d#
+ warn "DIEHOOK called in main context, Coro bug?\n";#d#
+ return;#d#
+ }#d#
+
+ # kill coroutine otherwise
+ warn Carp::longmess $_[0];
+ Coro::terminate
+};
+
+$SIG{__DIE__} = sub { }; #d#?
+
@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
@@ -328,13 +362,9 @@
}
sub freeze_mainloop {
- return unless $TICK_WATCHER->is_active;
+ tick_inhibit_inc;
- my $guard = Coro::guard {
- $TICK_WATCHER->start;
- };
- $TICK_WATCHER->stop;
- $guard
+ Coro::guard \&tick_inhibit_dec;
}
=item cf::periodic $interval, $cb
@@ -399,6 +429,8 @@
};
sub get_slot($;$$) {
+ return if tick_inhibit || $Coro::current == $Coro::main;
+
my ($time, $pri, $name) = @_;
$time = $TICK * .6 if $time > $TICK * .6;
@@ -445,8 +477,6 @@
LOG llevError, Carp::longmess "sync job";#d#
- # TODO: use suspend/resume instead
- # (but this is cancel-safe)
my $freeze_guard = freeze_mainloop;
my $busy = 1;
@@ -467,12 +497,9 @@
}
}
- $time = EV::time - $time;
-
- LOG llevError | logBacktrace, Carp::longmess "long sync job"
- if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
+ my $time = EV::time - $time;
- $tick_start += $time; # do not account sync jobs to server load
+ $TICK_START += $time; # do not account sync jobs to server load
wantarray ? @res : $res[0]
} else {
@@ -526,6 +553,33 @@
wantarray ? @res : $res[-1]
}
+=item $coin = coin_from_name $name
+
+=cut
+
+our %coin_alias = (
+ "silver" => "silvercoin",
+ "silvercoin" => "silvercoin",
+ "silvercoins" => "silvercoin",
+ "gold" => "goldcoin",
+ "goldcoin" => "goldcoin",
+ "goldcoins" => "goldcoin",
+ "platinum" => "platinacoin",
+ "platinumcoin" => "platinacoin",
+ "platinumcoins" => "platinacoin",
+ "platina" => "platinacoin",
+ "platinacoin" => "platinacoin",
+ "platinacoins" => "platinacoin",
+ "royalty" => "royalty",
+ "royalties" => "royalty",
+);
+
+sub coin_from_name($) {
+ $coin_alias{$_[0]}
+ ? cf::arch::find $coin_alias{$_[0]}
+ : undef
+}
+
=item $value = cf::db_get $family => $key
Returns a single value from the environment database.
@@ -970,7 +1024,7 @@
0
}
-=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)
+=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
@@ -1089,18 +1143,18 @@
$decname, length $$rdata, scalar @$objs;
if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
- chmod SAVE_MODE, $fh;
+ aio_chmod $fh, SAVE_MODE;
aio_write $fh, 0, (length $$rdata), $$rdata, 0;
aio_fsync $fh if $cf::USE_FSYNC;
- close $fh;
+ aio_close $fh;
if (@$objs) {
if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
- chmod SAVE_MODE, $fh;
+ aio_chmod $fh, SAVE_MODE;
my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
aio_write $fh, 0, (length $data), $data, 0;
aio_fsync $fh if $cf::USE_FSYNC;
- close $fh;
+ aio_close $fh;
aio_rename "$filename.pst~", "$filename.pst";
}
} else {
@@ -1305,8 +1359,7 @@
if (exists $v->{meta}{mandatory}) {
warn $msg;
- warn "mandatory extension failed to load, exiting.\n";
- exit 1;
+ cf::cleanup "mandatory extension failed to load, exiting.";
}
warn $msg;
@@ -1405,6 +1458,7 @@
my $pl = cf::player::load_pl $f
or return;
+
local $cf::PLAYER_LOADING{$login} = $pl;
$f->resolve_delayed_derefs;
$cf::PLAYER{$login} = $pl
@@ -1425,6 +1479,8 @@
aio_mkdir playerdir $pl, 0770;
$pl->{last_save} = $cf::RUNTIME;
+ cf::get_slot 0.01;
+
$pl->save_pl ($path);
cf::cede_to_tick;
}
@@ -1517,7 +1573,8 @@
my $path = path $login;
# a .pst is a dead give-away for a valid player
- unless (-e "$path.pst") {
+ # if no pst file found, open and chekc for blocked users
+ if (aio_stat "$path.pst") {
my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
aio_read $fh, 0, 512, my $buf, 0 or next;
$buf !~ /^password -------------$/m or next; # official not-valid tag
@@ -1726,6 +1783,9 @@
sub generate_random_map {
my ($self, $rmp) = @_;
+
+ my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
+
# mit "rum" bekleckern, nicht
$self->_create_random_map (
$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
@@ -1857,7 +1917,7 @@
sub save_path {
my ($self) = @_;
- (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
+ (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
"$TMPDIR/$path.map"
}
@@ -1865,7 +1925,7 @@
sub uniq_path {
my ($self) = @_;
- (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
+ (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
"$UNIQUEDIR/$path"
}
@@ -1973,8 +2033,8 @@
cf::lock_wait "map_find:$path";
$cf::MAP{$path} || do {
- my $guard1 = cf::lock_acquire "map_find:$path";
- my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
+ my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
+ my $guard2 = cf::lock_acquire "map_find:$path";
my $map = new_from_path cf::map $path
or return;
@@ -1987,8 +2047,8 @@
if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
# doing this can freeze the server in a sync job, obviously
#$cf::WAIT_FOR_TICK->wait;
- undef $guard1;
undef $guard2;
+ undef $guard1;
$map->reset;
return find $path;
}
@@ -2061,7 +2121,7 @@
$self->{last_save} = $cf::RUNTIME;
$self->last_access ($cf::RUNTIME);
- $self->in_memory (cf::MAP_IN_MEMORY);
+ $self->in_memory (cf::MAP_ACTIVE);
}
$self->post_load;
@@ -2129,7 +2189,7 @@
$path = normalise $path, $origin && $origin->{path};
if (my $map = $cf::MAP{$path}) {
- return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
+ return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
}
$MAP_PREFETCH{$path} |= $load;
@@ -2176,6 +2236,8 @@
$_->contr->save for $self->players;
};
+ cf::get_slot 0.02;
+
if ($uniq) {
$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
$self->_save_objects ($uniq, cf::IO_UNIQUES);
@@ -2193,7 +2255,7 @@
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->in_memory != cf::MAP_ACTIVE;
return if $self->{deny_save};
$self->in_memory (cf::MAP_SWAPPED);
@@ -2321,15 +2383,14 @@
[
map {
utf8::decode $_;
- /\.map$/
- ? normalise $_
- : ()
+ s/\.map$//; # TODO future compatibility hack
+ /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
+ ? ()
+ : normalise $_
} @{ aio_readdir $UNIQUEDIR or [] }
]
}
-package cf;
-
=back
=head3 cf::object
@@ -2342,7 +2403,8 @@
=item $ob->inv_recursive
-Returns the inventory of the object _and_ their inventories, recursively.
+Returns the inventory of the object I their inventories, recursively,
+but I the object itself.
=cut
@@ -2357,7 +2419,7 @@
=item $ref = $ob->ref
-creates and returns a persistent reference to an objetc that can be stored as a string.
+Creates and returns a persistent reference to an object that can be stored as a string.
=item $ob = cf::object::deref ($refstring)
@@ -2399,6 +2461,20 @@
=cut
+our $SAY_CHANNEL = {
+ id => "say",
+ title => "Map",
+ reply => "say ",
+ tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
+};
+
+our $CHAT_CHANNEL = {
+ id => "chat",
+ title => "Chat",
+ reply => "chat ",
+ tooltip => "Player chat and shouts, global to the server.",
+};
+
# rough implementation of a future "reply" method that works
# with dialog boxes.
#TODO: the first argument must go, split into a $npc->reply_to ( method
@@ -2419,7 +2495,7 @@
} else {
$msg = $npc->name . " says: $msg" if $npc;
- $self->message ($msg, $flags);
+ $self->send_msg ($SAY_CHANNEL => $msg, $flags);
}
}
}
@@ -2624,8 +2700,6 @@
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
@@ -2637,11 +2711,13 @@
$rmp->{origin_map} = $exit->map->path;
$rmp->{origin_x} = $exit->x;
$rmp->{origin_y} = $exit->y;
+
+ $exit->map->touch;
}
$rmp->{random_seed} ||= $exit->random_seed;
- my $data = cf::encode_json $rmp;
+ my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
my $md5 = Digest::MD5::md5_hex $data;
my $meta = "$RANDOMDIR/$md5.meta";
@@ -2650,8 +2726,12 @@
undef $fh;
aio_rename "$meta~", $meta;
- $exit->slaying ("?random/$md5");
- $exit->msg (undef);
+ my $slaying = "?random/$md5";
+
+ if ($exit->valid) {
+ $exit->slaying ("?random/$md5");
+ $exit->msg (undef);
+ }
}
}
@@ -2660,31 +2740,33 @@
return unless $self->type == cf::PLAYER;
- if ($exit->slaying eq "/!") {
- #TODO: this should de-fi-ni-te-ly not be a sync-job
- # the problem is that $exit might not survive long enough
- # so it needs to be done right now, right here
- 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;
- # if exit is damned, update players death & WoR home-position
- $self->contr->savebed ($slaying, $hp, $sp)
- if $exit->flag (FLAG_DAMNED);
-
(async {
- $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
+ $Coro::current->{desc} = "enter_exit";
- $self->deactivate_recursive; # just to be sure
unless (eval {
- $self->goto ($slaying, $hp, $sp);
+ $self->deactivate_recursive; # just to be sure
+
+ # random map handling
+ {
+ my $guard = cf::lock_acquire "exit_prepare:$exit";
- 1;
+ prepare_random_map $exit
+ if $exit->slaying eq "/!";
+ }
+
+ my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
+ my $x = $exit->stats->hp;
+ my $y = $exit->stats->sp;
+
+ $self->goto ($map, $x, $y);
+
+ # if exit is damned, update players death & WoR home-position
+ $self->contr->savebed ($map, $x, $y)
+ if $exit->flag (cf::FLAG_DAMNED);
+
+ 1
}) {
$self->message ("Something went wrong deep within the crossfire server. "
. "I'll try to bring you back to the map you were before. "
@@ -2774,6 +2856,12 @@
reply => undef,
tooltip => "Information related to the maps",
},
+ "c/party" => {
+ id => "party",
+ title => "Party",
+ reply => "gsay ",
+ tooltip => "Messages and chat related to your party",
+ },
);
sub cf::client::send_msg {
@@ -3020,7 +3108,7 @@
cf::object
contr pay_amount pay_player map x y force_find force_add destroy
- insert remove name archname title slaying race decrease_ob_nr
+ insert remove name archname title slaying race decrease split
cf::object::player
player
@@ -3036,7 +3124,7 @@
for (
["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
insert remove inv name archname title slaying race
- decrease_ob_nr destroy)],
+ decrease split destroy)],
["cf::object::player" => qw(player)],
["cf::player" => qw(peaceful)],
["cf::map" => qw(trigger)],
@@ -3151,6 +3239,7 @@
while (my ($face, $info) = each %$faces) {
my $idx = (cf::face::find $face) || cf::face::alloc $face;
+
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};
@@ -3161,8 +3250,10 @@
while (my ($face, $info) = each %$faces) {
next unless $info->{smooth};
+
my $idx = cf::face::find $face
or next;
+
if (my $smooth = cf::face::find $info->{smooth}) {
cf::face::set_smooth $idx, $smooth;
cf::face::set_smoothlevel $idx, $info->{smoothlevel};
@@ -3190,52 +3281,58 @@
# that gcfclient doesn't grok a >10000 face index.
my $res = $facedata->{resource};
- my $soundconf = delete $res->{"res/sound.conf"};
-
while (my ($name, $info) = each %$res) {
- my $idx = (cf::face::find $name) || cf::face::alloc $name;
- my $data;
+ 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} || {} },
+ });
- 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};
+ }
- $data = pack "(w/a*)*", $meta, $info->{data};
+ cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
+ cf::face::set_type $idx, $info->{type};
} else {
- $data = $info->{data};
+ $RESOURCE{$name} = $info;
}
- cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
- cf::face::set_type $idx, $info->{type};
-
cf::cede_to_tick;
}
+ }
- if ($soundconf) {
- $soundconf = $enc->decode (delete $soundconf->{data});
+ cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
- for (0 .. SOUND_CAST_SPELL_0 - 1) {
- my $sound = $soundconf->{compat}[$_]
- or next;
+ 1
+}
- my $face = cf::face::find "sound/$sound->[1]";
- cf::sound::set $sound->[0] => $face;
- cf::sound::old_sound_index $_, $face; # gcfclient-compat
- }
+cf::global->attach (on_resource_update => sub {
+ if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
+ $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
- while (my ($k, $v) = each %{$soundconf->{event}}) {
- my $face = cf::face::find "sound/$v";
- cf::sound::set $k => $face;
- }
+ 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
}
- }
- 1
-}
+ 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) = @_;
@@ -3245,6 +3342,16 @@
}
};
+sub load_resource_file($) {
+ my $guard = lock_acquire "load_resource_file";
+
+ my $status = load_resource_file_ $_[0];
+ get_slot 0.1, 100;
+ cf::arch::commit_load;
+
+ $status
+}
+
sub reload_regions {
# HACK to clear player env face cache, we need some signal framework
# for this (global event?)
@@ -3267,11 +3374,6 @@
sub reload_archetypes {
load_resource_file "$DATADIR/archetypes"
or die "unable to load archetypes\n";
- #d# NEED to laod twice to resolve forward references
- # this really needs to be done in an extra post-pass
- # (which needs to be synchronous, so solve it differently)
- load_resource_file "$DATADIR/archetypes"
- or die "unable to load archetypes\n";
}
sub reload_treasures {
@@ -3282,16 +3384,17 @@
sub reload_resources {
warn "reloading resource files...\n";
- reload_regions;
reload_facedata;
- #reload_archetypes;#d#
reload_archetypes;
+ reload_regions;
reload_treasures;
warn "finished reloading resource files\n";
}
sub init {
+ my $guard = freeze_mainloop;
+
reload_resources;
}
@@ -3300,7 +3403,7 @@
or return;
local $/;
- *CFG = YAML::Syck::Load <$fh>;
+ *CFG = YAML::Load <$fh>;
$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
@@ -3326,12 +3429,16 @@
})->prio (Coro::PRIO_MAX);
};
- reload_config;
- db_init;
- load_extensions;
+ {
+ my $guard = freeze_mainloop;
+ reload_config;
+ db_init;
+ load_extensions;
+
+ $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
+ evthread_start IO::AIO::poll_fileno;
+ }
- $TICK_WATCHER->start;
- $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
EV::loop;
}
@@ -3348,7 +3455,7 @@
}
}
-sub write_runtime {
+sub write_runtime_sync {
my $runtime = "$LOCALDIR/runtime";
# first touch the runtime file to show we are still running:
@@ -3386,6 +3493,49 @@
1
}
+our $uuid_lock;
+our $uuid_skip;
+
+sub write_uuid_sync($) {
+ $uuid_skip ||= $_[0];
+
+ return if $uuid_lock;
+ local $uuid_lock = 1;
+
+ my $uuid = "$LOCALDIR/uuid";
+
+ my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
+ or return;
+
+ my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
+ $uuid_skip = 0;
+
+ (aio_write $fh, 0, (length $value), $value, 0) <= 0
+ and return;
+
+ # always fsync - this file is important
+ aio_fsync $fh
+ and return;
+
+ close $fh
+ or return;
+
+ aio_rename "$uuid~", $uuid
+ and return;
+
+ warn "uuid file written ($value).\n";
+
+ 1
+
+}
+
+sub write_uuid($$) {
+ my ($skip, $sync) = @_;
+
+ $sync ? write_uuid_sync $skip
+ : async { write_uuid_sync $skip };
+}
+
sub emergency_save() {
my $freeze_guard = cf::freeze_mainloop;
@@ -3415,6 +3565,10 @@
warn "begin emergency database checkpoint\n";
BDB::db_env_txn_checkpoint $DB_ENV;
warn "end emergency database checkpoint\n";
+
+ warn "begin write uuid\n";
+ write_uuid_sync 1;
+ warn "end write uuid\n";
};
warn "leave emergency perl save\n";
@@ -3439,9 +3593,9 @@
warn "entering sync_job";
cf::sync_job {
- cf::write_runtime; # external watchdog should not bark
+ cf::write_runtime_sync; # external watchdog should not bark
cf::emergency_save;
- cf::write_runtime; # external watchdog should not bark
+ cf::write_runtime_sync; # external watchdog should not bark
warn "syncing database to disk";
BDB::db_env_txn_checkpoint $DB_ENV;
@@ -3538,8 +3692,7 @@
1
} or do {
warn $@;
- warn "error while reloading, exiting.";
- exit 1;
+ cf::cleanup "error while reloading, exiting.";
};
warn "reloaded";
@@ -3552,8 +3705,8 @@
# coro crashes during coro_state_free->destroy here.
$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
- undef $RELOAD_WATCHER;
do_reload_perl;
+ undef $RELOAD_WATCHER;
};
}
@@ -3577,8 +3730,7 @@
our @WAIT_FOR_TICK_BEGIN;
sub wait_for_tick {
- return unless $TICK_WATCHER->is_active;
- return if $Coro::current == $Coro::main;
+ return if tick_inhibit || $Coro::current == $Coro::main;
my $signal = new Coro::Signal;
push @WAIT_FOR_TICK, $signal;
@@ -3586,33 +3738,27 @@
}
sub wait_for_tick_begin {
- return unless $TICK_WATCHER->is_active;
- return if $Coro::current == $Coro::main;
+ return if tick_inhibit || $Coro::current == $Coro::main;
my $signal = new Coro::Signal;
push @WAIT_FOR_TICK_BEGIN, $signal;
$signal->wait;
}
-$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
+sub tick {
if ($Coro::current != $Coro::main) {
Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
unless ++$bug_warning > 10;
return;
}
- $NOW = $tick_start = EV::now;
-
cf::server_tick; # one server iteration
- $RUNTIME += $TICK;
- $NEXT_TICK += $TICK;
-
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
+ write_runtime_sync
or warn "ERROR: unable to write runtime file: $!";
};
}
@@ -3624,12 +3770,17 @@
$sig->send;
}
- $LOAD = ($NOW - $tick_start) / $TICK;
+ $LOAD = ($NOW - $TICK_START) / $TICK;
$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
- _post_tick;
-};
-$TICK_WATCHER->priority (EV::MAXPRI);
+ if (0) {
+ if ($NEXT_TICK) {
+ my $jitter = $TICK_START - $NEXT_TICK;
+ $JITTER = $JITTER * 0.75 + $jitter * 0.25;
+ warn "jitter $JITTER\n";#d#
+ }
+ }
+}
{
# configure BDB