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.434 by root, Thu May 29 03:27:37 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;
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::Syck (); 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;
61
62IO::AIO::max_poll_reqs 1;#d#
37 63
38# configure various modules to our taste 64# configure various modules to our taste
39# 65#
40$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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 68Compress::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 69
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
… …
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE; 97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 107our $DB_ENV;
88 108
… …
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 371}
340 372
341=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
342 374
343Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
398 } 430 }
399 } 431 }
400}; 432};
401 433
402sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
403 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
404 438
405 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
407 441
… …
444 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
446 480
447 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
448 482
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
452 484
453 my $busy = 1; 485 my $busy = 1;
454 my @res; 486 my @res;
455 487
… …
466 } else { 498 } else {
467 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
468 } 500 }
469 } 501 }
470 502
471 $time = EV::time - $time; 503 my $time = EV::time - $time;
472 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
477 506
478 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
479 } else { 508 } else {
480 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
481 510
… …
523 reset_signals; 552 reset_signals;
524 &$cb 553 &$cb
525 }, @args; 554 }, @args;
526 555
527 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
528} 584}
529 585
530=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
531 587
532Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1088 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
1091 1147
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
1096 close $fh; 1152 aio_close $fh;
1097 1153
1098 if (@$objs) { 1154 if (@$objs) {
1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1100 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1104 close $fh; 1160 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1162 }
1107 } else { 1163 } else {
1108 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
1109 } 1165 }
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1306 1362
1307 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1364 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1366 }
1312 1367
1313 warn $msg; 1368 warn $msg;
1314 } 1369 }
1315 1370
… …
1404 my $f = new_from_file cf::object::thawer path $login 1459 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1460 or return;
1406 1461
1407 my $pl = cf::player::load_pl $f 1462 my $pl = cf::player::load_pl $f
1408 or return; 1463 or return;
1464
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1465 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1466 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1412 } 1468 }
1413 } 1469 }
… …
1423 1479
1424 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1425 1481
1426 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1484
1485 cf::get_slot 0.01;
1428 1486
1429 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1488 cf::cede_to_tick;
1431} 1489}
1432 1490
… …
1468 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1469 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1470 1528
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1475 1535
1476 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1516 1576
1517 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1518 my $path = path $login; 1578 my $path = path $login;
1519 1579
1520 # a .pst is a dead give-away for a valid player 1580 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1586 }
1526 1587
… …
1725our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1727 1788
1728sub generate_random_map { 1789sub generate_random_map {
1729 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1730 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1795 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1920
1857# the temporary/swap location 1921# the temporary/swap location
1858sub save_path { 1922sub save_path {
1859 my ($self) = @_; 1923 my ($self) = @_;
1860 1924
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1863} 1927}
1864 1928
1865# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1866sub uniq_path { 1930sub uniq_path {
1867 my ($self) = @_; 1931 my ($self) = @_;
1868 1932
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1871} 1935}
1872 1936
1873# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1874# all maps in C++... 1938# all maps in C++...
… …
1972 2036
1973 cf::lock_wait "map_data:$path";#d#remove 2037 cf::lock_wait "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1975 2039
1976 $cf::MAP{$path} || do { 2040 $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 2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
1979 2043
1980 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1981 or return; 2045 or return;
1982 2046
1983 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
… …
1986 or return; 2050 or return;
1987 2051
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
1991 undef $guard1; 2056 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2057 $map->reset;
1994 return find $path; 2058 return find $path;
1995 } 2059 }
1996 2060
1997 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
… …
2060 } 2124 }
2061 2125
2062 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2064 2128
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2130 }
2067 2131
2068 $self->post_load; 2132 $self->post_load;
2069} 2133}
2070 2134
… …
2128 my ($path, $origin, $load) = @_; 2192 my ($path, $origin, $load) = @_;
2129 2193
2130 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
2131 2195
2132 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2198 }
2135 2199
2136 $MAP_PREFETCH{$path} |= $load; 2200 $MAP_PREFETCH{$path} |= $load;
2137 2201
2138 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2239 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2240 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
2178 }; 2242 };
2179 2243
2244 cf::get_slot 0.02;
2245
2180 if ($uniq) { 2246 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2249 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2192 $self->save; 2258 $self->save;
2193 2259
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2261
2196 return if $self->players; 2262 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2199 2265
2200 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2201 2267
2202 $self->deactivate; 2268 $self->deactivate;
… …
2320 2386
2321sub unique_maps() { 2387sub unique_maps() {
2322 [ 2388 [
2323 map { 2389 map {
2324 utf8::decode $_; 2390 utf8::decode $_;
2325 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2326 ? normalise $_ 2394 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2396 ]
2330} 2397}
2331 2398
2332package cf;
2333
2334=back 2399=back
2335 2400
2336=head3 cf::object 2401=head3 cf::object
2337 2402
2338=cut 2403=cut
… …
2341 2406
2342=over 4 2407=over 4
2343 2408
2344=item $ob->inv_recursive 2409=item $ob->inv_recursive
2345 2410
2346Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2347 2413
2348=cut 2414=cut
2349 2415
2350sub inv_recursive_; 2416sub inv_recursive_;
2351sub inv_recursive_ { 2417sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2357} 2423}
2358 2424
2359=item $ref = $ob->ref 2425=item $ref = $ob->ref
2360 2426
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2427Creates and returns a persistent reference to an object that can be stored as a string.
2362 2428
2363=item $ob = cf::object::deref ($refstring) 2429=item $ob = cf::object::deref ($refstring)
2364 2430
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2432even if the object actually exists. May block.
… …
2398can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2399dialogue with the given NPC character. 2465dialogue with the given NPC character.
2400 2466
2401=cut 2467=cut
2402 2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2482
2403# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2484# with dialog boxes.
2405#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2406sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2487 my ($self, $npc, $msg, $flags) = @_;
… …
2418 my $dialog = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420 2500
2421 } else { 2501 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2504 }
2425 } 2505 }
2426} 2506}
2427 2507
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2508=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2623} 2703}
2624 2704
2625sub prepare_random_map { 2705sub prepare_random_map {
2626 my ($exit) = @_; 2706 my ($exit) = @_;
2627 2707
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2710 # that depends on the exit object
2633 2711
2634 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
… …
2636 if ($exit->map) { 2714 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2641 } 2721 }
2642 2722
2643 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2644 2724
2645 my $data = cf::encode_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2648 2728
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2731 undef $fh;
2652 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2653 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2656 } 2740 }
2657} 2741}
2658 2742
2659sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2661 2745
2662 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2663 2747
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; 2748 $self->enter_link;
2676 2749
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 { 2750 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2751 $Coro::current->{desc} = "enter_exit";
2683 2752
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2686 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2687 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2688 1; 2774 1
2689 }) { 2775 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2691 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2773 id => "infobox", 2859 id => "infobox",
2774 title => "Map Info", 2860 title => "Map Info",
2775 reply => undef, 2861 reply => undef,
2776 tooltip => "Information related to the maps", 2862 tooltip => "Information related to the maps",
2777 }, 2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2778); 2870);
2779 2871
2780sub cf::client::send_msg { 2872sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2874
… …
3019 3111
3020The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
3021 3113
3022 cf::object 3114 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3115 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3116 insert remove name archname title slaying race decrease split
3025 3117
3026 cf::object::player 3118 cf::object::player
3027 player 3119 player
3028 3120
3029 cf::player 3121 cf::player
… …
3034 3126
3035=cut 3127=cut
3036 3128
3037for ( 3129for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3131 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3132 decrease split destroy)],
3041 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
3044) { 3136) {
3045 no strict 'refs'; 3137 no strict 'refs';
… …
3253 while (my ($k, $v) = each %$want) { 3345 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v); 3346 $ns->fx_want ($k, $v);
3255 } 3347 }
3256}; 3348};
3257 3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3359
3258sub reload_regions { 3360sub reload_regions {
3259 # HACK to clear player env face cache, we need some signal framework 3361 # HACK to clear player env face cache, we need some signal framework
3260 # for this (global event?) 3362 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = (); 3363 %ext::player_env::MUSIC_FACE_CACHE = ();
3262 3364
… …
3275} 3377}
3276 3378
3277sub reload_archetypes { 3379sub reload_archetypes {
3278 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
3279 or die "unable to load archetypes\n"; 3381 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} 3382}
3286 3383
3287sub reload_treasures { 3384sub reload_treasures {
3288 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
3289 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
3290} 3387}
3291 3388
3292sub reload_resources { 3389sub reload_resources {
3293 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
3294 3391
3392 reload_facedata;
3393 reload_archetypes;
3295 reload_regions; 3394 reload_regions;
3296 reload_facedata;
3297 #reload_archetypes;#d#
3298 reload_archetypes;
3299 reload_treasures; 3395 reload_treasures;
3300 3396
3301 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
3302} 3398}
3303 3399
3304sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
3305 reload_resources; 3403 reload_resources;
3306} 3404}
3307 3405
3308sub reload_config { 3406sub reload_config {
3309 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3310 or return; 3408 or return;
3311 3409
3312 local $/; 3410 local $/;
3313 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3314 3412
3315 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3316 3414
3317 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $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}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3334 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT; 3433 EV::loop EV::LOOP_ONESHOT;
3336 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3337 }; 3435 };
3338 3436
3437 {
3438 my $guard = freeze_mainloop;
3339 reload_config; 3439 reload_config;
3340 db_init; 3440 db_init;
3341 load_extensions; 3441 load_extensions;
3342 3442
3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3345 EV::loop; 3446 EV::loop;
3346} 3447}
3347 3448
3348############################################################################# 3449#############################################################################
3349# initialisation and cleanup 3450# initialisation and cleanup
… …
3356 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3357 }; 3458 };
3358 } 3459 }
3359} 3460}
3360 3461
3361sub write_runtime { 3462sub write_runtime_sync {
3362 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3363 3464
3364 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3366 3467
… …
3392 and return; 3493 and return;
3393 3494
3394 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3395 3496
3396 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3397} 3541}
3398 3542
3399sub emergency_save() { 3543sub emergency_save() {
3400 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3401 3545
… …
3423 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3424 3568
3425 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3426 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3427 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3428 }; 3576 };
3429 3577
3430 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3431} 3579}
3432 3580
… …
3447 warn "reloading..."; 3595 warn "reloading...";
3448 3596
3449 warn "entering sync_job"; 3597 warn "entering sync_job";
3450 3598
3451 cf::sync_job { 3599 cf::sync_job {
3452 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3453 cf::emergency_save; 3601 cf::emergency_save;
3454 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3455 3603
3456 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3457 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3458 3606
3459 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
… …
3546 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3547 3695
3548 1 3696 1
3549 } or do { 3697 } or do {
3550 warn $@; 3698 warn $@;
3551 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3552 exit 1;
3553 }; 3700 };
3554 3701
3555 warn "reloaded"; 3702 warn "reloaded";
3556}; 3703};
3557 3704
… …
3560sub reload_perl() { 3707sub reload_perl() {
3561 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3562 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3563 3710
3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3712 do_reload_perl;
3565 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3566 do_reload_perl;
3567 }; 3714 };
3568} 3715}
3569 3716
3570register_command "reload" => sub { 3717register_command "reload" => sub {
3571 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
… …
3585 3732
3586our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3587our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3588 3735
3589sub wait_for_tick { 3736sub wait_for_tick {
3590 return unless $TICK_WATCHER->is_active;
3591 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3592 3738
3593 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3594 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3595 $signal->wait; 3741 $signal->wait;
3596} 3742}
3597 3743
3598sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3599 return unless $TICK_WATCHER->is_active;
3600 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3601 3746
3602 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3603 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3604 $signal->wait; 3749 $signal->wait;
3605} 3750}
3606 3751
3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3752sub tick {
3608 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3610 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3611 return; 3756 return;
3612 } 3757 }
3613 3758
3614 $NOW = $tick_start = EV::now;
3615
3616 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3617
3618 $RUNTIME += $TICK;
3619 $NEXT_TICK = $_[0]->at;
3620 3760
3621 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3623 Coro::async_pool { 3763 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3625 write_runtime 3765 write_runtime_sync
3626 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3627 }; 3767 };
3628 } 3768 }
3629 3769
3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3632 } 3772 }
3633 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3634 $sig->send; 3774 $sig->send;
3635 } 3775 }
3636 3776
3637 $LOAD = ($NOW - $tick_start) / $TICK; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639 3779
3640 _post_tick; 3780 if (0) {
3641}; 3781 if ($NEXT_TICK) {
3642$TICK_WATCHER->priority (EV::MAXPRI); 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3786 }
3787}
3643 3788
3644{ 3789{
3645 # configure BDB 3790 # configure BDB
3646 3791
3647 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3648 BDB::max_poll_reqs $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3649 $Coro::BDB::WATCHER->priority (1); 3794 $AnyEvent::BDB::WATCHER->priority (1);
3650 3795
3651 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3652 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3654 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3685{ 3830{
3686 # configure IO::AIO 3831 # configure IO::AIO
3687 3832
3688 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3689 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3690 $Coro::AIO::WATCHER->priority (1); 3835 #undef $AnyEvent::AIO::WATCHER;
3691} 3836}
3692 3837
3693my $_log_backtrace; 3838my $_log_backtrace;
3694 3839
3695sub _log_backtrace { 3840sub _log_backtrace {
… …
3733# load additional modules 3878# load additional modules
3734use cf::pod; 3879use cf::pod;
3735 3880
3736END { cf::emergency_save } 3881END { cf::emergency_save }
3737 3882
3883evthread_start IO::AIO::poll_fileno;
3884
37381 38851
3739 3886

Diff Legend

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