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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.440 by root, Mon Aug 11 23:23:41 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;
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 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
23use Coro::BDB; 45use Coro::BDB 1.6;
24use Coro::Storable; 46use Coro::Storable;
25use Coro::Util (); 47use Coro::Util ();
26 48
27use JSON::XS 2.01 (); 49use JSON::XS 2.01 ();
28use BDB (); 50use BDB ();
29use Data::Dumper; 51use Data::Dumper;
30use Digest::MD5; 52use Digest::MD5;
31use Fcntl; 53use Fcntl;
32use YAML (); 54use YAML ();
33use IO::AIO 2.51 (); 55use IO::AIO ();
34use Time::HiRes; 56use Time::HiRes;
35use Compress::LZF; 57use Compress::LZF;
36use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
37 61
38# configure various modules to our taste 62# configure various modules to our taste
39# 63#
40$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 95our %RESOURCE;
72 96
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 99our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
79 101
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 105our $DB_ENV;
85 106
… …
96# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 119
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
102 124
103binmode STDOUT; 125binmode STDOUT;
104binmode STDERR; 126binmode STDERR;
105 127
106# read virtual server time, if available 128# read virtual server time, if available
… …
192 LOG llevError, $msg; 214 LOG llevError, $msg;
193 }; 215 };
194} 216}
195 217
196$Coro::State::DIEHOOK = sub { 218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
197 warn Carp::longmess $_[0]; 227 warn Carp::longmess $_[0];
198 Coro::terminate; 228 Coro::terminate
199}; 229};
230
231$SIG{__DIE__} = sub { }; #d#?
200 232
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
211for my $pkg (qw( 243for my $pkg (qw(
212 cf::global cf::attachable 244 cf::global cf::attachable
213 cf::object cf::object::player 245 cf::object cf::object::player
214 cf::client cf::player 246 cf::client cf::player
215 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
216 cf::map cf::party cf::region 249 cf::party cf::region
217)) { 250)) {
218 no strict 'refs'; 251 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 253}
221 254
… …
329 362
330 ! ! $LOCK{$key} 363 ! ! $LOCK{$key}
331} 364}
332 365
333sub freeze_mainloop { 366sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 367 tick_inhibit_inc;
335 368
336 my $guard = Coro::guard { 369 Coro::guard \&tick_inhibit_dec;
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 370}
342 371
343=item cf::periodic $interval, $cb 372=item cf::periodic $interval, $cb
344 373
345Like EV::periodic, but randomly selects a starting point so that the actions 374Like EV::periodic, but randomly selects a starting point so that the actions
… …
400 } 429 }
401 } 430 }
402}; 431};
403 432
404sub get_slot($;$$) { 433sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main;
435
405 my ($time, $pri, $name) = @_; 436 my ($time, $pri, $name) = @_;
406 437
407 $time = $TICK * .6 if $time > $TICK * .6; 438 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 439 my $sig = new Coro::Signal;
409 440
… …
446 # this is the main coro, too bad, we have to block 477 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 478 # till the operation succeeds, freezing the server :/
448 479
449 LOG llevError, Carp::longmess "sync job";#d# 480 LOG llevError, Carp::longmess "sync job";#d#
450 481
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 482 my $freeze_guard = freeze_mainloop;
454 483
455 my $busy = 1; 484 my $busy = 1;
456 my @res; 485 my @res;
457 486
… …
468 } else { 497 } else {
469 EV::loop EV::LOOP_ONESHOT; 498 EV::loop EV::LOOP_ONESHOT;
470 } 499 }
471 } 500 }
472 501
473 $time = EV::time - $time; 502 my $time = EV::time - $time;
474 503
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 504 $TICK_START += $time; # do not account sync jobs to server load
479 505
480 wantarray ? @res : $res[0] 506 wantarray ? @res : $res[0]
481 } else { 507 } else {
482 # we are in another coroutine, how wonderful, everything just works 508 # we are in another coroutine, how wonderful, everything just works
483 509
… …
525 reset_signals; 551 reset_signals;
526 &$cb 552 &$cb
527 }, @args; 553 }, @args;
528 554
529 wantarray ? @res : $res[-1] 555 wantarray ? @res : $res[-1]
556}
557
558=item $coin = coin_from_name $name
559
560=cut
561
562our %coin_alias = (
563 "silver" => "silvercoin",
564 "silvercoin" => "silvercoin",
565 "silvercoins" => "silvercoin",
566 "gold" => "goldcoin",
567 "goldcoin" => "goldcoin",
568 "goldcoins" => "goldcoin",
569 "platinum" => "platinacoin",
570 "platinumcoin" => "platinacoin",
571 "platinumcoins" => "platinacoin",
572 "platina" => "platinacoin",
573 "platinacoin" => "platinacoin",
574 "platinacoins" => "platinacoin",
575 "royalty" => "royalty",
576 "royalties" => "royalty",
577);
578
579sub coin_from_name($) {
580 $coin_alias{$_[0]}
581 ? cf::arch::find $coin_alias{$_[0]}
582 : undef
530} 583}
531 584
532=item $value = cf::db_get $family => $key 585=item $value = cf::db_get $family => $key
533 586
534Returns a single value from the environment database. 587Returns a single value from the environment database.
… …
1090 utf8::decode (my $decname = $filename); 1143 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1144 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1145 $decname, length $$rdata, scalar @$objs;
1093 1146
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1148 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1150 aio_fsync $fh if $cf::USE_FSYNC;
1098 close $fh; 1151 aio_close $fh;
1099 1152
1100 if (@$objs) { 1153 if (@$objs) {
1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1157 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1106 close $fh; 1159 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1160 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1161 }
1109 } else { 1162 } else {
1110 aio_unlink "$filename.pst"; 1163 aio_unlink "$filename.pst";
1111 } 1164 }
… …
1306 my $msg = $@ ? "$v->{path}: $@\n" 1359 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1360 : "$v->{base}: extension inactive.\n";
1308 1361
1309 if (exists $v->{meta}{mandatory}) { 1362 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1363 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1364 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1365 }
1314 1366
1315 warn $msg; 1367 warn $msg;
1316 } 1368 }
1317 1369
… …
1406 my $f = new_from_file cf::object::thawer path $login 1458 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1459 or return;
1408 1460
1409 my $pl = cf::player::load_pl $f 1461 my $pl = cf::player::load_pl $f
1410 or return; 1462 or return;
1463
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1464 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1465 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1466 $cf::PLAYER{$login} = $pl
1414 } 1467 }
1415 } 1468 }
… …
1425 1478
1426 return if $pl->{deny_save}; 1479 return if $pl->{deny_save};
1427 1480
1428 aio_mkdir playerdir $pl, 0770; 1481 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1482 $pl->{last_save} = $cf::RUNTIME;
1483
1484 cf::get_slot 0.01;
1430 1485
1431 $pl->save_pl ($path); 1486 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1487 cf::cede_to_tick;
1433} 1488}
1434 1489
… …
1470 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1526 $pl->password ("*"); # this should lock out the player until we nuked the dir
1472 1527
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1477 1534
1478 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1518 1575
1519 for my $login (@$dirs) { 1576 for my $login (@$dirs) {
1520 my $path = path $login; 1577 my $path = path $login;
1521 1578
1522 # a .pst is a dead give-away for a valid player 1579 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1580 # if no pst file found, open and chekc for blocked users
1581 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1582 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1583 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1584 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1585 }
1528 1586
… …
1727our $MAX_RESET = 3600; 1785our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1786our $DEFAULT_RESET = 3000;
1729 1787
1730sub generate_random_map { 1788sub generate_random_map {
1731 my ($self, $rmp) = @_; 1789 my ($self, $rmp) = @_;
1790
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792
1732 # mit "rum" bekleckern, nicht 1793 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1794 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1858 1919
1859# the temporary/swap location 1920# the temporary/swap location
1860sub save_path { 1921sub save_path {
1861 my ($self) = @_; 1922 my ($self) = @_;
1862 1923
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1924 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1925 "$TMPDIR/$path.map"
1865} 1926}
1866 1927
1867# the unique path, undef == no special unique path 1928# the unique path, undef == no special unique path
1868sub uniq_path { 1929sub uniq_path {
1869 my ($self) = @_; 1930 my ($self) = @_;
1870 1931
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1933 "$UNIQUEDIR/$path"
1873} 1934}
1874 1935
1875# and all this just because we cannot iterate over 1936# and all this just because we cannot iterate over
1876# all maps in C++... 1937# all maps in C++...
… …
1974 2035
1975 cf::lock_wait "map_data:$path";#d#remove 2036 cf::lock_wait "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
1977 2038
1978 $cf::MAP{$path} || do { 2039 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
1981 2042
1982 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
1983 or return; 2044 or return;
1984 2045
1985 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
… …
1988 or return; 2049 or return;
1989 2050
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
1993 undef $guard1; 2055 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2056 $map->reset;
1996 return find $path; 2057 return find $path;
1997 } 2058 }
1998 2059
1999 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
… …
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2087 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2088 $f->skip_block;
2028 $self->_load_objects ($f) 2089 $self->_load_objects ($f)
2029 or return; 2090 or return;
2030 2091
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
2032 if delete $self->{load_original}; 2093 if delete $self->{load_original};
2033 2094
2034 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2096 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2097 unless (aio_stat $uniq) {
… …
2062 } 2123 }
2063 2124
2064 $self->{last_save} = $cf::RUNTIME; 2125 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2126 $self->last_access ($cf::RUNTIME);
2066 2127
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2128 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2129 }
2069 2130
2070 $self->post_load; 2131 $self->post_load;
2071} 2132}
2072 2133
… …
2130 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
2131 2192
2132 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
2133 2194
2134 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2197 }
2137 2198
2138 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
2139 2200
2140 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
… …
2177 cf::async { 2238 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2239 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2240 $_->contr->save for $self->players;
2180 }; 2241 };
2181 2242
2243 cf::get_slot 0.02;
2244
2182 if ($uniq) { 2245 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2247 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2248 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2194 $self->save; 2257 $self->save;
2195 2258
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2260
2198 return if $self->players; 2261 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2201 2264
2202 $self->in_memory (cf::MAP_SWAPPED); 2265 $self->in_memory (cf::MAP_SWAPPED);
2203 2266
2204 $self->deactivate; 2267 $self->deactivate;
… …
2322 2385
2323sub unique_maps() { 2386sub unique_maps() {
2324 [ 2387 [
2325 map { 2388 map {
2326 utf8::decode $_; 2389 utf8::decode $_;
2327 /\.map$/ 2390 s/\.map$//; # TODO future compatibility hack
2391 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2392 ? ()
2328 ? normalise $_ 2393 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2394 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2395 ]
2332} 2396}
2333 2397
2334package cf;
2335
2336=back 2398=back
2337 2399
2338=head3 cf::object 2400=head3 cf::object
2339 2401
2340=cut 2402=cut
… …
2343 2405
2344=over 4 2406=over 4
2345 2407
2346=item $ob->inv_recursive 2408=item $ob->inv_recursive
2347 2409
2348Returns the inventory of the object _and_ their inventories, recursively. 2410Returns the inventory of the object I<and> their inventories, recursively,
2411but I<not> the object itself.
2349 2412
2350=cut 2413=cut
2351 2414
2352sub inv_recursive_; 2415sub inv_recursive_;
2353sub inv_recursive_ { 2416sub inv_recursive_ {
… …
2358 inv_recursive_ inv $_[0] 2421 inv_recursive_ inv $_[0]
2359} 2422}
2360 2423
2361=item $ref = $ob->ref 2424=item $ref = $ob->ref
2362 2425
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2426Creates and returns a persistent reference to an object that can be stored as a string.
2364 2427
2365=item $ob = cf::object::deref ($refstring) 2428=item $ob = cf::object::deref ($refstring)
2366 2429
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2430returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2431even if the object actually exists. May block.
… …
2400can be C<undef>. Does the right thing when the player is currently in a 2463can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2464dialogue with the given NPC character.
2402 2465
2403=cut 2466=cut
2404 2467
2468our $SAY_CHANNEL = {
2469 id => "say",
2470 title => "Map",
2471 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2473};
2474
2475our $CHAT_CHANNEL = {
2476 id => "chat",
2477 title => "Chat",
2478 reply => "chat ",
2479 tooltip => "Player chat and shouts, global to the server.",
2480};
2481
2405# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2483# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2484#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2486 my ($self, $npc, $msg, $flags) = @_;
… …
2420 my $dialog = $pl->{npc_dialog}; 2497 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2498 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2499
2423 } else { 2500 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2503 }
2427 } 2504 }
2428} 2505}
2429 2506
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2507=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2537Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2618be called at the end of this process.
2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2542 2622
2543=cut 2623=cut
2544 2624
2545our $GOTOGEN; 2625our $GOTOGEN;
2546 2626
… …
2625} 2705}
2626 2706
2627sub prepare_random_map { 2707sub prepare_random_map {
2628 my ($exit) = @_; 2708 my ($exit) = @_;
2629 2709
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2712 # that depends on the exit object
2635 2713
2636 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2638 if ($exit->map) { 2716 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2643 } 2723 }
2644 2724
2645 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2646 2726
2647 my $data = cf::encode_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2650 2730
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2733 undef $fh;
2654 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2655 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2658 } 2742 }
2659} 2743}
2660 2744
2661sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2663 2747
2664 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2665 2749
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2750 $self->enter_link;
2678 2751
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2752 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2753 $Coro::current->{desc} = "enter_exit";
2685 2754
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2688 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2689 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2690 1; 2776 1
2691 }) { 2777 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2693 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2775 id => "infobox", 2861 id => "infobox",
2776 title => "Map Info", 2862 title => "Map Info",
2777 reply => undef, 2863 reply => undef,
2778 tooltip => "Information related to the maps", 2864 tooltip => "Information related to the maps",
2779 }, 2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2780); 2872);
2781 2873
2782sub cf::client::send_msg { 2874sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2875 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2876
… …
3021 3113
3022The following functions and methods are available within a safe environment: 3114The following functions and methods are available within a safe environment:
3023 3115
3024 cf::object 3116 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3117 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3118 insert remove name archname title slaying race decrease split
3027 3119
3028 cf::object::player 3120 cf::object::player
3029 player 3121 player
3030 3122
3031 cf::player 3123 cf::player
… …
3036 3128
3037=cut 3129=cut
3038 3130
3039for ( 3131for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3133 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3134 decrease split destroy change_exp)],
3043 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
3045 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
3046) { 3138) {
3047 no strict 'refs'; 3139 no strict 'refs';
… …
3255 while (my ($k, $v) = each %$want) { 3347 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3348 $ns->fx_want ($k, $v);
3257 } 3349 }
3258}; 3350};
3259 3351
3352sub load_resource_file($) {
3353 my $guard = lock_acquire "load_resource_file";
3354
3355 my $status = load_resource_file_ $_[0];
3356 get_slot 0.1, 100;
3357 cf::arch::commit_load;
3358
3359 $status
3360}
3361
3260sub reload_regions { 3362sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3363 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3364 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3365 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3366
… …
3277} 3379}
3278 3380
3279sub reload_archetypes { 3381sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3382 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3383 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3384}
3288 3385
3289sub reload_treasures { 3386sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3387 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3388 or die "unable to load treasurelists\n";
3292} 3389}
3293 3390
3294sub reload_resources { 3391sub reload_resources {
3295 warn "reloading resource files...\n"; 3392 warn "reloading resource files...\n";
3296 3393
3394 reload_facedata;
3395 reload_archetypes;
3297 reload_regions; 3396 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3397 reload_treasures;
3302 3398
3303 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
3304} 3400}
3305 3401
3306sub init { 3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3307 reload_resources; 3407 reload_resources;
3308} 3408}
3309 3409
3310sub reload_config { 3410sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3411 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3436 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3437 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3438 })->prio (Coro::PRIO_MAX);
3339 }; 3439 };
3340 3440
3441 {
3442 my $guard = freeze_mainloop;
3341 reload_config; 3443 reload_config;
3342 db_init; 3444 db_init;
3343 load_extensions; 3445 load_extensions;
3344 3446
3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3448 }
3449
3347 EV::loop; 3450 EV::loop;
3348} 3451}
3349 3452
3350############################################################################# 3453#############################################################################
3351# initialisation and cleanup 3454# initialisation and cleanup
… …
3358 cf::cleanup "SIG$signal"; 3461 cf::cleanup "SIG$signal";
3359 }; 3462 };
3360 } 3463 }
3361} 3464}
3362 3465
3363sub write_runtime { 3466sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3467 my $runtime = "$LOCALDIR/runtime";
3365 3468
3366 # first touch the runtime file to show we are still running: 3469 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3470 # the fsync below can take a very very long time.
3368 3471
… …
3394 and return; 3497 and return;
3395 3498
3396 warn "runtime file written.\n"; 3499 warn "runtime file written.\n";
3397 3500
3398 1 3501 1
3502}
3503
3504our $uuid_lock;
3505our $uuid_skip;
3506
3507sub write_uuid_sync($) {
3508 $uuid_skip ||= $_[0];
3509
3510 return if $uuid_lock;
3511 local $uuid_lock = 1;
3512
3513 my $uuid = "$LOCALDIR/uuid";
3514
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return;
3517
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
3399} 3545}
3400 3546
3401sub emergency_save() { 3547sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3403 3549
… …
3425 warn "end emergency map save\n"; 3571 warn "end emergency map save\n";
3426 3572
3427 warn "begin emergency database checkpoint\n"; 3573 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3574 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3575 warn "end emergency database checkpoint\n";
3576
3577 warn "begin write uuid\n";
3578 write_uuid_sync 1;
3579 warn "end write uuid\n";
3430 }; 3580 };
3431 3581
3432 warn "leave emergency perl save\n"; 3582 warn "leave emergency perl save\n";
3433} 3583}
3434 3584
… …
3449 warn "reloading..."; 3599 warn "reloading...";
3450 3600
3451 warn "entering sync_job"; 3601 warn "entering sync_job";
3452 3602
3453 cf::sync_job { 3603 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3605 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3457 3607
3458 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3610
3461 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
… …
3548 warn "leaving sync_job"; 3698 warn "leaving sync_job";
3549 3699
3550 1 3700 1
3551 } or do { 3701 } or do {
3552 warn $@; 3702 warn $@;
3553 warn "error while reloading, exiting."; 3703 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3704 };
3556 3705
3557 warn "reloaded"; 3706 warn "reloaded";
3558}; 3707};
3559 3708
… …
3562sub reload_perl() { 3711sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3712 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3713 # coro crashes during coro_state_free->destroy here.
3565 3714
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3716 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3717 undef $RELOAD_WATCHER;
3568 do_reload_perl;
3569 }; 3718 };
3570} 3719}
3571 3720
3572register_command "reload" => sub { 3721register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3722 my ($who, $arg) = @_;
… …
3587 3736
3588our @WAIT_FOR_TICK; 3737our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3738our @WAIT_FOR_TICK_BEGIN;
3590 3739
3591sub wait_for_tick { 3740sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3742
3595 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3744 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3745 $signal->wait;
3598} 3746}
3599 3747
3600sub wait_for_tick_begin { 3748sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3749 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3750
3604 my $signal = new Coro::Signal; 3751 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3752 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3753 $signal->wait;
3607} 3754}
3608 3755
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3756sub tick {
3610 if ($Coro::current != $Coro::main) { 3757 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3758 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3759 unless ++$bug_warning > 10;
3613 return; 3760 return;
3614 } 3761 }
3615 3762
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3763 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3764
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3765 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3767 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3768 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3769 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3770 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3771 };
3630 } 3772 }
3631 3773
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3634 } 3776 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3777 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3778 $sig->send;
3637 } 3779 }
3638 3780
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3781 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3783
3642 _post_tick; 3784 if (0) {
3643}; 3785 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 3786 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d#
3789 }
3790 }
3791}
3645 3792
3646{ 3793{
3647 # configure BDB 3794 # configure BDB
3648 3795
3649 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
3650 BDB::max_poll_reqs $TICK * 0.1; 3797 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 3798 $AnyEvent::BDB::WATCHER->priority (1);
3652 3799
3653 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3803 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3804 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3807
3660 cf::sync_job { 3808 cf::sync_job {
3661 eval { 3809 eval {
… …
3687{ 3835{
3688 # configure IO::AIO 3836 # configure IO::AIO
3689 3837
3690 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 3840 undef $AnyEvent::AIO::WATCHER;
3693} 3841}
3694 3842
3695my $_log_backtrace; 3843my $_log_backtrace;
3696 3844
3697sub _log_backtrace { 3845sub _log_backtrace {

Diff Legend

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