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.550 by root, Fri May 14 22:56:47 2010 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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
… …
1861sub generate_random_map { 1928sub generate_random_map {
1862 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1863 1930
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 1932
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1871 $rmp->{exit_on_final_map},
1872 $rmp->{xsize}, $rmp->{ysize},
1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1875 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1876 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1877 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1878 (cf::region::find $rmp->{region}), $rmp->{custom}
1879 )
1880} 1934}
1881 1935
1882=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1883 1937
1884Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
… …
1935 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1936 $path = "$base/$path"; 1990 $path = "$base/$path";
1937 } 1991 }
1938 1992
1939 for ($path) { 1993 for ($path) {
1940 redo if s{//}{/};
1941 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1942 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1943 } 1996 }
1944 1997
1945 $path 1998 $path
… …
1963 2016
1964 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1965 () 2018 ()
1966} 2019}
1967 2020
2021# may re-bless or do other evil things
1968sub init { 2022sub init {
1969 my ($self) = @_; 2023 my ($self) = @_;
1970 2024
1971 $self 2025 $self
1972} 2026}
… …
2037 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2038 2092
2039 1 2093 1
2040} 2094}
2041 2095
2096# used to laod the header of an original map
2042sub load_header_orig { 2097sub load_header_orig {
2043 my ($self) = @_; 2098 my ($self) = @_;
2044 2099
2045 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2046} 2101}
2047 2102
2103# used to laod the header of an instantiated map
2048sub load_header_temp { 2104sub load_header_temp {
2049 my ($self) = @_; 2105 my ($self) = @_;
2050 2106
2051 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2052} 2108}
2053 2109
2110# called after loading the header from an instantiated map
2054sub prepare_temp { 2111sub prepare_temp {
2055 my ($self) = @_; 2112 my ($self) = @_;
2056 2113
2057 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2058 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2059 # safety 2116 # safety
2060 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2061 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2062} 2119}
2063 2120
2121# called after loading the header from an original map
2064sub prepare_orig { 2122sub prepare_orig {
2065 my ($self) = @_; 2123 my ($self) = @_;
2066 2124
2067 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2068 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2094sub find { 2152sub find {
2095 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2096 2154
2097 cf::cede_to_tick; 2155 cf::cede_to_tick;
2098 2156
2099 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2100 2158
2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2102 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2103 2161
2104 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2135 2193
2136 { 2194 {
2137 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2138 2196
2139 return unless $self->valid; 2197 return unless $self->valid;
2140 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2141
2142 $self->in_memory (cf::MAP_LOADING);
2143 2199
2144 $self->alloc; 2200 $self->alloc;
2145 2201
2146 $self->pre_load; 2202 $self->pre_load;
2147 cf::cede_to_tick; 2203 cf::cede_to_tick;
2148 2204
2205 if (exists $self->{load_path}) {
2149 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2150 $f->skip_block; 2207 $f->skip_block;
2151 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2152 or return; 2209 or return;
2153 2210
2154 $self->post_load_original 2211 $self->post_load_original
2155 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2156 2213
2157 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2158 utf8::encode $uniq; 2215 utf8::encode $uniq;
2159 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2160 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2161 $self->clear_unique_items; 2218 $self->clear_unique_items;
2162 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2163 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2164 } 2222 }
2165 } 2223 }
2166 }
2167 2224
2168 $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);
2169 2232
2170 cf::cede_to_tick; 2233 cf::cede_to_tick;
2171 # now do the right thing for maps 2234 # now do the right thing for maps
2172 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2173 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2176 2239
2177 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2178 $self->decay_objects; 2241 $self->decay_objects;
2179 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2180 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2181 cf::cede_to_tick; 2245 cf::cede_to_tick;
2182 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2183 } 2247 }
2184 2248
2185 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2186 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2187
2188 $self->in_memory (cf::MAP_ACTIVE);
2189 } 2251 }
2190 2252
2191 $self->post_load; 2253 $self->post_load;
2254
2255 1
2192} 2256}
2193 2257
2194# customize the map for a given player, i.e. 2258# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player 2259# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath 2260# maps to change the path to ~playername/mappath
… …
2234} 2298}
2235 2299
2236sub find_sync { 2300sub find_sync {
2237 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2238 2302
2303 # it's a bug to call this from the main context
2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main; 2305 if $Coro::current == $Coro::main;
2241 2306
2242 find $path, $origin 2307 find $path, $origin
2243} 2308}
2244 2309
2245sub do_load_sync { 2310sub do_load_sync {
2246 my ($map) = @_; 2311 my ($map) = @_;
2247 2312
2313 # it's a bug to call this from the main context
2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2249 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2250 2316
2251 $map->load; 2317 $map->load;
2252} 2318}
… …
2255our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2256 2322
2257sub find_async { 2323sub find_async {
2258 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2259 2325
2260 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2261 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2262 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2263 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2264 } 2332 }
2265 2333
2266 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2267 2335
2268 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2327sub swap_out { 2395sub swap_out {
2328 my ($self) = @_; 2396 my ($self) = @_;
2329 2397
2330 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2331 2399
2332 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2333 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2334 return if $self->players; 2402 return if $self->players;
2335 2403
2336 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate; 2405 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2339 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2340 2408
2341 # then atomically save 2409 # then atomically save
2342 $self->_save; 2410 $self->_save;
2343 2411
2344 # then free the map 2412 # then free the map
… …
2370 2438
2371 return if $self->players; 2439 return if $self->players;
2372 2440
2373 cf::trace "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2374 2442
2375 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2376 2444
2377 # need to save uniques path 2445 # need to save uniques path
2378 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380 2448
… …
2776 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2777 } 2845 }
2778 } 2846 }
2779 2847
2780 my $map = eval { 2848 my $map = eval {
2781 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2782 2850
2783 if ($map) { 2851 if ($map) {
2784 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2785 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2786 } else { 2854 } else {
… …
2876 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2877 2945
2878 unless (eval { 2946 unless (eval {
2879 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2880 2948
2881 # random map handling
2882 {
2883 my $guard = cf::lock_acquire "exit_prepare:$exit";
2884
2885 prepare_random_map $exit
2886 if $exit->slaying eq "/!";
2887 }
2888
2889 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2890 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2891 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 }
2892 2975
2893 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2894 2977
2895 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2896 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
3411 3494
3412 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3413 3496
3414 trace "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3415 3498
3416 0 < aio_load $path, my $facedata 3499 my $facedata = decode_storable load_file $path;
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3500
3421 $facedata->{version} == 2 3501 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3503
3424 # patch in the exptable 3504 # patch in the exptable
… …
3438 3518
3439 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3443 3524
3444 cf::cede_to_tick; 3525 cf::cede_to_tick;
3445 } 3526 }
3446 3527
3447 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3542} 3623}
3543 3624
3544sub reload_sound { 3625sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3626 trace "loading sound config from $DATADIR/sound\n";
3546 3627
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3629
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3631 my $sound = $soundconf->{compat}[$_]
3554 or next; 3632 or next;
3555 3633
… …
3579} 3657}
3580 3658
3581sub reload_config { 3659sub reload_config {
3582 trace "reloading config file...\n"; 3660 trace "reloading config file...\n";
3583 3661
3584 0 < aio_load "$CONFDIR/config", my $config 3662 my $config = load_file "$CONFDIR/config";
3585 or die "$CONFDIR/config: $!";
3586
3587 utf8::decode $config; 3663 utf8::decode $config;
3588 *CFG = yaml_load $config; 3664 *CFG = decode_yaml $config;
3589 3665
3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3591 3667
3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3631 3707
3632sub main { 3708sub main {
3633 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3634 3710
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3715
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641 3717
… …
4042 4118
4043############################################################################# 4119#############################################################################
4044 4120
4045my $bug_warning = 0; 4121my $bug_warning = 0;
4046 4122
4047our @WAIT_FOR_TICK;
4048our @WAIT_FOR_TICK_BEGIN;
4049
4050sub wait_for_tick() { 4123sub wait_for_tick() {
4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4052 4125
4053 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
4054 push @WAIT_FOR_TICK, $signal;
4055 $signal->wait;
4056} 4127}
4057 4128
4058sub wait_for_tick_begin() { 4129sub wait_for_tick_begin() {
4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4060 4131
4061 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
4062 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
4063 $signal->wait; 4134 $signal->wait;
4064} 4135}
… …
4068 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"
4069 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4070 return; 4141 return;
4071 } 4142 }
4072 4143
4073 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4074 4145
4075 #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#
4076 4147
4077 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4078 $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.;
… …
4084 } 4155 }
4085 4156
4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4087 $sig->send; 4158 $sig->send;
4088 } 4159 }
4089 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4090 $sig->send;
4091 }
4092 4161
4093 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4094 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4095 4164
4096 if (0) { 4165 if (0) {
… …
4150 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
4151 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
4152 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
4153} 4222}
4154 4223
4155my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
4156 4226
4157sub _log_backtrace { 4227sub _log_backtrace {
4158 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
4159 4229
4160 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
4161 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4162 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
4163 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
4164 ++$_log_backtrace; 4238 ++$_log_backtrace;
4165 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
4166 async { 4240 async {
4167 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
4168 4242
… …
4188 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
4189 --$_log_backtrace; 4263 --$_log_backtrace;
4190 }; 4264 };
4191 } else { 4265 } else {
4192 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
4193 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4194 } 4268 }
4195} 4269}
4196 4270
4197# load additional modules 4271# load additional modules
4198require "cf/$_.pm" for @EXTRA_MODULES; 4272require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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