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.370 by root, Thu Sep 13 10:59:41 2007 UTC vs.
Revision 1.423 by root, Sun Apr 20 00:44:13 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 Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 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.32 (); 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;
101our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 103our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 104our $DB_ENV;
88 105
89our %CFG; 106our %CFG;
90 107
91our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 109our $RUNTIME;
110our $NOW;
93 111
94our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
97 115
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 118
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
104 123
105binmode STDOUT; 124binmode STDOUT;
106binmode STDERR; 125binmode STDERR;
107 126
108# read virtual server time, if available 127# read virtual server time, if available
161 180
162The raw value load value from the last tick. 181The raw value load value from the last tick.
163 182
164=item %cf::CFG 183=item %cf::CFG
165 184
166Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 186from wherever your confdir points to.
168 187
169=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
170 189
171These 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
192 $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;
193 212
194 LOG llevError, $msg; 213 LOG llevError, $msg;
195 }; 214 };
196} 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#?
197 231
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
214)) { 248)) {
215 no strict 'refs'; 249 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 251}
218 252
219$Event::DIED = sub { 253$EV::DIED = sub {
220 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
221}; 255};
222 256
223############################################################################# 257#############################################################################
224 258
247 $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;
248 $d 282 $d
249 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
250} 284}
251 285
252=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
253 287
254Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
255 289
256=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
257 291
258Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
259 293
260=cut 294=cut
261 295
262our $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
263 297
264sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
266 300
267=item cf::lock_wait $string 301=item cf::lock_wait $string
268 302
269Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
270 304
326 360
327 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
328} 362}
329 363
330sub freeze_mainloop { 364sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
332 366
333 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start; 368}
335 }; 369
336 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
337 $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
338} 383}
339 384
340=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
341 386
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
353our @SLOT_QUEUE; 398our @SLOT_QUEUE;
354our $SLOT_QUEUE; 399our $SLOT_QUEUE;
355 400
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
358 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
359 406
360 while () { 407 while () {
361 next_job: 408 next_job:
362 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
370 } 417 }
371 } 418 }
372 } 419 }
373 420
374 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 424 $signal->wait;
378 } else { 425 } else {
379 Coro::schedule; 426 Coro::schedule;
380 } 427 }
381 } 428 }
382}; 429};
383 430
384sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
385 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
386 435
387 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
389 438
403 452
404BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
405 454
406=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
407 456
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
410partly 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
411acceptable. 460acceptable.
412 461
413If 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
414the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
419 468
420sub sync_job(&) { 469sub sync_job(&) {
421 my ($job) = @_; 470 my ($job) = @_;
422 471
423 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 473 my $time = EV::time;
425 474
426 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
428 477
429 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 479
431 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
432 481
433 my $busy = 1; 482 my $busy = 1;
434 my @res; 483 my @res;
435 484
436 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 487 @res = eval { $job->() };
438 warn $@ if $@; 488 warn $@ if $@;
439 undef $busy; 489 undef $busy;
440 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
441 491
442 while ($busy) { 492 while ($busy) {
443 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
444 } 497 }
498 }
445 499
446 $time = Event::time - $time; 500 my $time = EV::time - $time;
447 501
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
452 503
453 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
454 } else { 505 } else {
455 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
456 507
481=item fork_call { }, $args 532=item fork_call { }, $args
482 533
483Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
487 538
488=cut 539=cut
489 540
490sub fork_call(&@) { 541sub fork_call(&@) {
491 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
498 reset_signals; 549 reset_signals;
499 &$cb 550 &$cb
500 }, @args; 551 }, @args;
501 552
502 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
503} 581}
504 582
505=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
506 584
507Returns a single value from the environment database. 585Returns a single value from the environment database.
652attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
654 732
655In 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>
656C<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
657Crossfire TRT). 735Deliantra).
658 736
659=over 4 737=over 4
660 738
661=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
662 740
944 } 1022 }
945 1023
946 0 1024 0
947} 1025}
948 1026
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1028
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1030
953Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
954 1032
960 1038
961=cut 1039=cut
962 1040
963############################################################################# 1041#############################################################################
964# object support 1042# object support
965#
966 1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
967sub _can_merge { 1077sub _can_merge {
968 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
969 1079
970 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1081
974 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
975} 1084}
976 1085
977sub reattach { 1086sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1088 my ($obj) = @_;
1001cf::attachable->attach ( 1110cf::attachable->attach (
1002 prio => -1000000, 1111 prio => -1000000,
1003 on_instantiate => sub { 1112 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1005 1114
1006 $data = from_json $data; 1115 $data = decode_json $data;
1007 1116
1008 for (@$data) { 1117 for (@$data) {
1009 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1010 1119
1011 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1024 }, 1133 },
1025); 1134);
1026 1135
1027sub object_freezer_save { 1136sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1138
1032 sync_job { 1139 sync_job {
1033 if (length $$rdata) { 1140 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1042 close $fh; 1149 close $fh;
1043 1150
1044 if (@$objs) { 1151 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1157 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1159 }
1061 } else { 1168 } else {
1062 aio_unlink $filename; 1169 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1064 } 1171 }
1065 }; 1172 };
1066
1067 undef $guard;
1068} 1173}
1069 1174
1070sub object_freezer_as_string { 1175sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1072 1177
1077 1182
1078sub object_thawer_load { 1183sub object_thawer_load {
1079 my ($filename) = @_; 1184 my ($filename) = @_;
1080 1185
1081 my ($data, $av); 1186 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1187
1085 (aio_load $filename, $data) >= 0 1188 (aio_load $filename, $data) >= 0
1086 or return; 1189 or return;
1087 1190
1088 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1193 or return;
1091 1194
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1094 } 1197 }
1095 1198
1096 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1254 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1256 1359
1257 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1361 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1363 }
1262 1364
1263 warn $msg; 1365 warn $msg;
1264 } 1366 }
1265 1367
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1455
1354 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1457 or return;
1356 1458
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1359 or return; 1460 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1461 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1462 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1375 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1376 1477
1377 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1379 1480
1481 cf::get_slot 0.01;
1482
1380 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1484 cf::cede_to_tick;
1382} 1485}
1383 1486
1384sub new($) { 1487sub new($) {
1514 1617
1515Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1516 1619
1517=cut 1620=cut
1518 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
1519sub expand_cfpod { 1633sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1521 1635
1522 # escape & and < 1636 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1637
1526 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1527 1641
1528 1 while 1642 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1647 ([BCGHITU])
1534 # replace G<male|female> tags 1648 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1649 (?:
1536 $self->gender ? $2 : $1 1650 ([^<>]*) (?{ $group = $^N })
1537 }ge 1651 | < $interior >
1538 # replace H<hint text> 1652 )
1539 || s{H<([^\>]*)>} 1653 >
1654 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1675 "")
1544 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1546 1687
1688 for ($xml) {
1547 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1549 1691
1550 # compress some whitespace 1692 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1555 1698
1556 $_ 1699 $xml
1557} 1700}
1701
1702no re 'eval';
1558 1703
1559sub hintmode { 1704sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1706 $_[0]{hintmode}
1562} 1707}
1634our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1636 1781
1637sub generate_random_map { 1782sub generate_random_map {
1638 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
1639 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1788 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1913
1766# the temporary/swap location 1914# the temporary/swap location
1767sub save_path { 1915sub save_path {
1768 my ($self) = @_; 1916 my ($self) = @_;
1769 1917
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1772} 1920}
1773 1921
1774# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1775sub uniq_path { 1923sub uniq_path {
1776 my ($self) = @_; 1924 my ($self) = @_;
1777 1925
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1780} 1928}
1781 1929
1782# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1783# all maps in C++... 1931# all maps in C++...
1969 } 2117 }
1970 2118
1971 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1973 2121
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2123 }
1976 2124
1977 $self->post_load; 2125 $self->post_load;
1978} 2126}
1979 2127
2037 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2038 2186
2039 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2040 2188
2041 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2191 }
2044 2192
2045 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2046 2194
2047 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
2048 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2200 if (my $map = find $k) {
2051 $map->load if $v; 2201 $map->load if $v;
2052 } 2202 }
2078 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2079 2229
2080 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2081 2231
2082 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2084 }; 2235 };
2236
2237 cf::get_slot 0.02;
2085 2238
2086 if ($uniq) { 2239 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2242 } else {
2098 $self->save; 2251 $self->save;
2099 2252
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2254
2102 return if $self->players; 2255 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2105 2258
2106 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2107 2260
2108 $self->deactivate; 2261 $self->deactivate;
2226 2379
2227sub unique_maps() { 2380sub unique_maps() {
2228 [ 2381 [
2229 map { 2382 map {
2230 utf8::decode $_; 2383 utf8::decode $_;
2231 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2232 ? normalise $_ 2387 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2389 ]
2236} 2390}
2237 2391
2238package cf;
2239
2240=back 2392=back
2241 2393
2242=head3 cf::object 2394=head3 cf::object
2243 2395
2244=cut 2396=cut
2247 2399
2248=over 4 2400=over 4
2249 2401
2250=item $ob->inv_recursive 2402=item $ob->inv_recursive
2251 2403
2252Returns 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.
2253 2406
2254=cut 2407=cut
2255 2408
2256sub inv_recursive_; 2409sub inv_recursive_;
2257sub inv_recursive_ { 2410sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2263} 2416}
2264 2417
2265=item $ref = $ob->ref 2418=item $ref = $ob->ref
2266 2419
2267creates 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.
2268 2421
2269=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2270 2423
2271returns 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,
2272even if the object actually exists. May block. 2425even if the object actually exists. May block.
2274=cut 2427=cut
2275 2428
2276sub deref { 2429sub deref {
2277 my ($ref) = @_; 2430 my ($ref) = @_;
2278 2431
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2433 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2435 or return;
2286 $pl->ob->uuid eq $uuid 2436 $pl->ob->uuid eq $uuid
2287 or return; 2437 or return;
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2609
2460 $self->enter_link; 2610 $self->enter_link;
2461 2611
2462 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2463 # *tag paths override both path and x|y 2615 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2616 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2618 my $ob = $obs[rand @obs];
2467 2619
2547 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2548 } 2700 }
2549 2701
2550 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2551 2703
2552 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2555 2707
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2584 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2587 2739
2588 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2589 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2744 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2592 2746
2593 1; 2747 1;
2628the 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
2629the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2630 2784
2631=cut 2785=cut
2632 2786
2787# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2788our %CHANNEL = (
2634 "c/identify" => { 2789 "c/identify" => {
2635 id => "identify", 2790 id => "infobox",
2636 title => "Identify", 2791 title => "Identify",
2637 reply => undef, 2792 reply => undef,
2638 tooltip => "Items recently identified", 2793 tooltip => "Items recently identified",
2639 }, 2794 },
2640 "c/examine" => { 2795 "c/examine" => {
2641 id => "examine", 2796 id => "infobox",
2642 title => "Examine", 2797 title => "Examine",
2643 reply => undef, 2798 reply => undef,
2644 tooltip => "Signs and other items you examined", 2799 tooltip => "Signs and other items you examined",
2645 }, 2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
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",
2836 },
2646); 2837);
2647 2838
2648sub cf::client::send_msg { 2839sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2841
2651 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2652 2843
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2845
2655 # check predefined channels, for the benefit of C 2846 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2657 2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2658 if (ref $channel) { 2855 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2856 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2857 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2858 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2859 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2860 if $self->can_msg;
2880=pod 3077=pod
2881 3078
2882The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2883 3080
2884 cf::object 3081 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3082 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease_ob_nr
2887 3084
2888 cf::object::player 3085 cf::object::player
2889 player 3086 player
2890 3087
2897=cut 3094=cut
2898 3095
2899for ( 3096for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3098 insert remove inv name archname title slaying race
2902 decrease_ob_nr)], 3099 decrease_ob_nr destroy)],
2903 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2906) { 3103) {
2907 no strict 'refs'; 3104 no strict 'refs';
3012 { 3209 {
3013 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3014 3211
3015 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3017 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3019 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};
3020 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};
3021 3219
3022 cf::cede_to_tick; 3220 cf::cede_to_tick;
3023 } 3221 }
3024 3222
3025 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3027 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3028 or next; 3227 or next;
3228
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3232 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
3051 { 3251 {
3052 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3055 3255
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3259 my $data;
3061 3260
3062 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3063 # prepend meta info 3262 # prepend meta info
3064 3263
3065 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3066 name => $name, 3265 name => $name,
3067 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3068 }); 3267 });
3069 3268
3070 $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};
3071 } else { 3276 } else {
3072 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3073 } 3278 }
3074 3279
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3280 cf::cede_to_tick;
3079 } 3281 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3285
3100 1 3286 1
3101} 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});
3102 3308
3103register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3105 3311
3106 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3108 } 3314 }
3109}; 3315};
3316
3317sub load_resource_file($) {
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321 $status
3322}
3110 3323
3111sub reload_regions { 3324sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3325 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3326 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3327 %ext::player_env::MUSIC_FACE_CACHE = ();
3128} 3341}
3129 3342
3130sub reload_archetypes { 3343sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3344 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3345 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3346}
3139 3347
3140sub reload_treasures { 3348sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3349 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3350 or die "unable to load treasurelists\n";
3143} 3351}
3144 3352
3145sub reload_resources { 3353sub reload_resources {
3146 warn "reloading resource files...\n"; 3354 warn "reloading resource files...\n";
3147 3355
3356 reload_facedata;
3357 reload_archetypes;
3148 reload_regions; 3358 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3359 reload_treasures;
3153 3360
3154 warn "finished reloading resource files\n"; 3361 warn "finished reloading resource files\n";
3155} 3362}
3156 3363
3157sub init { 3364sub init {
3365 my $guard = freeze_mainloop;
3366
3158 reload_resources; 3367 reload_resources;
3159} 3368}
3160 3369
3161sub reload_config { 3370sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3371 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3372 or return;
3164 3373
3165 local $/; 3374 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3375 *CFG = YAML::Load <$fh>;
3167 3376
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3378
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3182sub main { 3391sub main {
3183 # we must not ever block the main coroutine 3392 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3393 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3394 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3395 (async {
3187 Event::one_event; 3396 $Coro::current->{desc} = "IDLE BUG HANDLER";
3397 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3398 })->prio (Coro::PRIO_MAX);
3189 }; 3399 };
3190 3400
3401 {
3402 my $guard = freeze_mainloop;
3191 reload_config; 3403 reload_config;
3192 db_init; 3404 db_init;
3193 load_extensions; 3405 load_extensions;
3194 3406
3195 $TICK_WATCHER->start; 3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3408 evthread_start IO::AIO::poll_fileno;
3409 }
3410
3196 Event::loop; 3411 EV::loop;
3197} 3412}
3198 3413
3199############################################################################# 3414#############################################################################
3200# initialisation and cleanup 3415# initialisation and cleanup
3201 3416
3202# install some emergency cleanup handlers 3417# install some emergency cleanup handlers
3203BEGIN { 3418BEGIN {
3419 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3420 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3421 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3422 cf::cleanup "SIG$signal";
3212 },
3213 ); 3423 };
3214 } 3424 }
3215} 3425}
3216 3426
3217sub write_runtime { 3427sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime"; 3428 my $runtime = "$LOCALDIR/runtime";
3219 3429
3220 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
3222 3432
3248 and return; 3458 and return;
3249 3459
3250 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
3251 3461
3252 1 3462 1
3463}
3464
3465our $uuid_lock;
3466our $uuid_skip;
3467
3468sub write_uuid_sync($) {
3469 $uuid_skip ||= $_[0];
3470
3471 return if $uuid_lock;
3472 local $uuid_lock = 1;
3473
3474 my $uuid = "$LOCALDIR/uuid";
3475
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return;
3478
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3480 $uuid_skip = 0;
3481
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return;
3484
3485 # always fsync - this file is important
3486 aio_fsync $fh
3487 and return;
3488
3489 close $fh
3490 or return;
3491
3492 aio_rename "$uuid~", $uuid
3493 and return;
3494
3495 warn "uuid file written ($value).\n";
3496
3497 1
3498
3499}
3500
3501sub write_uuid($$) {
3502 my ($skip, $sync) = @_;
3503
3504 $sync ? write_uuid_sync $skip
3505 : async { write_uuid_sync $skip };
3253} 3506}
3254 3507
3255sub emergency_save() { 3508sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3509 my $freeze_guard = cf::freeze_mainloop;
3257 3510
3263 # and maps saved/destroyed asynchronously. 3516 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3517 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3518 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3519 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3520 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3522 $pl->save;
3269 } 3523 }
3270 warn "end emergency player save\n"; 3524 warn "end emergency player save\n";
3271 3525
3272 warn "begin emergency map save\n"; 3526 warn "begin emergency map save\n";
3278 warn "end emergency map save\n"; 3532 warn "end emergency map save\n";
3279 3533
3280 warn "begin emergency database checkpoint\n"; 3534 warn "begin emergency database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3535 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3536 warn "end emergency database checkpoint\n";
3537
3538 warn "begin write uuid\n";
3539 write_uuid_sync 1;
3540 warn "end write uuid\n";
3283 }; 3541 };
3284 3542
3285 warn "leave emergency perl save\n"; 3543 warn "leave emergency perl save\n";
3286} 3544}
3287 3545
3302 warn "reloading..."; 3560 warn "reloading...";
3303 3561
3304 warn "entering sync_job"; 3562 warn "entering sync_job";
3305 3563
3306 cf::sync_job { 3564 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark 3565 cf::write_runtime_sync; # external watchdog should not bark
3308 cf::emergency_save; 3566 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark 3567 cf::write_runtime_sync; # external watchdog should not bark
3310 3568
3311 warn "syncing database to disk"; 3569 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3571
3314 # if anything goes wrong in here, we should simply crash as we already saved 3572 # if anything goes wrong in here, we should simply crash as we already saved
3315
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320 3573
3321 warn "flushing outstanding aio requests"; 3574 warn "flushing outstanding aio requests";
3322 for (;;) { 3575 for (;;) {
3323 BDB::flush; 3576 BDB::flush;
3324 IO::AIO::flush; 3577 IO::AIO::flush;
3325 Coro::cede; 3578 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3579 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3580 warn "iterate...";
3328 } 3581 }
3329 3582
3330 ++$RELOAD; 3583 ++$RELOAD;
3406 warn "leaving sync_job"; 3659 warn "leaving sync_job";
3407 3660
3408 1 3661 1
3409 } or do { 3662 } or do {
3410 warn $@; 3663 warn $@;
3411 warn "error while reloading, exiting."; 3664 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3665 };
3414 3666
3415 warn "reloaded"; 3667 warn "reloaded";
3416}; 3668};
3417 3669
3419 3671
3420sub reload_perl() { 3672sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3673 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3674 # coro crashes during coro_state_free->destroy here.
3423 3675
3424 $RELOAD_WATCHER ||= Event->timer ( 3676 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3425 reentrant => 0,
3426 after => 0,
3427 data => WF_AUTOCANCEL,
3428 cb => sub {
3429 do_reload_perl; 3677 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3678 undef $RELOAD_WATCHER;
3431 },
3432 ); 3679 };
3433} 3680}
3434 3681
3435register_command "reload" => sub { 3682register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3683 my ($who, $arg) = @_;
3437 3684
3438 if ($who->flag (FLAG_WIZ)) { 3685 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3686 $who->message ("reloading server.");
3687 async {
3688 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3689 reload_perl;
3690 };
3441 } 3691 }
3442}; 3692};
3443 3693
3444unshift @INC, $LIBDIR; 3694unshift @INC, $LIBDIR;
3445 3695
3447 3697
3448our @WAIT_FOR_TICK; 3698our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3699our @WAIT_FOR_TICK_BEGIN;
3450 3700
3451sub wait_for_tick { 3701sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 3702 return if tick_inhibit || $Coro::current == $Coro::main;
3454 3703
3455 my $signal = new Coro::Signal; 3704 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3705 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3706 $signal->wait;
3458} 3707}
3459 3708
3460sub wait_for_tick_begin { 3709sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 3710 return if tick_inhibit || $Coro::current == $Coro::main;
3463 3711
3464 my $signal = new Coro::Signal; 3712 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3713 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3714 $signal->wait;
3467} 3715}
3468 3716
3469$TICK_WATCHER = Event->timer ( 3717sub tick {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3718 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3719 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 3720 unless ++$bug_warning > 10;
3479 return; 3721 return;
3480 } 3722 }
3481 3723
3482 $NOW = $tick_start = Event::time;
3483
3484 cf::server_tick; # one server iteration 3724 cf::server_tick; # one server iteration
3485 3725
3486 $RUNTIME += $TICK;
3487 $NEXT_TICK += $TICK;
3488
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3726 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3727 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3728 Coro::async_pool {
3729 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3730 write_runtime_sync
3493 or warn "ERROR: unable to write runtime file: $!"; 3731 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3732 };
3733 }
3496 3734
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3735 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3736 $sig->send;
3499 } 3737 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3738 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3739 $sig->send;
3502 } 3740 }
3503 3741
3504 $NOW = Event::time; 3742 $LOAD = ($NOW - $TICK_START) / $TICK;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3743 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3744
3515 _post_tick; 3745 if (0) {
3746 if ($NEXT_TICK) {
3747 my $jitter = $TICK_START - $NEXT_TICK;
3748 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3749 warn "jitter $JITTER\n";#d#
3750 }
3516 }, 3751 }
3517); 3752}
3518 3753
3519{ 3754{
3755 # configure BDB
3756
3520 BDB::min_parallel 8; 3757 BDB::min_parallel 8;
3521 BDB::max_poll_time $TICK * 0.1; 3758 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3759 $Coro::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 3760
3546 unless ($DB_ENV) { 3761 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 3762 $DB_ENV = BDB::db_env_create;
3763 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3764 | BDB::LOG_AUTOREMOVE, 1);
3765 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3766 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3548 3767
3549 cf::sync_job { 3768 cf::sync_job {
3550 eval { 3769 eval {
3551 BDB::db_env_open 3770 BDB::db_env_open
3552 $DB_ENV, 3771 $DB_ENV,
3554 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3773 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3555 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3774 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3556 0666; 3775 0666;
3557 3776
3558 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3777 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3559
3560 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3561 | BDB::LOG_AUTOREMOVE, 1);
3562 $DB_ENV->set_lk_detect;
3563 }; 3778 };
3564 3779
3565 cf::cleanup "db_env_open(db): $@" if $@; 3780 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3781 };
3567 } 3782 }
3568 3783
3569 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3784 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 11, 3785 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3571 interval => 60, 3786 };
3572 hard => 1, 3787 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3788 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3577 },
3578 ); 3789 };
3579 $BDB_TRICKLE_WATCHER = Event->timer ( 3790 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3580 after => 5,
3581 interval => 10,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3791 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3587 },
3588 ); 3792 };
3589} 3793}
3590 3794
3591{ 3795{
3796 # configure IO::AIO
3797
3592 IO::AIO::min_parallel 8; 3798 IO::AIO::min_parallel 8;
3593
3594 undef $Coro::AIO::WATCHER;
3595 IO::AIO::max_poll_time $TICK * 0.1; 3799 IO::AIO::max_poll_time $TICK * 0.1;
3596 $AIO_POLL_WATCHER = Event->io ( 3800 $Coro::AIO::WATCHER->priority (1);
3597 reentrant => 0,
3598 data => WF_AUTOCANCEL,
3599 fd => IO::AIO::poll_fileno,
3600 poll => 'r',
3601 prio => 6,
3602 cb => \&IO::AIO::poll_cb,
3603 );
3604} 3801}
3605 3802
3606my $_log_backtrace; 3803my $_log_backtrace;
3607 3804
3608sub _log_backtrace { 3805sub _log_backtrace {
3612 3809
3613 # limit the # of concurrent backtraces 3810 # limit the # of concurrent backtraces
3614 if ($_log_backtrace < 2) { 3811 if ($_log_backtrace < 2) {
3615 ++$_log_backtrace; 3812 ++$_log_backtrace;
3616 async { 3813 async {
3814 $Coro::current->{desc} = "abt $msg";
3815
3617 my @bt = fork_call { 3816 my @bt = fork_call {
3618 @addr = map { sprintf "%x", $_ } @addr; 3817 @addr = map { sprintf "%x", $_ } @addr;
3619 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3818 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3620 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3819 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3621 or die "addr2line: $!"; 3820 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines