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.559 by root, Sat Feb 26 12:50:27 2011 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 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
… …
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.
… …
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};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
319 352
320############################################################################# 353#############################################################################
321 354
322=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
323 356
… …
344 $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;
345 $d 378 $d
346 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
347} 380}
348 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
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
432}
433
349=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
350 435
351Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
352 437
353=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
360 445
361sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
362sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
363 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
364=item $ref = cf::yaml_load $scalar 457=item $ref = cf::decode_yaml $scalar
365 458
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367 460
368=cut 461=cut
369 462
370sub fork_call(&@); 463sub decode_yaml($) {
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_ 464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
374} 478}
375 479
376=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
377 481
378Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
462 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
463} 567}
464 568
465=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
466 570
467Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
468This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
469of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
470 578
471The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
472used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
473 581
474Useful for short background jobs. 582Useful for short background jobs.
… …
503 } 611 }
504 } 612 }
505 613
506 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
507 # 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
508 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
509 $signal->wait;
510 } else { 617 } else {
511 $busy = 0; 618 $busy = 0;
512 Coro::schedule; 619 Coro::schedule;
513 } 620 }
514 } 621 }
… …
769 876
770 my @data; 877 my @data;
771 my $md5; 878 my $md5;
772 879
773 for (0 .. $#$src) { 880 for (0 .. $#$src) {
774 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
775 or Carp::croak "$src->[$_]: $!";
776 } 882 }
777 883
778 # if processing is expensive, check 884 # if processing is expensive, check
779 # checksum first 885 # checksum first
780 if (1) { 886 if (1) {
… …
1398 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1399 1505
1400 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1401 1507
1402 if (ref $msg) { 1508 if (ref $msg) {
1403 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1404 "ARRAY" eq ref $msg
1405 ? @$msg
1406 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1407 1510
1408 my @reply; 1511 my @reply;
1409 1512
1410 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1411 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1433 }; 1536 };
1434 1537
1435 $grp 1538 $grp
1436} 1539}
1437 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
1438sub load_extensions { 1552sub load_extensions {
1439 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1440 1556
1441 cf::sync_job { 1557 cf::sync_job {
1442 my %todo; 1558 my %todo;
1443 1559
1444 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1487 unless exists $done{$_}; 1603 unless exists $done{$_};
1488 } 1604 }
1489 1605
1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1491 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
1492 my $active = eval $v->{source}; 1617 my $active = eval $source;
1493 1618
1494 if (length $@) { 1619 if (length $@) {
1495 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1496 1621
1497 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1514 1639
1515 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1518 } 1643 }
1644
1645 last;
1519 } 1646 }
1520 } 1647 }
1521 }; 1648 };
1522} 1649}
1523 1650
… …
1951 2078
1952 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1953 () 2080 ()
1954} 2081}
1955 2082
2083# may re-bless or do other evil things
1956sub init { 2084sub init {
1957 my ($self) = @_; 2085 my ($self) = @_;
1958 2086
1959 $self 2087 $self
1960} 2088}
… …
2025 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2026 2154
2027 1 2155 1
2028} 2156}
2029 2157
2158# used to laod the header of an original map
2030sub load_header_orig { 2159sub load_header_orig {
2031 my ($self) = @_; 2160 my ($self) = @_;
2032 2161
2033 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2034} 2163}
2035 2164
2165# used to laod the header of an instantiated map
2036sub load_header_temp { 2166sub load_header_temp {
2037 my ($self) = @_; 2167 my ($self) = @_;
2038 2168
2039 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2040} 2170}
2041 2171
2172# called after loading the header from an instantiated map
2042sub prepare_temp { 2173sub prepare_temp {
2043 my ($self) = @_; 2174 my ($self) = @_;
2044 2175
2045 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2046 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2047 # safety 2178 # safety
2048 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2049 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2050} 2181}
2051 2182
2183# called after loading the header from an original map
2052sub prepare_orig { 2184sub prepare_orig {
2053 my ($self) = @_; 2185 my ($self) = @_;
2054 2186
2055 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2056 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2082sub find { 2214sub find {
2083 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2084 2216
2085 cf::cede_to_tick; 2217 cf::cede_to_tick;
2086 2218
2087 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2088 2220
2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2090 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2091 2223
2092 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2123 2255
2124 { 2256 {
2125 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2126 2258
2127 return unless $self->valid; 2259 return unless $self->valid;
2128 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2129
2130 $self->in_memory (cf::MAP_LOADING);
2131 2261
2132 $self->alloc; 2262 $self->alloc;
2133 2263
2134 $self->pre_load; 2264 $self->pre_load;
2135 cf::cede_to_tick; 2265 cf::cede_to_tick;
2136 2266
2267 if (exists $self->{load_path}) {
2137 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2138 $f->skip_block; 2269 $f->skip_block;
2139 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2140 or return; 2271 or return;
2141 2272
2142 $self->post_load_original 2273 $self->post_load_original
2143 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2144 2275
2145 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2146 utf8::encode $uniq; 2277 utf8::encode $uniq;
2147 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2148 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2149 $self->clear_unique_items; 2280 $self->clear_unique_items;
2150 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2151 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2152 } 2284 }
2153 } 2285 }
2154 }
2155 2286
2156 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2157 2294
2158 cf::cede_to_tick; 2295 cf::cede_to_tick;
2159 # now do the right thing for maps 2296 # now do the right thing for maps
2160 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2161 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2165 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2166 $self->decay_objects; 2303 $self->decay_objects;
2167 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2168 $self->update_buttons; 2305 $self->update_buttons;
2169 cf::cede_to_tick; 2306 cf::cede_to_tick;
2170 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2171 } 2308 }
2172 2309
2173 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2174 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2175
2176 $self->in_memory (cf::MAP_ACTIVE);
2177 } 2312 }
2178 2313
2179 $self->post_load; 2314 $self->post_load;
2180 2315
2181 1 2316 1
… …
2194# if $self->per_party; 2329# if $self->per_party;
2195 2330
2196 $self 2331 $self
2197} 2332}
2198 2333
2199# find and load all maps in the 3x3 area around a map
2200sub load_neighbours {
2201 my ($map) = @_;
2202
2203 my @neigh; # diagonal neighbours
2204
2205 for (0 .. 3) {
2206 my $neigh = $map->tile_path ($_)
2207 or next;
2208 $neigh = find $neigh, $map
2209 or next;
2210 $neigh->load;
2211
2212 # now find the diagonal neighbours
2213 push @neigh,
2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2216 }
2217
2218 for (grep defined $_->[0], @neigh) {
2219 my ($path, $origin) = @$_;
2220 my $neigh = find $path, $origin
2221 or next;
2222 $neigh->load;
2223 }
2224}
2225
2226sub find_sync { 2334sub find_sync {
2227 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2228 2336
2337 # it's a bug to call this from the main context
2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2231 2340
2232 find $path, $origin 2341 find $path, $origin
2233} 2342}
2234 2343
2235sub do_load_sync { 2344sub do_load_sync {
2236 my ($map) = @_; 2345 my ($map) = @_;
2237 2346
2347 # it's a bug to call this from the main context
2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2239 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2240 2350
2241 $map->load; 2351 $map->load;
2242} 2352}
… …
2245our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2246 2356
2247sub find_async { 2357sub find_async {
2248 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2249 2359
2250 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2251 2361
2252 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2254 } 2364 }
2255 2365
2256 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2257 2367
2258 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2317sub swap_out { 2427sub swap_out {
2318 my ($self) = @_; 2428 my ($self) = @_;
2319 2429
2320 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2321 2431
2322 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2323 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2324 return if $self->players; 2434 return if $self->players;
2325 2435
2326 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate; 2437 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2329 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2330 2440
2331 # then atomically save 2441 # then atomically save
2332 $self->_save; 2442 $self->_save;
2333 2443
2334 # then free the map 2444 # then free the map
… …
2360 2470
2361 return if $self->players; 2471 return if $self->players;
2362 2472
2363 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2364 2474
2365 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2366 2476
2367 # need to save uniques path 2477 # need to save uniques path
2368 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370 2480
… …
2700 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2701 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2702 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2703 2813
2704 $map->load; 2814 $map->load;
2705 $map->load_neighbours;
2706 2815
2707 return unless $self->contr->active; 2816 return unless $self->contr->active;
2708 2817
2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2710 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2766 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2767 } 2876 }
2768 } 2877 }
2769 2878
2770 my $map = eval { 2879 my $map = eval {
2771 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2772 2881
2773 if ($map) { 2882 if ($map) {
2774 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2775 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2776 } else { 2885 } else {
… …
2866 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2867 2976
2868 unless (eval { 2977 unless (eval {
2869 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2870 2979
2871 # random map handling
2872 {
2873 my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875 prepare_random_map $exit
2876 if $exit->slaying eq "/!";
2877 }
2878
2879 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2880 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2881 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 }
2882 3006
2883 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2884 3008
2885 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2886 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3128=cut 3252=cut
3129 3253
3130sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3131 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3132 3256
3133 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3135 } elsif ($self->extcmd == 1) {
3136 #TODO: version 1, remove
3137 unshift @msg, msgtype => "reply", msgid => $id;
3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3139 }
3140} 3260}
3141 3261
3142=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3143 3263
3144Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3199 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3200 3320
3201 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3202 3322
3203 if (ref $msg) { 3323 if (ref $msg) {
3204 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3205 "ARRAY" eq ref $msg
3206 ? @$msg
3207 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3208 3325
3209 my @reply; 3326 my @reply;
3210 3327
3211 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3212 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3390=cut 3507=cut
3391 3508
3392############################################################################# 3509#############################################################################
3393# the server's init and main functions 3510# the server's init and main functions
3394 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3395sub load_facedata($) { 3514sub load_facedata($) {
3396 my ($path) = @_; 3515 my ($path) = @_;
3397 3516
3398 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3399 # for this (global event?) 3518 # for this (global event?)
… …
3401 3520
3402 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3403 3522
3404 trace "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3405 3524
3406 0 < aio_load $path, my $facedata 3525 my $facedata = decode_storable load_file $path;
3407 or die "$path: $!";
3408
3409 $facedata = Coro::Storable::thaw $facedata;
3410 3526
3411 $facedata->{version} == 2 3527 $facedata->{version} == 2
3412 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3413 3529
3414 # patch in the exptable 3530 # patch in the exptable
… …
3421 cf::cede_to_tick; 3537 cf::cede_to_tick;
3422 3538
3423 { 3539 {
3424 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3425 3541
3426 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3427 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3428 3545
3429 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3430 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3434 3552
3435 cf::cede_to_tick; 3553 cf::cede_to_tick;
3436 } 3554 }
3437 3555
3438 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3465 3583
3466 { 3584 {
3467 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3468 3586
3469 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3470 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3471 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3472 3591
3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3474 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3475 } else { 3596 } else {
3476 $RESOURCE{$name} = $info; # unused 3597# $RESOURCE{$name} = $info; # unused
3477 } 3598 }
3478 3599
3479 cf::cede_to_tick; 3600 cf::cede_to_tick;
3480 } 3601 }
3481 } 3602 }
… …
3533} 3654}
3534 3655
3535sub reload_sound { 3656sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n"; 3657 trace "loading sound config from $DATADIR/sound\n";
3537 3658
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3542 3660
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_] 3662 my $sound = $soundconf->{compat}[$_]
3545 or next; 3663 or next;
3546 3664
… …
3570} 3688}
3571 3689
3572sub reload_config { 3690sub reload_config {
3573 trace "reloading config file...\n"; 3691 trace "reloading config file...\n";
3574 3692
3575 0 < aio_load "$CONFDIR/config", my $config 3693 my $config = load_file "$CONFDIR/config";
3576 or die "$CONFDIR/config: $!";
3577
3578 utf8::decode $config; 3694 utf8::decode $config;
3579 *CFG = yaml_load $config; 3695 *CFG = decode_yaml $config;
3580 3696
3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3582 3698
3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3622 3738
3623sub main { 3739sub main {
3624 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3625 3741
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630 3746
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632 3748
3633 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3634 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3635 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3636 (async { 3752 (async {
3637 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3638 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3639 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
… …
3674 }; 3790 };
3675 3791
3676 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n"; 3793 info "parse errors in files are no longer fatal from this point on.\n";
3678 3794
3679 my $free_main; $free_main = EV::idle sub { 3795 AE::postpone {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :) 3796 undef &main; # free gobs of memory :)
3682 }; 3797 };
3683 3798
3684 goto &main_loop; 3799 goto &main_loop;
3685} 3800}
… …
3842 3957
3843 cf::write_runtime_sync; # external watchdog should not bark 3958 cf::write_runtime_sync; # external watchdog should not bark
3844 3959
3845 trace "emergency_perl_save: flushing outstanding aio requests"; 3960 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) { 3961 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3848 } 3963 }
3849 3964
3850 cf::write_runtime_sync; # external watchdog should not bark 3965 cf::write_runtime_sync; # external watchdog should not bark
3851 }; 3966 };
3852 3967
… …
4033 4148
4034############################################################################# 4149#############################################################################
4035 4150
4036my $bug_warning = 0; 4151my $bug_warning = 0;
4037 4152
4038our @WAIT_FOR_TICK;
4039our @WAIT_FOR_TICK_BEGIN;
4040
4041sub wait_for_tick() { 4153sub wait_for_tick() {
4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4043 4155
4044 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
4045 push @WAIT_FOR_TICK, $signal;
4046 $signal->wait;
4047} 4157}
4048 4158
4049sub wait_for_tick_begin() { 4159sub wait_for_tick_begin() {
4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051 4161
4052 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
4053 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
4054 $signal->wait; 4164 $signal->wait;
4055} 4165}
… …
4059 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4060 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
4061 return; 4171 return;
4062 } 4172 }
4063 4173
4064 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4065 4175
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067 4177
4068 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4075 } 4185 }
4076 4186
4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4078 $sig->send; 4188 $sig->send;
4079 } 4189 }
4080 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
4081 $sig->send;
4082 }
4083 4191
4084 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4086 4194
4087 if (0) { 4195 if (0) {
… …
4096{ 4204{
4097 # configure BDB 4205 # configure BDB
4098 4206
4099 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4100 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4101 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4102 4210
4103 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4104 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4106 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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