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.556 by root, Sat Jul 3 01:49:18 2010 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $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)
152our $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;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The 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.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The 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
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The 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
223(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
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These 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
238returns 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
239per 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.
240 265
241=cut 266=cut
242 267
243sub wait_for_tick(); 268sub wait_for_tick();
244sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
312} 337}
313 338
314$EV::DIED = sub { 339$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
316}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
317 347
318############################################################################# 348#############################################################################
319 349
320=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
321 351
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 373 $d
344 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
345} 375}
346 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
347=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
348 392
349Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
350 394
351=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 402
359sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
361 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
362=item $ref = cf::yaml_load $scalar 414=item $ref = cf::decode_yaml $scalar
363 415
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 417
366=cut 418=cut
367 419
368sub fork_call(&@); 420sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
372} 435}
373 436
374=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
375 438
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
461} 524}
462 525
463=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
464 527
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
466This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
467of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
468 535
469The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
471 538
472Useful for short background jobs. 539Useful for short background jobs.
… …
501 } 568 }
502 } 569 }
503 570
504 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
505 # 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
506 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
507 $signal->wait;
508 } else { 574 } else {
509 $busy = 0; 575 $busy = 0;
510 Coro::schedule; 576 Coro::schedule;
511 } 577 }
512 } 578 }
… …
767 833
768 my @data; 834 my @data;
769 my $md5; 835 my $md5;
770 836
771 for (0 .. $#$src) { 837 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 839 }
775 840
776 # if processing is expensive, check 841 # if processing is expensive, check
777 # checksum first 842 # checksum first
778 if (1) { 843 if (1) {
… …
1512 1577
1513 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1516 } 1581 }
1582
1583 last;
1517 } 1584 }
1518 } 1585 }
1519 }; 1586 };
1520} 1587}
1521 1588
… …
1949 2016
1950 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1951 () 2018 ()
1952} 2019}
1953 2020
2021# may re-bless or do other evil things
1954sub init { 2022sub init {
1955 my ($self) = @_; 2023 my ($self) = @_;
1956 2024
1957 $self 2025 $self
1958} 2026}
… …
2023 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2024 2092
2025 1 2093 1
2026} 2094}
2027 2095
2096# used to laod the header of an original map
2028sub load_header_orig { 2097sub load_header_orig {
2029 my ($self) = @_; 2098 my ($self) = @_;
2030 2099
2031 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2032} 2101}
2033 2102
2103# used to laod the header of an instantiated map
2034sub load_header_temp { 2104sub load_header_temp {
2035 my ($self) = @_; 2105 my ($self) = @_;
2036 2106
2037 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2038} 2108}
2039 2109
2110# called after loading the header from an instantiated map
2040sub prepare_temp { 2111sub prepare_temp {
2041 my ($self) = @_; 2112 my ($self) = @_;
2042 2113
2043 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2044 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2045 # safety 2116 # safety
2046 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2047 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2048} 2119}
2049 2120
2121# called after loading the header from an original map
2050sub prepare_orig { 2122sub prepare_orig {
2051 my ($self) = @_; 2123 my ($self) = @_;
2052 2124
2053 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2054 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2080sub find { 2152sub find {
2081 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2082 2154
2083 cf::cede_to_tick; 2155 cf::cede_to_tick;
2084 2156
2085 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2086 2158
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2089 2161
2090 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2121 2193
2122 { 2194 {
2123 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2124 2196
2125 return unless $self->valid; 2197 return unless $self->valid;
2126 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2127
2128 $self->in_memory (cf::MAP_LOADING);
2129 2199
2130 $self->alloc; 2200 $self->alloc;
2131 2201
2132 $self->pre_load; 2202 $self->pre_load;
2133 cf::cede_to_tick; 2203 cf::cede_to_tick;
2134 2204
2205 if (exists $self->{load_path}) {
2135 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block; 2207 $f->skip_block;
2137 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2138 or return; 2209 or return;
2139 2210
2140 $self->post_load_original 2211 $self->post_load_original
2141 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2142 2213
2143 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2144 utf8::encode $uniq; 2215 utf8::encode $uniq;
2145 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2147 $self->clear_unique_items; 2218 $self->clear_unique_items;
2148 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2150 } 2222 }
2151 } 2223 }
2152 }
2153 2224
2154 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2155 2232
2156 cf::cede_to_tick; 2233 cf::cede_to_tick;
2157 # now do the right thing for maps 2234 # now do the right thing for maps
2158 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2159 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2163 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2164 $self->decay_objects; 2241 $self->decay_objects;
2165 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2166 $self->update_buttons; 2243 $self->update_buttons;
2167 cf::cede_to_tick; 2244 cf::cede_to_tick;
2168 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2169 } 2246 }
2170 2247
2171 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2173
2174 $self->in_memory (cf::MAP_ACTIVE);
2175 } 2250 }
2176 2251
2177 $self->post_load; 2252 $self->post_load;
2178 2253
2179 1 2254 1
… …
2192# if $self->per_party; 2267# if $self->per_party;
2193 2268
2194 $self 2269 $self
2195} 2270}
2196 2271
2197# find and load all maps in the 3x3 area around a map
2198sub load_neighbours {
2199 my ($map) = @_;
2200
2201 my @neigh; # diagonal neighbours
2202
2203 for (0 .. 3) {
2204 my $neigh = $map->tile_path ($_)
2205 or next;
2206 $neigh = find $neigh, $map
2207 or next;
2208 $neigh->load;
2209
2210 # now find the diagonal neighbours
2211 push @neigh,
2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2214 }
2215
2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
2218 my $neigh = find $path, $origin
2219 or next;
2220 $neigh->load;
2221 }
2222}
2223
2224sub find_sync { 2272sub find_sync {
2225 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2226 2274
2275 # it's a bug to call this from the main context
2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main; 2277 if $Coro::current == $Coro::main;
2229 2278
2230 find $path, $origin 2279 find $path, $origin
2231} 2280}
2232 2281
2233sub do_load_sync { 2282sub do_load_sync {
2234 my ($map) = @_; 2283 my ($map) = @_;
2235 2284
2285 # it's a bug to call this from the main context
2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2238 2288
2239 $map->load; 2289 $map->load;
2240} 2290}
… …
2243our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2244 2294
2245sub find_async { 2295sub find_async {
2246 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2247 2297
2248 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2249 2299
2250 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2252 } 2302 }
2253 2303
2254 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2255 2305
2256 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
… …
2315sub swap_out { 2365sub swap_out {
2316 my ($self) = @_; 2366 my ($self) = @_;
2317 2367
2318 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2319 2369
2320 return if $self->in_memory != cf::MAP_ACTIVE; 2370 return if !$self->linkable;
2321 return if $self->{deny_save}; 2371 return if $self->{deny_save};
2322 return if $self->players; 2372 return if $self->players;
2323 2373
2324 # first deactivate the map and "unlink" it from the core 2374 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate; 2375 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED); 2377 $self->state (cf::MAP_SWAPPED);
2328 2378
2329 # then atomically save 2379 # then atomically save
2330 $self->_save; 2380 $self->_save;
2331 2381
2332 # then free the map 2382 # then free the map
… …
2358 2408
2359 return if $self->players; 2409 return if $self->players;
2360 2410
2361 cf::trace "resetting map ", $self->path, "\n"; 2411 cf::trace "resetting map ", $self->path, "\n";
2362 2412
2363 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2364 2414
2365 # need to save uniques path 2415 # need to save uniques path
2366 unless ($self->{deny_save}) { 2416 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq; 2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368 2418
… …
2698 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2699 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2700 if $x <= 0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2701 2751
2702 $map->load; 2752 $map->load;
2703 $map->load_neighbours;
2704 2753
2705 return unless $self->contr->active; 2754 return unless $self->contr->active;
2706 2755
2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708 if ($self->enter_map ($map, $x, $y)) { 2757 if ($self->enter_map ($map, $x, $y)) {
… …
2764 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2765 } 2814 }
2766 } 2815 }
2767 2816
2768 my $map = eval { 2817 my $map = eval {
2769 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770 2819
2771 if ($map) { 2820 if ($map) {
2772 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2773 $map = $check->($map, $x, $y, $self) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2774 } else { 2823 } else {
… …
2864 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2865 2914
2866 unless (eval { 2915 unless (eval {
2867 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2868 2917
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2878 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2879 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 }
2880 2944
2881 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2882 2946
2883 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
… …
3399 3463
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401 3465
3402 trace "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3403 3467
3404 0 < aio_load $path, my $facedata 3468 my $facedata = decode_storable load_file $path;
3405 or die "$path: $!";
3406
3407 $facedata = Coro::Storable::thaw $facedata;
3408 3469
3409 $facedata->{version} == 2 3470 $facedata->{version} == 2
3410 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3411 3472
3412 # patch in the exptable 3473 # patch in the exptable
… …
3426 3487
3427 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3428 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3431 3493
3432 cf::cede_to_tick; 3494 cf::cede_to_tick;
3433 } 3495 }
3434 3496
3435 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
… …
3530} 3592}
3531 3593
3532sub reload_sound { 3594sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n"; 3595 trace "loading sound config from $DATADIR/sound\n";
3534 3596
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3539 3598
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_] 3600 my $sound = $soundconf->{compat}[$_]
3542 or next; 3601 or next;
3543 3602
… …
3567} 3626}
3568 3627
3569sub reload_config { 3628sub reload_config {
3570 trace "reloading config file...\n"; 3629 trace "reloading config file...\n";
3571 3630
3572 0 < aio_load "$CONFDIR/config", my $config 3631 my $config = load_file "$CONFDIR/config";
3573 or die "$CONFDIR/config: $!";
3574
3575 utf8::decode $config; 3632 utf8::decode $config;
3576 *CFG = yaml_load $config; 3633 *CFG = decode_yaml $config;
3577 3634
3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3579 3636
3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3619 3676
3620sub main { 3677sub main {
3621 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3622 3679
3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3627 3684
3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3629 3686
… …
3671 }; 3728 };
3672 3729
3673 cf::object::thawer::errors_are_fatal 0; 3730 cf::object::thawer::errors_are_fatal 0;
3674 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";
3675 3732
3676 my $free_main; $free_main = EV::idle sub { 3733 AE::postpone {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :) 3734 undef &main; # free gobs of memory :)
3679 }; 3735 };
3680 3736
3681 goto &main_loop; 3737 goto &main_loop;
3682} 3738}
… …
3839 3895
3840 cf::write_runtime_sync; # external watchdog should not bark 3896 cf::write_runtime_sync; # external watchdog should not bark
3841 3897
3842 trace "emergency_perl_save: flushing outstanding aio requests"; 3898 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) { 3899 while (IO::AIO::nreqs || BDB::nreqs) {
3844 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
3845 } 3901 }
3846 3902
3847 cf::write_runtime_sync; # external watchdog should not bark 3903 cf::write_runtime_sync; # external watchdog should not bark
3848 }; 3904 };
3849 3905
… …
4030 4086
4031############################################################################# 4087#############################################################################
4032 4088
4033my $bug_warning = 0; 4089my $bug_warning = 0;
4034 4090
4035our @WAIT_FOR_TICK;
4036our @WAIT_FOR_TICK_BEGIN;
4037
4038sub wait_for_tick() { 4091sub wait_for_tick() {
4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4040 4093
4041 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
4042 push @WAIT_FOR_TICK, $signal;
4043 $signal->wait;
4044} 4095}
4045 4096
4046sub wait_for_tick_begin() { 4097sub wait_for_tick_begin() {
4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4048 4099
4049 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
4050 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
4051 $signal->wait; 4102 $signal->wait;
4052} 4103}
… …
4056 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"
4057 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
4058 return; 4109 return;
4059 } 4110 }
4060 4111
4061 cf::server_tick; # one server iteration 4112 cf::one_tick; # one server iteration
4062 4113
4063 #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#
4064 4115
4065 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4066 $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.;
… …
4072 } 4123 }
4073 4124
4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4075 $sig->send; 4126 $sig->send;
4076 } 4127 }
4077 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
4078 $sig->send;
4079 }
4080 4129
4081 $LOAD = ($NOW - $TICK_START) / $TICK; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
4082 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4083 4132
4084 if (0) { 4133 if (0) {
… …
4093{ 4142{
4094 # configure BDB 4143 # configure BDB
4095 4144
4096 BDB::min_parallel 16; 4145 BDB::min_parallel 16;
4097 BDB::max_poll_reqs $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
4098 $AnyEvent::BDB::WATCHER->priority (1); 4147 #$AnyEvent::BDB::WATCHER->priority (1);
4099 4148
4100 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
4101 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
4102 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4103 $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