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.553 by root, Tue May 18 21:30:16 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
… …
1962 2016
1963 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1964 () 2018 ()
1965} 2019}
1966 2020
2021# may re-bless or do other evil things
1967sub init { 2022sub init {
1968 my ($self) = @_; 2023 my ($self) = @_;
1969 2024
1970 $self 2025 $self
1971} 2026}
… …
2036 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2037 2092
2038 1 2093 1
2039} 2094}
2040 2095
2096# used to laod the header of an original map
2041sub load_header_orig { 2097sub load_header_orig {
2042 my ($self) = @_; 2098 my ($self) = @_;
2043 2099
2044 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2045} 2101}
2046 2102
2103# used to laod the header of an instantiated map
2047sub load_header_temp { 2104sub load_header_temp {
2048 my ($self) = @_; 2105 my ($self) = @_;
2049 2106
2050 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2051} 2108}
2052 2109
2110# called after loading the header from an instantiated map
2053sub prepare_temp { 2111sub prepare_temp {
2054 my ($self) = @_; 2112 my ($self) = @_;
2055 2113
2056 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2057 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2058 # safety 2116 # safety
2059 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2060 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2061} 2119}
2062 2120
2121# called after loading the header from an original map
2063sub prepare_orig { 2122sub prepare_orig {
2064 my ($self) = @_; 2123 my ($self) = @_;
2065 2124
2066 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2067 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2093sub find { 2152sub find {
2094 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2095 2154
2096 cf::cede_to_tick; 2155 cf::cede_to_tick;
2097 2156
2098 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2099 2158
2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2101 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2102 2161
2103 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2134 2193
2135 { 2194 {
2136 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2137 2196
2138 return unless $self->valid; 2197 return unless $self->valid;
2139 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2140
2141 $self->in_memory (cf::MAP_LOADING);
2142 2199
2143 $self->alloc; 2200 $self->alloc;
2144 2201
2145 $self->pre_load; 2202 $self->pre_load;
2146 cf::cede_to_tick; 2203 cf::cede_to_tick;
2147 2204
2205 if (exists $self->{load_path}) {
2148 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2149 $f->skip_block; 2207 $f->skip_block;
2150 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2151 or return; 2209 or return;
2152 2210
2153 $self->post_load_original 2211 $self->post_load_original
2154 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2155 2213
2156 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2157 utf8::encode $uniq; 2215 utf8::encode $uniq;
2158 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2159 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2160 $self->clear_unique_items; 2218 $self->clear_unique_items;
2161 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2162 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2163 } 2222 }
2164 } 2223 }
2165 }
2166 2224
2167 $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);
2168 2232
2169 cf::cede_to_tick; 2233 cf::cede_to_tick;
2170 # now do the right thing for maps 2234 # now do the right thing for maps
2171 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2172 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2175 2239
2176 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2177 $self->decay_objects; 2241 $self->decay_objects;
2178 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2179 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2180 cf::cede_to_tick; 2245 cf::cede_to_tick;
2181 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2182 } 2247 }
2183 2248
2184 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2185 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2186
2187 $self->in_memory (cf::MAP_ACTIVE);
2188 } 2251 }
2189 2252
2190 $self->post_load; 2253 $self->post_load;
2191 2254
2192 1 2255 1
… …
2235} 2298}
2236 2299
2237sub find_sync { 2300sub find_sync {
2238 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2239 2302
2303 # it's a bug to call this from the main context
2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2241 if $Coro::current == $Coro::main; 2305 if $Coro::current == $Coro::main;
2242 2306
2243 find $path, $origin 2307 find $path, $origin
2244} 2308}
2245 2309
2246sub do_load_sync { 2310sub do_load_sync {
2247 my ($map) = @_; 2311 my ($map) = @_;
2248 2312
2313 # it's a bug to call this from the main context
2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2250 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2251 2316
2252 $map->load; 2317 $map->load;
2253} 2318}
… …
2256our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2257 2322
2258sub find_async { 2323sub find_async {
2259 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2260 2325
2261 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2262 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2263 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2264 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2265 } 2332 }
2266 2333
2267 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2268 2335
2269 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2328sub swap_out { 2395sub swap_out {
2329 my ($self) = @_; 2396 my ($self) = @_;
2330 2397
2331 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2332 2399
2333 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2334 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2335 return if $self->players; 2402 return if $self->players;
2336 2403
2337 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate; 2405 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2340 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2341 2408
2342 # then atomically save 2409 # then atomically save
2343 $self->_save; 2410 $self->_save;
2344 2411
2345 # then free the map 2412 # then free the map
… …
2371 2438
2372 return if $self->players; 2439 return if $self->players;
2373 2440
2374 cf::trace "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2375 2442
2376 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2377 2444
2378 # need to save uniques path 2445 # need to save uniques path
2379 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2380 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2381 2448
… …
2777 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2778 } 2845 }
2779 } 2846 }
2780 2847
2781 my $map = eval { 2848 my $map = eval {
2782 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2783 2850
2784 if ($map) { 2851 if ($map) {
2785 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2786 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2787 } else { 2854 } else {
… …
2877 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2878 2945
2879 unless (eval { 2946 unless (eval {
2880 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2881 2948
2882 # random map handling
2883 {
2884 my $guard = cf::lock_acquire "exit_prepare:$exit";
2885
2886 prepare_random_map $exit
2887 if $exit->slaying eq "/!";
2888 }
2889
2890 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2891 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2892 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 }
2893 2975
2894 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2895 2977
2896 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2897 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
3412 3494
3413 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3414 3496
3415 trace "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3416 3498
3417 0 < aio_load $path, my $facedata 3499 my $facedata = decode_storable load_file $path;
3418 or die "$path: $!";
3419
3420 $facedata = Coro::Storable::thaw $facedata;
3421 3500
3422 $facedata->{version} == 2 3501 $facedata->{version} == 2
3423 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3424 3503
3425 # patch in the exptable 3504 # patch in the exptable
… …
3439 3518
3440 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3441 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3443 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} ;
3444 3524
3445 cf::cede_to_tick; 3525 cf::cede_to_tick;
3446 } 3526 }
3447 3527
3448 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3543} 3623}
3544 3624
3545sub reload_sound { 3625sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n"; 3626 trace "loading sound config from $DATADIR/sound\n";
3547 3627
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3552 3629
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_] 3631 my $sound = $soundconf->{compat}[$_]
3555 or next; 3632 or next;
3556 3633
… …
3580} 3657}
3581 3658
3582sub reload_config { 3659sub reload_config {
3583 trace "reloading config file...\n"; 3660 trace "reloading config file...\n";
3584 3661
3585 0 < aio_load "$CONFDIR/config", my $config 3662 my $config = load_file "$CONFDIR/config";
3586 or die "$CONFDIR/config: $!";
3587
3588 utf8::decode $config; 3663 utf8::decode $config;
3589 *CFG = yaml_load $config; 3664 *CFG = decode_yaml $config;
3590 3665
3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3592 3667
3593 $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};
3594 $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};
… …
3632 3707
3633sub main { 3708sub main {
3634 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3635 3710
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 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.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640 3715
3641 $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
3642 3717
… …
4043 4118
4044############################################################################# 4119#############################################################################
4045 4120
4046my $bug_warning = 0; 4121my $bug_warning = 0;
4047 4122
4048our @WAIT_FOR_TICK;
4049our @WAIT_FOR_TICK_BEGIN;
4050
4051sub wait_for_tick() { 4123sub wait_for_tick() {
4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4053 4125
4054 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
4055 push @WAIT_FOR_TICK, $signal;
4056 $signal->wait;
4057} 4127}
4058 4128
4059sub wait_for_tick_begin() { 4129sub wait_for_tick_begin() {
4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4061 4131
4062 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
4063 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
4064 $signal->wait; 4134 $signal->wait;
4065} 4135}
… …
4069 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"
4070 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4071 return; 4141 return;
4072 } 4142 }
4073 4143
4074 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4075 4145
4076 #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#
4077 4147
4078 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4079 $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.;
… …
4085 } 4155 }
4086 4156
4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4088 $sig->send; 4158 $sig->send;
4089 } 4159 }
4090 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4091 $sig->send;
4092 }
4093 4161
4094 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4095 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4096 4164
4097 if (0) { 4165 if (0) {

Diff Legend

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