ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 2011 UTC

… …
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 132
133our %CFG; 133our %CFG;
134 134
135our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
137our $NOW; 138our $NOW;
138 139
139our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
150 151
151our @POST_INIT; 152our @POST_INIT;
152 153
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
155 159
156binmode STDOUT; 160binmode STDOUT;
157binmode STDERR; 161binmode STDERR;
158 162
159# read virtual server time, if available 163# read virtual server time, if available
… …
193 197
194=over 4 198=over 4
195 199
196=item $cf::UPTIME 200=item $cf::UPTIME
197 201
198The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
199 218
200=item $cf::RUNTIME 219=item $cf::RUNTIME
201 220
202The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 222every server tick.
… …
209Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
212database environment. 231database environment.
213 232
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 233=item $cf::LOADAVG
223 234
224The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
238 249
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
240returns directly I<after> the tick processing (and consequently, can only wake one thread 251returns directly I<after> the tick processing (and consequently, can only wake one thread
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
242 265
243=cut 266=cut
244 267
245sub wait_for_tick(); 268sub wait_for_tick();
246sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
545 } 568 }
546 } 569 }
547 570
548 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 574 } else {
553 $busy = 0; 575 $busy = 0;
554 Coro::schedule; 576 Coro::schedule;
555 } 577 }
556 } 578 }
… …
2245# if $self->per_party; 2267# if $self->per_party;
2246 2268
2247 $self 2269 $self
2248} 2270}
2249 2271
2250# find and load all maps in the 3x3 area around a map
2251sub load_neighbours {
2252 my ($map) = @_;
2253
2254 my @neigh; # diagonal neighbours
2255
2256 for (0 .. 3) {
2257 my $neigh = $map->tile_path ($_)
2258 or next;
2259 $neigh = find $neigh, $map
2260 or next;
2261 $neigh->load;
2262
2263 # now find the diagonal neighbours
2264 push @neigh,
2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2267 }
2268
2269 for (grep defined $_->[0], @neigh) {
2270 my ($path, $origin) = @$_;
2271 my $neigh = find $path, $origin
2272 or next;
2273 $neigh->load;
2274 }
2275}
2276
2277sub find_sync { 2272sub find_sync {
2278 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2279 2274
2280 # it's a bug to call this from the main context 2275 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
… …
2299 2294
2300sub find_async { 2295sub find_async {
2301 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2302 2297
2303 $path = normalise $path, $origin; 2298 $path = normalise $path, $origin;
2304 2299
2305 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2306 return $map if !$load || $map->linkable; 2301 return $map if !$load || $map->linkable;
2307 } 2302 }
2308 2303
2309 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
… …
2753 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2754 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2755 if $x <= 0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2756 2751
2757 $map->load; 2752 $map->load;
2758 $map->load_neighbours;
2759 2753
2760 return unless $self->contr->active; 2754 return unless $self->contr->active;
2761 2755
2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2763 if ($self->enter_map ($map, $x, $y)) { 2757 if ($self->enter_map ($map, $x, $y)) {
… …
3734 }; 3728 };
3735 3729
3736 cf::object::thawer::errors_are_fatal 0; 3730 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3731 info "parse errors in files are no longer fatal from this point on.\n";
3738 3732
3739 my $free_main; $free_main = EV::idle sub { 3733 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3734 undef &main; # free gobs of memory :)
3742 }; 3735 };
3743 3736
3744 goto &main_loop; 3737 goto &main_loop;
3745} 3738}
… …
3902 3895
3903 cf::write_runtime_sync; # external watchdog should not bark 3896 cf::write_runtime_sync; # external watchdog should not bark
3904 3897
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 3898 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 3899 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3900 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 3901 }
3909 3902
3910 cf::write_runtime_sync; # external watchdog should not bark 3903 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 3904 };
3912 3905
… …
4093 4086
4094############################################################################# 4087#############################################################################
4095 4088
4096my $bug_warning = 0; 4089my $bug_warning = 0;
4097 4090
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4091sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4093
4104 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4095}
4108 4096
4109sub wait_for_tick_begin() { 4097sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4099
4112 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4102 $signal->wait;
4115} 4103}
… …
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4107 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
4121 return; 4109 return;
4122 } 4110 }
4123 4111
4124 cf::server_tick; # one server iteration 4112 cf::one_tick; # one server iteration
4125 4113
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4114 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4115
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4117 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4135 } 4123 }
4136 4124
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4126 $sig->send;
4139 } 4127 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4129
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4132
4147 if (0) { 4133 if (0) {
… …
4156{ 4142{
4157 # configure BDB 4143 # configure BDB
4158 4144
4159 BDB::min_parallel 16; 4145 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4147 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4148
4163 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4152 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines