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.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.424 by root, Sun Apr 20 05:24:55 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 || {} });
… …
1081 close $fh; 1149 close $fh;
1082 1150
1083 if (@$objs) { 1151 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1157 close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1159 }
… …
1122 1190
1123 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1193 or return;
1126 1194
1127 my $st = eval { Coro::Storable::thaw $av } 1195 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1196 $av = $st->{objs};
1130 } 1197 }
1131 1198
1132 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
… …
1290 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1291 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1292 1359
1293 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1294 warn $msg; 1361 warn $msg;
1295 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1296 exit 1;
1297 } 1363 }
1298 1364
1299 warn $msg; 1365 warn $msg;
1300 } 1366 }
1301 1367
… …
1410 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1411 1477
1412 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1413 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1414 1480
1481 cf::get_slot 0.01;
1482
1415 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1416 cf::cede_to_tick; 1484 cf::cede_to_tick;
1417} 1485}
1418 1486
1419sub new($) { 1487sub new($) {
… …
1549 1617
1550Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1551 1619
1552=cut 1620=cut
1553 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
1554sub expand_cfpod { 1633sub expand_cfpod {
1555 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1556 1635
1557 # escape & and < 1636 my $xml;
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560 1637
1561 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1562 1641
1563 1 while 1642 $group =~ s/&/&amp;/g;
1564 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1565 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1566 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1567 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1647 ([BCGHITU])
1569 # replace G<male|female> tags 1648 <
1570 || s{G<([^>|]*)\|([^>]*)>}{ 1649 (?:
1571 $self->gender ? $2 : $1 1650 ([^<>]*) (?{ $group = $^N })
1572 }ge 1651 | < $interior >
1573 # replace H<hint text> 1652 )
1574 || s{H<([^\>]*)>} 1653 >
1654 %gcsx
1575 { 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") {
1576 ("<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>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "") 1675 "")
1579 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1580 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1581 1687
1688 for ($xml) {
1582 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1584 1691
1585 # compress some whitespace 1692 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1590 1698
1591 $_ 1699 $xml
1592} 1700}
1701
1702no re 'eval';
1593 1703
1594sub hintmode { 1704sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode} 1706 $_[0]{hintmode}
1597} 1707}
… …
1669our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1670our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1671 1781
1672sub generate_random_map { 1782sub generate_random_map {
1673 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
1674 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1675 $self->_create_random_map ( 1788 $self->_create_random_map (
1676 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1677 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1678 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1800 1913
1801# the temporary/swap location 1914# the temporary/swap location
1802sub save_path { 1915sub save_path {
1803 my ($self) = @_; 1916 my ($self) = @_;
1804 1917
1805 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1806 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1807} 1920}
1808 1921
1809# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1810sub uniq_path { 1923sub uniq_path {
1811 my ($self) = @_; 1924 my ($self) = @_;
1812 1925
1813 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1814 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1815} 1928}
1816 1929
1817# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1818# all maps in C++... 1931# all maps in C++...
… …
2004 } 2117 }
2005 2118
2006 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2008 2121
2009 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2010 } 2123 }
2011 2124
2012 $self->post_load; 2125 $self->post_load;
2013} 2126}
2014 2127
… …
2072 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2073 2186
2074 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2075 2188
2076 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2078 } 2191 }
2079 2192
2080 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2081 2194
2082 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2119 cf::async { 2232 cf::async {
2120 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2121 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2122 }; 2235 };
2123 2236
2237 cf::get_slot 0.02;
2238
2124 if ($uniq) { 2239 if ($uniq) {
2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2126 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2127 } else { 2242 } else {
2128 $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);
… …
2136 $self->save; 2251 $self->save;
2137 2252
2138 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139 2254
2140 return if $self->players; 2255 return if $self->players;
2141 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2142 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2143 2258
2144 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2145 2260
2146 $self->deactivate; 2261 $self->deactivate;
… …
2264 2379
2265sub unique_maps() { 2380sub unique_maps() {
2266 [ 2381 [
2267 map { 2382 map {
2268 utf8::decode $_; 2383 utf8::decode $_;
2269 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2270 ? normalise $_ 2387 : normalise $_
2271 : ()
2272 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2273 ] 2389 ]
2274} 2390}
2275 2391
2276package cf;
2277
2278=back 2392=back
2279 2393
2280=head3 cf::object 2394=head3 cf::object
2281 2395
2282=cut 2396=cut
… …
2285 2399
2286=over 4 2400=over 4
2287 2401
2288=item $ob->inv_recursive 2402=item $ob->inv_recursive
2289 2403
2290Returns 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.
2291 2406
2292=cut 2407=cut
2293 2408
2294sub inv_recursive_; 2409sub inv_recursive_;
2295sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2300 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2301} 2416}
2302 2417
2303=item $ref = $ob->ref 2418=item $ref = $ob->ref
2304 2419
2305creates 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.
2306 2421
2307=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2308 2423
2309returns 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,
2310even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2584 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2585 } 2700 }
2586 2701
2587 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2588 2703
2589 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2590 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2591 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2592 2707
2593 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2594 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
2667the 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
2668the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2669 2784
2670=cut 2785=cut
2671 2786
2787# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2788our %CHANNEL = (
2673 "c/identify" => { 2789 "c/identify" => {
2674 id => "infobox", 2790 id => "infobox",
2675 title => "Identify", 2791 title => "Identify",
2676 reply => undef, 2792 reply => undef,
… …
2680 id => "infobox", 2796 id => "infobox",
2681 title => "Examine", 2797 title => "Examine",
2682 reply => undef, 2798 reply => undef,
2683 tooltip => "Signs and other items you examined", 2799 tooltip => "Signs and other items you examined",
2684 }, 2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2685 "c/lookat" => { 2807 "c/lookat" => {
2686 id => "infobox", 2808 id => "infobox",
2687 title => "Look", 2809 title => "Look",
2688 reply => undef, 2810 reply => undef,
2689 tooltip => "What you saw there", 2811 tooltip => "What you saw there",
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",
2690 }, 2836 },
2691); 2837);
2692 2838
2693sub cf::client::send_msg { 2839sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3063 { 3209 {
3064 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3065 3211
3066 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3067 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3068 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3070 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};
3071 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};
3072 3219
3073 cf::cede_to_tick; 3220 cf::cede_to_tick;
3074 } 3221 }
3075 3222
3076 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3077 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3078 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3079 or next; 3227 or next;
3228
3080 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3083 } else { 3232 } else {
3084 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3102 { 3251 {
3103 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3106 3255
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data; 3259 my $data;
3112 3260
3113 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3114 # prepend meta info 3262 # prepend meta info
3115 3263
3116 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3117 name => $name, 3265 name => $name,
3118 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3119 }); 3267 });
3120 3268
3121 $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};
3122 } else { 3276 } else {
3123 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3124 } 3278 }
3125 3279
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick; 3280 cf::cede_to_tick;
3130 } 3281 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3150 3285
3151 1 3286 1
3152} 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});
3153 3308
3154register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3156 3311
3157 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3159 } 3314 }
3160}; 3315};
3316
3317sub load_resource_file($) {
3318 my $guard = lock_acquire "load_resource_file";
3319
3320 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100;
3322 cf::arch::commit_load;
3323
3324 $status
3325}
3161 3326
3162sub reload_regions { 3327sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework 3328 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?) 3329 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3179} 3344}
3180 3345
3181sub reload_archetypes { 3346sub reload_archetypes {
3182 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3183 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3184 #d# NEED to laod twice to resolve forward references
3185 # this really needs to be done in an extra post-pass
3186 # (which needs to be synchronous, so solve it differently)
3187 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n";
3189} 3349}
3190 3350
3191sub reload_treasures { 3351sub reload_treasures {
3192 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3193 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3194} 3354}
3195 3355
3196sub reload_resources { 3356sub reload_resources {
3197 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3198 3358
3359 reload_facedata;
3360 reload_archetypes;
3199 reload_regions; 3361 reload_regions;
3200 reload_facedata;
3201 #reload_archetypes;#d#
3202 reload_archetypes;
3203 reload_treasures; 3362 reload_treasures;
3204 3363
3205 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3206} 3365}
3207 3366
3208sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
3209 reload_resources; 3370 reload_resources;
3210} 3371}
3211 3372
3212sub reload_config { 3373sub reload_config {
3213 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
3214 or return; 3375 or return;
3215 3376
3216 local $/; 3377 local $/;
3217 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
3218 3379
3219 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3220 3381
3221 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3222 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3234 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3235 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3237 (async { 3398 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3239 Event::one_event; 3400 EV::loop EV::LOOP_ONESHOT;
3240 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3241 }; 3402 };
3242 3403
3404 {
3405 my $guard = freeze_mainloop;
3243 reload_config; 3406 reload_config;
3244 db_init; 3407 db_init;
3245 load_extensions; 3408 load_extensions;
3246 3409
3247 $TICK_WATCHER->start; 3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 }
3413
3248 Event::loop; 3414 EV::loop;
3249} 3415}
3250 3416
3251############################################################################# 3417#############################################################################
3252# initialisation and cleanup 3418# initialisation and cleanup
3253 3419
3254# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
3255BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
3256 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
3257 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3258 reentrant => 0,
3259 data => WF_AUTOCANCEL,
3260 signal => $signal,
3261 prio => 0,
3262 cb => sub {
3263 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3264 },
3265 ); 3426 };
3266 } 3427 }
3267} 3428}
3268 3429
3269sub write_runtime { 3430sub write_runtime_sync {
3270 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
3271 3432
3272 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
3273 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
3274 3435
… …
3300 and return; 3461 and return;
3301 3462
3302 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
3303 3464
3304 1 3465 1
3466}
3467
3468our $uuid_lock;
3469our $uuid_skip;
3470
3471sub write_uuid_sync($) {
3472 $uuid_skip ||= $_[0];
3473
3474 return if $uuid_lock;
3475 local $uuid_lock = 1;
3476
3477 my $uuid = "$LOCALDIR/uuid";
3478
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return;
3481
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3483 $uuid_skip = 0;
3484
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return;
3487
3488 # always fsync - this file is important
3489 aio_fsync $fh
3490 and return;
3491
3492 close $fh
3493 or return;
3494
3495 aio_rename "$uuid~", $uuid
3496 and return;
3497
3498 warn "uuid file written ($value).\n";
3499
3500 1
3501
3502}
3503
3504sub write_uuid($$) {
3505 my ($skip, $sync) = @_;
3506
3507 $sync ? write_uuid_sync $skip
3508 : async { write_uuid_sync $skip };
3305} 3509}
3306 3510
3307sub emergency_save() { 3511sub emergency_save() {
3308 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
3309 3513
… …
3331 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
3332 3536
3333 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
3334 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
3335 warn "end emergency database checkpoint\n"; 3539 warn "end emergency database checkpoint\n";
3540
3541 warn "begin write uuid\n";
3542 write_uuid_sync 1;
3543 warn "end write uuid\n";
3336 }; 3544 };
3337 3545
3338 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
3339} 3547}
3340 3548
… …
3355 warn "reloading..."; 3563 warn "reloading...";
3356 3564
3357 warn "entering sync_job"; 3565 warn "entering sync_job";
3358 3566
3359 cf::sync_job { 3567 cf::sync_job {
3360 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
3361 cf::emergency_save; 3569 cf::emergency_save;
3362 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
3363 3571
3364 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3365 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3366 3574
3367 # if anything goes wrong in here, we should simply crash as we already saved 3575 # if anything goes wrong in here, we should simply crash as we already saved
3368
3369 warn "cancelling all WF_AUTOCANCEL watchers";
3370 for (Event::all_watchers) {
3371 $_->cancel if $_->data & WF_AUTOCANCEL;
3372 }
3373 3576
3374 warn "flushing outstanding aio requests"; 3577 warn "flushing outstanding aio requests";
3375 for (;;) { 3578 for (;;) {
3376 BDB::flush; 3579 BDB::flush;
3377 IO::AIO::flush; 3580 IO::AIO::flush;
… …
3459 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3460 3663
3461 1 3664 1
3462 } or do { 3665 } or do {
3463 warn $@; 3666 warn $@;
3464 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3465 exit 1;
3466 }; 3668 };
3467 3669
3468 warn "reloaded"; 3670 warn "reloaded";
3469}; 3671};
3470 3672
… …
3472 3674
3473sub reload_perl() { 3675sub reload_perl() {
3474 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3475 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3476 3678
3477 $RELOAD_WATCHER ||= Event->timer ( 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3478 reentrant => 0,
3479 after => 0,
3480 data => WF_AUTOCANCEL,
3481 cb => sub {
3482 do_reload_perl; 3680 do_reload_perl;
3483 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3484 },
3485 ); 3682 };
3486} 3683}
3487 3684
3488register_command "reload" => sub { 3685register_command "reload" => sub {
3489 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
3490 3687
… …
3503 3700
3504our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3505our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3506 3703
3507sub wait_for_tick { 3704sub wait_for_tick {
3508 return unless $TICK_WATCHER->is_active;
3509 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3510 3706
3511 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3512 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3513 $signal->wait; 3709 $signal->wait;
3514} 3710}
3515 3711
3516sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3517 return unless $TICK_WATCHER->is_active;
3518 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3519 3714
3520 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3521 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3522 $signal->wait; 3717 $signal->wait;
3523} 3718}
3524 3719
3525$TICK_WATCHER = Event->timer ( 3720sub tick {
3526 reentrant => 0,
3527 parked => 1,
3528 prio => 0,
3529 at => $NEXT_TICK || $TICK,
3530 data => WF_AUTOCANCEL,
3531 cb => sub {
3532 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3534 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3535 return; 3724 return;
3536 } 3725 }
3537 3726
3538 $NOW = $tick_start = Event::time;
3539
3540 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3541 3728
3542 $RUNTIME += $TICK;
3543 $NEXT_TICK += $TICK;
3544
3545 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3546 $NEXT_RUNTIME_WRITE = $NOW + 10; 3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3547 Coro::async_pool { 3731 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver"; 3732 $Coro::current->{desc} = "runtime saver";
3549 write_runtime 3733 write_runtime_sync
3550 or warn "ERROR: unable to write runtime file: $!"; 3734 or warn "ERROR: unable to write runtime file: $!";
3551 };
3552 } 3735 };
3736 }
3553 3737
3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3555 $sig->send; 3739 $sig->send;
3556 } 3740 }
3557 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3558 $sig->send; 3742 $sig->send;
3559 } 3743 }
3560 3744
3561 $NOW = Event::time; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3562
3563 # if we are delayed by four ticks or more, skip them all
3564 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3565
3566 $TICK_WATCHER->at ($NEXT_TICK);
3567 $TICK_WATCHER->start;
3568
3569 $LOAD = ($NOW - $tick_start) / $TICK;
3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3571 3747
3572 _post_tick; 3748 if (0) {
3749 if ($NEXT_TICK) {
3750 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d#
3753 }
3573 }, 3754 }
3574); 3755}
3575 3756
3576{ 3757{
3758 # configure BDB
3759
3577 BDB::min_parallel 8; 3760 BDB::min_parallel 8;
3578 BDB::max_poll_time $TICK * 0.1; 3761 BDB::max_poll_reqs $TICK * 0.1;
3579 $BDB_POLL_WATCHER = Event->io ( 3762 $Coro::BDB::WATCHER->priority (1);
3580 reentrant => 0,
3581 fd => BDB::poll_fileno,
3582 poll => 'r',
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => \&BDB::poll_cb,
3586 );
3587
3588 BDB::set_sync_prepare {
3589 my $status;
3590 my $current = $Coro::current;
3591 (
3592 sub {
3593 $status = $!;
3594 $current->ready; undef $current;
3595 },
3596 sub {
3597 Coro::schedule while defined $current;
3598 $! = $status;
3599 },
3600 )
3601 };
3602 3763
3603 unless ($DB_ENV) { 3764 unless ($DB_ENV) {
3604 $DB_ENV = BDB::db_env_create; 3765 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1); 3767 | BDB::LOG_AUTOREMOVE, 1);
… …
3621 3782
3622 cf::cleanup "db_env_open(db): $@" if $@; 3783 cf::cleanup "db_env_open(db): $@" if $@;
3623 }; 3784 };
3624 } 3785 }
3625 3786
3626 $BDB_DEADLOCK_WATCHER = Event->timer ( 3787 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3788 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 ); 3789 };
3636 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3790 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3791 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 ); 3792 };
3646 $BDB_TRICKLE_WATCHER = Event->timer ( 3793 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3794 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 ); 3795 };
3656} 3796}
3657 3797
3658{ 3798{
3799 # configure IO::AIO
3800
3659 IO::AIO::min_parallel 8; 3801 IO::AIO::min_parallel 8;
3660
3661 undef $Coro::AIO::WATCHER;
3662 IO::AIO::max_poll_time $TICK * 0.1; 3802 IO::AIO::max_poll_time $TICK * 0.1;
3663 $AIO_POLL_WATCHER = Event->io ( 3803 $Coro::AIO::WATCHER->priority (1);
3664 reentrant => 0,
3665 data => WF_AUTOCANCEL,
3666 fd => IO::AIO::poll_fileno,
3667 poll => 'r',
3668 prio => 0,
3669 cb => \&IO::AIO::poll_cb,
3670 );
3671} 3804}
3672 3805
3673my $_log_backtrace; 3806my $_log_backtrace;
3674 3807
3675sub _log_backtrace { 3808sub _log_backtrace {

Diff Legend

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