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.564 by elmex, Thu Apr 28 14:58:08 2011 UTC vs.
Revision 1.591 by root, Tue Nov 6 23:33:15 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,2011 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.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 116
113our %RESOURCE; # unused 117#our %RESOURCE; # unused
114 118
115our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
117 121
118our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our $DB_ENV; 133our $DB_ENV;
130 134
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 136
133our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 139
135our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
137our $NOW; 143our $NOW;
138 144
139our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
150 156
151our @POST_INIT; 157our @POST_INIT;
152 158
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
155 164
156binmode STDOUT; 165binmode STDOUT;
157binmode STDERR; 166binmode STDERR;
158 167
159# read virtual server time, if available 168# read virtual server time, if available
… …
193 202
194=over 4 203=over 4
195 204
196=item $cf::UPTIME 205=item $cf::UPTIME
197 206
198The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
199 223
200=item $cf::RUNTIME 224=item $cf::RUNTIME
201 225
202The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 227every server tick.
204 228
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 232
209Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
212database environment. 236database environment.
213 237
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 238=item $cf::LOADAVG
223 239
224The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
238 254
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
240returns directly I<after> the tick processing (and consequently, can only wake one thread 256returns directly I<after> the tick processing (and consequently, can only wake one thread
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
242 270
243=cut 271=cut
244 272
245sub wait_for_tick(); 273sub wait_for_tick();
246sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
312)) { 340)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 342}
315 343
316$EV::DIED = sub { 344$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
318}; 346};
319 347
320############################################################################# 348#############################################################################
321 349
322sub fork_call(&@); 350sub fork_call(&@);
… …
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 378 $d
351 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
352} 380}
353 381
354=item $scalar = load_file $path 382=item $scalar = cf::load_file $path
355 383
356Loads the given file from path and returns its contents. Croaks on error 384Loads the given file from path and returns its contents. Croaks on error
357and can block. 385and can block.
358 386
359=cut 387=cut
… …
361sub load_file($) { 389sub load_file($) {
362 0 <= aio_load $_[0], my $data 390 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 391 or Carp::croak "$_[0]: $!";
364 392
365 $data 393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
366} 432}
367 433
368=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
369 435
370Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
… …
545 } 611 }
546 } 612 }
547 613
548 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 617 } else {
553 $busy = 0; 618 $busy = 0;
554 Coro::schedule; 619 Coro::schedule;
555 } 620 }
556 } 621 }
… …
1439 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1440 1505
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1507
1443 if (ref $msg) { 1508 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1510
1449 my @reply; 1511 my @reply;
1450 1512
1451 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1474 }; 1536 };
1475 1537
1476 $grp 1538 $grp
1477} 1539}
1478 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1479sub load_extensions { 1552sub load_extensions {
1480 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1481 1556
1482 cf::sync_job { 1557 cf::sync_job {
1483 my %todo; 1558 my %todo;
1484 1559
1485 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1528 unless exists $done{$_}; 1603 unless exists $done{$_};
1529 } 1604 }
1530 1605
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1533 my $active = eval $v->{source}; 1617 my $active = eval $source;
1534 1618
1535 if (length $@) { 1619 if (length $@) {
1536 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1537 1621
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1816 for (@$files) { 1900 for (@$files) {
1817 utf8::decode $_; 1901 utf8::decode $_;
1818 next if /\.(?:pl|pst)$/; 1902 next if /\.(?:pl|pst)$/;
1819 next unless /^$PATH_SEP/o; 1903 next unless /^$PATH_SEP/o;
1820 1904
1821 push @paths, cf::map::normalise "~$pl/$_", $pl->map; 1905 push @paths, cf::map::normalise "~$pl/$_";
1822 } 1906 }
1823 1907
1824 \@paths 1908 \@paths
1825} 1909}
1826 1910
… …
1954 # {... are special paths that are not being touched 2038 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 2039 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 2040 # ?random/... random maps
1957 # /... normal maps 2041 # /... normal maps
1958 # ~user/... per-player map of a specific user 2042 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 2043
1961 $path =~ s/$PATH_SEP/\//go; 2044 $path =~ s/$PATH_SEP/\//go;
1962 2045
1963 # treat it as relative path if it starts with 2046 # treat it as relative path if it starts with
1964 # something that looks reasonable 2047 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 2048 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 2049 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 2050
1968 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 2052 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1984 } 2053 }
1985 2054
1986 for ($path) { 2055 for ($path) {
1987 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
… …
2084 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2085 2154
2086 1 2155 1
2087} 2156}
2088 2157
2158# used to laod the header of an original map
2089sub load_header_orig { 2159sub load_header_orig {
2090 my ($self) = @_; 2160 my ($self) = @_;
2091 2161
2092 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2093} 2163}
2094 2164
2165# used to laod the header of an instantiated map
2095sub load_header_temp { 2166sub load_header_temp {
2096 my ($self) = @_; 2167 my ($self) = @_;
2097 2168
2098 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2099} 2170}
2100 2171
2172# called after loading the header from an instantiated map
2101sub prepare_temp { 2173sub prepare_temp {
2102 my ($self) = @_; 2174 my ($self) = @_;
2103 2175
2104 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2105 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2106 # safety 2178 # safety
2107 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2108 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2109} 2181}
2110 2182
2183# called after loading the header from an original map
2111sub prepare_orig { 2184sub prepare_orig {
2112 my ($self) = @_; 2185 my ($self) = @_;
2113 2186
2114 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2115 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2182 2255
2183 { 2256 {
2184 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2185 2258
2186 return unless $self->valid; 2259 return unless $self->valid;
2187 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2188
2189 $self->in_memory (cf::MAP_LOADING);
2190 2261
2191 $self->alloc; 2262 $self->alloc;
2192 2263
2193 $self->pre_load; 2264 $self->pre_load;
2194 cf::cede_to_tick; 2265 cf::cede_to_tick;
… …
2212 } 2283 }
2213 } 2284 }
2214 } 2285 }
2215 2286
2216 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2217 } 2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2218 2294
2219 cf::cede_to_tick; 2295 cf::cede_to_tick;
2220 # now do the right thing for maps 2296 # now do the right thing for maps
2221 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2222 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2226 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2227 $self->decay_objects; 2303 $self->decay_objects;
2228 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2229 $self->update_buttons; 2305 $self->update_buttons;
2230 cf::cede_to_tick; 2306 cf::cede_to_tick;
2231 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2232 } 2308 }
2233 2309
2234 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2235 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2236
2237 $self->in_memory (cf::MAP_ACTIVE);
2238 } 2312 }
2239 2313
2240 $self->post_load; 2314 $self->post_load;
2241 2315
2242 1 2316 1
… …
2255# if $self->per_party; 2329# if $self->per_party;
2256 2330
2257 $self 2331 $self
2258} 2332}
2259 2333
2260# find and load all maps in the 3x3 area around a map
2261sub load_neighbours {
2262 my ($map) = @_;
2263
2264 my @neigh; # diagonal neighbours
2265
2266 for (0 .. 3) {
2267 my $neigh = $map->tile_path ($_)
2268 or next;
2269 $neigh = find $neigh, $map
2270 or next;
2271 $neigh->load;
2272
2273 # now find the diagonal neighbours
2274 push @neigh,
2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2277 }
2278
2279 for (grep defined $_->[0], @neigh) {
2280 my ($path, $origin) = @$_;
2281 my $neigh = find $path, $origin
2282 or next;
2283 $neigh->load;
2284 }
2285}
2286
2287sub find_sync { 2334sub find_sync {
2288 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2289 2336
2337 # it's a bug to call this from the main context
2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2292 2340
2293 find $path, $origin 2341 find $path, $origin
2294} 2342}
2295 2343
2296sub do_load_sync { 2344sub do_load_sync {
2297 my ($map) = @_; 2345 my ($map) = @_;
2298 2346
2347 # it's a bug to call this from the main context
2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2300 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2301 2350
2302 $map->load; 2351 $map->load;
2303} 2352}
… …
2309 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2310 2359
2311 $path = normalise $path, $origin; 2360 $path = normalise $path, $origin;
2312 2361
2313 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2315 } 2364 }
2316 2365
2317 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2318 2367
2319 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2378sub swap_out { 2427sub swap_out {
2379 my ($self) = @_; 2428 my ($self) = @_;
2380 2429
2381 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2382 2431
2383 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2384 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2385 return if $self->players; 2434 return if $self->players;
2386 2435
2387 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate; 2437 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2390 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2391 2440
2392 # then atomically save 2441 # then atomically save
2393 $self->_save; 2442 $self->_save;
2394 2443
2395 # then free the map 2444 # then free the map
… …
2421 2470
2422 return if $self->players; 2471 return if $self->players;
2423 2472
2424 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2425 2474
2426 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2427 2476
2428 # need to save uniques path 2477 # need to save uniques path
2429 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431 2480
… …
2761 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2762 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2763 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2764 2813
2765 $map->load; 2814 $map->load;
2766 $map->load_neighbours;
2767 2815
2768 return unless $self->contr->active; 2816 return unless $self->contr->active;
2769 2817
2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2771 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2927 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2928 2976
2929 unless (eval { 2977 unless (eval {
2930 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2931 2979
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2943 3006
2944 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2945 3008
2946 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3172=cut 3235=cut
3173 3236
3174sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3175 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3176 3239
3177 if ($self->extcmd == 2) {
3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3179 } elsif ($self->extcmd == 1) { # TODO: remove
3180 push @msg, msgtype => "event_$type";
3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3182 }
3183} 3241}
3184 3242
3185=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3186 3244
3187Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3189=cut 3247=cut
3190 3248
3191sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3192 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3193 3251
3194 if ($self->extcmd == 2) {
3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3196 } elsif ($self->extcmd == 1) {
3197 #TODO: version 1, remove
3198 unshift @msg, msgtype => "reply", msgid => $id;
3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3200 }
3201} 3253}
3202 3254
3203=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3204 3256
3205Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3260 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3261 3313
3262 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3263 3315
3264 if (ref $msg) { 3316 if (ref $msg) {
3265 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3266 "ARRAY" eq ref $msg
3267 ? @$msg
3268 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3269 3318
3270 my @reply; 3319 my @reply;
3271 3320
3272 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3273 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3451=cut 3500=cut
3452 3501
3453############################################################################# 3502#############################################################################
3454# the server's init and main functions 3503# the server's init and main functions
3455 3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3528
3456sub load_facedata($) { 3529sub load_facedata($) {
3457 my ($path) = @_; 3530 my ($path) = @_;
3458 3531
3459 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3460 # for this (global event?) 3533 # for this (global event?)
… …
3467 my $facedata = decode_storable load_file $path; 3540 my $facedata = decode_storable load_file $path;
3468 3541
3469 $facedata->{version} == 2 3542 $facedata->{version} == 2
3470 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3471 3544
3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3474 $facedata->{resource}{"res/exp_table"} = {
3475 type => FT_RSRC,
3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3478 };
3479 cf::cede_to_tick; 3545 cf::cede_to_tick;
3480 3546
3481 { 3547 {
3482 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3483 3549
3484 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3485 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486 3553
3487 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3488 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3492 3560
3493 cf::cede_to_tick; 3561 cf::cede_to_tick;
3494 } 3562 }
3495 3563
3496 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3523 3591
3524 { 3592 {
3525 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3526 3594
3527 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3528 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3529 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3530 3599
3600 cf::face::set_type $idx, $type;
3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3532 cf::face::set_type $idx, $info->{type}; 3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3533 } else { 3604 } else {
3534 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3535 } 3606 }
3536 3607
3537 cf::cede_to_tick; 3608 cf::cede_to_tick;
3538 } 3609 }
3539 } 3610 }
… …
3557 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3559 cf::arch::commit_load; 3630 cf::arch::commit_load;
3560 3631
3561 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3562} 3646}
3563 3647
3564sub reload_regions { 3648sub reload_regions {
3565 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3566 # for this (global event?) 3650 # for this (global event?)
… …
3581} 3665}
3582 3666
3583sub reload_archetypes { 3667sub reload_archetypes {
3584 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3585 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3586} 3679}
3587 3680
3588sub reload_treasures { 3681sub reload_treasures {
3589 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3590 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
… …
3608 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3610 } 3703 }
3611} 3704}
3612 3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759}
3760
3613sub reload_resources { 3761sub reload_resources {
3614 trace "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3615 3763
3616 reload_exp_table;
3617 reload_materials; 3764 reload_materials;
3618 reload_facedata; 3765 reload_facedata;
3766 reload_exp_table;
3619 reload_sound; 3767 reload_sound;
3620 reload_archetypes; 3768 reload_archetypes;
3621 reload_regions; 3769 reload_regions;
3622 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3623 3772
3624 trace "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3625} 3774}
3626 3775
3627sub reload_config { 3776sub reload_config {
… …
3675 3824
3676sub main { 3825sub main {
3677 cf::init_globals; # initialise logging 3826 cf::init_globals; # initialise logging
3678 3827
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3828 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3829 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3830 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3831 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683 3832
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3833 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685 3834
3686 # we must not ever block the main coroutine 3835 # we must not ever block the main coroutine
3687 local $Coro::idle = sub { 3836 $Coro::idle = sub {
3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3837 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3689 (async { 3838 (async {
3690 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3839 $Coro::current->{desc} = "IDLE BUG HANDLER";
3691 EV::loop EV::LOOP_ONESHOT; 3840 EV::loop EV::LOOP_ONESHOT;
3692 })->prio (Coro::PRIO_MAX); 3841 })->prio (Coro::PRIO_MAX);
… …
3695 evthread_start IO::AIO::poll_fileno; 3844 evthread_start IO::AIO::poll_fileno;
3696 3845
3697 cf::sync_job { 3846 cf::sync_job {
3698 cf::incloader::init (); 3847 cf::incloader::init ();
3699 3848
3849 db_init;
3850
3700 cf::init_anim; 3851 cf::init_anim;
3701 cf::init_attackmess; 3852 cf::init_attackmess;
3702 cf::init_dynamic; 3853 cf::init_dynamic;
3703 3854
3704 cf::load_settings; 3855 cf::load_settings;
3705 3856
3706 reload_resources; 3857 reload_resources;
3707 reload_config; 3858 reload_config;
3708 db_init;
3709 3859
3710 cf::init_uuid; 3860 cf::init_uuid;
3711 cf::init_signals; 3861 cf::init_signals;
3712 cf::init_skills; 3862 cf::init_skills;
3713 3863
… …
3727 }; 3877 };
3728 3878
3729 cf::object::thawer::errors_are_fatal 0; 3879 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n"; 3880 info "parse errors in files are no longer fatal from this point on.\n";
3731 3881
3732 my $free_main; $free_main = EV::idle sub { 3882 AE::postpone {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :) 3883 undef &main; # free gobs of memory :)
3735 }; 3884 };
3736 3885
3737 goto &main_loop; 3886 goto &main_loop;
3738} 3887}
… …
3895 4044
3896 cf::write_runtime_sync; # external watchdog should not bark 4045 cf::write_runtime_sync; # external watchdog should not bark
3897 4046
3898 trace "emergency_perl_save: flushing outstanding aio requests"; 4047 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) { 4048 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4049 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3901 } 4050 }
3902 4051
3903 cf::write_runtime_sync; # external watchdog should not bark 4052 cf::write_runtime_sync; # external watchdog should not bark
3904 }; 4053 };
3905 4054
… …
4086 4235
4087############################################################################# 4236#############################################################################
4088 4237
4089my $bug_warning = 0; 4238my $bug_warning = 0;
4090 4239
4091our @WAIT_FOR_TICK;
4092our @WAIT_FOR_TICK_BEGIN;
4093
4094sub wait_for_tick() { 4240sub wait_for_tick() {
4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4241 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4096 4242
4097 my $signal = new Coro::Signal; 4243 $WAIT_FOR_TICK->wait;
4098 push @WAIT_FOR_TICK, $signal;
4099 $signal->wait;
4100} 4244}
4101 4245
4102sub wait_for_tick_begin() { 4246sub wait_for_tick_begin() {
4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4247 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4104 4248
4105 my $signal = new Coro::Signal; 4249 my $signal = new Coro::Signal;
4106 push @WAIT_FOR_TICK_BEGIN, $signal; 4250 push @WAIT_FOR_TICK_BEGIN, $signal;
4107 $signal->wait; 4251 $signal->wait;
4108} 4252}
… …
4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4256 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4113 unless ++$bug_warning > 10; 4257 unless ++$bug_warning > 10;
4114 return; 4258 return;
4115 } 4259 }
4116 4260
4117 cf::server_tick; # one server iteration 4261 cf::one_tick; # one server iteration
4118 4262
4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4263 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4120 4264
4121 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4265 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4266 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4128 } 4272 }
4129 4273
4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4274 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4131 $sig->send; 4275 $sig->send;
4132 } 4276 }
4133 while (my $sig = shift @WAIT_FOR_TICK) { 4277 $WAIT_FOR_TICK->broadcast;
4134 $sig->send;
4135 }
4136 4278
4137 $LOAD = ($NOW - $TICK_START) / $TICK; 4279 $LOAD = ($NOW - $TICK_START) / $TICK;
4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4280 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4139 4281
4140 if (0) { 4282 if (0) {
… …
4146 } 4288 }
4147} 4289}
4148 4290
4149{ 4291{
4150 # configure BDB 4292 # configure BDB
4293 info "initialising database";
4151 4294
4152 BDB::min_parallel 16; 4295 BDB::min_parallel 16;
4153 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
4154 $AnyEvent::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
4155 4298
4156 unless ($DB_ENV) { 4299 unless ($DB_ENV) {
4157 $DB_ENV = BDB::db_env_create; 4300 $DB_ENV = BDB::db_env_create;
4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4302 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4184 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4185 }; 4328 };
4186 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4187 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4188 }; 4331 };
4332
4333 info "database initialised";
4189} 4334}
4190 4335
4191{ 4336{
4192 # configure IO::AIO 4337 # configure IO::AIO
4193 4338
4339 info "initialising aio";
4194 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
4195 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
4196 undef $AnyEvent::AIO::WATCHER; 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
4197} 4344}
4198 4345
4199our $_log_backtrace; 4346our $_log_backtrace;
4200our $_log_backtrace_last; 4347our $_log_backtrace_last;
4201 4348

Diff Legend

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