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.563 by root, Sat Apr 23 04:56:51 2011 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 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 }
… …
1439 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1440 1462
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1464
1443 if (ref $msg) { 1465 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1467
1449 my @reply; 1468 my @reply;
1450 1469
1451 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
2069 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2070 2089
2071 1 2090 1
2072} 2091}
2073 2092
2093# used to laod the header of an original map
2074sub load_header_orig { 2094sub load_header_orig {
2075 my ($self) = @_; 2095 my ($self) = @_;
2076 2096
2077 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2078} 2098}
2079 2099
2100# used to laod the header of an instantiated map
2080sub load_header_temp { 2101sub load_header_temp {
2081 my ($self) = @_; 2102 my ($self) = @_;
2082 2103
2083 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2084} 2105}
2085 2106
2107# called after loading the header from an instantiated map
2086sub prepare_temp { 2108sub prepare_temp {
2087 my ($self) = @_; 2109 my ($self) = @_;
2088 2110
2089 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2090 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2091 # safety 2113 # safety
2092 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2093 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2094} 2116}
2095 2117
2118# called after loading the header from an original map
2096sub prepare_orig { 2119sub prepare_orig {
2097 my ($self) = @_; 2120 my ($self) = @_;
2098 2121
2099 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2100 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2126sub find { 2149sub find {
2127 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2128 2151
2129 cf::cede_to_tick; 2152 cf::cede_to_tick;
2130 2153
2131 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2132 2155
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2135 2158
2136 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2167 2190
2168 { 2191 {
2169 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2170 2193
2171 return unless $self->valid; 2194 return unless $self->valid;
2172 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2173
2174 $self->in_memory (cf::MAP_LOADING);
2175 2196
2176 $self->alloc; 2197 $self->alloc;
2177 2198
2178 $self->pre_load; 2199 $self->pre_load;
2179 cf::cede_to_tick; 2200 cf::cede_to_tick;
… …
2197 } 2218 }
2198 } 2219 }
2199 } 2220 }
2200 2221
2201 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2202 } 2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2203 2229
2204 cf::cede_to_tick; 2230 cf::cede_to_tick;
2205 # now do the right thing for maps 2231 # now do the right thing for maps
2206 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2207 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2211 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2212 $self->decay_objects; 2238 $self->decay_objects;
2213 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2214 $self->update_buttons; 2240 $self->update_buttons;
2215 cf::cede_to_tick; 2241 cf::cede_to_tick;
2216 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2217 } 2243 }
2218 2244
2219 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2220 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2221
2222 $self->in_memory (cf::MAP_ACTIVE);
2223 } 2247 }
2224 2248
2225 $self->post_load; 2249 $self->post_load;
2226 2250
2227 1 2251 1
… …
2240# if $self->per_party; 2264# if $self->per_party;
2241 2265
2242 $self 2266 $self
2243} 2267}
2244 2268
2245# find and load all maps in the 3x3 area around a map
2246sub load_neighbours {
2247 my ($map) = @_;
2248
2249 my @neigh; # diagonal neighbours
2250
2251 for (0 .. 3) {
2252 my $neigh = $map->tile_path ($_)
2253 or next;
2254 $neigh = find $neigh, $map
2255 or next;
2256 $neigh->load;
2257
2258 # now find the diagonal neighbours
2259 push @neigh,
2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2262 }
2263
2264 for (grep defined $_->[0], @neigh) {
2265 my ($path, $origin) = @$_;
2266 my $neigh = find $path, $origin
2267 or next;
2268 $neigh->load;
2269 }
2270}
2271
2272sub find_sync { 2269sub find_sync {
2273 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2274 2271
2272 # it's a bug to call this from the main context
2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2277 2275
2278 find $path, $origin 2276 find $path, $origin
2279} 2277}
2280 2278
2281sub do_load_sync { 2279sub do_load_sync {
2282 my ($map) = @_; 2280 my ($map) = @_;
2283 2281
2282 # it's a bug to call this from the main context
2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2285 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2286 2285
2287 $map->load; 2286 $map->load;
2288} 2287}
… …
2291our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2292 2291
2293sub find_async { 2292sub find_async {
2294 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2295 2294
2296 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2297 2296
2298 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2300 } 2299 }
2301 2300
2302 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2303 2302
2304 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2363sub swap_out { 2362sub swap_out {
2364 my ($self) = @_; 2363 my ($self) = @_;
2365 2364
2366 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2367 2366
2368 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2369 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2370 return if $self->players; 2369 return if $self->players;
2371 2370
2372 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate; 2372 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2375 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2376 2375
2377 # then atomically save 2376 # then atomically save
2378 $self->_save; 2377 $self->_save;
2379 2378
2380 # then free the map 2379 # then free the map
… …
2406 2405
2407 return if $self->players; 2406 return if $self->players;
2408 2407
2409 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2410 2409
2411 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2412 2411
2413 # need to save uniques path 2412 # need to save uniques path
2414 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416 2415
… …
2746 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2747 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2748 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2749 2748
2750 $map->load; 2749 $map->load;
2751 $map->load_neighbours;
2752 2750
2753 return unless $self->contr->active; 2751 return unless $self->contr->active;
2754 2752
2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2756 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2812 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2813 } 2811 }
2814 } 2812 }
2815 2813
2816 my $map = eval { 2814 my $map = eval {
2817 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818 2816
2819 if ($map) { 2817 if ($map) {
2820 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2821 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2822 } else { 2820 } else {
… …
2912 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2913 2911
2914 unless (eval { 2912 unless (eval {
2915 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2916 2914
2917 # random map handling
2918 {
2919 my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921 prepare_random_map $exit
2922 if $exit->slaying eq "/!";
2923 }
2924
2925 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2926 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2927 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2928 2941
2929 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2930 2943
2931 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3174=cut 3187=cut
3175 3188
3176sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3177 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3178 3191
3179 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3181 } elsif ($self->extcmd == 1) {
3182 #TODO: version 1, remove
3183 unshift @msg, msgtype => "reply", msgid => $id;
3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3185 }
3186} 3195}
3187 3196
3188=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3189 3198
3190Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3245 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3246 3255
3247 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3248 3257
3249 if (ref $msg) { 3258 if (ref $msg) {
3250 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3251 "ARRAY" eq ref $msg
3252 ? @$msg
3253 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3254 3260
3255 my @reply; 3261 my @reply;
3256 3262
3257 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3258 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3712 }; 3718 };
3713 3719
3714 cf::object::thawer::errors_are_fatal 0; 3720 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n"; 3721 info "parse errors in files are no longer fatal from this point on.\n";
3716 3722
3717 my $free_main; $free_main = EV::idle sub { 3723 AE::postpone {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :) 3724 undef &main; # free gobs of memory :)
3720 }; 3725 };
3721 3726
3722 goto &main_loop; 3727 goto &main_loop;
3723} 3728}
… …
3880 3885
3881 cf::write_runtime_sync; # external watchdog should not bark 3886 cf::write_runtime_sync; # external watchdog should not bark
3882 3887
3883 trace "emergency_perl_save: flushing outstanding aio requests"; 3888 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) { 3889 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3886 } 3891 }
3887 3892
3888 cf::write_runtime_sync; # external watchdog should not bark 3893 cf::write_runtime_sync; # external watchdog should not bark
3889 }; 3894 };
3890 3895
… …
4071 4076
4072############################################################################# 4077#############################################################################
4073 4078
4074my $bug_warning = 0; 4079my $bug_warning = 0;
4075 4080
4076our @WAIT_FOR_TICK;
4077our @WAIT_FOR_TICK_BEGIN;
4078
4079sub wait_for_tick() { 4081sub wait_for_tick() {
4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4081 4083
4082 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
4083 push @WAIT_FOR_TICK, $signal;
4084 $signal->wait;
4085} 4085}
4086 4086
4087sub wait_for_tick_begin() { 4087sub wait_for_tick_begin() {
4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4089 4089
4090 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
4091 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
4092 $signal->wait; 4092 $signal->wait;
4093} 4093}
… …
4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4098 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
4099 return; 4099 return;
4100 } 4100 }
4101 4101
4102 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4103 4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105 4105
4106 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4113 } 4113 }
4114 4114
4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116 $sig->send; 4116 $sig->send;
4117 } 4117 }
4118 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
4119 $sig->send;
4120 }
4121 4119
4122 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124 4122
4125 if (0) { 4123 if (0) {
… …
4134{ 4132{
4135 # configure BDB 4133 # configure BDB
4136 4134
4137 BDB::min_parallel 16; 4135 BDB::min_parallel 16;
4138 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
4139 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
4140 4138
4141 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
4142 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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