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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.32 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
… …
27use JSON::XS 2.01 (); 48use JSON::XS 2.01 ();
28use BDB (); 49use BDB ();
29use Data::Dumper; 50use Data::Dumper;
30use Digest::MD5; 51use Digest::MD5;
31use Fcntl; 52use Fcntl;
32use YAML::Syck (); 53use YAML ();
33use IO::AIO 2.51 (); 54use IO::AIO 2.51 ();
34use Time::HiRes; 55use Time::HiRes;
35use Compress::LZF; 56use Compress::LZF;
36use Digest::MD5 (); 57use Digest::MD5 ();
37 58
38# configure various modules to our taste 59# configure various modules to our taste
39# 60#
40$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
… …
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE; 92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
… …
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
… …
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
198 216
199$Coro::State::DIEHOOK = sub { 217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
200 warn Carp::longmess $_[0]; 226 warn Carp::longmess $_[0];
201 Coro::terminate; 227 Coro::terminate
202}; 228};
229
230$SIG{__DIE__} = sub { }; #d#?
203 231
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
332 360
333 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
334} 362}
335 363
336sub freeze_mainloop { 364sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
338 366
339 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 368}
345 369
346=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
347 371
348Like EV::periodic, but randomly selects a starting point so that the actions 372Like EV::periodic, but randomly selects a starting point so that the actions
… …
403 } 427 }
404 } 428 }
405}; 429};
406 430
407sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
408 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
409 435
410 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
412 438
… …
449 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
451 477
452 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
453 479
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
457 481
458 my $busy = 1; 482 my $busy = 1;
459 my @res; 483 my @res;
460 484
… …
471 } else { 495 } else {
472 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
473 } 497 }
474 } 498 }
475 499
476 $time = EV::time - $time; 500 my $time = EV::time - $time;
477 501
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
482 503
483 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
484 } else { 505 } else {
485 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
486 507
… …
528 reset_signals; 549 reset_signals;
529 &$cb 550 &$cb
530 }, @args; 551 }, @args;
531 552
532 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
533} 581}
534 582
535=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
536 584
537Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1093 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1096 1144
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1101 close $fh; 1149 aio_close $fh;
1102 1150
1103 if (@$objs) { 1151 if (@$objs) {
1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1109 close $fh; 1157 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1159 }
1112 } else { 1160 } else {
1113 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1114 } 1162 }
… …
1309 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1311 1359
1312 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1313 warn $msg; 1361 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1315 exit 1;
1316 } 1363 }
1317 1364
1318 warn $msg; 1365 warn $msg;
1319 } 1366 }
1320 1367
… …
1409 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1457 or return;
1411 1458
1412 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1413 or return; 1460 or return;
1461
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1417 } 1465 }
1418 } 1466 }
… …
1428 1476
1429 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1430 1478
1431 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1433 1483
1434 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1485 cf::cede_to_tick;
1436} 1486}
1437 1487
… …
1473 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1475 1525
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1480 1532
1481 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1521 1573
1522 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1523 my $path = path $login; 1575 my $path = path $login;
1524 1576
1525 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1583 }
1531 1584
… …
1730our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1732 1785
1733sub generate_random_map { 1786sub generate_random_map {
1734 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1735 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1792 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1861 1917
1862# the temporary/swap location 1918# the temporary/swap location
1863sub save_path { 1919sub save_path {
1864 my ($self) = @_; 1920 my ($self) = @_;
1865 1921
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1868} 1924}
1869 1925
1870# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1871sub uniq_path { 1927sub uniq_path {
1872 my ($self) = @_; 1928 my ($self) = @_;
1873 1929
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1876} 1932}
1877 1933
1878# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1879# all maps in C++... 1935# all maps in C++...
… …
1977 2033
1978 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1980 2036
1981 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
1984 2040
1985 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1986 or return; 2042 or return;
1987 2043
1988 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
… …
1991 or return; 2047 or return;
1992 2048
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
1996 undef $guard1; 2053 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2054 $map->reset;
1999 return find $path; 2055 return find $path;
2000 } 2056 }
2001 2057
2002 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
… …
2065 } 2121 }
2066 2122
2067 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
2069 2125
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2127 }
2072 2128
2073 $self->post_load; 2129 $self->post_load;
2074} 2130}
2075 2131
… …
2133 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2134 2190
2135 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2136 2192
2137 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2195 }
2140 2196
2141 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2142 2198
2143 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
… …
2180 cf::async { 2236 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2237 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2183 }; 2239 };
2184 2240
2241 cf::get_slot 0.02;
2242
2185 if ($uniq) { 2243 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2246 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2197 $self->save; 2255 $self->save;
2198 2256
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2258
2201 return if $self->players; 2259 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2203 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2204 2262
2205 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2206 2264
2207 $self->deactivate; 2265 $self->deactivate;
… …
2325 2383
2326sub unique_maps() { 2384sub unique_maps() {
2327 [ 2385 [
2328 map { 2386 map {
2329 utf8::decode $_; 2387 utf8::decode $_;
2330 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2331 ? normalise $_ 2391 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2393 ]
2335} 2394}
2336 2395
2337package cf;
2338
2339=back 2396=back
2340 2397
2341=head3 cf::object 2398=head3 cf::object
2342 2399
2343=cut 2400=cut
… …
2346 2403
2347=over 4 2404=over 4
2348 2405
2349=item $ob->inv_recursive 2406=item $ob->inv_recursive
2350 2407
2351Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2352 2410
2353=cut 2411=cut
2354 2412
2355sub inv_recursive_; 2413sub inv_recursive_;
2356sub inv_recursive_ { 2414sub inv_recursive_ {
… …
2361 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2362} 2420}
2363 2421
2364=item $ref = $ob->ref 2422=item $ref = $ob->ref
2365 2423
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2424Creates and returns a persistent reference to an object that can be stored as a string.
2367 2425
2368=item $ob = cf::object::deref ($refstring) 2426=item $ob = cf::object::deref ($refstring)
2369 2427
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2429even if the object actually exists. May block.
… …
2403can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2462dialogue with the given NPC character.
2405 2463
2406=cut 2464=cut
2407 2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2479
2408# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2481# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
… …
2423 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2497
2426 } else { 2498 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2501 }
2430 } 2502 }
2431} 2503}
2432 2504
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2628} 2700}
2629 2701
2630sub prepare_random_map { 2702sub prepare_random_map {
2631 my ($exit) = @_; 2703 my ($exit) = @_;
2632 2704
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2707 # that depends on the exit object
2638 2708
2639 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
… …
2641 if ($exit->map) { 2711 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2646 } 2718 }
2647 2719
2648 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2649 2721
2650 my $data = cf::encode_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2653 2725
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2728 undef $fh;
2657 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2658 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2661 } 2737 }
2662} 2738}
2663 2739
2664sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2666 2742
2667 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2668 2744
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2745 $self->enter_link;
2681 2746
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2747 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2748 $Coro::current->{desc} = "enter_exit";
2688 2749
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2691 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2692 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2693 1; 2771 1
2694 }) { 2772 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2696 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2778 id => "infobox", 2856 id => "infobox",
2779 title => "Map Info", 2857 title => "Map Info",
2780 reply => undef, 2858 reply => undef,
2781 tooltip => "Information related to the maps", 2859 tooltip => "Information related to the maps",
2782 }, 2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2783); 2867);
2784 2868
2785sub cf::client::send_msg { 2869sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2787 2871
… …
3024 3108
3025The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
3026 3110
3027 cf::object 3111 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3112 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
3030 3114
3031 cf::object::player 3115 cf::object::player
3032 player 3116 player
3033 3117
3034 cf::player 3118 cf::player
… …
3039 3123
3040=cut 3124=cut
3041 3125
3042for ( 3126for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3129 decrease split destroy)],
3046 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
3048 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3049) { 3133) {
3050 no strict 'refs'; 3134 no strict 'refs';
… …
3258 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3260 } 3344 }
3261}; 3345};
3262 3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3356
3263sub reload_regions { 3357sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3358 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3359 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3361
… …
3280} 3374}
3281 3375
3282sub reload_archetypes { 3376sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3379}
3291 3380
3292sub reload_treasures { 3381sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3295} 3384}
3296 3385
3297sub reload_resources { 3386sub reload_resources {
3298 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3299 3388
3389 reload_facedata;
3390 reload_archetypes;
3300 reload_regions; 3391 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3392 reload_treasures;
3305 3393
3306 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3307} 3395}
3308 3396
3309sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3310 reload_resources; 3400 reload_resources;
3311} 3401}
3312 3402
3313sub reload_config { 3403sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3405 or return;
3316 3406
3317 local $/; 3407 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
3319 3409
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3411
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3430 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3342 }; 3432 };
3343 3433
3434 {
3435 my $guard = freeze_mainloop;
3344 reload_config; 3436 reload_config;
3345 db_init; 3437 db_init;
3346 load_extensions; 3438 load_extensions;
3347 3439
3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
3350 EV::loop; 3444 EV::loop;
3351} 3445}
3352 3446
3353############################################################################# 3447#############################################################################
3354# initialisation and cleanup 3448# initialisation and cleanup
… …
3361 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
3362 }; 3456 };
3363 } 3457 }
3364} 3458}
3365 3459
3366sub write_runtime { 3460sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
3368 3462
3369 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3371 3465
… …
3397 and return; 3491 and return;
3398 3492
3399 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3400 3494
3401 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
3402} 3539}
3403 3540
3404sub emergency_save() { 3541sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3406 3543
… …
3428 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
3429 3566
3430 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
3433 }; 3574 };
3434 3575
3435 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
3436} 3577}
3437 3578
… …
3452 warn "reloading..."; 3593 warn "reloading...";
3453 3594
3454 warn "entering sync_job"; 3595 warn "entering sync_job";
3455 3596
3456 cf::sync_job { 3597 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3599 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3460 3601
3461 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3604
3464 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
… …
3551 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3552 3693
3553 1 3694 1
3554 } or do { 3695 } or do {
3555 warn $@; 3696 warn $@;
3556 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3698 };
3559 3699
3560 warn "reloaded"; 3700 warn "reloaded";
3561}; 3701};
3562 3702
… …
3565sub reload_perl() { 3705sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3568 3708
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3710 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3571 do_reload_perl;
3572 }; 3712 };
3573} 3713}
3574 3714
3575register_command "reload" => sub { 3715register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
… …
3590 3730
3591our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3593 3733
3594sub wait_for_tick { 3734sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3736
3598 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3739 $signal->wait;
3601} 3740}
3602 3741
3603sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3606 3744
3607 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3747 $signal->wait;
3610} 3748}
3611 3749
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3750sub tick {
3613 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3616 return; 3754 return;
3617 } 3755 }
3618 3756
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 3758
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 3761 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3762 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3763 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3764 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3765 };
3633 } 3766 }
3634 3767
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3637 } 3770 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 3772 $sig->send;
3640 } 3773 }
3641 3774
3642 $LOAD = ($NOW - $tick_start) / $TICK; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 3777
3645 _post_tick; 3778 if (0) {
3646}; 3779 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3784 }
3785}
3648 3786
3649{ 3787{
3650 # configure BDB 3788 # configure BDB
3651 3789
3652 BDB::min_parallel 8; 3790 BDB::min_parallel 8;

Diff Legend

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