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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 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';
… …
327 361
328 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
329} 363}
330 364
331sub freeze_mainloop { 365sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
333 367
334 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 369}
340 370
341=item cf::periodic $interval, $cb 371=item cf::periodic $interval, $cb
342 372
343Like 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
… …
398 } 428 }
399 } 429 }
400}; 430};
401 431
402sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
403 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
404 436
405 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
407 439
… …
444 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
446 478
447 LOG llevError, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
448 480
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
452 482
453 my $busy = 1; 483 my $busy = 1;
454 my @res; 484 my @res;
455 485
… …
466 } else { 496 } else {
467 EV::loop EV::LOOP_ONESHOT; 497 EV::loop EV::LOOP_ONESHOT;
468 } 498 }
469 } 499 }
470 500
471 $time = EV::time - $time; 501 my $time = EV::time - $time;
472 502
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 503 $TICK_START += $time; # do not account sync jobs to server load
477 504
478 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
479 } else { 506 } else {
480 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
481 508
… …
523 reset_signals; 550 reset_signals;
524 &$cb 551 &$cb
525 }, @args; 552 }, @args;
526 553
527 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
528} 582}
529 583
530=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
531 585
532Returns a single value from the environment database. 586Returns a single value from the environment database.
… …
969 } 1023 }
970 1024
971 0 1025 0
972} 1026}
973 1027
974=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
975 1029
976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
977 1031
978Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
979 1033
… …
1088 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1091 1145
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1096 close $fh; 1150 aio_close $fh;
1097 1151
1098 if (@$objs) { 1152 if (@$objs) {
1099 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) {
1100 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1104 close $fh; 1158 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1160 }
1107 } else { 1161 } else {
1108 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1109 } 1163 }
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1306 1360
1307 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1362 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1364 }
1312 1365
1313 warn $msg; 1366 warn $msg;
1314 } 1367 }
1315 1368
… …
1404 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1458 or return;
1406 1459
1407 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1408 or return; 1461 or return;
1462
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1412 } 1466 }
1413 } 1467 }
… …
1423 1477
1424 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1425 1479
1426 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1428 1484
1429 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1486 cf::cede_to_tick;
1431} 1487}
1432 1488
… …
1468 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1469 $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
1470 1526
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1475 1533
1476 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1516 1574
1517 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1518 my $path = path $login; 1576 my $path = path $login;
1519 1577
1520 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1584 }
1526 1585
… …
1725our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1727 1786
1728sub generate_random_map { 1787sub generate_random_map {
1729 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
1730 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1793 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1918
1857# the temporary/swap location 1919# the temporary/swap location
1858sub save_path { 1920sub save_path {
1859 my ($self) = @_; 1921 my ($self) = @_;
1860 1922
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1863} 1925}
1864 1926
1865# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1866sub uniq_path { 1928sub uniq_path {
1867 my ($self) = @_; 1929 my ($self) = @_;
1868 1930
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1871} 1933}
1872 1934
1873# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1874# all maps in C++... 1936# all maps in C++...
… …
1972 2034
1973 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1975 2037
1976 $cf::MAP{$path} || do { 2038 $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 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
1979 2041
1980 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1981 or return; 2043 or return;
1982 2044
1983 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1986 or return; 2048 or return;
1987 2049
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1991 undef $guard1; 2054 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2055 $map->reset;
1994 return find $path; 2056 return find $path;
1995 } 2057 }
1996 2058
1997 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2087 $f->skip_block;
2026 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
2027 or return; 2089 or return;
2028 2090
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
2030 if delete $self->{load_original}; 2092 if delete $self->{load_original};
2031 2093
2032 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2095 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
… …
2060 } 2122 }
2061 2123
2062 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2064 2126
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2128 }
2067 2129
2068 $self->post_load; 2130 $self->post_load;
2069} 2131}
2070 2132
… …
2128 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2129 2191
2130 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2131 2193
2132 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2196 }
2135 2197
2136 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2137 2199
2138 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2237 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2178 }; 2240 };
2179 2241
2242 cf::get_slot 0.02;
2243
2180 if ($uniq) { 2244 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2247 } else {
2184 $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);
… …
2192 $self->save; 2256 $self->save;
2193 2257
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2259
2196 return if $self->players; 2260 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2199 2263
2200 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2201 2265
2202 $self->deactivate; 2266 $self->deactivate;
… …
2320 2384
2321sub unique_maps() { 2385sub unique_maps() {
2322 [ 2386 [
2323 map { 2387 map {
2324 utf8::decode $_; 2388 utf8::decode $_;
2325 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2326 ? normalise $_ 2392 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2394 ]
2330} 2395}
2331 2396
2332package cf;
2333
2334=back 2397=back
2335 2398
2336=head3 cf::object 2399=head3 cf::object
2337 2400
2338=cut 2401=cut
… …
2341 2404
2342=over 4 2405=over 4
2343 2406
2344=item $ob->inv_recursive 2407=item $ob->inv_recursive
2345 2408
2346Returns 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.
2347 2411
2348=cut 2412=cut
2349 2413
2350sub inv_recursive_; 2414sub inv_recursive_;
2351sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2357} 2421}
2358 2422
2359=item $ref = $ob->ref 2423=item $ref = $ob->ref
2360 2424
2361creates 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.
2362 2426
2363=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2364 2428
2365returns 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,
2366even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2398can 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
2399dialogue with the given NPC character. 2463dialogue with the given NPC character.
2400 2464
2401=cut 2465=cut
2402 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
2403# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2482# with dialog boxes.
2405#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
2406sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2418 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2419 $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));
2420 2498
2421 } else { 2499 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2502 }
2425 } 2503 }
2426} 2504}
2427 2505
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2535Moves the player to the given map-path and coordinates by first freezing 2613Moves the player to the given map-path and coordinates by first freezing
2536her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2537that has to return the map if sucecssful, and then unfreezes the player on 2615that 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 2616the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process. 2617be called at the end of this process.
2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2540 2621
2541=cut 2622=cut
2542 2623
2543our $GOTOGEN; 2624our $GOTOGEN;
2544 2625
… …
2623} 2704}
2624 2705
2625sub prepare_random_map { 2706sub prepare_random_map {
2626 my ($exit) = @_; 2707 my ($exit) = @_;
2627 2708
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2711 # that depends on the exit object
2633 2712
2634 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
… …
2636 if ($exit->map) { 2715 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2641 } 2722 }
2642 2723
2643 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2644 2725
2645 my $data = cf::encode_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2648 2729
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2732 undef $fh;
2652 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2653 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2656 } 2741 }
2657} 2742}
2658 2743
2659sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2661 2746
2662 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2663 2748
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; 2749 $self->enter_link;
2676 2750
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 { 2751 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2683 2753
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2686 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2687 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2688 1; 2775 1
2689 }) { 2776 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2691 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2773 id => "infobox", 2860 id => "infobox",
2774 title => "Map Info", 2861 title => "Map Info",
2775 reply => undef, 2862 reply => undef,
2776 tooltip => "Information related to the maps", 2863 tooltip => "Information related to the maps",
2777 }, 2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2778); 2871);
2779 2872
2780sub cf::client::send_msg { 2873sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2875
… …
3019 3112
3020The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
3021 3114
3022 cf::object 3115 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3116 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
3025 3118
3026 cf::object::player 3119 cf::object::player
3027 player 3120 player
3028 3121
3029 cf::player 3122 cf::player
… …
3034 3127
3035=cut 3128=cut
3036 3129
3037for ( 3130for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3133 decrease split destroy change_exp)],
3041 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
3044) { 3137) {
3045 no strict 'refs'; 3138 no strict 'refs';
… …
3218 $RESOURCE{$name} = $info; 3311 $RESOURCE{$name} = $info;
3219 } 3312 }
3220 3313
3221 cf::cede_to_tick; 3314 cf::cede_to_tick;
3222 } 3315 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 } 3316 }
3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3242 3319
3243 1 3320 1
3244} 3321}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3245 3342
3246register_exticmd fx_want => sub { 3343register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_; 3344 my ($ns, $want) = @_;
3248 3345
3249 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3251 } 3348 }
3252}; 3349};
3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3253 3360
3254sub reload_regions { 3361sub reload_regions {
3255 # HACK to clear player env face cache, we need some signal framework 3362 # HACK to clear player env face cache, we need some signal framework
3256 # for this (global event?) 3363 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3271} 3378}
3272 3379
3273sub reload_archetypes { 3380sub reload_archetypes {
3274 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3275 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
3276 #d# NEED to laod twice to resolve forward references
3277 # this really needs to be done in an extra post-pass
3278 # (which needs to be synchronous, so solve it differently)
3279 load_resource_file "$DATADIR/archetypes"
3280 or die "unable to load archetypes\n";
3281} 3383}
3282 3384
3283sub reload_treasures { 3385sub reload_treasures {
3284 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3285 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3286} 3388}
3287 3389
3288sub reload_resources { 3390sub reload_resources {
3289 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3290 3392
3393 reload_facedata;
3394 reload_archetypes;
3291 reload_regions; 3395 reload_regions;
3292 reload_facedata;
3293 #reload_archetypes;#d#
3294 reload_archetypes;
3295 reload_treasures; 3396 reload_treasures;
3296 3397
3297 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3298} 3399}
3299 3400
3300sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3301 reload_resources; 3406 reload_resources;
3302} 3407}
3303 3408
3304sub reload_config { 3409sub reload_config {
3305 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
3306 or return; 3411 or return;
3307 3412
3308 local $/; 3413 local $/;
3309 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
3310 3415
3311 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3312 3417
3313 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3314 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3330 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3332 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3333 }; 3438 };
3334 3439
3440 {
3441 my $guard = freeze_mainloop;
3335 reload_config; 3442 reload_config;
3336 db_init; 3443 db_init;
3337 load_extensions; 3444 load_extensions;
3338 3445
3339 $TICK_WATCHER->start;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
3341 EV::loop; 3449 EV::loop;
3342} 3450}
3343 3451
3344############################################################################# 3452#############################################################################
3345# initialisation and cleanup 3453# initialisation and cleanup
… …
3352 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3353 }; 3461 };
3354 } 3462 }
3355} 3463}
3356 3464
3357sub write_runtime { 3465sub write_runtime_sync {
3358 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3359 3467
3360 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3361 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3362 3470
… …
3388 and return; 3496 and return;
3389 3497
3390 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3391 3499
3392 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
3393} 3544}
3394 3545
3395sub emergency_save() { 3546sub emergency_save() {
3396 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3397 3548
… …
3419 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3420 3571
3421 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3422 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3423 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
3424 }; 3579 };
3425 3580
3426 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3427} 3582}
3428 3583
… …
3443 warn "reloading..."; 3598 warn "reloading...";
3444 3599
3445 warn "entering sync_job"; 3600 warn "entering sync_job";
3446 3601
3447 cf::sync_job { 3602 cf::sync_job {
3448 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3449 cf::emergency_save; 3604 cf::emergency_save;
3450 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3451 3606
3452 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3453 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3454 3609
3455 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
… …
3542 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3543 3698
3544 1 3699 1
3545 } or do { 3700 } or do {
3546 warn $@; 3701 warn $@;
3547 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3548 exit 1;
3549 }; 3703 };
3550 3704
3551 warn "reloaded"; 3705 warn "reloaded";
3552}; 3706};
3553 3707
… …
3556sub reload_perl() { 3710sub reload_perl() {
3557 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3558 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3559 3713
3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3715 do_reload_perl;
3561 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3562 do_reload_perl;
3563 }; 3717 };
3564} 3718}
3565 3719
3566register_command "reload" => sub { 3720register_command "reload" => sub {
3567 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
… …
3581 3735
3582our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3583our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3584 3738
3585sub wait_for_tick { 3739sub wait_for_tick {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3741
3589 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3591 $signal->wait; 3744 $signal->wait;
3592} 3745}
3593 3746
3594sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3749
3598 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3600 $signal->wait; 3752 $signal->wait;
3601} 3753}
3602 3754
3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3755sub tick {
3604 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3607 return; 3759 return;
3608 } 3760 }
3609 3761
3610 $NOW = $tick_start = EV::now;
3611
3612 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3613
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK = $_[0]->at;
3616 3763
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3766 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3767 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3768 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3769 or warn "ERROR: unable to write runtime file: $!";
3623 }; 3770 };
3624 } 3771 }
3625 3772
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3628 } 3775 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3777 $sig->send;
3631 } 3778 }
3632 3779
3633 $LOAD = ($NOW - $tick_start) / $TICK; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3635 3782
3636 _post_tick; 3783 if (0) {
3637}; 3784 if ($NEXT_TICK) {
3638$TICK_WATCHER->priority (EV::MAXPRI); 3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
3789 }
3790}
3639 3791
3640{ 3792{
3641 # configure BDB 3793 # configure BDB
3642 3794
3643 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3644 BDB::max_poll_reqs $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3645 $Coro::BDB::WATCHER->priority (1); 3797 $AnyEvent::BDB::WATCHER->priority (1);
3646 3798
3647 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3648 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3650 | BDB::LOG_AUTOREMOVE, 1); 3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3653 3806
3654 cf::sync_job { 3807 cf::sync_job {
3655 eval { 3808 eval {
… …
3681{ 3834{
3682 # configure IO::AIO 3835 # configure IO::AIO
3683 3836
3684 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3685 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3686 $Coro::AIO::WATCHER->priority (1); 3839 undef $AnyEvent::AIO::WATCHER;
3687} 3840}
3688 3841
3689my $_log_backtrace; 3842my $_log_backtrace;
3690 3843
3691sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

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