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.555 by root, Wed Jun 30 01:32:56 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, $rmp->{total_map_hp},
1869 (cf::region::find $rmp->{region})
1870 )
1871} 1934}
1872 1935
1873=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1874 1937
1875Register 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
… …
1953 2016
1954 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1955 () 2018 ()
1956} 2019}
1957 2020
2021# may re-bless or do other evil things
1958sub init { 2022sub init {
1959 my ($self) = @_; 2023 my ($self) = @_;
1960 2024
1961 $self 2025 $self
1962} 2026}
… …
2027 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2028 2092
2029 1 2093 1
2030} 2094}
2031 2095
2096# used to laod the header of an original map
2032sub load_header_orig { 2097sub load_header_orig {
2033 my ($self) = @_; 2098 my ($self) = @_;
2034 2099
2035 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2036} 2101}
2037 2102
2103# used to laod the header of an instantiated map
2038sub load_header_temp { 2104sub load_header_temp {
2039 my ($self) = @_; 2105 my ($self) = @_;
2040 2106
2041 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2042} 2108}
2043 2109
2110# called after loading the header from an instantiated map
2044sub prepare_temp { 2111sub prepare_temp {
2045 my ($self) = @_; 2112 my ($self) = @_;
2046 2113
2047 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2048 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2049 # safety 2116 # safety
2050 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2051 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2052} 2119}
2053 2120
2121# called after loading the header from an original map
2054sub prepare_orig { 2122sub prepare_orig {
2055 my ($self) = @_; 2123 my ($self) = @_;
2056 2124
2057 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2058 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2084sub find { 2152sub find {
2085 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2086 2154
2087 cf::cede_to_tick; 2155 cf::cede_to_tick;
2088 2156
2089 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2090 2158
2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2092 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2093 2161
2094 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2125 2193
2126 { 2194 {
2127 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2128 2196
2129 return unless $self->valid; 2197 return unless $self->valid;
2130 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2131
2132 $self->in_memory (cf::MAP_LOADING);
2133 2199
2134 $self->alloc; 2200 $self->alloc;
2135 2201
2136 $self->pre_load; 2202 $self->pre_load;
2137 cf::cede_to_tick; 2203 cf::cede_to_tick;
2138 2204
2205 if (exists $self->{load_path}) {
2139 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2140 $f->skip_block; 2207 $f->skip_block;
2141 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2142 or return; 2209 or return;
2143 2210
2144 $self->post_load_original 2211 $self->post_load_original
2145 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2146 2213
2147 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2148 utf8::encode $uniq; 2215 utf8::encode $uniq;
2149 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2150 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2151 $self->clear_unique_items; 2218 $self->clear_unique_items;
2152 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2153 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2154 } 2222 }
2155 } 2223 }
2156 }
2157 2224
2158 $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);
2159 2232
2160 cf::cede_to_tick; 2233 cf::cede_to_tick;
2161 # now do the right thing for maps 2234 # now do the right thing for maps
2162 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2163 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2166 2239
2167 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2168 $self->decay_objects; 2241 $self->decay_objects;
2169 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2170 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2171 cf::cede_to_tick; 2245 cf::cede_to_tick;
2172 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2173 } 2247 }
2174 2248
2175 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2176 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2177
2178 $self->in_memory (cf::MAP_ACTIVE);
2179 } 2251 }
2180 2252
2181 $self->post_load; 2253 $self->post_load;
2182 2254
2183 1 2255 1
… …
2226} 2298}
2227 2299
2228sub find_sync { 2300sub find_sync {
2229 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2230 2302
2303 # it's a bug to call this from the main context
2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2232 if $Coro::current == $Coro::main; 2305 if $Coro::current == $Coro::main;
2233 2306
2234 find $path, $origin 2307 find $path, $origin
2235} 2308}
2236 2309
2237sub do_load_sync { 2310sub do_load_sync {
2238 my ($map) = @_; 2311 my ($map) = @_;
2239 2312
2313 # it's a bug to call this from the main context
2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2241 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2242 2316
2243 $map->load; 2317 $map->load;
2244} 2318}
… …
2247our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2248 2322
2249sub find_async { 2323sub find_async {
2250 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2251 2325
2252 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2253 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2254 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2255 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2256 } 2332 }
2257 2333
2258 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2259 2335
2260 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2319sub swap_out { 2395sub swap_out {
2320 my ($self) = @_; 2396 my ($self) = @_;
2321 2397
2322 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323 2399
2324 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2325 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2326 return if $self->players; 2402 return if $self->players;
2327 2403
2328 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate; 2405 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2331 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2332 2408
2333 # then atomically save 2409 # then atomically save
2334 $self->_save; 2410 $self->_save;
2335 2411
2336 # then free the map 2412 # then free the map
… …
2362 2438
2363 return if $self->players; 2439 return if $self->players;
2364 2440
2365 cf::trace "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2366 2442
2367 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2368 2444
2369 # need to save uniques path 2445 # need to save uniques path
2370 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2371 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2372 2448
… …
2768 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2769 } 2845 }
2770 } 2846 }
2771 2847
2772 my $map = eval { 2848 my $map = eval {
2773 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2774 2850
2775 if ($map) { 2851 if ($map) {
2776 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2777 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2778 } else { 2854 } else {
… …
2868 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2869 2945
2870 unless (eval { 2946 unless (eval {
2871 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2872 2948
2873 # random map handling
2874 {
2875 my $guard = cf::lock_acquire "exit_prepare:$exit";
2876
2877 prepare_random_map $exit
2878 if $exit->slaying eq "/!";
2879 }
2880
2881 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2882 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2883 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 }
2884 2975
2885 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2886 2977
2887 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2888 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
3403 3494
3404 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3405 3496
3406 trace "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3407 3498
3408 0 < aio_load $path, my $facedata 3499 my $facedata = decode_storable load_file $path;
3409 or die "$path: $!";
3410
3411 $facedata = Coro::Storable::thaw $facedata;
3412 3500
3413 $facedata->{version} == 2 3501 $facedata->{version} == 2
3414 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3415 3503
3416 # patch in the exptable 3504 # patch in the exptable
… …
3430 3518
3431 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3432 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3433 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3434 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} ;
3435 3524
3436 cf::cede_to_tick; 3525 cf::cede_to_tick;
3437 } 3526 }
3438 3527
3439 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3534} 3623}
3535 3624
3536sub reload_sound { 3625sub reload_sound {
3537 trace "loading sound config from $DATADIR/sound\n"; 3626 trace "loading sound config from $DATADIR/sound\n";
3538 3627
3539 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3540 or die "$DATADIR/sound $!";
3541
3542 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3543 3629
3544 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545 my $sound = $soundconf->{compat}[$_] 3631 my $sound = $soundconf->{compat}[$_]
3546 or next; 3632 or next;
3547 3633
… …
3571} 3657}
3572 3658
3573sub reload_config { 3659sub reload_config {
3574 trace "reloading config file...\n"; 3660 trace "reloading config file...\n";
3575 3661
3576 0 < aio_load "$CONFDIR/config", my $config 3662 my $config = load_file "$CONFDIR/config";
3577 or die "$CONFDIR/config: $!";
3578
3579 utf8::decode $config; 3663 utf8::decode $config;
3580 *CFG = yaml_load $config; 3664 *CFG = decode_yaml $config;
3581 3665
3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3583 3667
3584 $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};
3585 $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};
… …
3623 3707
3624sub main { 3708sub main {
3625 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3626 3710
3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3628 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.";
3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3630 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3631 3715
3632 $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
3633 3717
… …
4034 4118
4035############################################################################# 4119#############################################################################
4036 4120
4037my $bug_warning = 0; 4121my $bug_warning = 0;
4038 4122
4039our @WAIT_FOR_TICK;
4040our @WAIT_FOR_TICK_BEGIN;
4041
4042sub wait_for_tick() { 4123sub wait_for_tick() {
4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4044 4125
4045 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
4046 push @WAIT_FOR_TICK, $signal;
4047 $signal->wait;
4048} 4127}
4049 4128
4050sub wait_for_tick_begin() { 4129sub wait_for_tick_begin() {
4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4052 4131
4053 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
4054 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
4055 $signal->wait; 4134 $signal->wait;
4056} 4135}
… …
4060 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"
4061 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4062 return; 4141 return;
4063 } 4142 }
4064 4143
4065 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4066 4145
4067 #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#
4068 4147
4069 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4070 $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.;
… …
4076 } 4155 }
4077 4156
4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4079 $sig->send; 4158 $sig->send;
4080 } 4159 }
4081 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4082 $sig->send;
4083 }
4084 4161
4085 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4086 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4087 4164
4088 if (0) { 4165 if (0) {

Diff Legend

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