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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.426 by root, Thu Apr 24 04:40:31 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 || $Coro::current == $Coro::main;
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
1553 use re 'eval'; 1622use re 'eval';
1554 1623
1555my $group; 1624my $group;
1556my $interior; $interior = qr{ 1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1557 (?: 1627 (?:
1558 \ (.*?)\ (?{ $group = $^N }) 1628 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) > 1629 | < (??{$interior}) >
1560 ) 1630 )
1561}x; 1631}x;
1564 my ($self, $pod) = @_; 1634 my ($self, $pod) = @_;
1565 1635
1566 my $xml; 1636 my $xml;
1567 1637
1568 while () { 1638 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) { 1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1570 $group = $1; 1640 $group = $1;
1571 1641
1572 $group =~ s/&/&amp;/g; 1642 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g; 1643 $group =~ s/</&lt;/g;
1574 1644
1627 } 1697 }
1628 1698
1629 $xml 1699 $xml
1630} 1700}
1631 1701
1702no re 'eval';
1703
1632sub hintmode { 1704sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode} 1706 $_[0]{hintmode}
1635} 1707}
1636 1708
1707our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1709 1781
1710sub generate_random_map { 1782sub generate_random_map {
1711 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
1712 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1788 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1838 1913
1839# the temporary/swap location 1914# the temporary/swap location
1840sub save_path { 1915sub save_path {
1841 my ($self) = @_; 1916 my ($self) = @_;
1842 1917
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1845} 1920}
1846 1921
1847# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1848sub uniq_path { 1923sub uniq_path {
1849 my ($self) = @_; 1924 my ($self) = @_;
1850 1925
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1853} 1928}
1854 1929
1855# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1856# all maps in C++... 1931# all maps in C++...
2042 } 2117 }
2043 2118
2044 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2046 2121
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2123 }
2049 2124
2050 $self->post_load; 2125 $self->post_load;
2051} 2126}
2052 2127
2110 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2111 2186
2112 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2113 2188
2114 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2191 }
2117 2192
2118 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2119 2194
2120 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2157 cf::async { 2232 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2160 }; 2235 };
2161 2236
2237 cf::get_slot 0.02;
2238
2162 if ($uniq) { 2239 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2242 } else {
2166 $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);
2174 $self->save; 2251 $self->save;
2175 2252
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2254
2178 return if $self->players; 2255 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2181 2258
2182 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2183 2260
2184 $self->deactivate; 2261 $self->deactivate;
2302 2379
2303sub unique_maps() { 2380sub unique_maps() {
2304 [ 2381 [
2305 map { 2382 map {
2306 utf8::decode $_; 2383 utf8::decode $_;
2307 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2308 ? normalise $_ 2387 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2389 ]
2312} 2390}
2313 2391
2314package cf;
2315
2316=back 2392=back
2317 2393
2318=head3 cf::object 2394=head3 cf::object
2319 2395
2320=cut 2396=cut
2323 2399
2324=over 4 2400=over 4
2325 2401
2326=item $ob->inv_recursive 2402=item $ob->inv_recursive
2327 2403
2328Returns 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.
2329 2406
2330=cut 2407=cut
2331 2408
2332sub inv_recursive_; 2409sub inv_recursive_;
2333sub inv_recursive_ { 2410sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2339} 2416}
2340 2417
2341=item $ref = $ob->ref 2418=item $ref = $ob->ref
2342 2419
2343creates 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.
2344 2421
2345=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2346 2423
2347returns 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,
2348even if the object actually exists. May block. 2425even if the object actually exists. May block.
2622 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2623 } 2700 }
2624 2701
2625 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2626 2703
2627 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2630 2707
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2755 id => "infobox", 2832 id => "infobox",
2756 title => "Map Info", 2833 title => "Map Info",
2757 reply => undef, 2834 reply => undef,
2758 tooltip => "Information related to the maps", 2835 tooltip => "Information related to the maps",
2759 }, 2836 },
2837 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2760); 2843);
2761 2844
2762sub cf::client::send_msg { 2845sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2846 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2847
3001 3084
3002The following functions and methods are available within a safe environment: 3085The following functions and methods are available within a safe environment:
3003 3086
3004 cf::object 3087 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3088 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3089 insert remove name archname title slaying race decrease split
3007 3090
3008 cf::object::player 3091 cf::object::player
3009 player 3092 player
3010 3093
3011 cf::player 3094 cf::player
3017=cut 3100=cut
3018 3101
3019for ( 3102for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3104 insert remove inv name archname title slaying race
3022 decrease_ob_nr destroy)], 3105 decrease split destroy)],
3023 ["cf::object::player" => qw(player)], 3106 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3107 ["cf::player" => qw(peaceful)],
3025 ["cf::map" => qw(trigger)], 3108 ["cf::map" => qw(trigger)],
3026) { 3109) {
3027 no strict 'refs'; 3110 no strict 'refs';
3132 { 3215 {
3133 my $faces = $facedata->{faceinfo}; 3216 my $faces = $facedata->{faceinfo};
3134 3217
3135 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3219 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220
3137 cf::face::set_visibility $idx, $info->{visibility}; 3221 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3222 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3223 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3224 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141 3225
3142 cf::cede_to_tick; 3226 cf::cede_to_tick;
3143 } 3227 }
3144 3228
3145 while (my ($face, $info) = each %$faces) { 3229 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3230 next unless $info->{smooth};
3231
3147 my $idx = cf::face::find $face 3232 my $idx = cf::face::find $face
3148 or next; 3233 or next;
3234
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3235 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3236 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3237 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3238 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3239 warn "smooth face '$info->{smooth}' not found for face '$face'";
3171 { 3257 {
3172 # TODO: for gcfclient pleasure, we should give resources 3258 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3259 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3260 my $res = $facedata->{resource};
3175 3261
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3262 while (my ($name, $info) = each %$res) {
3263 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3264 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3265 my $data;
3181 3266
3182 if ($info->{type} & 1) { 3267 if ($info->{type} & 1) {
3183 # prepend meta info 3268 # prepend meta info
3184 3269
3185 my $meta = $enc->encode ({ 3270 my $meta = $enc->encode ({
3186 name => $name, 3271 name => $name,
3187 %{ $info->{meta} || {} }, 3272 %{ $info->{meta} || {} },
3188 }); 3273 });
3189 3274
3190 $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $data = pack "(w/a*)*", $meta, $info->{data};
3276 } else {
3277 $data = $info->{data};
3278 }
3279
3280 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281 cf::face::set_type $idx, $info->{type};
3191 } else { 3282 } else {
3192 $data = $info->{data}; 3283 $RESOURCE{$name} = $info;
3193 } 3284 }
3194 3285
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3286 cf::cede_to_tick;
3199 } 3287 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3288 }
3289
3290 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3291
3220 1 3292 1
3221} 3293}
3294
3295cf::global->attach (on_resource_update => sub {
3296 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3297 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3298
3299 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3300 my $sound = $soundconf->{compat}[$_]
3301 or next;
3302
3303 my $face = cf::face::find "sound/$sound->[1]";
3304 cf::sound::set $sound->[0] => $face;
3305 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3306 }
3307
3308 while (my ($k, $v) = each %{$soundconf->{event}}) {
3309 my $face = cf::face::find "sound/$v";
3310 cf::sound::set $k => $face;
3311 }
3312 }
3313});
3222 3314
3223register_exticmd fx_want => sub { 3315register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3316 my ($ns, $want) = @_;
3225 3317
3226 while (my ($k, $v) = each %$want) { 3318 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3319 $ns->fx_want ($k, $v);
3228 } 3320 }
3229}; 3321};
3322
3323sub load_resource_file($) {
3324 my $guard = lock_acquire "load_resource_file";
3325
3326 my $status = load_resource_file_ $_[0];
3327 get_slot 0.1, 100;
3328 cf::arch::commit_load;
3329
3330 $status
3331}
3230 3332
3231sub reload_regions { 3333sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3334 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3335 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3336 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3350}
3249 3351
3250sub reload_archetypes { 3352sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3353 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3354 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3355}
3259 3356
3260sub reload_treasures { 3357sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3358 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3359 or die "unable to load treasurelists\n";
3263} 3360}
3264 3361
3265sub reload_resources { 3362sub reload_resources {
3266 warn "reloading resource files...\n"; 3363 warn "reloading resource files...\n";
3267 3364
3365 reload_facedata;
3366 reload_archetypes;
3268 reload_regions; 3367 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3368 reload_treasures;
3273 3369
3274 warn "finished reloading resource files\n"; 3370 warn "finished reloading resource files\n";
3275} 3371}
3276 3372
3277sub init { 3373sub init {
3374 my $guard = freeze_mainloop;
3375
3278 reload_resources; 3376 reload_resources;
3279} 3377}
3280 3378
3281sub reload_config { 3379sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3380 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3381 or return;
3284 3382
3285 local $/; 3383 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3384 *CFG = YAML::Load <$fh>;
3287 3385
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3386 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3387
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3388 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3291 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3389 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3303 # we must not ever block the main coroutine 3401 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3402 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3403 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3404 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3405 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3406 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3407 })->prio (Coro::PRIO_MAX);
3310 }; 3408 };
3311 3409
3410 {
3411 my $guard = freeze_mainloop;
3312 reload_config; 3412 reload_config;
3313 db_init; 3413 db_init;
3314 load_extensions; 3414 load_extensions;
3315 3415
3316 $TICK_WATCHER->start; 3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 evthread_start IO::AIO::poll_fileno;
3418 }
3419
3317 Event::loop; 3420 EV::loop;
3318} 3421}
3319 3422
3320############################################################################# 3423#############################################################################
3321# initialisation and cleanup 3424# initialisation and cleanup
3322 3425
3323# install some emergency cleanup handlers 3426# install some emergency cleanup handlers
3324BEGIN { 3427BEGIN {
3428 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3429 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3430 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3333 },
3334 ); 3432 };
3335 } 3433 }
3336} 3434}
3337 3435
3338sub write_runtime { 3436sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3437 my $runtime = "$LOCALDIR/runtime";
3340 3438
3341 # first touch the runtime file to show we are still running: 3439 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3440 # the fsync below can take a very very long time.
3343 3441
3369 and return; 3467 and return;
3370 3468
3371 warn "runtime file written.\n"; 3469 warn "runtime file written.\n";
3372 3470
3373 1 3471 1
3472}
3473
3474our $uuid_lock;
3475our $uuid_skip;
3476
3477sub write_uuid_sync($) {
3478 $uuid_skip ||= $_[0];
3479
3480 return if $uuid_lock;
3481 local $uuid_lock = 1;
3482
3483 my $uuid = "$LOCALDIR/uuid";
3484
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return;
3487
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3489 $uuid_skip = 0;
3490
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return;
3493
3494 # always fsync - this file is important
3495 aio_fsync $fh
3496 and return;
3497
3498 close $fh
3499 or return;
3500
3501 aio_rename "$uuid~", $uuid
3502 and return;
3503
3504 warn "uuid file written ($value).\n";
3505
3506 1
3507
3508}
3509
3510sub write_uuid($$) {
3511 my ($skip, $sync) = @_;
3512
3513 $sync ? write_uuid_sync $skip
3514 : async { write_uuid_sync $skip };
3374} 3515}
3375 3516
3376sub emergency_save() { 3517sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3518 my $freeze_guard = cf::freeze_mainloop;
3378 3519
3400 warn "end emergency map save\n"; 3541 warn "end emergency map save\n";
3401 3542
3402 warn "begin emergency database checkpoint\n"; 3543 warn "begin emergency database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3544 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3545 warn "end emergency database checkpoint\n";
3546
3547 warn "begin write uuid\n";
3548 write_uuid_sync 1;
3549 warn "end write uuid\n";
3405 }; 3550 };
3406 3551
3407 warn "leave emergency perl save\n"; 3552 warn "leave emergency perl save\n";
3408} 3553}
3409 3554
3424 warn "reloading..."; 3569 warn "reloading...";
3425 3570
3426 warn "entering sync_job"; 3571 warn "entering sync_job";
3427 3572
3428 cf::sync_job { 3573 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3574 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3575 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3432 3577
3433 warn "syncing database to disk"; 3578 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3580
3436 # if anything goes wrong in here, we should simply crash as we already saved 3581 # if anything goes wrong in here, we should simply crash as we already saved
3437
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442 3582
3443 warn "flushing outstanding aio requests"; 3583 warn "flushing outstanding aio requests";
3444 for (;;) { 3584 for (;;) {
3445 BDB::flush; 3585 BDB::flush;
3446 IO::AIO::flush; 3586 IO::AIO::flush;
3528 warn "leaving sync_job"; 3668 warn "leaving sync_job";
3529 3669
3530 1 3670 1
3531 } or do { 3671 } or do {
3532 warn $@; 3672 warn $@;
3533 warn "error while reloading, exiting."; 3673 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3674 };
3536 3675
3537 warn "reloaded"; 3676 warn "reloaded";
3538}; 3677};
3539 3678
3541 3680
3542sub reload_perl() { 3681sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3682 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3683 # coro crashes during coro_state_free->destroy here.
3545 3684
3546 $RELOAD_WATCHER ||= Event->timer ( 3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl; 3686 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3687 undef $RELOAD_WATCHER;
3553 },
3554 ); 3688 };
3555} 3689}
3556 3690
3557register_command "reload" => sub { 3691register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3692 my ($who, $arg) = @_;
3559 3693
3572 3706
3573our @WAIT_FOR_TICK; 3707our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3708our @WAIT_FOR_TICK_BEGIN;
3575 3709
3576sub wait_for_tick { 3710sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3711 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3712
3580 my $signal = new Coro::Signal; 3713 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3714 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3715 $signal->wait;
3583} 3716}
3584 3717
3585sub wait_for_tick_begin { 3718sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3719 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3720
3589 my $signal = new Coro::Signal; 3721 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3722 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3723 $signal->wait;
3592} 3724}
3593 3725
3594$TICK_WATCHER = Event->timer ( 3726sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3727 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3728 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3729 unless ++$bug_warning > 10;
3604 return; 3730 return;
3605 } 3731 }
3606 3732
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3733 cf::server_tick; # one server iteration
3610 3734
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3735 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3737 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3738 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3739 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3740 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3741 };
3742 }
3622 3743
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3744 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3745 $sig->send;
3625 } 3746 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3747 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3748 $sig->send;
3628 } 3749 }
3629 3750
3630 $NOW = Event::time; 3751 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3752 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3753
3641 _post_tick; 3754 if (0) {
3755 if ($NEXT_TICK) {
3756 my $jitter = $TICK_START - $NEXT_TICK;
3757 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3758 warn "jitter $JITTER\n";#d#
3759 }
3642 }, 3760 }
3643); 3761}
3644 3762
3645{ 3763{
3764 # configure BDB
3765
3646 BDB::min_parallel 8; 3766 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3767 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3768 $Coro::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 3769
3672 unless ($DB_ENV) { 3770 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3771 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1); 3773 | BDB::LOG_AUTOREMOVE, 1);
3690 3788
3691 cf::cleanup "db_env_open(db): $@" if $@; 3789 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3790 };
3693 } 3791 }
3694 3792
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3793 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3794 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3795 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3796 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3797 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3798 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3799 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3800 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3801 };
3725} 3802}
3726 3803
3727{ 3804{
3805 # configure IO::AIO
3806
3728 IO::AIO::min_parallel 8; 3807 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3808 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3809 $Coro::AIO::WATCHER->priority (1);
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 3810}
3741 3811
3742my $_log_backtrace; 3812my $_log_backtrace;
3743 3813
3744sub _log_backtrace { 3814sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines