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.572 by root, Sun May 8 11:44:43 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 }
… …
2069 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2070 2092
2071 1 2093 1
2072} 2094}
2073 2095
2096# used to laod the header of an original map
2074sub load_header_orig { 2097sub load_header_orig {
2075 my ($self) = @_; 2098 my ($self) = @_;
2076 2099
2077 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2078} 2101}
2079 2102
2103# used to laod the header of an instantiated map
2080sub load_header_temp { 2104sub load_header_temp {
2081 my ($self) = @_; 2105 my ($self) = @_;
2082 2106
2083 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2084} 2108}
2085 2109
2110# called after loading the header from an instantiated map
2086sub prepare_temp { 2111sub prepare_temp {
2087 my ($self) = @_; 2112 my ($self) = @_;
2088 2113
2089 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2090 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2091 # safety 2116 # safety
2092 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2093 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2094} 2119}
2095 2120
2121# called after loading the header from an original map
2096sub prepare_orig { 2122sub prepare_orig {
2097 my ($self) = @_; 2123 my ($self) = @_;
2098 2124
2099 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2100 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2126sub find { 2152sub find {
2127 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2128 2154
2129 cf::cede_to_tick; 2155 cf::cede_to_tick;
2130 2156
2131 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2132 2158
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2135 2161
2136 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2167 2193
2168 { 2194 {
2169 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2170 2196
2171 return unless $self->valid; 2197 return unless $self->valid;
2172 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2173
2174 $self->in_memory (cf::MAP_LOADING);
2175 2199
2176 $self->alloc; 2200 $self->alloc;
2177 2201
2178 $self->pre_load; 2202 $self->pre_load;
2179 cf::cede_to_tick; 2203 cf::cede_to_tick;
… …
2197 } 2221 }
2198 } 2222 }
2199 } 2223 }
2200 2224
2201 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2202 } 2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2203 2232
2204 cf::cede_to_tick; 2233 cf::cede_to_tick;
2205 # now do the right thing for maps 2234 # now do the right thing for maps
2206 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2207 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2210 2239
2211 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2212 $self->decay_objects; 2241 $self->decay_objects;
2213 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2214 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2215 cf::cede_to_tick; 2245 cf::cede_to_tick;
2216 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2217 } 2247 }
2218 2248
2219 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2220 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2221
2222 $self->in_memory (cf::MAP_ACTIVE);
2223 } 2251 }
2224 2252
2225 $self->post_load; 2253 $self->post_load;
2226 2254
2227 1 2255 1
… …
2270} 2298}
2271 2299
2272sub find_sync { 2300sub find_sync {
2273 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2274 2302
2303 # it's a bug to call this from the main context
2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main; 2305 if $Coro::current == $Coro::main;
2277 2306
2278 find $path, $origin 2307 find $path, $origin
2279} 2308}
2280 2309
2281sub do_load_sync { 2310sub do_load_sync {
2282 my ($map) = @_; 2311 my ($map) = @_;
2283 2312
2313 # it's a bug to call this from the main context
2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2285 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2286 2316
2287 $map->load; 2317 $map->load;
2288} 2318}
… …
2291our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2292 2322
2293sub find_async { 2323sub find_async {
2294 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2295 2325
2296 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2297 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2298 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2300 } 2332 }
2301 2333
2302 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2303 2335
2304 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2363sub swap_out { 2395sub swap_out {
2364 my ($self) = @_; 2396 my ($self) = @_;
2365 2397
2366 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2367 2399
2368 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2369 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2370 return if $self->players; 2402 return if $self->players;
2371 2403
2372 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate; 2405 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2375 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2376 2408
2377 # then atomically save 2409 # then atomically save
2378 $self->_save; 2410 $self->_save;
2379 2411
2380 # then free the map 2412 # then free the map
… …
2406 2438
2407 return if $self->players; 2439 return if $self->players;
2408 2440
2409 cf::trace "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2410 2442
2411 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2412 2444
2413 # need to save uniques path 2445 # need to save uniques path
2414 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416 2448
… …
2812 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2813 } 2845 }
2814 } 2846 }
2815 2847
2816 my $map = eval { 2848 my $map = eval {
2817 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818 2850
2819 if ($map) { 2851 if ($map) {
2820 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2821 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2822 } else { 2854 } else {
… …
2912 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2913 2945
2914 unless (eval { 2946 unless (eval {
2915 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2916 2948
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; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2926 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2927 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2928 2975
2929 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2930 2977
2931 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
4071 4118
4072############################################################################# 4119#############################################################################
4073 4120
4074my $bug_warning = 0; 4121my $bug_warning = 0;
4075 4122
4076our @WAIT_FOR_TICK;
4077our @WAIT_FOR_TICK_BEGIN;
4078
4079sub wait_for_tick() { 4123sub wait_for_tick() {
4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4081 4125
4082 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
4083 push @WAIT_FOR_TICK, $signal;
4084 $signal->wait;
4085} 4127}
4086 4128
4087sub wait_for_tick_begin() { 4129sub wait_for_tick_begin() {
4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4089 4131
4090 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
4091 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
4092 $signal->wait; 4134 $signal->wait;
4093} 4135}
… …
4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4098 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4099 return; 4141 return;
4100 } 4142 }
4101 4143
4102 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4103 4145
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105 4147
4106 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4113 } 4155 }
4114 4156
4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116 $sig->send; 4158 $sig->send;
4117 } 4159 }
4118 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4119 $sig->send;
4120 }
4121 4161
4122 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124 4164
4125 if (0) { 4165 if (0) {

Diff Legend

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