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.551 by root, Sun May 16 13:48:07 2010 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 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,2012 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) {
… …
1396 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1397 1462
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1464
1400 if (ref $msg) { 1465 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405 1467
1406 my @reply; 1468 my @reply;
1407 1469
1408 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1409 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1512 1574
1513 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1516 } 1578 }
1579
1580 last;
1517 } 1581 }
1518 } 1582 }
1519 }; 1583 };
1520} 1584}
1521 1585
… …
1861sub generate_random_map { 1925sub generate_random_map {
1862 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1863 1927
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 1929
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 1930 $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} 1931}
1881 1932
1882=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1883 1934
1884Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1962 2013
1963 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1964 () 2015 ()
1965} 2016}
1966 2017
2018# may re-bless or do other evil things
1967sub init { 2019sub init {
1968 my ($self) = @_; 2020 my ($self) = @_;
1969 2021
1970 $self 2022 $self
1971} 2023}
… …
2036 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2037 2089
2038 1 2090 1
2039} 2091}
2040 2092
2093# used to laod the header of an original map
2041sub load_header_orig { 2094sub load_header_orig {
2042 my ($self) = @_; 2095 my ($self) = @_;
2043 2096
2044 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2045} 2098}
2046 2099
2100# used to laod the header of an instantiated map
2047sub load_header_temp { 2101sub load_header_temp {
2048 my ($self) = @_; 2102 my ($self) = @_;
2049 2103
2050 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2051} 2105}
2052 2106
2107# called after loading the header from an instantiated map
2053sub prepare_temp { 2108sub prepare_temp {
2054 my ($self) = @_; 2109 my ($self) = @_;
2055 2110
2056 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2057 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2058 # safety 2113 # safety
2059 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2060 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2061} 2116}
2062 2117
2118# called after loading the header from an original map
2063sub prepare_orig { 2119sub prepare_orig {
2064 my ($self) = @_; 2120 my ($self) = @_;
2065 2121
2066 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2067 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2093sub find { 2149sub find {
2094 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2095 2151
2096 cf::cede_to_tick; 2152 cf::cede_to_tick;
2097 2153
2098 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2099 2155
2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2101 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2102 2158
2103 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2134 2190
2135 { 2191 {
2136 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2137 2193
2138 return unless $self->valid; 2194 return unless $self->valid;
2139 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2140
2141 $self->in_memory (cf::MAP_LOADING);
2142 2196
2143 $self->alloc; 2197 $self->alloc;
2144 2198
2145 $self->pre_load; 2199 $self->pre_load;
2146 cf::cede_to_tick; 2200 cf::cede_to_tick;
2147 2201
2202 if (exists $self->{load_path}) {
2148 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2149 $f->skip_block; 2204 $f->skip_block;
2150 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2151 or return; 2206 or return;
2152 2207
2153 $self->post_load_original 2208 $self->post_load_original
2154 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2155 2210
2156 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2157 utf8::encode $uniq; 2212 utf8::encode $uniq;
2158 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2159 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2160 $self->clear_unique_items; 2215 $self->clear_unique_items;
2161 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2162 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2163 } 2219 }
2164 } 2220 }
2165 }
2166 2221
2167 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2168 2229
2169 cf::cede_to_tick; 2230 cf::cede_to_tick;
2170 # now do the right thing for maps 2231 # now do the right thing for maps
2171 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2172 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2176 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2177 $self->decay_objects; 2238 $self->decay_objects;
2178 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2179 $self->update_buttons; 2240 $self->update_buttons;
2180 cf::cede_to_tick; 2241 cf::cede_to_tick;
2181 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2182 } 2243 }
2183 2244
2184 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2185 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2186
2187 $self->in_memory (cf::MAP_ACTIVE);
2188 } 2247 }
2189 2248
2190 $self->post_load; 2249 $self->post_load;
2250
2251 1
2191} 2252}
2192 2253
2193# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2203# if $self->per_party; 2264# if $self->per_party;
2204 2265
2205 $self 2266 $self
2206} 2267}
2207 2268
2208# find and load all maps in the 3x3 area around a map
2209sub load_neighbours {
2210 my ($map) = @_;
2211
2212 my @neigh; # diagonal neighbours
2213
2214 for (0 .. 3) {
2215 my $neigh = $map->tile_path ($_)
2216 or next;
2217 $neigh = find $neigh, $map
2218 or next;
2219 $neigh->load;
2220
2221 # now find the diagonal neighbours
2222 push @neigh,
2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2225 }
2226
2227 for (grep defined $_->[0], @neigh) {
2228 my ($path, $origin) = @$_;
2229 my $neigh = find $path, $origin
2230 or next;
2231 $neigh->load;
2232 }
2233}
2234
2235sub find_sync { 2269sub find_sync {
2236 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2237 2271
2272 # it's a bug to call this from the main context
2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2240 2275
2241 find $path, $origin 2276 find $path, $origin
2242} 2277}
2243 2278
2244sub do_load_sync { 2279sub do_load_sync {
2245 my ($map) = @_; 2280 my ($map) = @_;
2246 2281
2282 # it's a bug to call this from the main context
2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2248 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2249 2285
2250 $map->load; 2286 $map->load;
2251} 2287}
… …
2254our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2255 2291
2256sub find_async { 2292sub find_async {
2257 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2258 2294
2259 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2260 2296
2261 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2262 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2263 } 2299 }
2264 2300
2265 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2266 2302
2267 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2326sub swap_out { 2362sub swap_out {
2327 my ($self) = @_; 2363 my ($self) = @_;
2328 2364
2329 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330 2366
2331 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2332 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2333 return if $self->players; 2369 return if $self->players;
2334 2370
2335 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate; 2372 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2338 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2339 2375
2340 # then atomically save 2376 # then atomically save
2341 $self->_save; 2377 $self->_save;
2342 2378
2343 # then free the map 2379 # then free the map
… …
2369 2405
2370 return if $self->players; 2406 return if $self->players;
2371 2407
2372 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2373 2409
2374 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2375 2411
2376 # need to save uniques path 2412 # need to save uniques path
2377 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379 2415
… …
2709 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2710 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2711 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2712 2748
2713 $map->load; 2749 $map->load;
2714 $map->load_neighbours;
2715 2750
2716 return unless $self->contr->active; 2751 return unless $self->contr->active;
2717 2752
2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2719 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2775 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2776 } 2811 }
2777 } 2812 }
2778 2813
2779 my $map = eval { 2814 my $map = eval {
2780 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2781 2816
2782 if ($map) { 2817 if ($map) {
2783 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2784 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2785 } else { 2820 } else {
… …
2875 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2876 2911
2877 unless (eval { 2912 unless (eval {
2878 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2879 2914
2880 # random map handling
2881 {
2882 my $guard = cf::lock_acquire "exit_prepare:$exit";
2883
2884 prepare_random_map $exit
2885 if $exit->slaying eq "/!";
2886 }
2887
2888 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2889 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2890 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2891 2941
2892 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2893 2943
2894 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2895 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3137=cut 3187=cut
3138 3188
3139sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3140 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3141 3191
3142 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3144 } elsif ($self->extcmd == 1) {
3145 #TODO: version 1, remove
3146 unshift @msg, msgtype => "reply", msgid => $id;
3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3148 }
3149} 3195}
3150 3196
3151=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3152 3198
3153Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3208 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3209 3255
3210 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3211 3257
3212 if (ref $msg) { 3258 if (ref $msg) {
3213 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3214 "ARRAY" eq ref $msg
3215 ? @$msg
3216 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3217 3260
3218 my @reply; 3261 my @reply;
3219 3262
3220 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3221 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3410 3453
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3455
3413 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3414 3457
3415 0 < aio_load $path, my $facedata 3458 my $facedata = decode_storable load_file $path;
3416 or die "$path: $!";
3417
3418 $facedata = Coro::Storable::thaw $facedata;
3419 3459
3420 $facedata->{version} == 2 3460 $facedata->{version} == 2
3421 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3422 3462
3423 # patch in the exptable 3463 # patch in the exptable
… …
3437 3477
3438 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3439 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3442 3483
3443 cf::cede_to_tick; 3484 cf::cede_to_tick;
3444 } 3485 }
3445 3486
3446 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3541} 3582}
3542 3583
3543sub reload_sound { 3584sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n"; 3585 trace "loading sound config from $DATADIR/sound\n";
3545 3586
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3550 3588
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_] 3590 my $sound = $soundconf->{compat}[$_]
3553 or next; 3591 or next;
3554 3592
… …
3578} 3616}
3579 3617
3580sub reload_config { 3618sub reload_config {
3581 trace "reloading config file...\n"; 3619 trace "reloading config file...\n";
3582 3620
3583 0 < aio_load "$CONFDIR/config", my $config 3621 my $config = load_file "$CONFDIR/config";
3584 or die "$CONFDIR/config: $!";
3585
3586 utf8::decode $config; 3622 utf8::decode $config;
3587 *CFG = yaml_load $config; 3623 *CFG = decode_yaml $config;
3588 3624
3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3590 3626
3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3630 3666
3631sub main { 3667sub main {
3632 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3633 3669
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638 3674
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3640 3676
… …
3682 }; 3718 };
3683 3719
3684 cf::object::thawer::errors_are_fatal 0; 3720 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n"; 3721 info "parse errors in files are no longer fatal from this point on.\n";
3686 3722
3687 my $free_main; $free_main = EV::idle sub { 3723 AE::postpone {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :) 3724 undef &main; # free gobs of memory :)
3690 }; 3725 };
3691 3726
3692 goto &main_loop; 3727 goto &main_loop;
3693} 3728}
… …
3850 3885
3851 cf::write_runtime_sync; # external watchdog should not bark 3886 cf::write_runtime_sync; # external watchdog should not bark
3852 3887
3853 trace "emergency_perl_save: flushing outstanding aio requests"; 3888 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) { 3889 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3856 } 3891 }
3857 3892
3858 cf::write_runtime_sync; # external watchdog should not bark 3893 cf::write_runtime_sync; # external watchdog should not bark
3859 }; 3894 };
3860 3895
… …
4041 4076
4042############################################################################# 4077#############################################################################
4043 4078
4044my $bug_warning = 0; 4079my $bug_warning = 0;
4045 4080
4046our @WAIT_FOR_TICK;
4047our @WAIT_FOR_TICK_BEGIN;
4048
4049sub wait_for_tick() { 4081sub wait_for_tick() {
4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051 4083
4052 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
4053 push @WAIT_FOR_TICK, $signal;
4054 $signal->wait;
4055} 4085}
4056 4086
4057sub wait_for_tick_begin() { 4087sub wait_for_tick_begin() {
4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4059 4089
4060 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
4061 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
4062 $signal->wait; 4092 $signal->wait;
4063} 4093}
… …
4067 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4068 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
4069 return; 4099 return;
4070 } 4100 }
4071 4101
4072 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4073 4103
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075 4105
4076 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4083 } 4113 }
4084 4114
4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4086 $sig->send; 4116 $sig->send;
4087 } 4117 }
4088 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
4089 $sig->send;
4090 }
4091 4119
4092 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
4093 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4094 4122
4095 if (0) { 4123 if (0) {
… …
4104{ 4132{
4105 # configure BDB 4133 # configure BDB
4106 4134
4107 BDB::min_parallel 16; 4135 BDB::min_parallel 16;
4108 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
4109 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
4110 4138
4111 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
4112 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
4113 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4114 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4149 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
4150 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
4151 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
4152} 4180}
4153 4181
4154my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
4155 4184
4156sub _log_backtrace { 4185sub _log_backtrace {
4157 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
4158 4187
4159 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
4160 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4161 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
4162 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4163 ++$_log_backtrace; 4196 ++$_log_backtrace;
4164 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
4165 async { 4198 async {
4166 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
4167 4200
… …
4187 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4188 --$_log_backtrace; 4221 --$_log_backtrace;
4189 }; 4222 };
4190 } else { 4223 } else {
4191 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4193 } 4226 }
4194} 4227}
4195 4228
4196# load additional modules 4229# load additional modules
4197require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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