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.552 by root, Mon May 17 21:12:59 2010 UTC vs.
Revision 1.585 by root, Tue Oct 30 20:18:00 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.
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
… …
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";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 135
133our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
135our $NOW; 139our $NOW;
136 140
137our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
148 152
149our @POST_INIT; 153our @POST_INIT;
150 154
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
153 160
154binmode STDOUT; 161binmode STDOUT;
155binmode STDERR; 162binmode STDERR;
156 163
157# read virtual server time, if available 164# read virtual server time, if available
… …
191 198
192=over 4 199=over 4
193 200
194=item $cf::UPTIME 201=item $cf::UPTIME
195 202
196The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
197 219
198=item $cf::RUNTIME 220=item $cf::RUNTIME
199 221
200The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 223every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
210database environment. 232database environment.
211 233
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 234=item $cf::LOADAVG
221 235
222The current CPU load on the server (alpha-smoothed), as a value between 0 236The 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 237(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
236 250
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These 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 252returns 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. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
240 266
241=cut 267=cut
242 268
243sub wait_for_tick(); 269sub wait_for_tick();
244sub wait_for_tick_begin(); 270sub wait_for_tick_begin();
… …
312} 338}
313 339
314$EV::DIED = sub { 340$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
316}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
317 348
318############################################################################# 349#############################################################################
319 350
320=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
321 352
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 374 $d
344 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
345} 376}
346 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
347=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
348 431
349Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
350 433
351=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 441
359sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
361 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
362=item $ref = cf::yaml_load $scalar 453=item $ref = cf::decode_yaml $scalar
363 454
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 456
366=cut 457=cut
367 458
368sub fork_call(&@); 459sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
372} 474}
373 475
374=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
375 477
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
461} 563}
462 564
463=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
464 566
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
466This call blocks and returns only when you have at least C<$time> seconds 568(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. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
468 574
469The optional C<$name> can be used to identify the job to run. It might be 575The 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. 576used for statistical purposes and should identify the same time-class.
471 577
472Useful for short background jobs. 578Useful for short background jobs.
… …
501 } 607 }
502 } 608 }
503 609
504 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
507 $signal->wait;
508 } else { 613 } else {
509 $busy = 0; 614 $busy = 0;
510 Coro::schedule; 615 Coro::schedule;
511 } 616 }
512 } 617 }
… …
767 872
768 my @data; 873 my @data;
769 my $md5; 874 my $md5;
770 875
771 for (0 .. $#$src) { 876 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 878 }
775 879
776 # if processing is expensive, check 880 # if processing is expensive, check
777 # checksum first 881 # checksum first
778 if (1) { 882 if (1) {
… …
1396 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1397 1501
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1503
1400 if (ref $msg) { 1504 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1505 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 1506
1406 my @reply; 1507 my @reply;
1407 1508
1408 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1409 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1431 }; 1532 };
1432 1533
1433 $grp 1534 $grp
1434} 1535}
1435 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1436sub load_extensions { 1548sub load_extensions {
1437 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1438 1552
1439 cf::sync_job { 1553 cf::sync_job {
1440 my %todo; 1554 my %todo;
1441 1555
1442 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1485 unless exists $done{$_}; 1599 unless exists $done{$_};
1486 } 1600 }
1487 1601
1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489 1603
1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1490 my $active = eval $v->{source}; 1613 my $active = eval $source;
1491 1614
1492 if (length $@) { 1615 if (length $@) {
1493 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1494 1617
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1512 1635
1513 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1516 } 1639 }
1640
1641 last;
1517 } 1642 }
1518 } 1643 }
1519 }; 1644 };
1520} 1645}
1521 1646
… …
1861sub generate_random_map { 1986sub generate_random_map {
1862 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1863 1988
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 1990
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 1991 $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} 1992}
1881 1993
1882=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1883 1995
1884Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
… …
1962 2074
1963 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1964 () 2076 ()
1965} 2077}
1966 2078
2079# may re-bless or do other evil things
1967sub init { 2080sub init {
1968 my ($self) = @_; 2081 my ($self) = @_;
1969 2082
1970 $self 2083 $self
1971} 2084}
… …
2036 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
2037 2150
2038 1 2151 1
2039} 2152}
2040 2153
2154# used to laod the header of an original map
2041sub load_header_orig { 2155sub load_header_orig {
2042 my ($self) = @_; 2156 my ($self) = @_;
2043 2157
2044 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2045} 2159}
2046 2160
2161# used to laod the header of an instantiated map
2047sub load_header_temp { 2162sub load_header_temp {
2048 my ($self) = @_; 2163 my ($self) = @_;
2049 2164
2050 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2051} 2166}
2052 2167
2168# called after loading the header from an instantiated map
2053sub prepare_temp { 2169sub prepare_temp {
2054 my ($self) = @_; 2170 my ($self) = @_;
2055 2171
2056 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2057 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2058 # safety 2174 # safety
2059 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2060 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2061} 2177}
2062 2178
2179# called after loading the header from an original map
2063sub prepare_orig { 2180sub prepare_orig {
2064 my ($self) = @_; 2181 my ($self) = @_;
2065 2182
2066 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2067 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2093sub find { 2210sub find {
2094 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2095 2212
2096 cf::cede_to_tick; 2213 cf::cede_to_tick;
2097 2214
2098 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2099 2216
2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2101 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2102 2219
2103 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2134 2251
2135 { 2252 {
2136 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2137 2254
2138 return unless $self->valid; 2255 return unless $self->valid;
2139 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2140
2141 $self->in_memory (cf::MAP_LOADING);
2142 2257
2143 $self->alloc; 2258 $self->alloc;
2144 2259
2145 $self->pre_load; 2260 $self->pre_load;
2146 cf::cede_to_tick; 2261 cf::cede_to_tick;
2147 2262
2263 if (exists $self->{load_path}) {
2148 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2149 $f->skip_block; 2265 $f->skip_block;
2150 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2151 or return; 2267 or return;
2152 2268
2153 $self->post_load_original 2269 $self->post_load_original
2154 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2155 2271
2156 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2157 utf8::encode $uniq; 2273 utf8::encode $uniq;
2158 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2159 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2160 $self->clear_unique_items; 2276 $self->clear_unique_items;
2161 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2162 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2163 } 2280 }
2164 } 2281 }
2165 }
2166 2282
2167 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2168 2290
2169 cf::cede_to_tick; 2291 cf::cede_to_tick;
2170 # now do the right thing for maps 2292 # now do the right thing for maps
2171 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2172 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2176 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2177 $self->decay_objects; 2299 $self->decay_objects;
2178 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2179 $self->update_buttons; 2301 $self->update_buttons;
2180 cf::cede_to_tick; 2302 cf::cede_to_tick;
2181 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2182 } 2304 }
2183 2305
2184 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2185 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2186
2187 $self->in_memory (cf::MAP_ACTIVE);
2188 } 2308 }
2189 2309
2190 $self->post_load; 2310 $self->post_load;
2311
2312 1
2191} 2313}
2192 2314
2193# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2203# if $self->per_party; 2325# if $self->per_party;
2204 2326
2205 $self 2327 $self
2206} 2328}
2207 2329
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 { 2330sub find_sync {
2236 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2237 2332
2333 # it's a bug to call this from the main context
2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2240 2336
2241 find $path, $origin 2337 find $path, $origin
2242} 2338}
2243 2339
2244sub do_load_sync { 2340sub do_load_sync {
2245 my ($map) = @_; 2341 my ($map) = @_;
2246 2342
2343 # it's a bug to call this from the main context
2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2248 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2249 2346
2250 $map->load; 2347 $map->load;
2251} 2348}
… …
2254our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2255 2352
2256sub find_async { 2353sub find_async {
2257 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2258 2355
2259 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2260 2357
2261 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2262 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2263 } 2360 }
2264 2361
2265 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2266 2363
2267 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2326sub swap_out { 2423sub swap_out {
2327 my ($self) = @_; 2424 my ($self) = @_;
2328 2425
2329 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330 2427
2331 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2332 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2333 return if $self->players; 2430 return if $self->players;
2334 2431
2335 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate; 2433 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2338 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2339 2436
2340 # then atomically save 2437 # then atomically save
2341 $self->_save; 2438 $self->_save;
2342 2439
2343 # then free the map 2440 # then free the map
… …
2369 2466
2370 return if $self->players; 2467 return if $self->players;
2371 2468
2372 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2373 2470
2374 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2375 2472
2376 # need to save uniques path 2473 # need to save uniques path
2377 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379 2476
… …
2709 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2710 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2711 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2712 2809
2713 $map->load; 2810 $map->load;
2714 $map->load_neighbours;
2715 2811
2716 return unless $self->contr->active; 2812 return unless $self->contr->active;
2717 2813
2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2719 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2775 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2776 } 2872 }
2777 } 2873 }
2778 2874
2779 my $map = eval { 2875 my $map = eval {
2780 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2781 2877
2782 if ($map) { 2878 if ($map) {
2783 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2784 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2785 } else { 2881 } else {
… …
2875 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2876 2972
2877 unless (eval { 2973 unless (eval {
2878 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2879 2975
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; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2889 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2890 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2891 3002
2892 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2893 3004
2894 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2895 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3137=cut 3248=cut
3138 3249
3139sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3140 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3141 3252
3142 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $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} 3256}
3150 3257
3151=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3152 3259
3153Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3208 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3209 3316
3210 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3211 3318
3212 if (ref $msg) { 3319 if (ref $msg) {
3213 my ($type, $reply, @payload) = 3320 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 3321
3218 my @reply; 3322 my @reply;
3219 3323
3220 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3221 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3399=cut 3503=cut
3400 3504
3401############################################################################# 3505#############################################################################
3402# the server's init and main functions 3506# the server's init and main functions
3403 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3404sub load_facedata($) { 3510sub load_facedata($) {
3405 my ($path) = @_; 3511 my ($path) = @_;
3406 3512
3407 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?) 3514 # for this (global event?)
… …
3410 3516
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3518
3413 trace "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3414 3520
3415 0 < aio_load $path, my $facedata 3521 my $facedata = decode_storable load_file $path;
3416 or die "$path: $!";
3417
3418 $facedata = Coro::Storable::thaw $facedata;
3419 3522
3420 $facedata->{version} == 2 3523 $facedata->{version} == 2
3421 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3422 3525
3423 # patch in the exptable 3526 # patch in the exptable
… …
3430 cf::cede_to_tick; 3533 cf::cede_to_tick;
3431 3534
3432 { 3535 {
3433 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3434 3537
3435 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3436 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3437 3541
3438 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3439 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3547 $FACEHASH{$info->{hash64}} = $idx;#d#
3442 3548
3443 cf::cede_to_tick; 3549 cf::cede_to_tick;
3444 } 3550 }
3445 3551
3446 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
… …
3473 3579
3474 { 3580 {
3475 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3476 3582
3477 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3478 if (defined $info->{type}) { 3584 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue
3479 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3480 3587
3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3482 cf::face::set_type $idx, $info->{type}; 3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d#
3483 } else { 3592 } else {
3484 $RESOURCE{$name} = $info; # unused 3593# $RESOURCE{$name} = $info; # unused
3485 } 3594 }
3486 3595
3487 cf::cede_to_tick; 3596 cf::cede_to_tick;
3488 } 3597 }
3489 } 3598 }
… …
3541} 3650}
3542 3651
3543sub reload_sound { 3652sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n"; 3653 trace "loading sound config from $DATADIR/sound\n";
3545 3654
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); 3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3550 3656
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_] 3658 my $sound = $soundconf->{compat}[$_]
3553 or next; 3659 or next;
3554 3660
… …
3578} 3684}
3579 3685
3580sub reload_config { 3686sub reload_config {
3581 trace "reloading config file...\n"; 3687 trace "reloading config file...\n";
3582 3688
3583 0 < aio_load "$CONFDIR/config", my $config 3689 my $config = load_file "$CONFDIR/config";
3584 or die "$CONFDIR/config: $!";
3585
3586 utf8::decode $config; 3690 utf8::decode $config;
3587 *CFG = yaml_load $config; 3691 *CFG = decode_yaml $config;
3588 3692
3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3590 3694
3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3695 $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}; 3696 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3630 3734
3631sub main { 3735sub main {
3632 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3633 3737
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3739 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638 3742
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3640 3744
… …
3682 }; 3786 };
3683 3787
3684 cf::object::thawer::errors_are_fatal 0; 3788 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n"; 3789 info "parse errors in files are no longer fatal from this point on.\n";
3686 3790
3687 my $free_main; $free_main = EV::idle sub { 3791 AE::postpone {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :) 3792 undef &main; # free gobs of memory :)
3690 }; 3793 };
3691 3794
3692 goto &main_loop; 3795 goto &main_loop;
3693} 3796}
… …
3850 3953
3851 cf::write_runtime_sync; # external watchdog should not bark 3954 cf::write_runtime_sync; # external watchdog should not bark
3852 3955
3853 trace "emergency_perl_save: flushing outstanding aio requests"; 3956 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) { 3957 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3958 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3856 } 3959 }
3857 3960
3858 cf::write_runtime_sync; # external watchdog should not bark 3961 cf::write_runtime_sync; # external watchdog should not bark
3859 }; 3962 };
3860 3963
… …
4041 4144
4042############################################################################# 4145#############################################################################
4043 4146
4044my $bug_warning = 0; 4147my $bug_warning = 0;
4045 4148
4046our @WAIT_FOR_TICK;
4047our @WAIT_FOR_TICK_BEGIN;
4048
4049sub wait_for_tick() { 4149sub wait_for_tick() {
4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051 4151
4052 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
4053 push @WAIT_FOR_TICK, $signal;
4054 $signal->wait;
4055} 4153}
4056 4154
4057sub wait_for_tick_begin() { 4155sub wait_for_tick_begin() {
4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4059 4157
4060 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
4061 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
4062 $signal->wait; 4160 $signal->wait;
4063} 4161}
… …
4067 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4165 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4068 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
4069 return; 4167 return;
4070 } 4168 }
4071 4169
4072 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4073 4171
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075 4173
4076 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4083 } 4181 }
4084 4182
4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4086 $sig->send; 4184 $sig->send;
4087 } 4185 }
4088 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
4089 $sig->send;
4090 }
4091 4187
4092 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
4093 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4094 4190
4095 if (0) { 4191 if (0) {
… …
4104{ 4200{
4105 # configure BDB 4201 # configure BDB
4106 4202
4107 BDB::min_parallel 16; 4203 BDB::min_parallel 16;
4108 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
4109 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
4110 4206
4111 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
4112 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
4113 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4114 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4210 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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