ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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