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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.420 by root, Tue Apr 15 14:21:04 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 Event; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.51 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
… …
89 105
90our %CFG; 106our %CFG;
91 107
92our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 109our $RUNTIME;
110our $NOW;
94 111
95our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
98 115
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
… …
162 180
163The raw value load value from the last tick. 181The raw value load value from the last tick.
164 182
165=item %cf::CFG 183=item %cf::CFG
166 184
167Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 186from wherever your confdir points to.
169 187
170=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
171 189
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 248)) {
216 no strict 'refs'; 249 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 251}
219 252
220$Event::DIED = sub { 253$EV::DIED = sub {
221 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
222}; 255};
223 256
224############################################################################# 257#############################################################################
225 258
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 282 $d
250 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
251} 284}
252 285
253=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
254 287
255Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
256 289
257=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
258 291
259Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
260 293
261=cut 294=cut
262 295
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 297
265sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
267 300
268=item cf::lock_wait $string 301=item cf::lock_wait $string
269 302
270Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
271 304
… …
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 368}
336 }; 369
337 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
338 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
339} 383}
340 384
341=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
342 386
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
383 } 427 }
384 } 428 }
385}; 429};
386 430
387sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit;
433
388 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
389 435
390 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
392 438
… …
406 452
407BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
408 454
409=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
410 456
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 460acceptable.
415 461
416If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
… …
422 468
423sub sync_job(&) { 469sub sync_job(&) {
424 my ($job) = @_; 470 my ($job) = @_;
425 471
426 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 473 my $time = EV::time;
428 474
429 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
431 477
432 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
433 479
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
437 481
438 my $busy = 1; 482 my $busy = 1;
439 my @res; 483 my @res;
440 484
… …
447 491
448 while ($busy) { 492 while ($busy) {
449 if (Coro::nready) { 493 if (Coro::nready) {
450 Coro::cede_notself; 494 Coro::cede_notself;
451 } else { 495 } else {
452 Event::one_event; 496 EV::loop EV::LOOP_ONESHOT;
453 } 497 }
454 } 498 }
455 499
456 $time = Event::time - $time; 500 my $time = EV::time - $time;
457 501
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
462 503
463 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
464 } else { 505 } else {
465 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
466 507
… …
491=item fork_call { }, $args 532=item fork_call { }, $args
492 533
493Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
497 538
498=cut 539=cut
499 540
500sub fork_call(&@) { 541sub fork_call(&@) {
501 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
… …
508 reset_signals; 549 reset_signals;
509 &$cb 550 &$cb
510 }, @args; 551 }, @args;
511 552
512 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
513} 581}
514 582
515=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
516 584
517Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
664 732
665In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 735Deliantra).
668 736
669=over 4 737=over 4
670 738
671=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
672 740
… …
954 } 1022 }
955 1023
956 0 1024 0
957} 1025}
958 1026
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1028
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1030
963Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
964 1032
… …
1042cf::attachable->attach ( 1110cf::attachable->attach (
1043 prio => -1000000, 1111 prio => -1000000,
1044 on_instantiate => sub { 1112 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1046 1114
1047 $data = from_json $data; 1115 $data = decode_json $data;
1048 1116
1049 for (@$data) { 1117 for (@$data) {
1050 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1051 1119
1052 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
… …
1289 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1291 1359
1292 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1361 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1363 }
1297 1364
1298 warn $msg; 1365 warn $msg;
1299 } 1366 }
1300 1367
… …
1409 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1410 1477
1411 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1413 1480
1481 cf::get_slot 0.01;
1482
1414 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1484 cf::cede_to_tick;
1416} 1485}
1417 1486
1418sub new($) { 1487sub new($) {
… …
1548 1617
1549Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1550 1619
1551=cut 1620=cut
1552 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1553sub expand_cfpod { 1633sub expand_cfpod {
1554 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1555 1635
1556 # escape & and < 1636 my $xml;
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559 1637
1560 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1561 1641
1562 1 while 1642 $group =~ s/&/&amp;/g;
1563 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1564 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1565 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1566 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1647 ([BCGHITU])
1568 # replace G<male|female> tags 1648 <
1569 || s{G<([^>|]*)\|([^>]*)>}{ 1649 (?:
1570 $self->gender ? $2 : $1 1650 ([^<>]*) (?{ $group = $^N })
1571 }ge 1651 | < $interior >
1572 # replace H<hint text> 1652 )
1573 || s{H<([^\>]*)>} 1653 >
1654 %gcsx
1574 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "") 1675 "")
1578 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1579 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1580 1687
1688 for ($xml) {
1581 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1583 1691
1584 # compress some whitespace 1692 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1589 1698
1590 $_ 1699 $xml
1591} 1700}
1701
1702no re 'eval';
1592 1703
1593sub hintmode { 1704sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode} 1706 $_[0]{hintmode}
1596} 1707}
… …
1668our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1670 1781
1671sub generate_random_map { 1782sub generate_random_map {
1672 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1673 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1788 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1799 1913
1800# the temporary/swap location 1914# the temporary/swap location
1801sub save_path { 1915sub save_path {
1802 my ($self) = @_; 1916 my ($self) = @_;
1803 1917
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1806} 1920}
1807 1921
1808# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1809sub uniq_path { 1923sub uniq_path {
1810 my ($self) = @_; 1924 my ($self) = @_;
1811 1925
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1814} 1928}
1815 1929
1816# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1817# all maps in C++... 1931# all maps in C++...
… …
2003 } 2117 }
2004 2118
2005 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2007 2121
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2123 }
2010 2124
2011 $self->post_load; 2125 $self->post_load;
2012} 2126}
2013 2127
… …
2071 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2072 2186
2073 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2074 2188
2075 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2191 }
2078 2192
2079 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2080 2194
2081 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2118 cf::async { 2232 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2121 }; 2235 };
2122 2236
2237 cf::get_slot 0.02;
2238
2123 if ($uniq) { 2239 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2242 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2135 $self->save; 2251 $self->save;
2136 2252
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2254
2139 return if $self->players; 2255 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2142 2258
2143 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2144 2260
2145 $self->deactivate; 2261 $self->deactivate;
… …
2263 2379
2264sub unique_maps() { 2380sub unique_maps() {
2265 [ 2381 [
2266 map { 2382 map {
2267 utf8::decode $_; 2383 utf8::decode $_;
2268 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2269 ? normalise $_ 2387 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2389 ]
2273} 2390}
2274 2391
2275package cf;
2276
2277=back 2392=back
2278 2393
2279=head3 cf::object 2394=head3 cf::object
2280 2395
2281=cut 2396=cut
… …
2284 2399
2285=over 4 2400=over 4
2286 2401
2287=item $ob->inv_recursive 2402=item $ob->inv_recursive
2288 2403
2289Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2290 2406
2291=cut 2407=cut
2292 2408
2293sub inv_recursive_; 2409sub inv_recursive_;
2294sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2299 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2300} 2416}
2301 2417
2302=item $ref = $ob->ref 2418=item $ref = $ob->ref
2303 2419
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2420Creates and returns a persistent reference to an object that can be stored as a string.
2305 2421
2306=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2307 2423
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2583 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2584 } 2700 }
2585 2701
2586 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2587 2703
2588 my $data = cf::to_json $rmp; 2704 my $data = cf::encode_json $rmp;
2589 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2591 2707
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2668 2784
2669=cut 2785=cut
2670 2786
2787# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2788our %CHANNEL = (
2672 "c/identify" => { 2789 "c/identify" => {
2673 id => "infobox", 2790 id => "infobox",
2674 title => "Identify", 2791 title => "Identify",
2675 reply => undef, 2792 reply => undef,
… …
2691 id => "infobox", 2808 id => "infobox",
2692 title => "Look", 2809 title => "Look",
2693 reply => undef, 2810 reply => undef,
2694 tooltip => "What you saw there", 2811 tooltip => "What you saw there",
2695 }, 2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2696); 2837);
2697 2838
2698sub cf::client::send_msg { 2839sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2700 2841
… …
3068 { 3209 {
3069 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3070 3211
3071 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3073 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3077 3219
3078 cf::cede_to_tick; 3220 cf::cede_to_tick;
3079 } 3221 }
3080 3222
3081 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3083 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3084 or next; 3227 or next;
3228
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3232 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3107 { 3251 {
3108 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3111 3255
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data; 3259 my $data;
3117 3260
3118 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3119 # prepend meta info 3262 # prepend meta info
3120 3263
3121 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3122 name => $name, 3265 name => $name,
3123 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3124 }); 3267 });
3125 3268
3126 $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
3127 } else { 3276 } else {
3128 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3129 } 3278 }
3130 3279
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick; 3280 cf::cede_to_tick;
3135 } 3281 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3285
3156 1 3286 1
3157} 3287}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3158 3308
3159register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3161 3311
3162 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
… …
3217sub reload_config { 3367sub reload_config {
3218 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3219 or return; 3369 or return;
3220 3370
3221 local $/; 3371 local $/;
3222 *CFG = YAML::Syck::Load <$fh>; 3372 *CFG = YAML::Load <$fh>;
3223 3373
3224 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3225 3375
3226 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3227 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3239 # we must not ever block the main coroutine 3389 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3390 local $Coro::idle = sub {
3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242 (async { 3392 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3393 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3394 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3395 })->prio (Coro::PRIO_MAX);
3246 }; 3396 };
3247 3397
3248 reload_config; 3398 reload_config;
3249 db_init; 3399 db_init;
3250 load_extensions; 3400 load_extensions;
3251 3401
3252 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno;
3253 Event::loop; 3404 EV::loop;
3254} 3405}
3255 3406
3256############################################################################# 3407#############################################################################
3257# initialisation and cleanup 3408# initialisation and cleanup
3258 3409
3259# install some emergency cleanup handlers 3410# install some emergency cleanup handlers
3260BEGIN { 3411BEGIN {
3412 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3413 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3414 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3263 reentrant => 0,
3264 data => WF_AUTOCANCEL,
3265 signal => $signal,
3266 prio => 0,
3267 cb => sub {
3268 cf::cleanup "SIG$signal"; 3415 cf::cleanup "SIG$signal";
3269 },
3270 ); 3416 };
3271 } 3417 }
3272} 3418}
3273 3419
3274sub write_runtime { 3420sub write_runtime_sync {
3275 my $runtime = "$LOCALDIR/runtime"; 3421 my $runtime = "$LOCALDIR/runtime";
3276 3422
3277 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3279 3425
… …
3305 and return; 3451 and return;
3306 3452
3307 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3308 3454
3309 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3310} 3499}
3311 3500
3312sub emergency_save() { 3501sub emergency_save() {
3313 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3314 3503
… …
3336 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3337 3526
3338 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3339 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3340 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3341 }; 3534 };
3342 3535
3343 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3344} 3537}
3345 3538
… …
3360 warn "reloading..."; 3553 warn "reloading...";
3361 3554
3362 warn "entering sync_job"; 3555 warn "entering sync_job";
3363 3556
3364 cf::sync_job { 3557 cf::sync_job {
3365 cf::write_runtime; # external watchdog should not bark 3558 cf::write_runtime_sync; # external watchdog should not bark
3366 cf::emergency_save; 3559 cf::emergency_save;
3367 cf::write_runtime; # external watchdog should not bark 3560 cf::write_runtime_sync; # external watchdog should not bark
3368 3561
3369 warn "syncing database to disk"; 3562 warn "syncing database to disk";
3370 BDB::db_env_txn_checkpoint $DB_ENV; 3563 BDB::db_env_txn_checkpoint $DB_ENV;
3371 3564
3372 # if anything goes wrong in here, we should simply crash as we already saved 3565 # if anything goes wrong in here, we should simply crash as we already saved
3373
3374 warn "cancelling all WF_AUTOCANCEL watchers";
3375 for (Event::all_watchers) {
3376 $_->cancel if $_->data & WF_AUTOCANCEL;
3377 }
3378 3566
3379 warn "flushing outstanding aio requests"; 3567 warn "flushing outstanding aio requests";
3380 for (;;) { 3568 for (;;) {
3381 BDB::flush; 3569 BDB::flush;
3382 IO::AIO::flush; 3570 IO::AIO::flush;
… …
3464 warn "leaving sync_job"; 3652 warn "leaving sync_job";
3465 3653
3466 1 3654 1
3467 } or do { 3655 } or do {
3468 warn $@; 3656 warn $@;
3469 warn "error while reloading, exiting."; 3657 cf::cleanup "error while reloading, exiting.";
3470 exit 1;
3471 }; 3658 };
3472 3659
3473 warn "reloaded"; 3660 warn "reloaded";
3474}; 3661};
3475 3662
… …
3477 3664
3478sub reload_perl() { 3665sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3481 3668
3482 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3483 reentrant => 0,
3484 after => 0,
3485 data => WF_AUTOCANCEL,
3486 cb => sub {
3487 do_reload_perl; 3670 do_reload_perl;
3488 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3489 },
3490 ); 3672 };
3491} 3673}
3492 3674
3493register_command "reload" => sub { 3675register_command "reload" => sub {
3494 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3495 3677
… …
3508 3690
3509our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3510our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3511 3693
3512sub wait_for_tick { 3694sub wait_for_tick {
3513 return unless $TICK_WATCHER->is_active; 3695 return if tick_inhibit;
3514 return if $Coro::current == $Coro::main; 3696 return if $Coro::current == $Coro::main;
3515 3697
3516 my $signal = new Coro::Signal; 3698 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK, $signal; 3699 push @WAIT_FOR_TICK, $signal;
3518 $signal->wait; 3700 $signal->wait;
3519} 3701}
3520 3702
3521sub wait_for_tick_begin { 3703sub wait_for_tick_begin {
3522 return unless $TICK_WATCHER->is_active; 3704 return if tick_inhibit;
3523 return if $Coro::current == $Coro::main; 3705 return if $Coro::current == $Coro::main;
3524 3706
3525 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 3708 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 3709 $signal->wait;
3528} 3710}
3529 3711
3530$TICK_WATCHER = Event->timer ( 3712sub tick {
3531 reentrant => 0,
3532 parked => 1,
3533 prio => 0,
3534 at => $NEXT_TICK || $TICK,
3535 data => WF_AUTOCANCEL,
3536 cb => sub {
3537 if ($Coro::current != $Coro::main) { 3713 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3714 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 3715 unless ++$bug_warning > 10;
3540 return; 3716 return;
3541 } 3717 }
3542 3718
3543 $NOW = $tick_start = Event::time;
3544
3545 cf::server_tick; # one server iteration 3719 cf::server_tick; # one server iteration
3546 3720
3547 $RUNTIME += $TICK;
3548 $NEXT_TICK += $TICK;
3549
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3721 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 3723 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 3724 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 3725 write_runtime_sync
3555 or warn "ERROR: unable to write runtime file: $!"; 3726 or warn "ERROR: unable to write runtime file: $!";
3556 };
3557 } 3727 };
3728 }
3558 3729
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 3731 $sig->send;
3561 } 3732 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 3733 while (my $sig = shift @WAIT_FOR_TICK) {
3563 $sig->send; 3734 $sig->send;
3564 } 3735 }
3565 3736
3566 $NOW = Event::time; 3737 $LOAD = ($NOW - $TICK_START) / $TICK;
3567
3568 # if we are delayed by four ticks or more, skip them all
3569 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571 $TICK_WATCHER->at ($NEXT_TICK);
3572 $TICK_WATCHER->start;
3573
3574 $LOAD = ($NOW - $tick_start) / $TICK;
3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3738 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 3739
3577 _post_tick; 3740 if (0) {
3741 if ($NEXT_TICK) {
3742 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d#
3745 }
3578 }, 3746 }
3579); 3747}
3580 3748
3581{ 3749{
3750 # configure BDB
3751
3582 BDB::min_parallel 8; 3752 BDB::min_parallel 8;
3583 BDB::max_poll_time $TICK * 0.1; 3753 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 3754 $Coro::BDB::WATCHER->priority (1);
3585 reentrant => 0,
3586 fd => BDB::poll_fileno,
3587 poll => 'r',
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => \&BDB::poll_cb,
3591 );
3592
3593 BDB::set_sync_prepare {
3594 my $status;
3595 my $current = $Coro::current;
3596 (
3597 sub {
3598 $status = $!;
3599 $current->ready; undef $current;
3600 },
3601 sub {
3602 Coro::schedule while defined $current;
3603 $! = $status;
3604 },
3605 )
3606 };
3607 3755
3608 unless ($DB_ENV) { 3756 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 3757 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1); 3759 | BDB::LOG_AUTOREMOVE, 1);
… …
3626 3774
3627 cf::cleanup "db_env_open(db): $@" if $@; 3775 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 3776 };
3629 } 3777 }
3630 3778
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 3779 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3780 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 3781 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3782 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3783 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 3784 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 3785 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3786 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 3787 };
3661} 3788}
3662 3789
3663{ 3790{
3791 # configure IO::AIO
3792
3664 IO::AIO::min_parallel 8; 3793 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 3794 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 3795 $Coro::AIO::WATCHER->priority (1);
3669 reentrant => 0,
3670 data => WF_AUTOCANCEL,
3671 fd => IO::AIO::poll_fileno,
3672 poll => 'r',
3673 prio => 0,
3674 cb => \&IO::AIO::poll_cb,
3675 );
3676} 3796}
3677 3797
3678my $_log_backtrace; 3798my $_log_backtrace;
3679 3799
3680sub _log_backtrace { 3800sub _log_backtrace {

Diff Legend

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