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.374 by root, Wed Sep 19 22:07:16 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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
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 68
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
49 87
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 89
52our %COMMAND = (); 90our %COMMAND = ();
53our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
59our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
60 98
61our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
62our @EVENT; 100our @EVENT;
63 101
64our $CONFDIR = confdir; 102our $CONFDIR = confdir;
65our $DATADIR = datadir; 103our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
75 117
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 120our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
83 122
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 123our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 124our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 125our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 126our $DB_ENV;
89 127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
105 145
106binmode STDOUT; 146binmode STDOUT;
107binmode STDERR; 147binmode STDERR;
108 148
109# read virtual server time, if available 149# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
114} 154}
115 155
116mkdir $_ 156mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 202
163The raw value load value from the last tick. 203The raw value load value from the last tick.
164 204
165=item %cf::CFG 205=item %cf::CFG
166 206
167Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 208from wherever your confdir points to.
169 209
170=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
171 211
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These 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; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 234
195 LOG llevError, $msg; 235 LOG llevError, $msg;
196 }; 236 };
197} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
198 253
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 264for my $pkg (qw(
210 cf::global cf::attachable 265 cf::global cf::attachable
211 cf::object cf::object::player 266 cf::object cf::object::player
212 cf::client cf::player 267 cf::client cf::player
213 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
214 cf::map cf::party cf::region 270 cf::party cf::region
215)) { 271)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 273}
219 274
220$Event::DIED = sub { 275$EV::DIED = sub {
221 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
222}; 277};
223 278
224############################################################################# 279#############################################################################
225 280
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 304 $d
250 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
251} 306}
252 307
253=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
254 309
255Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
256 311
257=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
258 313
259Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
260 315
261=cut 316=cut
262 317
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 319
265sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
267 322
268=item cf::lock_wait $string 323=item cf::lock_wait $string
269 324
270Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
271 326
327 382
328 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
329} 384}
330 385
331sub freeze_mainloop { 386sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
333 388
334 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 390}
336 }; 391
337 $TICK_WATCHER->stop; 392=item cf::periodic $interval, $cb
338 $guard 393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
339} 405}
340 406
341=item cf::get_slot $time[, $priority[, $name]] 407=item cf::get_slot $time[, $priority[, $name]]
342 408
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 409Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 439 }
374 } 440 }
375 } 441 }
376 442
377 if (@SLOT_QUEUE) { 443 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 445 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 446 $signal->wait;
381 } else { 447 } else {
382 Coro::schedule; 448 Coro::schedule;
383 } 449 }
384 } 450 }
385}; 451};
386 452
387sub get_slot($;$$) { 453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
388 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
389 457
390 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
392 460
406 474
407BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
408 476
409=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
410 478
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 480is 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 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 482acceptable.
415 483
416If it must be done, put the blocking parts into C<sync_job>. This will run 484If 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 485the given BLOCK in another coroutine while waiting for the result. The
422 490
423sub sync_job(&) { 491sub sync_job(&) {
424 my ($job) = @_; 492 my ($job) = @_;
425 493
426 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 495 my $time = EV::time;
428 496
429 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
431 499
432 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 501
434 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
435 503
436 my $busy = 1; 504 my $busy = 1;
437 my @res; 505 my @res;
438 506
442 warn $@ if $@; 510 warn $@ if $@;
443 undef $busy; 511 undef $busy;
444 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
445 513
446 while ($busy) { 514 while ($busy) {
447 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
448 } 519 }
520 }
449 521
450 $time = Event::time - $time; 522 my $time = EV::time - $time;
451 523
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 524 $TICK_START += $time; # do not account sync jobs to server load
456 525
457 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
458 } else { 527 } else {
459 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
460 529
485=item fork_call { }, $args 554=item fork_call { }, $args
486 555
487Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
491 560
492=cut 561=cut
493 562
494sub fork_call(&@) { 563sub fork_call(&@) {
495 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
502 reset_signals; 571 reset_signals;
503 &$cb 572 &$cb
504 }, @args; 573 }, @args;
505 574
506 wantarray ? @res : $res[-1] 575 wantarray ? @res : $res[-1]
576}
577
578=item $coin = coin_from_name $name
579
580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
507} 603}
508 604
509=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
510 606
511Returns a single value from the environment database. 607Returns a single value from the environment database.
650 746
651############################################################################# 747#############################################################################
652 748
653=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
654 750
655Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
656attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
658 754
659In the following description, CLASS can be any of C<global>, C<object> 755In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 756C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 757Deliantra).
662 758
663=over 4 759=over 4
664 760
665=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
666 762
710=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
711 807
712Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
714 810
715Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
716that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
717 813
718These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
719 815
720=over 4 816=over 4
948 } 1044 }
949 1045
950 0 1046 0
951} 1047}
952 1048
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1050
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1052
957Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
958 1054
964 1060
965=cut 1061=cut
966 1062
967############################################################################# 1063#############################################################################
968# object support 1064# object support
969#
970 1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
971sub _can_merge { 1099sub _can_merge {
972 my ($ob1, $ob2) = @_; 1100 my ($ob1, $ob2) = @_;
973 1101
974 local $Storable::canonical = 1; 1102 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1103
978 $fob1 eq $fob2 1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
979} 1106}
980 1107
981sub reattach { 1108sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1110 my ($obj) = @_;
984 1111
1112 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1114
987 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
988 1116
989 @$registry = (); 1117 @$registry = ();
990 1118
1005cf::attachable->attach ( 1133cf::attachable->attach (
1006 prio => -1000000, 1134 prio => -1000000,
1007 on_instantiate => sub { 1135 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
1009 1137
1010 $data = from_json $data; 1138 $data = decode_json $data;
1011 1139
1012 for (@$data) { 1140 for (@$data) {
1013 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
1014 1142
1015 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1164 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1039 1167
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1172 aio_close $fh;
1045 1173
1046 if (@$objs) { 1174 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1180 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1182 }
1055 } else { 1183 } else {
1056 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1057 } 1185 }
1085 1213
1086 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1216 or return;
1089 1217
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1091 } 1220 }
1092 1221
1093 utf8::decode (my $decname = $filename); 1222 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1225 1354
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1357
1229 $ext{source} = 1358 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1232 . $source 1361 . $source
1233 . "\n};\n1"; 1362 . "\n};\n1";
1234 1363
1235 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1251 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1253 1382
1254 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1384 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1386 }
1259 1387
1260 warn $msg; 1388 warn $msg;
1261 } 1389 }
1262 1390
1276 1404
1277=back 1405=back
1278 1406
1279=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1280 1408
1281Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1282 1410
1283=cut 1411=cut
1284 1412
1285package cf::player; 1413package cf::player;
1286 1414
1351 my $f = new_from_file cf::object::thawer path $login 1479 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1480 or return;
1353 1481
1354 my $pl = cf::player::load_pl $f 1482 my $pl = cf::player::load_pl $f
1355 or return; 1483 or return;
1484
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1485 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1486 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1359 } 1488 }
1360 } 1489 }
1370 1499
1371 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1372 1501
1373 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1504
1505 cf::get_slot 0.01;
1375 1506
1376 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1508 cf::cede_to_tick;
1378} 1509}
1379 1510
1411 my ($pl) = @_; 1542 my ($pl) = @_;
1412 1543
1413 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1414 1545
1415 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1548
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1422 1555
1423 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1596
1464 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1465 my $path = path $login; 1598 my $path = path $login;
1466 1599
1467 # a .pst is a dead give-away for a valid player 1600 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1606 }
1473 1607
1504 } 1638 }
1505 1639
1506 \@paths 1640 \@paths
1507} 1641}
1508 1642
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1644
1511Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1646
1560=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1561 1648
1562Sends an ext reply to the player. 1649Sends an ext reply to the player.
1563 1650
1630our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1632 1719
1633sub generate_random_map { 1720sub generate_random_map {
1634 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1635 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1726 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1851
1762# the temporary/swap location 1852# the temporary/swap location
1763sub save_path { 1853sub save_path {
1764 my ($self) = @_; 1854 my ($self) = @_;
1765 1855
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1768} 1858}
1769 1859
1770# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1771sub uniq_path { 1861sub uniq_path {
1772 my ($self) = @_; 1862 my ($self) = @_;
1773 1863
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1776} 1866}
1777 1867
1778# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1779# all maps in C++... 1869# all maps in C++...
1877 1967
1878 cf::lock_wait "map_data:$path";#d#remove 1968 cf::lock_wait "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1880 1970
1881 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1974
1885 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1886 or return; 1976 or return;
1887 1977
1888 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1891 or return; 1981 or return;
1892 1982
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1896 undef $guard1; 1987 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 1988 $map->reset;
1899 return find $path; 1989 return find $path;
1900 } 1990 }
1901 1991
1902 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2020 $f->skip_block;
1931 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
1932 or return; 2022 or return;
1933 2023
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1935 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1936 2026
1937 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2028 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
1965 } 2055 }
1966 2056
1967 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
1969 2059
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2061 }
1972 2062
1973 $self->post_load; 2063 $self->post_load;
1974} 2064}
1975 2065
2033 my ($path, $origin, $load) = @_; 2123 my ($path, $origin, $load) = @_;
2034 2124
2035 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
2036 2126
2037 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2129 }
2040 2130
2041 $MAP_PREFETCH{$path} |= $load; 2131 $MAP_PREFETCH{$path} |= $load;
2042 2132
2043 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2170 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2171 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2083 }; 2173 };
2084 2174
2175 cf::get_slot 0.02;
2176
2085 if ($uniq) { 2177 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2180 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2097 $self->save; 2189 $self->save;
2098 2190
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2192
2101 return if $self->players; 2193 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2104 2196
2105 $self->in_memory (cf::MAP_SWAPPED); 2197 $self->in_memory (cf::MAP_SWAPPED);
2106 2198
2107 $self->deactivate; 2199 $self->deactivate;
2225 2317
2226sub unique_maps() { 2318sub unique_maps() {
2227 [ 2319 [
2228 map { 2320 map {
2229 utf8::decode $_; 2321 utf8::decode $_;
2230 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2231 ? normalise $_ 2325 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2327 ]
2235} 2328}
2236 2329
2237package cf;
2238
2239=back 2330=back
2240 2331
2241=head3 cf::object 2332=head3 cf::object
2242 2333
2243=cut 2334=cut
2246 2337
2247=over 4 2338=over 4
2248 2339
2249=item $ob->inv_recursive 2340=item $ob->inv_recursive
2250 2341
2251Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2252 2344
2253=cut 2345=cut
2254 2346
2255sub inv_recursive_; 2347sub inv_recursive_;
2256sub inv_recursive_ { 2348sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2262} 2354}
2263 2355
2264=item $ref = $ob->ref 2356=item $ref = $ob->ref
2265 2357
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2358Creates and returns a persistent reference to an object that can be stored as a string.
2267 2359
2268=item $ob = cf::object::deref ($refstring) 2360=item $ob = cf::object::deref ($refstring)
2269 2361
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2363even if the object actually exists. May block.
2273=cut 2365=cut
2274 2366
2275sub deref { 2367sub deref {
2276 my ($ref) = @_; 2368 my ($ref) = @_;
2277 2369
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2370 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2371 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2372 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2373 or return;
2285 $pl->ob->uuid eq $uuid 2374 $pl->ob->uuid eq $uuid
2286 or return; 2375 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2396dialogue with the given NPC character.
2308 2397
2309=cut 2398=cut
2310 2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2413
2311# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2415# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2418 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2431
2329 } else { 2432 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2435 }
2333 } 2436 }
2334} 2437}
2335 2438
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2361 2464
2362=item $player_object->enter_link 2465=item $player_object->enter_link
2363 2466
2364Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2365 2468
2366The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2367I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2368 2473
2369Will never block. 2474Will never block.
2370 2475
2371=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2372 2477
2430 2535
2431 $map->load; 2536 $map->load;
2432 $map->load_neighbours; 2537 $map->load_neighbours;
2433 2538
2434 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2435 $self->activate_recursive; 2541 $self->activate_recursive;
2436 2542
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2439} 2545}
2443Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2446the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2448 2557
2449=cut 2558=cut
2450 2559
2451our $GOTOGEN; 2560our $GOTOGEN;
2452 2561
2531} 2640}
2532 2641
2533sub prepare_random_map { 2642sub prepare_random_map {
2534 my ($exit) = @_; 2643 my ($exit) = @_;
2535 2644
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2647 # that depends on the exit object
2541 2648
2542 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2651 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2549 } 2658 }
2550 2659
2551 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2552 2661
2553 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2556 2665
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2668 undef $fh;
2560 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2561 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2564 } 2677 }
2565} 2678}
2566 2679
2567sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2569 2682
2570 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2571 2684
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2685 $self->enter_link;
2584 2686
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2687 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2591 2689
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2594 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2595 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2596 1; 2711 1
2597 }) { 2712 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2602 2717
2603 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2633 2748
2634=cut 2749=cut
2635 2750
2751# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2752our %CHANNEL = (
2637 "c/identify" => { 2753 "c/identify" => {
2638 id => "identify", 2754 id => "infobox",
2639 title => "Identify", 2755 title => "Identify",
2640 reply => undef, 2756 reply => undef,
2641 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2642 }, 2758 },
2643 "c/examine" => { 2759 "c/examine" => {
2644 id => "examine", 2760 id => "infobox",
2645 title => "Examine", 2761 title => "Examine",
2646 reply => undef, 2762 reply => undef,
2647 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2648 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2649); 2807);
2650 2808
2651sub cf::client::send_msg { 2809sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2653 2811
2654 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2655 2814
2656 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657 2816
2658 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2660 2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2661 if (ref $channel) { 2826 } elsif (ref $channel) {
2662 # send meta info to client, if not yet sent 2827 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) { 2828 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel; 2829 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel) 2830 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg; 2831 if $self->can_msg;
2674 if ($self->can_msg) { 2839 if ($self->can_msg) {
2675 # default colour, mask it out 2840 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2678 2843
2679 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2680 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2681 } else { 2860 } else {
2682 if ($color >= 0) { 2861 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2684 for ($msg) { 2863 for ($msg) {
2685 1 while 2864 1 while
2883=pod 3062=pod
2884 3063
2885The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2886 3065
2887 cf::object 3066 cf::object
2888 contr pay_amount pay_player map x y force_find force_add 3067 contr pay_amount pay_player map x y force_find force_add destroy
2889 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
2890 3069
2891 cf::object::player 3070 cf::object::player
2892 player 3071 player
2893 3072
2894 cf::player 3073 cf::player
2899 3078
2900=cut 3079=cut
2901 3080
2902for ( 3081for (
2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2904 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
2905 decrease_ob_nr)], 3084 decrease split destroy change_exp)],
2906 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2907 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2908 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2909) { 3088) {
2910 no strict 'refs'; 3089 no strict 'refs';
3015 { 3194 {
3016 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
3017 3196
3018 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
3019 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
3020 cf::face::set_visibility $idx, $info->{visibility}; 3200 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap}; 3201 cf::face::set_magicmap $idx, $info->{magicmap};
3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3023 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3024 3204
3025 cf::cede_to_tick; 3205 cf::cede_to_tick;
3026 } 3206 }
3027 3207
3028 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
3029 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
3030 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
3031 or next; 3212 or next;
3213
3032 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
3033 cf::face::set_smooth $idx, $smooth; 3215 cf::face::set_smooth $idx, $smooth;
3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3035 } else { 3217 } else {
3036 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
3054 { 3236 {
3055 # TODO: for gcfclient pleasure, we should give resources 3237 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index. 3238 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource}; 3239 my $res = $facedata->{resource};
3058 3240
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) { 3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data; 3244 my $data;
3064 3245
3065 if ($info->{type} & 1) { 3246 if ($info->{type} & 1) {
3066 # prepend meta info 3247 # prepend meta info
3067 3248
3068 my $meta = $enc->encode ({ 3249 my $meta = $enc->encode ({
3069 name => $name, 3250 name => $name,
3070 %{ $info->{meta} || {} }, 3251 %{ $info->{meta} || {} },
3071 }); 3252 });
3072 3253
3073 $data = pack "(w/a*)*", $meta, $info->{data}; 3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
3074 } else { 3261 } else {
3075 $data = $info->{data}; 3262 $RESOURCE{$name} = $info;
3076 } 3263 }
3077 3264
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3079 cf::face::set_type $idx, $info->{type};
3080
3081 cf::cede_to_tick; 3265 cf::cede_to_tick;
3082 } 3266 }
3083
3084 if ($soundconf) {
3085 $soundconf = $enc->decode (delete $soundconf->{data});
3086
3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3088 my $sound = $soundconf->{compat}[$_]
3089 or next;
3090
3091 my $face = cf::face::find "sound/$sound->[1]";
3092 cf::sound::set $sound->[0] => $face;
3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3094 }
3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
3099 }
3100 }
3101 } 3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3102 3270
3103 1 3271 1
3104} 3272}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3105 3293
3106register_exticmd fx_want => sub { 3294register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_; 3295 my ($ns, $want) = @_;
3108 3296
3109 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
3110 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
3111 } 3299 }
3112}; 3300};
3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3113 3311
3114sub reload_regions { 3312sub reload_regions {
3115 # HACK to clear player env face cache, we need some signal framework 3313 # HACK to clear player env face cache, we need some signal framework
3116 # for this (global event?) 3314 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = (); 3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3131} 3329}
3132 3330
3133sub reload_archetypes { 3331sub reload_archetypes {
3134 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
3135 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
3136 #d# NEED to laod twice to resolve forward references
3137 # this really needs to be done in an extra post-pass
3138 # (which needs to be synchronous, so solve it differently)
3139 load_resource_file "$DATADIR/archetypes"
3140 or die "unable to load archetypes\n";
3141} 3334}
3142 3335
3143sub reload_treasures { 3336sub reload_treasures {
3144 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
3145 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
3146} 3339}
3147 3340
3148sub reload_resources { 3341sub reload_resources {
3149 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
3150 3343
3344 reload_facedata;
3345 reload_archetypes;
3151 reload_regions; 3346 reload_regions;
3152 reload_facedata;
3153 #reload_archetypes;#d#
3154 reload_archetypes;
3155 reload_treasures; 3347 reload_treasures;
3156 3348
3157 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3158} 3350}
3159 3351
3160sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3161 reload_resources; 3357 reload_resources;
3162} 3358}
3163 3359
3164sub reload_config { 3360sub reload_config {
3165 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
3166 or return; 3362 or return;
3167 3363
3168 local $/; 3364 local $/;
3169 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
3170 3366
3171 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3172 3368
3173 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3174 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3180 }; 3376 };
3181 warn $@ if $@; 3377 warn $@ if $@;
3182 } 3378 }
3183} 3379}
3184 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3185sub main { 3400sub main {
3401 atomic;
3402
3186 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3187 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3189 (async { 3406 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3191 Event::one_event; 3408 EV::loop EV::LOOP_ONESHOT;
3192 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3193 }; 3410 };
3194 3411
3412 {
3413 my $guard = freeze_mainloop;
3195 reload_config; 3414 reload_config;
3196 db_init; 3415 db_init;
3197 load_extensions; 3416 load_extensions;
3198 3417
3199 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3200 Event::loop; 3426 EV::loop;
3201} 3427}
3202 3428
3203############################################################################# 3429#############################################################################
3204# initialisation and cleanup 3430# initialisation and cleanup
3205 3431
3206# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
3207BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
3208 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
3209 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3210 reentrant => 0,
3211 data => WF_AUTOCANCEL,
3212 signal => $signal,
3213 prio => 0,
3214 cb => sub {
3215 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
3216 },
3217 ); 3438 };
3218 } 3439 }
3219} 3440}
3220 3441
3221sub write_runtime { 3442sub write_runtime_sync {
3222 my $runtime = "$LOCALDIR/runtime";
3223
3224 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3225 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3226 3445
3227 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3228 3447
3229 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3230 3449
3231 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3232 or return; 3451 or return;
3233 3452
3234 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3235 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3236 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
3246 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3247 3466
3248 close $fh 3467 close $fh
3249 or return; 3468 or return;
3250 3469
3251 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3252 and return; 3471 and return;
3253 3472
3254 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3255 3474
3256 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
3257} 3519}
3258 3520
3259sub emergency_save() { 3521sub emergency_save() {
3260 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3261 3523
3267 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3268 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
3269 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3270 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3271 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3272 $pl->save; 3535 $pl->save;
3273 } 3536 }
3274 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
3275 3538
3276 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
3282 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3283 3546
3284 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3285 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3286 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
3287 }; 3554 };
3288 3555
3289 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3290} 3557}
3291 3558
3292sub post_cleanup { 3559sub post_cleanup {
3293 my ($make_core) = @_; 3560 my ($make_core) = @_;
3294 3561
3295 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3296 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3297} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3298 3596
3299sub do_reload_perl() { 3597sub do_reload_perl() {
3300 # can/must only be called in main 3598 # can/must only be called in main
3301 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3302 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3303 return; 3601 return;
3304 } 3602 }
3305 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3306 warn "reloading..."; 3607 warn "reloading...";
3307 3608
3308 warn "entering sync_job"; 3609 warn "entering sync_job";
3309 3610
3310 cf::sync_job { 3611 cf::sync_job {
3311 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3312 cf::emergency_save; 3613 cf::emergency_save;
3313 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3314 3615
3315 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3316 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3317 3618
3318 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3319 3620
3320 warn "cancelling all WF_AUTOCANCEL watchers";
3321 for (Event::all_watchers) {
3322 $_->cancel if $_->data & WF_AUTOCANCEL;
3323 }
3324
3325 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3326 for (;;) {
3327 BDB::flush;
3328 IO::AIO::flush;
3329 Coro::cede;
3330 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3331 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3332 }
3333
3334 ++$RELOAD;
3335
3336 warn "cancelling all extension coros";
3337 $_->cancel for values %EXT_CORO;
3338 %EXT_CORO = ();
3339
3340 warn "removing commands";
3341 %COMMAND = ();
3342
3343 warn "removing ext/exti commands";
3344 %EXTCMD = ();
3345 %EXTICMD = ();
3346
3347 warn "unloading/nuking all extensions";
3348 for my $pkg (@EXTS) {
3349 warn "... unloading $pkg";
3350
3351 if (my $cb = $pkg->can ("unload")) {
3352 eval {
3353 $cb->($pkg);
3354 1
3355 } or warn "$pkg unloaded, but with errors: $@";
3356 } 3624 }
3357 3625
3358 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3359 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3360 } 3628 %EXT_CORO = ();
3361 3629
3362 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3363 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3364 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3365 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3366 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3367 delete $INC{$k};
3368 3640
3369 $k =~ s/\.pm$//;
3370 $k =~ s/\//::/g;
3371
3372 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3373 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3374 } 3650 }
3375 3651
3376 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3377 } 3667 }
3378 3668
3379 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3380 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3381 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3382 3672
3383 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3384 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3385 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3386 3676
3387 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3388 # and global variables created in xs 3678 # and global variables created in xs
3389 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3390 3680
3391 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3392 3682
3393 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3394 require cf; 3684 require cf;
3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3396 3686
3397 warn "loading config and database again"; 3687 warn "loading config and database again";
3398 cf::reload_config; 3688 cf::reload_config;
3399 3689
3400 warn "loading extensions"; 3690 warn "loading extensions";
3401 cf::load_extensions; 3691 cf::load_extensions;
3402 3692
3403 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3404 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3405 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3406 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3407 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3408 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3409 3699
3410 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3411 3701
3412 1 3702 1
3413 } or do { 3703 } or do {
3414 warn $@; 3704 warn $@;
3415 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3416 exit 1;
3417 }; 3706 };
3418 3707
3419 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3420}; 3711};
3421 3712
3422our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3423 3714
3424sub reload_perl() { 3715sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3427 3718
3428 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3429 reentrant => 0,
3430 after => 0,
3431 data => WF_AUTOCANCEL,
3432 cb => sub {
3433 do_reload_perl; 3720 do_reload_perl;
3434 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3435 },
3436 ); 3722 };
3437} 3723}
3438 3724
3439register_command "reload" => sub { 3725register_command "reload" => sub {
3440 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3441 3727
3454 3740
3455our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3456our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3457 3743
3458sub wait_for_tick { 3744sub wait_for_tick {
3459 return unless $TICK_WATCHER->is_active;
3460 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3461 3746
3462 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3463 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3464 $signal->wait; 3749 $signal->wait;
3465} 3750}
3466 3751
3467sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3470 3754
3471 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait; 3757 $signal->wait;
3474} 3758}
3475 3759
3476$TICK_WATCHER = Event->timer ( 3760sub tick {
3477 reentrant => 0,
3478 parked => 1,
3479 prio => 0,
3480 at => $NEXT_TICK || $TICK,
3481 data => WF_AUTOCANCEL,
3482 cb => sub {
3483 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3484 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3485 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3486 return; 3764 return;
3487 } 3765 }
3488 3766
3489 $NOW = $tick_start = Event::time;
3490
3491 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3492 3768
3493 $RUNTIME += $TICK;
3494 $NEXT_TICK += $TICK;
3495
3496 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3497 $NEXT_RUNTIME_WRITE = $NOW + 10; 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3498 Coro::async_pool { 3771 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver"; 3772 $Coro::current->{desc} = "runtime saver";
3500 write_runtime 3773 write_runtime_sync
3501 or warn "ERROR: unable to write runtime file: $!"; 3774 or warn "ERROR: unable to write runtime file: $!";
3502 };
3503 } 3775 };
3776 }
3504 3777
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3779 $sig->send;
3507 } 3780 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3782 $sig->send;
3510 } 3783 }
3511 3784
3512 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3787
3523 _post_tick; 3788 if (0) {
3789 if ($NEXT_TICK) {
3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3524 }, 3794 }
3525); 3795}
3526 3796
3527{ 3797{
3798 # configure BDB
3799
3528 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3801 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3802 $AnyEvent::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 3803
3554 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3557 | BDB::LOG_AUTOREMOVE, 1); 3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3811
3561 cf::sync_job { 3812 cf::sync_job {
3562 eval { 3813 eval {
3572 3823
3573 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3825 };
3575 } 3826 }
3576 3827
3577 $BDB_DEADLOCK_WATCHER = Event->timer ( 3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 ); 3830 };
3587 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 ); 3833 };
3597 $BDB_TRICKLE_WATCHER = Event->timer ( 3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 ); 3836 };
3607} 3837}
3608 3838
3609{ 3839{
3840 # configure IO::AIO
3841
3610 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3611
3612 undef $Coro::AIO::WATCHER;
3613 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3614 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3615 reentrant => 0,
3616 data => WF_AUTOCANCEL,
3617 fd => IO::AIO::poll_fileno,
3618 poll => 'r',
3619 prio => 6,
3620 cb => \&IO::AIO::poll_cb,
3621 );
3622} 3845}
3623 3846
3624my $_log_backtrace; 3847my $_log_backtrace;
3625 3848
3626sub _log_backtrace { 3849sub _log_backtrace {
3629 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3630 3853
3631 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3632 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3633 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3634 async { 3858 async {
3635 $Coro::current->{desc} = "abt $msg"; 3859 $Coro::current->{desc} = "abt $msg";
3636 3860
3637 my @bt = fork_call { 3861 my @bt = fork_call {
3638 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3649 } 3873 }
3650 3874
3651 @funcs 3875 @funcs
3652 }; 3876 };
3653 3877
3654 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3655 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3656 --$_log_backtrace; 3881 --$_log_backtrace;
3657 }; 3882 };
3658 } else { 3883 } else {
3659 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines