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.564 by elmex, Thu Apr 28 14:58:08 2011 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 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 }
… …
1816 for (@$files) { 1838 for (@$files) {
1817 utf8::decode $_; 1839 utf8::decode $_;
1818 next if /\.(?:pl|pst)$/; 1840 next if /\.(?:pl|pst)$/;
1819 next unless /^$PATH_SEP/o; 1841 next unless /^$PATH_SEP/o;
1820 1842
1821 push @paths, cf::map::normalise "~$pl/$_", $pl->map; 1843 push @paths, cf::map::normalise "~$pl/$_";
1822 } 1844 }
1823 1845
1824 \@paths 1846 \@paths
1825} 1847}
1826 1848
… …
1954 # {... are special paths that are not being touched 1976 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 1977 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 1978 # ?random/... random maps
1957 # /... normal maps 1979 # /... normal maps
1958 # ~user/... per-player map of a specific user 1980 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 1981
1961 $path =~ s/$PATH_SEP/\//go; 1982 $path =~ s/$PATH_SEP/\//go;
1962 1983
1963 # treat it as relative path if it starts with 1984 # treat it as relative path if it starts with
1964 # something that looks reasonable 1985 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1986 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1987 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 1988
1968 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 1990 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1984 } 1991 }
1985 1992
1986 for ($path) { 1993 for ($path) {
1987 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
… …
2084 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2085 2092
2086 1 2093 1
2087} 2094}
2088 2095
2096# used to laod the header of an original map
2089sub load_header_orig { 2097sub load_header_orig {
2090 my ($self) = @_; 2098 my ($self) = @_;
2091 2099
2092 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2093} 2101}
2094 2102
2103# used to laod the header of an instantiated map
2095sub load_header_temp { 2104sub load_header_temp {
2096 my ($self) = @_; 2105 my ($self) = @_;
2097 2106
2098 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2099} 2108}
2100 2109
2110# called after loading the header from an instantiated map
2101sub prepare_temp { 2111sub prepare_temp {
2102 my ($self) = @_; 2112 my ($self) = @_;
2103 2113
2104 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2105 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2106 # safety 2116 # safety
2107 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2108 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2109} 2119}
2110 2120
2121# called after loading the header from an original map
2111sub prepare_orig { 2122sub prepare_orig {
2112 my ($self) = @_; 2123 my ($self) = @_;
2113 2124
2114 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2115 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2182 2193
2183 { 2194 {
2184 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2185 2196
2186 return unless $self->valid; 2197 return unless $self->valid;
2187 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2188
2189 $self->in_memory (cf::MAP_LOADING);
2190 2199
2191 $self->alloc; 2200 $self->alloc;
2192 2201
2193 $self->pre_load; 2202 $self->pre_load;
2194 cf::cede_to_tick; 2203 cf::cede_to_tick;
… …
2212 } 2221 }
2213 } 2222 }
2214 } 2223 }
2215 2224
2216 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2217 } 2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2218 2232
2219 cf::cede_to_tick; 2233 cf::cede_to_tick;
2220 # now do the right thing for maps 2234 # now do the right thing for maps
2221 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2222 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2226 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2227 $self->decay_objects; 2241 $self->decay_objects;
2228 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2229 $self->update_buttons; 2243 $self->update_buttons;
2230 cf::cede_to_tick; 2244 cf::cede_to_tick;
2231 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2232 } 2246 }
2233 2247
2234 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2235 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2236
2237 $self->in_memory (cf::MAP_ACTIVE);
2238 } 2250 }
2239 2251
2240 $self->post_load; 2252 $self->post_load;
2241 2253
2242 1 2254 1
… …
2255# if $self->per_party; 2267# if $self->per_party;
2256 2268
2257 $self 2269 $self
2258} 2270}
2259 2271
2260# find and load all maps in the 3x3 area around a map
2261sub load_neighbours {
2262 my ($map) = @_;
2263
2264 my @neigh; # diagonal neighbours
2265
2266 for (0 .. 3) {
2267 my $neigh = $map->tile_path ($_)
2268 or next;
2269 $neigh = find $neigh, $map
2270 or next;
2271 $neigh->load;
2272
2273 # now find the diagonal neighbours
2274 push @neigh,
2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2277 }
2278
2279 for (grep defined $_->[0], @neigh) {
2280 my ($path, $origin) = @$_;
2281 my $neigh = find $path, $origin
2282 or next;
2283 $neigh->load;
2284 }
2285}
2286
2287sub find_sync { 2272sub find_sync {
2288 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2289 2274
2275 # it's a bug to call this from the main context
2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main; 2277 if $Coro::current == $Coro::main;
2292 2278
2293 find $path, $origin 2279 find $path, $origin
2294} 2280}
2295 2281
2296sub do_load_sync { 2282sub do_load_sync {
2297 my ($map) = @_; 2283 my ($map) = @_;
2298 2284
2285 # it's a bug to call this from the main context
2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2300 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2301 2288
2302 $map->load; 2289 $map->load;
2303} 2290}
… …
2309 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2310 2297
2311 $path = normalise $path, $origin; 2298 $path = normalise $path, $origin;
2312 2299
2313 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2315 } 2302 }
2316 2303
2317 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2318 2305
2319 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
… …
2378sub swap_out { 2365sub swap_out {
2379 my ($self) = @_; 2366 my ($self) = @_;
2380 2367
2381 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2382 2369
2383 return if $self->in_memory != cf::MAP_ACTIVE; 2370 return if !$self->linkable;
2384 return if $self->{deny_save}; 2371 return if $self->{deny_save};
2385 return if $self->players; 2372 return if $self->players;
2386 2373
2387 # first deactivate the map and "unlink" it from the core 2374 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate; 2375 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2390 $self->in_memory (cf::MAP_SWAPPED); 2377 $self->state (cf::MAP_SWAPPED);
2391 2378
2392 # then atomically save 2379 # then atomically save
2393 $self->_save; 2380 $self->_save;
2394 2381
2395 # then free the map 2382 # then free the map
… …
2421 2408
2422 return if $self->players; 2409 return if $self->players;
2423 2410
2424 cf::trace "resetting map ", $self->path, "\n"; 2411 cf::trace "resetting map ", $self->path, "\n";
2425 2412
2426 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2427 2414
2428 # need to save uniques path 2415 # need to save uniques path
2429 unless ($self->{deny_save}) { 2416 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq; 2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431 2418
… …
2761 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2762 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2763 if $x <= 0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2764 2751
2765 $map->load; 2752 $map->load;
2766 $map->load_neighbours;
2767 2753
2768 return unless $self->contr->active; 2754 return unless $self->contr->active;
2769 2755
2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2771 if ($self->enter_map ($map, $x, $y)) { 2757 if ($self->enter_map ($map, $x, $y)) {
… …
2927 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2928 2914
2929 unless (eval { 2915 unless (eval {
2930 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2931 2917
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2943 2944
2944 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2945 2946
2946 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
… …
4086 4087
4087############################################################################# 4088#############################################################################
4088 4089
4089my $bug_warning = 0; 4090my $bug_warning = 0;
4090 4091
4091our @WAIT_FOR_TICK;
4092our @WAIT_FOR_TICK_BEGIN;
4093
4094sub wait_for_tick() { 4092sub wait_for_tick() {
4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4096 4094
4097 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
4098 push @WAIT_FOR_TICK, $signal;
4099 $signal->wait;
4100} 4096}
4101 4097
4102sub wait_for_tick_begin() { 4098sub wait_for_tick_begin() {
4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4104 4100
4105 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
4106 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
4107 $signal->wait; 4103 $signal->wait;
4108} 4104}
… …
4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4113 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
4114 return; 4110 return;
4115 } 4111 }
4116 4112
4117 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
4118 4114
4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4120 4116
4121 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4128 } 4124 }
4129 4125
4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4131 $sig->send; 4127 $sig->send;
4132 } 4128 }
4133 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
4134 $sig->send;
4135 }
4136 4130
4137 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4139 4133
4140 if (0) { 4134 if (0) {

Diff Legend

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