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.406 by root, Mon Dec 17 08:27:44 2007 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
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
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
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 368}
340 369
341=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
342 371
343Like 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
… …
398 } 427 }
399 } 428 }
400}; 429};
401 430
402sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
403 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
404 435
405 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
407 438
… …
444 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
446 477
447 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
448 479
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
452 481
453 my $busy = 1; 482 my $busy = 1;
454 my @res; 483 my @res;
455 484
… …
466 } else { 495 } else {
467 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
468 } 497 }
469 } 498 }
470 499
471 $time = EV::time - $time; 500 my $time = EV::time - $time;
472 501
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
477 503
478 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
479 } else { 505 } else {
480 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
481 507
… …
523 reset_signals; 549 reset_signals;
524 &$cb 550 &$cb
525 }, @args; 551 }, @args;
526 552
527 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
528} 581}
529 582
530=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
531 584
532Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1088 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1091 1144
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1096 close $fh; 1149 aio_close $fh;
1097 1150
1098 if (@$objs) { 1151 if (@$objs) {
1099 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) {
1100 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1104 close $fh; 1157 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1159 }
1107 } else { 1160 } else {
1108 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1109 } 1162 }
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1306 1359
1307 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1361 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1363 }
1312 1364
1313 warn $msg; 1365 warn $msg;
1314 } 1366 }
1315 1367
… …
1404 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1457 or return;
1406 1458
1407 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1408 or return; 1460 or return;
1461
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1412 } 1465 }
1413 } 1466 }
… …
1423 1476
1424 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1425 1478
1426 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1428 1483
1429 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1485 cf::cede_to_tick;
1431} 1486}
1432 1487
… …
1468 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1469 $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
1470 1525
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1475 1532
1476 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1516 1573
1517 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1518 my $path = path $login; 1575 my $path = path $login;
1519 1576
1520 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1583 }
1526 1584
… …
1725our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1727 1785
1728sub generate_random_map { 1786sub generate_random_map {
1729 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
1730 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1792 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1917
1857# the temporary/swap location 1918# the temporary/swap location
1858sub save_path { 1919sub save_path {
1859 my ($self) = @_; 1920 my ($self) = @_;
1860 1921
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1863} 1924}
1864 1925
1865# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1866sub uniq_path { 1927sub uniq_path {
1867 my ($self) = @_; 1928 my ($self) = @_;
1868 1929
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1871} 1932}
1872 1933
1873# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1874# all maps in C++... 1935# all maps in C++...
… …
1972 2033
1973 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1975 2036
1976 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 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";
1979 2040
1980 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1981 or return; 2042 or return;
1982 2043
1983 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
… …
1986 or return; 2047 or return;
1987 2048
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
1991 undef $guard1; 2053 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2054 $map->reset;
1994 return find $path; 2055 return find $path;
1995 } 2056 }
1996 2057
1997 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
… …
2060 } 2121 }
2061 2122
2062 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
2064 2125
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2127 }
2067 2128
2068 $self->post_load; 2129 $self->post_load;
2069} 2130}
2070 2131
… …
2128 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2129 2190
2130 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2131 2192
2132 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2195 }
2135 2196
2136 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2137 2198
2138 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2236 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2237 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2178 }; 2239 };
2179 2240
2241 cf::get_slot 0.02;
2242
2180 if ($uniq) { 2243 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2246 } else {
2184 $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);
… …
2192 $self->save; 2255 $self->save;
2193 2256
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2258
2196 return if $self->players; 2259 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2199 2262
2200 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2201 2264
2202 $self->deactivate; 2265 $self->deactivate;
… …
2320 2383
2321sub unique_maps() { 2384sub unique_maps() {
2322 [ 2385 [
2323 map { 2386 map {
2324 utf8::decode $_; 2387 utf8::decode $_;
2325 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2326 ? normalise $_ 2391 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2393 ]
2330} 2394}
2331 2395
2332package cf;
2333
2334=back 2396=back
2335 2397
2336=head3 cf::object 2398=head3 cf::object
2337 2399
2338=cut 2400=cut
… …
2341 2403
2342=over 4 2404=over 4
2343 2405
2344=item $ob->inv_recursive 2406=item $ob->inv_recursive
2345 2407
2346Returns 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.
2347 2410
2348=cut 2411=cut
2349 2412
2350sub inv_recursive_; 2413sub inv_recursive_;
2351sub inv_recursive_ { 2414sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2357} 2420}
2358 2421
2359=item $ref = $ob->ref 2422=item $ref = $ob->ref
2360 2423
2361creates 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.
2362 2425
2363=item $ob = cf::object::deref ($refstring) 2426=item $ob = cf::object::deref ($refstring)
2364 2427
2365returns 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,
2366even if the object actually exists. May block. 2429even if the object actually exists. May block.
… …
2398can 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
2399dialogue with the given NPC character. 2462dialogue with the given NPC character.
2400 2463
2401=cut 2464=cut
2402 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
2403# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2481# with dialog boxes.
2405#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
2406sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
… …
2418 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2419 $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));
2420 2497
2421 } else { 2498 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2501 }
2425 } 2502 }
2426} 2503}
2427 2504
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2623} 2700}
2624 2701
2625sub prepare_random_map { 2702sub prepare_random_map {
2626 my ($exit) = @_; 2703 my ($exit) = @_;
2627 2704
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2707 # that depends on the exit object
2633 2708
2634 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
… …
2636 if ($exit->map) { 2711 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2641 } 2718 }
2642 2719
2643 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2644 2721
2645 my $data = cf::encode_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2648 2725
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2728 undef $fh;
2652 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2653 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2656 } 2737 }
2657} 2738}
2658 2739
2659sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2661 2742
2662 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2663 2744
2664 if ($exit->slaying eq "/!") {
2665 #TODO: this should de-fi-ni-te-ly not be a sync-job
2666 # the problem is that $exit might not survive long enough
2667 # so it needs to be done right now, right here
2668 cf::sync_job { prepare_random_map $exit };
2669 }
2670
2671 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2672 my $hp = $exit->stats->hp;
2673 my $sp = $exit->stats->sp;
2674
2675 $self->enter_link; 2745 $self->enter_link;
2676 2746
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2681 (async { 2747 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2748 $Coro::current->{desc} = "enter_exit";
2683 2749
2684 $self->deactivate_recursive; # just to be sure
2685 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
2686 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2687 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
2688 1; 2771 1
2689 }) { 2772 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2691 . "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. "
2692 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2773 id => "infobox", 2856 id => "infobox",
2774 title => "Map Info", 2857 title => "Map Info",
2775 reply => undef, 2858 reply => undef,
2776 tooltip => "Information related to the maps", 2859 tooltip => "Information related to the maps",
2777 }, 2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2778); 2867);
2779 2868
2780sub cf::client::send_msg { 2869sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2871
… …
3019 3108
3020The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
3021 3110
3022 cf::object 3111 cf::object
3023 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
3024 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
3025 3114
3026 cf::object::player 3115 cf::object::player
3027 player 3116 player
3028 3117
3029 cf::player 3118 cf::player
… …
3034 3123
3035=cut 3124=cut
3036 3125
3037for ( 3126for (
3038 ["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
3039 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3129 decrease split destroy)],
3041 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3044) { 3133) {
3045 no strict 'refs'; 3134 no strict 'refs';
… …
3253 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3255 } 3344 }
3256}; 3345};
3257 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
3258sub reload_regions { 3357sub reload_regions {
3259 # 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
3260 # for this (global event?) 3359 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3262 3361
… …
3275} 3374}
3276 3375
3277sub reload_archetypes { 3376sub reload_archetypes {
3278 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3279 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
3280 #d# NEED to laod twice to resolve forward references
3281 # this really needs to be done in an extra post-pass
3282 # (which needs to be synchronous, so solve it differently)
3283 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n";
3285} 3379}
3286 3380
3287sub reload_treasures { 3381sub reload_treasures {
3288 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3289 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3290} 3384}
3291 3385
3292sub reload_resources { 3386sub reload_resources {
3293 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3294 3388
3389 reload_facedata;
3390 reload_archetypes;
3295 reload_regions; 3391 reload_regions;
3296 reload_facedata;
3297 #reload_archetypes;#d#
3298 reload_archetypes;
3299 reload_treasures; 3392 reload_treasures;
3300 3393
3301 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3302} 3395}
3303 3396
3304sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3305 reload_resources; 3400 reload_resources;
3306} 3401}
3307 3402
3308sub reload_config { 3403sub reload_config {
3309 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
3310 or return; 3405 or return;
3311 3406
3312 local $/; 3407 local $/;
3313 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
3314 3409
3315 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3316 3411
3317 $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};
3318 $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};
… …
3334 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT; 3430 EV::loop EV::LOOP_ONESHOT;
3336 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3337 }; 3432 };
3338 3433
3434 {
3435 my $guard = freeze_mainloop;
3339 reload_config; 3436 reload_config;
3340 db_init; 3437 db_init;
3341 load_extensions; 3438 load_extensions;
3342 3439
3343 $TICK_WATCHER->start;
3344 $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
3345 EV::loop; 3444 EV::loop;
3346} 3445}
3347 3446
3348############################################################################# 3447#############################################################################
3349# initialisation and cleanup 3448# initialisation and cleanup
… …
3356 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
3357 }; 3456 };
3358 } 3457 }
3359} 3458}
3360 3459
3361sub write_runtime { 3460sub write_runtime_sync {
3362 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
3363 3462
3364 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3366 3465
… …
3392 and return; 3491 and return;
3393 3492
3394 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3395 3494
3396 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 };
3397} 3539}
3398 3540
3399sub emergency_save() { 3541sub emergency_save() {
3400 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3401 3543
… …
3423 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
3424 3566
3425 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
3426 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
3427 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";
3428 }; 3574 };
3429 3575
3430 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
3431} 3577}
3432 3578
… …
3447 warn "reloading..."; 3593 warn "reloading...";
3448 3594
3449 warn "entering sync_job"; 3595 warn "entering sync_job";
3450 3596
3451 cf::sync_job { 3597 cf::sync_job {
3452 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3453 cf::emergency_save; 3599 cf::emergency_save;
3454 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3455 3601
3456 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3457 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3458 3604
3459 # 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
… …
3546 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3547 3693
3548 1 3694 1
3549 } or do { 3695 } or do {
3550 warn $@; 3696 warn $@;
3551 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3552 exit 1;
3553 }; 3698 };
3554 3699
3555 warn "reloaded"; 3700 warn "reloaded";
3556}; 3701};
3557 3702
… …
3560sub reload_perl() { 3705sub reload_perl() {
3561 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3562 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3563 3708
3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3710 do_reload_perl;
3565 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3566 do_reload_perl;
3567 }; 3712 };
3568} 3713}
3569 3714
3570register_command "reload" => sub { 3715register_command "reload" => sub {
3571 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
… …
3585 3730
3586our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3587our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3588 3733
3589sub wait_for_tick { 3734sub wait_for_tick {
3590 return unless $TICK_WATCHER->is_active;
3591 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3592 3736
3593 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3594 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3595 $signal->wait; 3739 $signal->wait;
3596} 3740}
3597 3741
3598sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3599 return unless $TICK_WATCHER->is_active;
3600 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3601 3744
3602 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3603 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3604 $signal->wait; 3747 $signal->wait;
3605} 3748}
3606 3749
3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3750sub tick {
3608 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3609 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"
3610 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3611 return; 3754 return;
3612 } 3755 }
3613 3756
3614 $NOW = $tick_start = EV::now;
3615
3616 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3617
3618 $RUNTIME += $TICK;
3619 $NEXT_TICK = $_[0]->at;
3620 3758
3621 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3622 $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.;
3623 Coro::async_pool { 3761 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver"; 3762 $Coro::current->{desc} = "runtime saver";
3625 write_runtime 3763 write_runtime_sync
3626 or warn "ERROR: unable to write runtime file: $!"; 3764 or warn "ERROR: unable to write runtime file: $!";
3627 }; 3765 };
3628 } 3766 }
3629 3767
3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3632 } 3770 }
3633 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3634 $sig->send; 3772 $sig->send;
3635 } 3773 }
3636 3774
3637 $LOAD = ($NOW - $tick_start) / $TICK; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639 3777
3640 _post_tick; 3778 if (0) {
3641}; 3779 if ($NEXT_TICK) {
3642$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}
3643 3786
3644{ 3787{
3645 # configure BDB 3788 # configure BDB
3646 3789
3647 BDB::min_parallel 8; 3790 BDB::min_parallel 8;

Diff Legend

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