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.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::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
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 213
195 LOG llevError, $msg; 214 LOG llevError, $msg;
196 }; 215 };
197} 216}
217
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
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
198 232
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 243for my $pkg (qw(
210 cf::global cf::attachable 244 cf::global cf::attachable
211 cf::object cf::object::player 245 cf::object cf::object::player
212 cf::client cf::player 246 cf::client cf::player
213 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
214 cf::map cf::party cf::region 249 cf::party cf::region
215)) { 250)) {
216 no strict 'refs'; 251 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 253}
219 254
… …
327 362
328 ! ! $LOCK{$key} 363 ! ! $LOCK{$key}
329} 364}
330 365
331sub freeze_mainloop { 366sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 367 tick_inhibit_inc;
333 368
334 my $guard = Coro::guard { 369 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 370}
340 371
341=item cf::periodic $interval, $cb 372=item cf::periodic $interval, $cb
342 373
343Like 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
… …
398 } 429 }
399 } 430 }
400}; 431};
401 432
402sub get_slot($;$$) { 433sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main;
435
403 my ($time, $pri, $name) = @_; 436 my ($time, $pri, $name) = @_;
404 437
405 $time = $TICK * .6 if $time > $TICK * .6; 438 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 439 my $sig = new Coro::Signal;
407 440
… …
444 # this is the main coro, too bad, we have to block 477 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 478 # till the operation succeeds, freezing the server :/
446 479
447 LOG llevError, Carp::longmess "sync job";#d# 480 LOG llevError, Carp::longmess "sync job";#d#
448 481
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 482 my $freeze_guard = freeze_mainloop;
452 483
453 my $busy = 1; 484 my $busy = 1;
454 my @res; 485 my @res;
455 486
… …
466 } else { 497 } else {
467 EV::loop EV::LOOP_ONESHOT; 498 EV::loop EV::LOOP_ONESHOT;
468 } 499 }
469 } 500 }
470 501
471 $time = EV::time - $time; 502 my $time = EV::time - $time;
472 503
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 504 $TICK_START += $time; # do not account sync jobs to server load
477 505
478 wantarray ? @res : $res[0] 506 wantarray ? @res : $res[0]
479 } else { 507 } else {
480 # we are in another coroutine, how wonderful, everything just works 508 # we are in another coroutine, how wonderful, everything just works
481 509
… …
523 reset_signals; 551 reset_signals;
524 &$cb 552 &$cb
525 }, @args; 553 }, @args;
526 554
527 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
528} 583}
529 584
530=item $value = cf::db_get $family => $key 585=item $value = cf::db_get $family => $key
531 586
532Returns a single value from the environment database. 587Returns a single value from the environment database.
… …
1088 utf8::decode (my $decname = $filename); 1143 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1144 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1145 $decname, length $$rdata, scalar @$objs;
1091 1146
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1148 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1150 aio_fsync $fh if $cf::USE_FSYNC;
1096 close $fh; 1151 aio_close $fh;
1097 1152
1098 if (@$objs) { 1153 if (@$objs) {
1099 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) {
1100 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1157 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1104 close $fh; 1159 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1160 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1161 }
1107 } else { 1162 } else {
1108 aio_unlink "$filename.pst"; 1163 aio_unlink "$filename.pst";
1109 } 1164 }
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1359 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1360 : "$v->{base}: extension inactive.\n";
1306 1361
1307 if (exists $v->{meta}{mandatory}) { 1362 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1363 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1364 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1365 }
1312 1366
1313 warn $msg; 1367 warn $msg;
1314 } 1368 }
1315 1369
… …
1404 my $f = new_from_file cf::object::thawer path $login 1458 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1459 or return;
1406 1460
1407 my $pl = cf::player::load_pl $f 1461 my $pl = cf::player::load_pl $f
1408 or return; 1462 or return;
1463
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1464 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1465 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1466 $cf::PLAYER{$login} = $pl
1412 } 1467 }
1413 } 1468 }
… …
1423 1478
1424 return if $pl->{deny_save}; 1479 return if $pl->{deny_save};
1425 1480
1426 aio_mkdir playerdir $pl, 0770; 1481 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1482 $pl->{last_save} = $cf::RUNTIME;
1483
1484 cf::get_slot 0.01;
1428 1485
1429 $pl->save_pl ($path); 1486 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1487 cf::cede_to_tick;
1431} 1488}
1432 1489
… …
1468 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1469 $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
1470 1527
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1475 1534
1476 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1516 1575
1517 for my $login (@$dirs) { 1576 for my $login (@$dirs) {
1518 my $path = path $login; 1577 my $path = path $login;
1519 1578
1520 # a .pst is a dead give-away for a valid player 1579 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1580 # if no pst file found, open and chekc for blocked users
1581 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1582 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1583 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1584 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1585 }
1526 1586
… …
1725our $MAX_RESET = 3600; 1785our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1786our $DEFAULT_RESET = 3000;
1727 1787
1728sub generate_random_map { 1788sub generate_random_map {
1729 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
1730 # mit "rum" bekleckern, nicht 1793 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1794 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1919
1857# the temporary/swap location 1920# the temporary/swap location
1858sub save_path { 1921sub save_path {
1859 my ($self) = @_; 1922 my ($self) = @_;
1860 1923
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1924 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1925 "$TMPDIR/$path.map"
1863} 1926}
1864 1927
1865# the unique path, undef == no special unique path 1928# the unique path, undef == no special unique path
1866sub uniq_path { 1929sub uniq_path {
1867 my ($self) = @_; 1930 my ($self) = @_;
1868 1931
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1933 "$UNIQUEDIR/$path"
1871} 1934}
1872 1935
1873# and all this just because we cannot iterate over 1936# and all this just because we cannot iterate over
1874# all maps in C++... 1937# all maps in C++...
… …
1972 2035
1973 cf::lock_wait "map_data:$path";#d#remove 2036 cf::lock_wait "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
1975 2038
1976 $cf::MAP{$path} || do { 2039 $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 2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
1979 2042
1980 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
1981 or return; 2044 or return;
1982 2045
1983 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
… …
1986 or return; 2049 or return;
1987 2050
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
1991 undef $guard1; 2055 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2056 $map->reset;
1994 return find $path; 2057 return find $path;
1995 } 2058 }
1996 2059
1997 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
… …
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2087 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2088 $f->skip_block;
2026 $self->_load_objects ($f) 2089 $self->_load_objects ($f)
2027 or return; 2090 or return;
2028 2091
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
2030 if delete $self->{load_original}; 2093 if delete $self->{load_original};
2031 2094
2032 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2096 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2097 unless (aio_stat $uniq) {
… …
2060 } 2123 }
2061 2124
2062 $self->{last_save} = $cf::RUNTIME; 2125 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2126 $self->last_access ($cf::RUNTIME);
2064 2127
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2128 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2129 }
2067 2130
2068 $self->post_load; 2131 $self->post_load;
2069} 2132}
2070 2133
… …
2128 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
2129 2192
2130 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
2131 2194
2132 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2197 }
2135 2198
2136 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
2137 2200
2138 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2238 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2239 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2240 $_->contr->save for $self->players;
2178 }; 2241 };
2179 2242
2243 cf::get_slot 0.02;
2244
2180 if ($uniq) { 2245 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2247 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2248 } else {
2184 $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);
… …
2192 $self->save; 2257 $self->save;
2193 2258
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2260
2196 return if $self->players; 2261 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2199 2264
2200 $self->in_memory (cf::MAP_SWAPPED); 2265 $self->in_memory (cf::MAP_SWAPPED);
2201 2266
2202 $self->deactivate; 2267 $self->deactivate;
… …
2320 2385
2321sub unique_maps() { 2386sub unique_maps() {
2322 [ 2387 [
2323 map { 2388 map {
2324 utf8::decode $_; 2389 utf8::decode $_;
2325 /\.map$/ 2390 s/\.map$//; # TODO future compatibility hack
2391 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2392 ? ()
2326 ? normalise $_ 2393 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2394 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2395 ]
2330} 2396}
2331 2397
2332package cf;
2333
2334=back 2398=back
2335 2399
2336=head3 cf::object 2400=head3 cf::object
2337 2401
2338=cut 2402=cut
… …
2341 2405
2342=over 4 2406=over 4
2343 2407
2344=item $ob->inv_recursive 2408=item $ob->inv_recursive
2345 2409
2346Returns 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.
2347 2412
2348=cut 2413=cut
2349 2414
2350sub inv_recursive_; 2415sub inv_recursive_;
2351sub inv_recursive_ { 2416sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2421 inv_recursive_ inv $_[0]
2357} 2422}
2358 2423
2359=item $ref = $ob->ref 2424=item $ref = $ob->ref
2360 2425
2361creates 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.
2362 2427
2363=item $ob = cf::object::deref ($refstring) 2428=item $ob = cf::object::deref ($refstring)
2364 2429
2365returns 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,
2366even if the object actually exists. May block. 2431even if the object actually exists. May block.
… …
2398can 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
2399dialogue with the given NPC character. 2464dialogue with the given NPC character.
2400 2465
2401=cut 2466=cut
2402 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
2403# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2483# with dialog boxes.
2405#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
2406sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2486 my ($self, $npc, $msg, $flags) = @_;
… …
2418 my $dialog = $pl->{npc_dialog}; 2497 my $dialog = $pl->{npc_dialog};
2419 $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));
2420 2499
2421 } else { 2500 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2503 }
2425 } 2504 }
2426} 2505}
2427 2506
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2507=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2535Moves 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
2536her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2537that 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
2538the 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
2539be 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 >>.
2540 2622
2541=cut 2623=cut
2542 2624
2543our $GOTOGEN; 2625our $GOTOGEN;
2544 2626
… …
2623} 2705}
2624 2706
2625sub prepare_random_map { 2707sub prepare_random_map {
2626 my ($exit) = @_; 2708 my ($exit) = @_;
2627 2709
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2712 # that depends on the exit object
2633 2713
2634 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2636 if ($exit->map) { 2716 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2641 } 2723 }
2642 2724
2643 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2644 2726
2645 my $data = cf::encode_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2648 2730
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2733 undef $fh;
2652 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2653 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2656 } 2742 }
2657} 2743}
2658 2744
2659sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2661 2747
2662 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2663 2749
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; 2750 $self->enter_link;
2676 2751
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 { 2752 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2753 $Coro::current->{desc} = "enter_exit";
2683 2754
2684 $self->deactivate_recursive; # just to be sure
2685 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
2686 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2687 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
2688 1; 2776 1
2689 }) { 2777 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2691 . "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. "
2692 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2773 id => "infobox", 2861 id => "infobox",
2774 title => "Map Info", 2862 title => "Map Info",
2775 reply => undef, 2863 reply => undef,
2776 tooltip => "Information related to the maps", 2864 tooltip => "Information related to the maps",
2777 }, 2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2778); 2872);
2779 2873
2780sub cf::client::send_msg { 2874sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2875 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2876
… …
3019 3113
3020The following functions and methods are available within a safe environment: 3114The following functions and methods are available within a safe environment:
3021 3115
3022 cf::object 3116 cf::object
3023 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
3024 insert remove name archname title slaying race decrease_ob_nr 3118 insert remove name archname title slaying race decrease split
3025 3119
3026 cf::object::player 3120 cf::object::player
3027 player 3121 player
3028 3122
3029 cf::player 3123 cf::player
… …
3034 3128
3035=cut 3129=cut
3036 3130
3037for ( 3131for (
3038 ["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
3039 insert remove inv name archname title slaying race 3133 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3134 decrease split destroy change_exp)],
3041 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
3044) { 3138) {
3045 no strict 'refs'; 3139 no strict 'refs';
… …
3253 while (my ($k, $v) = each %$want) { 3347 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v); 3348 $ns->fx_want ($k, $v);
3255 } 3349 }
3256}; 3350};
3257 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
3258sub reload_regions { 3362sub reload_regions {
3259 # 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
3260 # for this (global event?) 3364 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = (); 3365 %ext::player_env::MUSIC_FACE_CACHE = ();
3262 3366
… …
3275} 3379}
3276 3380
3277sub reload_archetypes { 3381sub reload_archetypes {
3278 load_resource_file "$DATADIR/archetypes" 3382 load_resource_file "$DATADIR/archetypes"
3279 or die "unable to load archetypes\n"; 3383 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} 3384}
3286 3385
3287sub reload_treasures { 3386sub reload_treasures {
3288 load_resource_file "$DATADIR/treasures" 3387 load_resource_file "$DATADIR/treasures"
3289 or die "unable to load treasurelists\n"; 3388 or die "unable to load treasurelists\n";
3290} 3389}
3291 3390
3292sub reload_resources { 3391sub reload_resources {
3293 warn "reloading resource files...\n"; 3392 warn "reloading resource files...\n";
3294 3393
3394 reload_facedata;
3395 reload_archetypes;
3295 reload_regions; 3396 reload_regions;
3296 reload_facedata;
3297 #reload_archetypes;#d#
3298 reload_archetypes;
3299 reload_treasures; 3397 reload_treasures;
3300 3398
3301 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
3302} 3400}
3303 3401
3304sub init { 3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3305 reload_resources; 3407 reload_resources;
3306} 3408}
3307 3409
3308sub reload_config { 3410sub reload_config {
3309 open my $fh, "<:utf8", "$CONFDIR/config" 3411 open my $fh, "<:utf8", "$CONFDIR/config"
3310 or return; 3412 or return;
3311 3413
3312 local $/; 3414 local $/;
3313 *CFG = YAML::Syck::Load <$fh>; 3415 *CFG = YAML::Load <$fh>;
3314 3416
3315 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3316 3418
3317 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3419 $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}; 3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3334 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3436 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT; 3437 EV::loop EV::LOOP_ONESHOT;
3336 })->prio (Coro::PRIO_MAX); 3438 })->prio (Coro::PRIO_MAX);
3337 }; 3439 };
3338 3440
3441 {
3442 my $guard = freeze_mainloop;
3339 reload_config; 3443 reload_config;
3340 db_init; 3444 db_init;
3341 load_extensions; 3445 load_extensions;
3342 3446
3343 $TICK_WATCHER->start;
3344 $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
3345 EV::loop; 3450 EV::loop;
3346} 3451}
3347 3452
3348############################################################################# 3453#############################################################################
3349# initialisation and cleanup 3454# initialisation and cleanup
… …
3356 cf::cleanup "SIG$signal"; 3461 cf::cleanup "SIG$signal";
3357 }; 3462 };
3358 } 3463 }
3359} 3464}
3360 3465
3361sub write_runtime { 3466sub write_runtime_sync {
3362 my $runtime = "$LOCALDIR/runtime"; 3467 my $runtime = "$LOCALDIR/runtime";
3363 3468
3364 # first touch the runtime file to show we are still running: 3469 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time. 3470 # the fsync below can take a very very long time.
3366 3471
… …
3392 and return; 3497 and return;
3393 3498
3394 warn "runtime file written.\n"; 3499 warn "runtime file written.\n";
3395 3500
3396 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 };
3397} 3545}
3398 3546
3399sub emergency_save() { 3547sub emergency_save() {
3400 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3401 3549
… …
3423 warn "end emergency map save\n"; 3571 warn "end emergency map save\n";
3424 3572
3425 warn "begin emergency database checkpoint\n"; 3573 warn "begin emergency database checkpoint\n";
3426 BDB::db_env_txn_checkpoint $DB_ENV; 3574 BDB::db_env_txn_checkpoint $DB_ENV;
3427 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";
3428 }; 3580 };
3429 3581
3430 warn "leave emergency perl save\n"; 3582 warn "leave emergency perl save\n";
3431} 3583}
3432 3584
… …
3447 warn "reloading..."; 3599 warn "reloading...";
3448 3600
3449 warn "entering sync_job"; 3601 warn "entering sync_job";
3450 3602
3451 cf::sync_job { 3603 cf::sync_job {
3452 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3453 cf::emergency_save; 3605 cf::emergency_save;
3454 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3455 3607
3456 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3457 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3458 3610
3459 # 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
… …
3546 warn "leaving sync_job"; 3698 warn "leaving sync_job";
3547 3699
3548 1 3700 1
3549 } or do { 3701 } or do {
3550 warn $@; 3702 warn $@;
3551 warn "error while reloading, exiting."; 3703 cf::cleanup "error while reloading, exiting.";
3552 exit 1;
3553 }; 3704 };
3554 3705
3555 warn "reloaded"; 3706 warn "reloaded";
3556}; 3707};
3557 3708
… …
3560sub reload_perl() { 3711sub reload_perl() {
3561 # doing reload synchronously and two reloads happen back-to-back, 3712 # doing reload synchronously and two reloads happen back-to-back,
3562 # coro crashes during coro_state_free->destroy here. 3713 # coro crashes during coro_state_free->destroy here.
3563 3714
3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3716 do_reload_perl;
3565 undef $RELOAD_WATCHER; 3717 undef $RELOAD_WATCHER;
3566 do_reload_perl;
3567 }; 3718 };
3568} 3719}
3569 3720
3570register_command "reload" => sub { 3721register_command "reload" => sub {
3571 my ($who, $arg) = @_; 3722 my ($who, $arg) = @_;
… …
3585 3736
3586our @WAIT_FOR_TICK; 3737our @WAIT_FOR_TICK;
3587our @WAIT_FOR_TICK_BEGIN; 3738our @WAIT_FOR_TICK_BEGIN;
3588 3739
3589sub wait_for_tick { 3740sub wait_for_tick {
3590 return unless $TICK_WATCHER->is_active;
3591 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3592 3742
3593 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3594 push @WAIT_FOR_TICK, $signal; 3744 push @WAIT_FOR_TICK, $signal;
3595 $signal->wait; 3745 $signal->wait;
3596} 3746}
3597 3747
3598sub wait_for_tick_begin { 3748sub wait_for_tick_begin {
3599 return unless $TICK_WATCHER->is_active;
3600 return if $Coro::current == $Coro::main; 3749 return if tick_inhibit || $Coro::current == $Coro::main;
3601 3750
3602 my $signal = new Coro::Signal; 3751 my $signal = new Coro::Signal;
3603 push @WAIT_FOR_TICK_BEGIN, $signal; 3752 push @WAIT_FOR_TICK_BEGIN, $signal;
3604 $signal->wait; 3753 $signal->wait;
3605} 3754}
3606 3755
3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3756sub tick {
3608 if ($Coro::current != $Coro::main) { 3757 if ($Coro::current != $Coro::main) {
3609 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"
3610 unless ++$bug_warning > 10; 3759 unless ++$bug_warning > 10;
3611 return; 3760 return;
3612 } 3761 }
3613 3762
3614 $NOW = $tick_start = EV::now;
3615
3616 cf::server_tick; # one server iteration 3763 cf::server_tick; # one server iteration
3617
3618 $RUNTIME += $TICK;
3619 $NEXT_TICK = $_[0]->at;
3620 3764
3621 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3765 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3622 $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.;
3623 Coro::async_pool { 3767 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver"; 3768 $Coro::current->{desc} = "runtime saver";
3625 write_runtime 3769 write_runtime_sync
3626 or warn "ERROR: unable to write runtime file: $!"; 3770 or warn "ERROR: unable to write runtime file: $!";
3627 }; 3771 };
3628 } 3772 }
3629 3773
3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3632 } 3776 }
3633 while (my $sig = shift @WAIT_FOR_TICK) { 3777 while (my $sig = shift @WAIT_FOR_TICK) {
3634 $sig->send; 3778 $sig->send;
3635 } 3779 }
3636 3780
3637 $LOAD = ($NOW - $tick_start) / $TICK; 3781 $LOAD = ($NOW - $TICK_START) / $TICK;
3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639 3783
3640 _post_tick; 3784 if (0) {
3641}; 3785 if ($NEXT_TICK) {
3642$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}
3643 3792
3644{ 3793{
3645 # configure BDB 3794 # configure BDB
3646 3795
3647 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
3648 BDB::max_poll_reqs $TICK * 0.1; 3797 BDB::max_poll_reqs $TICK * 0.1;
3649 $Coro::BDB::WATCHER->priority (1); 3798 $AnyEvent::BDB::WATCHER->priority (1);
3650 3799
3651 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
3652 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3654 | 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;
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3657 3807
3658 cf::sync_job { 3808 cf::sync_job {
3659 eval { 3809 eval {
… …
3685{ 3835{
3686 # configure IO::AIO 3836 # configure IO::AIO
3687 3837
3688 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
3689 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
3690 $Coro::AIO::WATCHER->priority (1); 3840 undef $AnyEvent::AIO::WATCHER;
3691} 3841}
3692 3842
3693my $_log_backtrace; 3843my $_log_backtrace;
3694 3844
3695sub _log_backtrace { 3845sub _log_backtrace {

Diff Legend

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