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.449 by root, Sat Sep 20 00:09:27 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
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $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 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 113our $DB_ENV;
89 114
90our %CFG; 115our %CFG;
91 116
92our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 118our $RUNTIME;
119our $NOW;
94 120
95our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
98 124
99# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 127
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
105 132
106binmode STDOUT; 133binmode STDOUT;
107binmode STDERR; 134binmode STDERR;
108 135
109# read virtual server time, if available 136# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
114} 141}
115 142
116mkdir $_ 143mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 189
163The raw value load value from the last tick. 190The raw value load value from the last tick.
164 191
165=item %cf::CFG 192=item %cf::CFG
166 193
167Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 195from wherever your confdir points to.
169 196
170=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
171 198
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 199These 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; 220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 221
195 LOG llevError, $msg; 222 LOG llevError, $msg;
196 }; 223 };
197} 224}
225
226$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "=="
228
229 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d#
232 }#d#
233
234 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate
237};
238
239$SIG{__DIE__} = sub { }; #d#?
198 240
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 251for my $pkg (qw(
210 cf::global cf::attachable 252 cf::global cf::attachable
211 cf::object cf::object::player 253 cf::object cf::object::player
212 cf::client cf::player 254 cf::client cf::player
213 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
214 cf::map cf::party cf::region 257 cf::party cf::region
215)) { 258)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 260}
219 261
220$Event::DIED = sub { 262$EV::DIED = sub {
221 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
222}; 264};
223 265
224############################################################################# 266#############################################################################
225 267
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 290 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 291 $d
250 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
251} 293}
252 294
253=item $ref = cf::from_json $json 295=item $ref = cf::decode_json $json
254 296
255Converts a JSON string into the corresponding perl data structure. 297Converts a JSON string into the corresponding perl data structure.
256 298
257=item $json = cf::to_json $ref 299=item $json = cf::encode_json $ref
258 300
259Converts a perl data structure into its JSON representation. 301Converts a perl data structure into its JSON representation.
260 302
261=cut 303=cut
262 304
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 306
265sub to_json ($) { $json_coder->encode ($_[0]) } 307sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 308sub decode_json($) { $json_coder->decode ($_[0]) }
267 309
268=item cf::lock_wait $string 310=item cf::lock_wait $string
269 311
270Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
271 313
327 369
328 ! ! $LOCK{$key} 370 ! ! $LOCK{$key}
329} 371}
330 372
331sub freeze_mainloop { 373sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 374 tick_inhibit_inc;
333 375
334 my $guard = Coro::guard { 376 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 377}
336 }; 378
337 $TICK_WATCHER->stop; 379=item cf::periodic $interval, $cb
338 $guard 380
381Like EV::periodic, but randomly selects a starting point so that the actions
382get spread over timer.
383
384=cut
385
386sub periodic($$) {
387 my ($interval, $cb) = @_;
388
389 my $start = rand List::Util::min 180, $interval;
390
391 EV::periodic $start, $interval, 0, $cb
339} 392}
340 393
341=item cf::get_slot $time[, $priority[, $name]] 394=item cf::get_slot $time[, $priority[, $name]]
342 395
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 396Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 426 }
374 } 427 }
375 } 428 }
376 429
377 if (@SLOT_QUEUE) { 430 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 431 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 432 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 433 $signal->wait;
381 } else { 434 } else {
382 Coro::schedule; 435 Coro::schedule;
383 } 436 }
384 } 437 }
385}; 438};
386 439
387sub get_slot($;$$) { 440sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main;
442
388 my ($time, $pri, $name) = @_; 443 my ($time, $pri, $name) = @_;
389 444
390 $time = $TICK * .6 if $time > $TICK * .6; 445 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 446 my $sig = new Coro::Signal;
392 447
406 461
407BEGIN { *async = \&Coro::async_pool } 462BEGIN { *async = \&Coro::async_pool }
408 463
409=item cf::sync_job { BLOCK } 464=item cf::sync_job { BLOCK }
410 465
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 466The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 467is 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 468partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 469acceptable.
415 470
416If it must be done, put the blocking parts into C<sync_job>. This will run 471If 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 472the given BLOCK in another coroutine while waiting for the result. The
422 477
423sub sync_job(&) { 478sub sync_job(&) {
424 my ($job) = @_; 479 my ($job) = @_;
425 480
426 if ($Coro::current == $Coro::main) { 481 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 482 my $time = EV::time;
428 483
429 # this is the main coro, too bad, we have to block 484 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 485 # till the operation succeeds, freezing the server :/
431 486
432 # TODO: use suspend/resume instead 487 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 488
434 my $freeze_guard = freeze_mainloop; 489 my $freeze_guard = freeze_mainloop;
435 490
436 my $busy = 1; 491 my $busy = 1;
437 my @res; 492 my @res;
438 493
442 warn $@ if $@; 497 warn $@ if $@;
443 undef $busy; 498 undef $busy;
444 })->prio (Coro::PRIO_MAX); 499 })->prio (Coro::PRIO_MAX);
445 500
446 while ($busy) { 501 while ($busy) {
447 Coro::cede or Event::one_event; 502 if (Coro::nready) {
503 Coro::cede_notself;
504 } else {
505 EV::loop EV::LOOP_ONESHOT;
448 } 506 }
507 }
449 508
450 $time = Event::time - $time; 509 my $time = EV::time - $time;
451 510
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 511 $TICK_START += $time; # do not account sync jobs to server load
456 512
457 wantarray ? @res : $res[0] 513 wantarray ? @res : $res[0]
458 } else { 514 } else {
459 # we are in another coroutine, how wonderful, everything just works 515 # we are in another coroutine, how wonderful, everything just works
460 516
485=item fork_call { }, $args 541=item fork_call { }, $args
486 542
487Executes the given code block with the given arguments in a seperate 543Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 544process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 545Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 546never block itself or use any form of event handling.
491 547
492=cut 548=cut
493 549
494sub fork_call(&@) { 550sub fork_call(&@) {
495 my ($cb, @args) = @_; 551 my ($cb, @args) = @_;
502 reset_signals; 558 reset_signals;
503 &$cb 559 &$cb
504 }, @args; 560 }, @args;
505 561
506 wantarray ? @res : $res[-1] 562 wantarray ? @res : $res[-1]
563}
564
565=item $coin = coin_from_name $name
566
567=cut
568
569our %coin_alias = (
570 "silver" => "silvercoin",
571 "silvercoin" => "silvercoin",
572 "silvercoins" => "silvercoin",
573 "gold" => "goldcoin",
574 "goldcoin" => "goldcoin",
575 "goldcoins" => "goldcoin",
576 "platinum" => "platinacoin",
577 "platinumcoin" => "platinacoin",
578 "platinumcoins" => "platinacoin",
579 "platina" => "platinacoin",
580 "platinacoin" => "platinacoin",
581 "platinacoins" => "platinacoin",
582 "royalty" => "royalty",
583 "royalties" => "royalty",
584);
585
586sub coin_from_name($) {
587 $coin_alias{$_[0]}
588 ? cf::arch::find $coin_alias{$_[0]}
589 : undef
507} 590}
508 591
509=item $value = cf::db_get $family => $key 592=item $value = cf::db_get $family => $key
510 593
511Returns a single value from the environment database. 594Returns a single value from the environment database.
650 733
651############################################################################# 734#############################################################################
652 735
653=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
654 737
655Many objects in crossfire are so-called attachable objects. That means you can 738Many objects in deliantra are so-called attachable objects. That means you can
656attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
658 741
659In the following description, CLASS can be any of C<global>, C<object> 742In 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 743C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 744Deliantra).
662 745
663=over 4 746=over 4
664 747
665=item $attachable->attach ($attachment, key => $value...) 748=item $attachable->attach ($attachment, key => $value...)
666 749
710=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
711 794
712Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
714 797
715Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
716that are attached at load/instantiate time, thus the need for a name. 799that are attached at load/instantiate time, thus the need for a name.
717 800
718These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
719 802
720=over 4 803=over 4
948 } 1031 }
949 1032
950 0 1033 0
951} 1034}
952 1035
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1037
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1039
957Generate an object-specific event with the given arguments. 1040Generate an object-specific event with the given arguments.
958 1041
964 1047
965=cut 1048=cut
966 1049
967############################################################################# 1050#############################################################################
968# object support 1051# object support
969#
970 1052
1053sub _object_equal($$);
1054sub _object_equal($$) {
1055 my ($a, $b) = @_;
1056
1057 return 0 unless (ref $a) eq (ref $b);
1058
1059 if ("HASH" eq ref $a) {
1060 my @ka = keys %$a;
1061 my @kb = keys %$b;
1062
1063 return 0 if @ka != @kb;
1064
1065 for (0 .. $#ka) {
1066 return 0 unless $ka[$_] eq $kb[$_];
1067 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1068 }
1069
1070 } elsif ("ARRAY" eq ref $a) {
1071
1072 return 0 if @$a != @$b;
1073
1074 for (0 .. $#$a) {
1075 return 0 unless _object_equal $a->[$_], $b->[$_];
1076 }
1077
1078 } elsif ($a ne $b) {
1079 return 0;
1080 }
1081
1082 1
1083}
1084
1085our $SLOW_MERGES;#d#
971sub _can_merge { 1086sub _can_merge {
972 my ($ob1, $ob2) = @_; 1087 my ($ob1, $ob2) = @_;
973 1088
974 local $Storable::canonical = 1; 1089 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1090
978 $fob1 eq $fob2 1091 # we do the slow way here
1092 return _object_equal $ob1, $ob2
979} 1093}
980 1094
981sub reattach { 1095sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1097 my ($obj) = @_;
984 1098
1099 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1100 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1101
987 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
988 1103
989 @$registry = (); 1104 @$registry = ();
990 1105
1005cf::attachable->attach ( 1120cf::attachable->attach (
1006 prio => -1000000, 1121 prio => -1000000,
1007 on_instantiate => sub { 1122 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1123 my ($obj, $data) = @_;
1009 1124
1010 $data = from_json $data; 1125 $data = decode_json $data;
1011 1126
1012 for (@$data) { 1127 for (@$data) {
1013 my ($name, $args) = @$_; 1128 my ($name, $args) = @$_;
1014 1129
1015 $obj->attach ($name, %{$args || {} }); 1130 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
1039 1154
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1159 aio_close $fh;
1045 1160
1046 if (@$objs) { 1161 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1167 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1169 }
1055 } else { 1170 } else {
1056 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1057 } 1172 }
1085 1200
1086 unless (aio_stat "$filename.pst") { 1201 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1202 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1203 or return;
1089 1204
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1205 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs};
1091 } 1207 }
1092 1208
1093 utf8::decode (my $decname = $filename); 1209 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1210 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1211 $decname, length $data, scalar @{$av || []};
1225 1341
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1344
1229 $ext{source} = 1345 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1232 . $source 1348 . $source
1233 . "\n};\n1"; 1349 . "\n};\n1";
1234 1350
1235 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
1251 my $msg = $@ ? "$v->{path}: $@\n" 1367 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1368 : "$v->{base}: extension inactive.\n";
1253 1369
1254 if (exists $v->{meta}{mandatory}) { 1370 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1371 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1372 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1373 }
1259 1374
1260 warn $msg; 1375 warn $msg;
1261 } 1376 }
1262 1377
1276 1391
1277=back 1392=back
1278 1393
1279=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1280 1395
1281Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1282 1397
1283=cut 1398=cut
1284 1399
1285package cf::player; 1400package cf::player;
1286 1401
1351 my $f = new_from_file cf::object::thawer path $login 1466 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1467 or return;
1353 1468
1354 my $pl = cf::player::load_pl $f 1469 my $pl = cf::player::load_pl $f
1355 or return; 1470 or return;
1471
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1472 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1473 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1359 } 1475 }
1360 } 1476 }
1370 1486
1371 return if $pl->{deny_save}; 1487 return if $pl->{deny_save};
1372 1488
1373 aio_mkdir playerdir $pl, 0770; 1489 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1490 $pl->{last_save} = $cf::RUNTIME;
1491
1492 cf::get_slot 0.01;
1375 1493
1376 $pl->save_pl ($path); 1494 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1495 cf::cede_to_tick;
1378} 1496}
1379 1497
1411 my ($pl) = @_; 1529 my ($pl) = @_;
1412 1530
1413 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1414 1532
1415 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1535
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1422 1542
1423 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1583
1464 for my $login (@$dirs) { 1584 for my $login (@$dirs) {
1465 my $path = path $login; 1585 my $path = path $login;
1466 1586
1467 # a .pst is a dead give-away for a valid player 1587 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1588 # if no pst file found, open and chekc for blocked users
1589 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1593 }
1473 1594
1504 } 1625 }
1505 1626
1506 \@paths 1627 \@paths
1507} 1628}
1508 1629
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1631
1511Expand crossfire pod fragments into protocol xml. 1632Expand 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 1633
1560=item $player->ext_reply ($msgid, @msg) 1634=item $player->ext_reply ($msgid, @msg)
1561 1635
1562Sends an ext reply to the player. 1636Sends an ext reply to the player.
1563 1637
1630our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1632 1706
1633sub generate_random_map { 1707sub generate_random_map {
1634 my ($self, $rmp) = @_; 1708 my ($self, $rmp) = @_;
1709
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711
1635 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1713 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1838
1762# the temporary/swap location 1839# the temporary/swap location
1763sub save_path { 1840sub save_path {
1764 my ($self) = @_; 1841 my ($self) = @_;
1765 1842
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1768} 1845}
1769 1846
1770# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1771sub uniq_path { 1848sub uniq_path {
1772 my ($self) = @_; 1849 my ($self) = @_;
1773 1850
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1776} 1853}
1777 1854
1778# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1779# all maps in C++... 1856# all maps in C++...
1877 1954
1878 cf::lock_wait "map_data:$path";#d#remove 1955 cf::lock_wait "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1880 1957
1881 $cf::MAP{$path} || do { 1958 $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 1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1961
1885 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1886 or return; 1963 or return;
1887 1964
1888 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1891 or return; 1968 or return;
1892 1969
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1896 undef $guard1; 1974 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 1975 $map->reset;
1899 return find $path; 1976 return find $path;
1900 } 1977 }
1901 1978
1902 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2007 $f->skip_block;
1931 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
1932 or return; 2009 or return;
1933 2010
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1935 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1936 2013
1937 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2015 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
1965 } 2042 }
1966 2043
1967 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
1969 2046
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2048 }
1972 2049
1973 $self->post_load; 2050 $self->post_load;
1974} 2051}
1975 2052
2033 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2034 2111
2035 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2036 2113
2037 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2116 }
2040 2117
2041 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2042 2119
2043 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2157 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2083 }; 2160 };
2084 2161
2162 cf::get_slot 0.02;
2163
2085 if ($uniq) { 2164 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2167 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2097 $self->save; 2176 $self->save;
2098 2177
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2179
2101 return if $self->players; 2180 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2104 2183
2105 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2106 2185
2107 $self->deactivate; 2186 $self->deactivate;
2225 2304
2226sub unique_maps() { 2305sub unique_maps() {
2227 [ 2306 [
2228 map { 2307 map {
2229 utf8::decode $_; 2308 utf8::decode $_;
2230 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2231 ? normalise $_ 2312 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2314 ]
2235} 2315}
2236 2316
2237package cf;
2238
2239=back 2317=back
2240 2318
2241=head3 cf::object 2319=head3 cf::object
2242 2320
2243=cut 2321=cut
2246 2324
2247=over 4 2325=over 4
2248 2326
2249=item $ob->inv_recursive 2327=item $ob->inv_recursive
2250 2328
2251Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
2252 2331
2253=cut 2332=cut
2254 2333
2255sub inv_recursive_; 2334sub inv_recursive_;
2256sub inv_recursive_ { 2335sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2262} 2341}
2263 2342
2264=item $ref = $ob->ref 2343=item $ref = $ob->ref
2265 2344
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2345Creates and returns a persistent reference to an object that can be stored as a string.
2267 2346
2268=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2269 2348
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2350even if the object actually exists. May block.
2273=cut 2352=cut
2274 2353
2275sub deref { 2354sub deref {
2276 my ($ref) = @_; 2355 my ($ref) = @_;
2277 2356
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2357 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2358 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2359 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2360 or return;
2285 $pl->ob->uuid eq $uuid 2361 $pl->ob->uuid eq $uuid
2286 or return; 2362 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2383dialogue with the given NPC character.
2308 2384
2309=cut 2385=cut
2310 2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
2400
2311# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2402# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2418
2329 } else { 2419 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2422 }
2333 } 2423 }
2334} 2424}
2335 2425
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2361 2451
2362=item $player_object->enter_link 2452=item $player_object->enter_link
2363 2453
2364Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2365 2455
2366The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2367I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2368 2460
2369Will never block. 2461Will never block.
2370 2462
2371=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2372 2464
2430 2522
2431 $map->load; 2523 $map->load;
2432 $map->load_neighbours; 2524 $map->load_neighbours;
2433 2525
2434 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2435 $self->activate_recursive; 2528 $self->activate_recursive;
2436 2529
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2439} 2532}
2443Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2538that 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 2539the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2448 2544
2449=cut 2545=cut
2450 2546
2451our $GOTOGEN; 2547our $GOTOGEN;
2452 2548
2531} 2627}
2532 2628
2533sub prepare_random_map { 2629sub prepare_random_map {
2534 my ($exit) = @_; 2630 my ($exit) = @_;
2535 2631
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2634 # that depends on the exit object
2541 2635
2542 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2638 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2549 } 2645 }
2550 2646
2551 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2552 2648
2553 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2556 2652
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2655 undef $fh;
2560 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2561 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2564 } 2664 }
2565} 2665}
2566 2666
2567sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2569 2669
2570 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2571 2671
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; 2672 $self->enter_link;
2584 2673
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 { 2674 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2591 2676
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2594 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2595 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2596 1; 2698 1
2597 }) { 2699 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2602 2704
2603 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2733the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2734the message unless the client supports the msg packet.
2633 2735
2634=cut 2736=cut
2635 2737
2738# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2739our %CHANNEL = (
2637 "c/identify" => { 2740 "c/identify" => {
2638 id => "identify", 2741 id => "infobox",
2639 title => "Identify", 2742 title => "Identify",
2640 reply => undef, 2743 reply => undef,
2641 tooltip => "Items recently identified", 2744 tooltip => "Items recently identified",
2642 }, 2745 },
2643 "c/examine" => { 2746 "c/examine" => {
2644 id => "examine", 2747 id => "infobox",
2645 title => "Examine", 2748 title => "Examine",
2646 reply => undef, 2749 reply => undef,
2647 tooltip => "Signs and other items you examined", 2750 tooltip => "Signs and other items you examined",
2648 }, 2751 },
2752 "c/book" => {
2753 id => "infobox",
2754 title => "Book",
2755 reply => undef,
2756 tooltip => "The contents of a note or book",
2757 },
2758 "c/lookat" => {
2759 id => "infobox",
2760 title => "Look",
2761 reply => undef,
2762 tooltip => "What you saw there",
2763 },
2764 "c/who" => {
2765 id => "infobox",
2766 title => "Players",
2767 reply => undef,
2768 tooltip => "Shows players who are currently online",
2769 },
2770 "c/body" => {
2771 id => "infobox",
2772 title => "Body Parts",
2773 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available",
2775 },
2776 "c/uptime" => {
2777 id => "infobox",
2778 title => "Uptime",
2779 reply => undef,
2780 tooltip => "How long the server has been running since last restart",
2781 },
2782 "c/mapinfo" => {
2783 id => "infobox",
2784 title => "Map Info",
2785 reply => undef,
2786 tooltip => "Information related to the maps",
2787 },
2788 "c/party" => {
2789 id => "party",
2790 title => "Party",
2791 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party",
2793 },
2649); 2794);
2650 2795
2651sub cf::client::send_msg { 2796sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_; 2797 my ($self, $channel, $msg, $color, @extra) = @_;
2653 2798
2654 $msg = $self->pl->expand_cfpod ($msg); 2799 $msg = $self->pl->expand_cfpod ($msg)
2800 unless $color & cf::NDI_VERBATIM;
2655 2801
2656 $color &= cf::NDI_CLIENT_MASK; # just in case... 2802 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657 2803
2658 # check predefined channels, for the benefit of C 2804 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2805 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel};
2660 2807
2808 $self->ext_msg (channel_info => $channel)
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id};
2812
2661 if (ref $channel) { 2813 } elsif (ref $channel) {
2662 # send meta info to client, if not yet sent 2814 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) { 2815 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel; 2816 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel) 2817 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg; 2818 if $self->can_msg;
2674 if ($self->can_msg) { 2826 if ($self->can_msg) {
2675 # default colour, mask it out 2827 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF; 2829 if $color & cf::NDI_DEF;
2678 2830
2679 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2831 my $pkt = "msg "
2832 . $self->{json_coder}->encode (
2680 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 );
2835
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt);
2681 } else { 2847 } else {
2682 if ($color >= 0) { 2848 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones 2849 # replace some tags by gcfclient-compatible ones
2684 for ($msg) { 2850 for ($msg) {
2685 1 while 2851 1 while
2883=pod 3049=pod
2884 3050
2885The following functions and methods are available within a safe environment: 3051The following functions and methods are available within a safe environment:
2886 3052
2887 cf::object 3053 cf::object
2888 contr pay_amount pay_player map x y force_find force_add 3054 contr pay_amount pay_player map x y force_find force_add destroy
2889 insert remove name archname title slaying race decrease_ob_nr 3055 insert remove name archname title slaying race decrease split
2890 3056
2891 cf::object::player 3057 cf::object::player
2892 player 3058 player
2893 3059
2894 cf::player 3060 cf::player
2899 3065
2900=cut 3066=cut
2901 3067
2902for ( 3068for (
2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2904 insert remove inv name archname title slaying race 3070 insert remove inv nrof name archname title slaying race
2905 decrease_ob_nr)], 3071 decrease split destroy change_exp)],
2906 ["cf::object::player" => qw(player)], 3072 ["cf::object::player" => qw(player)],
2907 ["cf::player" => qw(peaceful)], 3073 ["cf::player" => qw(peaceful)],
2908 ["cf::map" => qw(trigger)], 3074 ["cf::map" => qw(trigger)],
2909) { 3075) {
2910 no strict 'refs'; 3076 no strict 'refs';
3015 { 3181 {
3016 my $faces = $facedata->{faceinfo}; 3182 my $faces = $facedata->{faceinfo};
3017 3183
3018 while (my ($face, $info) = each %$faces) { 3184 while (my ($face, $info) = each %$faces) {
3019 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3185 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186
3020 cf::face::set_visibility $idx, $info->{visibility}; 3187 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap}; 3188 cf::face::set_magicmap $idx, $info->{magicmap};
3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3189 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}; 3190 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3024 3191
3025 cf::cede_to_tick; 3192 cf::cede_to_tick;
3026 } 3193 }
3027 3194
3028 while (my ($face, $info) = each %$faces) { 3195 while (my ($face, $info) = each %$faces) {
3029 next unless $info->{smooth}; 3196 next unless $info->{smooth};
3197
3030 my $idx = cf::face::find $face 3198 my $idx = cf::face::find $face
3031 or next; 3199 or next;
3200
3032 if (my $smooth = cf::face::find $info->{smooth}) { 3201 if (my $smooth = cf::face::find $info->{smooth}) {
3033 cf::face::set_smooth $idx, $smooth; 3202 cf::face::set_smooth $idx, $smooth;
3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3203 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3035 } else { 3204 } else {
3036 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3205 warn "smooth face '$info->{smooth}' not found for face '$face'";
3054 { 3223 {
3055 # TODO: for gcfclient pleasure, we should give resources 3224 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index. 3225 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource}; 3226 my $res = $facedata->{resource};
3058 3227
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) { 3228 while (my ($name, $info) = each %$res) {
3229 if (defined $info->{type}) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3230 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data; 3231 my $data;
3064 3232
3065 if ($info->{type} & 1) { 3233 if ($info->{type} & 1) {
3066 # prepend meta info 3234 # prepend meta info
3067 3235
3068 my $meta = $enc->encode ({ 3236 my $meta = $enc->encode ({
3069 name => $name, 3237 name => $name,
3070 %{ $info->{meta} || {} }, 3238 %{ $info->{meta} || {} },
3071 }); 3239 });
3072 3240
3073 $data = pack "(w/a*)*", $meta, $info->{data}; 3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 cf::face::set_type $idx, $info->{type};
3074 } else { 3248 } else {
3075 $data = $info->{data}; 3249 $RESOURCE{$name} = $info;
3076 } 3250 }
3077 3251
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; 3252 cf::cede_to_tick;
3082 } 3253 }
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 } 3254 }
3255
3256 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3102 3257
3103 1 3258 1
3104} 3259}
3260
3261cf::global->attach (on_resource_update => sub {
3262 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3263 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3264
3265 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3266 my $sound = $soundconf->{compat}[$_]
3267 or next;
3268
3269 my $face = cf::face::find "sound/$sound->[1]";
3270 cf::sound::set $sound->[0] => $face;
3271 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3272 }
3273
3274 while (my ($k, $v) = each %{$soundconf->{event}}) {
3275 my $face = cf::face::find "sound/$v";
3276 cf::sound::set $k => $face;
3277 }
3278 }
3279});
3105 3280
3106register_exticmd fx_want => sub { 3281register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_; 3282 my ($ns, $want) = @_;
3108 3283
3109 while (my ($k, $v) = each %$want) { 3284 while (my ($k, $v) = each %$want) {
3110 $ns->fx_want ($k, $v); 3285 $ns->fx_want ($k, $v);
3111 } 3286 }
3112}; 3287};
3288
3289sub load_resource_file($) {
3290 my $guard = lock_acquire "load_resource_file";
3291
3292 my $status = load_resource_file_ $_[0];
3293 get_slot 0.1, 100;
3294 cf::arch::commit_load;
3295
3296 $status
3297}
3113 3298
3114sub reload_regions { 3299sub reload_regions {
3115 # HACK to clear player env face cache, we need some signal framework 3300 # HACK to clear player env face cache, we need some signal framework
3116 # for this (global event?) 3301 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = (); 3302 %ext::player_env::MUSIC_FACE_CACHE = ();
3131} 3316}
3132 3317
3133sub reload_archetypes { 3318sub reload_archetypes {
3134 load_resource_file "$DATADIR/archetypes" 3319 load_resource_file "$DATADIR/archetypes"
3135 or die "unable to load archetypes\n"; 3320 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} 3321}
3142 3322
3143sub reload_treasures { 3323sub reload_treasures {
3144 load_resource_file "$DATADIR/treasures" 3324 load_resource_file "$DATADIR/treasures"
3145 or die "unable to load treasurelists\n"; 3325 or die "unable to load treasurelists\n";
3146} 3326}
3147 3327
3148sub reload_resources { 3328sub reload_resources {
3149 warn "reloading resource files...\n"; 3329 warn "reloading resource files...\n";
3150 3330
3331 reload_facedata;
3332 reload_archetypes;
3151 reload_regions; 3333 reload_regions;
3152 reload_facedata;
3153 #reload_archetypes;#d#
3154 reload_archetypes;
3155 reload_treasures; 3334 reload_treasures;
3156 3335
3157 warn "finished reloading resource files\n"; 3336 warn "finished reloading resource files\n";
3158} 3337}
3159 3338
3160sub init { 3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3161 reload_resources; 3344 reload_resources;
3162} 3345}
3163 3346
3164sub reload_config { 3347sub reload_config {
3165 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3166 or return; 3349 or return;
3167 3350
3168 local $/; 3351 local $/;
3169 *CFG = YAML::Syck::Load <$fh>; 3352 *CFG = YAML::Load <$fh>;
3170 3353
3171 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3172 3355
3173 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3356 $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}; 3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3180 }; 3363 };
3181 warn $@ if $@; 3364 warn $@ if $@;
3182 } 3365 }
3183} 3366}
3184 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
3185sub main { 3387sub main {
3388 atomic;
3389
3186 # we must not ever block the main coroutine 3390 # we must not ever block the main coroutine
3187 local $Coro::idle = sub { 3391 local $Coro::idle = sub {
3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3189 (async { 3393 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3394 $Coro::current->{desc} = "IDLE BUG HANDLER";
3191 Event::one_event; 3395 EV::loop EV::LOOP_ONESHOT;
3192 })->prio (Coro::PRIO_MAX); 3396 })->prio (Coro::PRIO_MAX);
3193 }; 3397 };
3194 3398
3399 {
3400 my $guard = freeze_mainloop;
3195 reload_config; 3401 reload_config;
3196 db_init; 3402 db_init;
3197 load_extensions; 3403 load_extensions;
3198 3404
3199 $TICK_WATCHER->start; 3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE;
3409
3410 # no (long-running) fork's whatsoever before this point(!)
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412
3200 Event::loop; 3413 EV::loop;
3201} 3414}
3202 3415
3203############################################################################# 3416#############################################################################
3204# initialisation and cleanup 3417# initialisation and cleanup
3205 3418
3206# install some emergency cleanup handlers 3419# install some emergency cleanup handlers
3207BEGIN { 3420BEGIN {
3421 our %SIGWATCHER = ();
3208 for my $signal (qw(INT HUP TERM)) { 3422 for my $signal (qw(INT HUP TERM)) {
3209 Event->signal ( 3423 $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"; 3424 cf::cleanup "SIG$signal";
3216 },
3217 ); 3425 };
3218 } 3426 }
3219} 3427}
3220 3428
3221sub write_runtime { 3429sub write_runtime_sync {
3222 my $runtime = "$LOCALDIR/runtime";
3223
3224 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
3225 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
3226 3432
3227 IO::AIO::aio_utime $runtime, undef, undef; 3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3228 3434
3229 my $guard = cf::lock_acquire "write_runtime"; 3435 my $guard = cf::lock_acquire "write_runtime";
3230 3436
3231 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3232 or return; 3438 or return;
3233 3439
3234 my $value = $cf::RUNTIME + 90 + 10; 3440 my $value = $cf::RUNTIME + 90 + 10;
3235 # 10 is the runtime save interval, for a monotonic clock 3441 # 10 is the runtime save interval, for a monotonic clock
3236 # 60 allows for the watchdog to kill the server. 3442 # 60 allows for the watchdog to kill the server.
3246 aio_utime $fh, undef, undef; 3452 aio_utime $fh, undef, undef;
3247 3453
3248 close $fh 3454 close $fh
3249 or return; 3455 or return;
3250 3456
3251 aio_rename "$runtime~", $runtime 3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3252 and return; 3458 and return;
3253 3459
3254 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
3255 3461
3256 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 };
3257} 3506}
3258 3507
3259sub emergency_save() { 3508sub emergency_save() {
3260 my $freeze_guard = cf::freeze_mainloop; 3509 my $freeze_guard = cf::freeze_mainloop;
3261 3510
3267 # and maps saved/destroyed asynchronously. 3516 # and maps saved/destroyed asynchronously.
3268 warn "begin emergency player save\n"; 3517 warn "begin emergency player save\n";
3269 for my $login (keys %cf::PLAYER) { 3518 for my $login (keys %cf::PLAYER) {
3270 my $pl = $cf::PLAYER{$login} or next; 3519 my $pl = $cf::PLAYER{$login} or next;
3271 $pl->valid or next; 3520 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3272 $pl->save; 3522 $pl->save;
3273 } 3523 }
3274 warn "end emergency player save\n"; 3524 warn "end emergency player save\n";
3275 3525
3276 warn "begin emergency map save\n"; 3526 warn "begin emergency map save\n";
3282 warn "end emergency map save\n"; 3532 warn "end emergency map save\n";
3283 3533
3284 warn "begin emergency database checkpoint\n"; 3534 warn "begin emergency database checkpoint\n";
3285 BDB::db_env_txn_checkpoint $DB_ENV; 3535 BDB::db_env_txn_checkpoint $DB_ENV;
3286 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";
3287 }; 3541 };
3288 3542
3289 warn "leave emergency perl save\n"; 3543 warn "leave emergency perl save\n";
3290} 3544}
3291 3545
3292sub post_cleanup { 3546sub post_cleanup {
3293 my ($make_core) = @_; 3547 my ($make_core) = @_;
3294 3548
3295 warn Carp::longmess "post_cleanup backtrace" 3549 warn Carp::longmess "post_cleanup backtrace"
3296 if $make_core; 3550 if $make_core;
3551
3552 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$;
3297} 3554}
3555
3556# a safer delete_package, copied from Symbol
3557sub clear_package($) {
3558 my $pkg = shift;
3559
3560 # expand to full symbol table name if needed
3561 unless ($pkg =~ /^main::.*::$/) {
3562 $pkg = "main$pkg" if $pkg =~ /^::/;
3563 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3564 $pkg .= '::' unless $pkg =~ /::$/;
3565 }
3566
3567 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3568 my $stem_symtab = *{$stem}{HASH};
3569
3570 defined $stem_symtab and exists $stem_symtab->{$leaf}
3571 or return;
3572
3573 # clear all symbols
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 }
3579 warn "cleared package #$pkg\n";#d#
3580}
3581
3582our $RELOAD; # how many times to reload
3298 3583
3299sub do_reload_perl() { 3584sub do_reload_perl() {
3300 # can/must only be called in main 3585 # can/must only be called in main
3301 if ($Coro::current != $Coro::main) { 3586 if ($Coro::current != $Coro::main) {
3302 warn "can only reload from main coroutine"; 3587 warn "can only reload from main coroutine";
3303 return; 3588 return;
3304 } 3589 }
3305 3590
3591 return if $RELOAD++;
3592
3593 while ($RELOAD) {
3306 warn "reloading..."; 3594 warn "reloading...";
3307 3595
3308 warn "entering sync_job"; 3596 warn "entering sync_job";
3309 3597
3310 cf::sync_job { 3598 cf::sync_job {
3311 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3312 cf::emergency_save; 3600 cf::emergency_save;
3313 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3314 3602
3315 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3316 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3317 3605
3318 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
3319 3607
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"; 3608 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; 3609 while (IO::AIO::nreqs || BDB::nreqs) {
3331 warn "iterate..."; 3610 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 } 3611 }
3357 3612
3358 warn "... nuking $pkg"; 3613 warn "cancelling all extension coros";
3359 Symbol::delete_package $pkg; 3614 $_->cancel for values %EXT_CORO;
3360 } 3615 %EXT_CORO = ();
3361 3616
3362 warn "unloading all perl modules loaded from $LIBDIR"; 3617 warn "removing commands";
3363 while (my ($k, $v) = each %INC) { 3618 %COMMAND = ();
3364 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3365 3619
3620 warn "removing ext/exti commands";
3621 %EXTCMD = ();
3622 %EXTICMD = ();
3623
3624 warn "unloading/nuking all extensions";
3625 for my $pkg (@EXTS) {
3366 warn "... unloading $k"; 3626 warn "... unloading $pkg";
3367 delete $INC{$k};
3368 3627
3369 $k =~ s/\.pm$//;
3370 $k =~ s/\//::/g;
3371
3372 if (my $cb = $k->can ("unload_module")) { 3628 if (my $cb = $pkg->can ("unload")) {
3629 eval {
3373 $cb->(); 3630 $cb->($pkg);
3631 1
3632 } or warn "$pkg unloaded, but with errors: $@";
3633 }
3634
3635 warn "... clearing $pkg";
3636 clear_package $pkg;
3374 } 3637 }
3375 3638
3376 Symbol::delete_package $k; 3639 warn "unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642
3643 warn "... unloading $k";
3644 delete $INC{$k};
3645
3646 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g;
3648
3649 if (my $cb = $k->can ("unload_module")) {
3650 $cb->();
3651 }
3652
3653 clear_package $k;
3377 } 3654 }
3378 3655
3379 warn "getting rid of safe::, as good as possible"; 3656 warn "getting rid of safe::, as good as possible";
3380 Symbol::delete_package "safe::$_" 3657 clear_package "safe::$_"
3381 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3382 3659
3383 warn "unloading cf.pm \"a bit\""; 3660 warn "unloading cf.pm \"a bit\"";
3384 delete $INC{"cf.pm"}; 3661 delete $INC{"cf.pm"};
3385 delete $INC{"cf/pod.pm"}; 3662 delete $INC{"cf/pod.pm"};
3386 3663
3387 # don't, removes xs symbols, too, 3664 # don't, removes xs symbols, too,
3388 # and global variables created in xs 3665 # and global variables created in xs
3389 #Symbol::delete_package __PACKAGE__; 3666 #clear_package __PACKAGE__;
3390 3667
3391 warn "unload completed, starting to reload now"; 3668 warn "unload completed, starting to reload now";
3392 3669
3393 warn "reloading cf.pm"; 3670 warn "reloading cf.pm";
3394 require cf; 3671 require cf;
3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3396 3673
3397 warn "loading config and database again"; 3674 warn "loading config and database again";
3398 cf::reload_config; 3675 cf::reload_config;
3399 3676
3400 warn "loading extensions"; 3677 warn "loading extensions";
3401 cf::load_extensions; 3678 cf::load_extensions;
3402 3679
3403 warn "reattaching attachments to objects/players"; 3680 warn "reattaching attachments to objects/players";
3404 _global_reattach; # objects, sockets 3681 _global_reattach; # objects, sockets
3405 warn "reattaching attachments to maps"; 3682 warn "reattaching attachments to maps";
3406 reattach $_ for values %MAP; 3683 reattach $_ for values %MAP;
3407 warn "reattaching attachments to players"; 3684 warn "reattaching attachments to players";
3408 reattach $_ for values %PLAYER; 3685 reattach $_ for values %PLAYER;
3409 3686
3410 warn "leaving sync_job"; 3687 warn "leaving sync_job";
3411 3688
3412 1 3689 1
3413 } or do { 3690 } or do {
3414 warn $@; 3691 warn $@;
3415 warn "error while reloading, exiting."; 3692 cf::cleanup "error while reloading, exiting.";
3416 exit 1;
3417 }; 3693 };
3418 3694
3419 warn "reloaded"; 3695 warn "reloaded";
3696 --$RELOAD;
3697 }
3420}; 3698};
3421 3699
3422our $RELOAD_WATCHER; # used only during reload 3700our $RELOAD_WATCHER; # used only during reload
3423 3701
3424sub reload_perl() { 3702sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back, 3703 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here. 3704 # coro crashes during coro_state_free->destroy here.
3427 3705
3428 $RELOAD_WATCHER ||= Event->timer ( 3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3429 reentrant => 0,
3430 after => 0,
3431 data => WF_AUTOCANCEL,
3432 cb => sub {
3433 do_reload_perl; 3707 do_reload_perl;
3434 undef $RELOAD_WATCHER; 3708 undef $RELOAD_WATCHER;
3435 },
3436 ); 3709 };
3437} 3710}
3438 3711
3439register_command "reload" => sub { 3712register_command "reload" => sub {
3440 my ($who, $arg) = @_; 3713 my ($who, $arg) = @_;
3441 3714
3454 3727
3455our @WAIT_FOR_TICK; 3728our @WAIT_FOR_TICK;
3456our @WAIT_FOR_TICK_BEGIN; 3729our @WAIT_FOR_TICK_BEGIN;
3457 3730
3458sub wait_for_tick { 3731sub wait_for_tick {
3459 return unless $TICK_WATCHER->is_active;
3460 return if $Coro::current == $Coro::main; 3732 return if tick_inhibit || $Coro::current == $Coro::main;
3461 3733
3462 my $signal = new Coro::Signal; 3734 my $signal = new Coro::Signal;
3463 push @WAIT_FOR_TICK, $signal; 3735 push @WAIT_FOR_TICK, $signal;
3464 $signal->wait; 3736 $signal->wait;
3465} 3737}
3466 3738
3467sub wait_for_tick_begin { 3739sub wait_for_tick_begin {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3470 3741
3471 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal; 3743 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait; 3744 $signal->wait;
3474} 3745}
3475 3746
3476$TICK_WATCHER = Event->timer ( 3747sub 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) { 3748 if ($Coro::current != $Coro::main) {
3484 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3749 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3485 unless ++$bug_warning > 10; 3750 unless ++$bug_warning > 10;
3486 return; 3751 return;
3487 } 3752 }
3488 3753
3489 $NOW = $tick_start = Event::time;
3490
3491 cf::server_tick; # one server iteration 3754 cf::server_tick; # one server iteration
3492 3755
3493 $RUNTIME += $TICK;
3494 $NEXT_TICK += $TICK;
3495
3496 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3756 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3497 $NEXT_RUNTIME_WRITE = $NOW + 10; 3757 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3498 Coro::async_pool { 3758 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver"; 3759 $Coro::current->{desc} = "runtime saver";
3500 write_runtime 3760 write_runtime_sync
3501 or warn "ERROR: unable to write runtime file: $!"; 3761 or warn "ERROR: unable to write runtime file: $!";
3502 };
3503 } 3762 };
3763 }
3504 3764
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3765 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3766 $sig->send;
3507 } 3767 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3768 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3769 $sig->send;
3510 } 3770 }
3511 3771
3512 $NOW = Event::time; 3772 $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; 3773 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3774
3523 _post_tick; 3775 if (0) {
3776 if ($NEXT_TICK) {
3777 my $jitter = $TICK_START - $NEXT_TICK;
3778 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3779 warn "jitter $JITTER\n";#d#
3780 }
3524 }, 3781 }
3525); 3782}
3526 3783
3527{ 3784{
3785 # configure BDB
3786
3528 BDB::min_parallel 8; 3787 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3788 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3789 $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 3790
3554 unless ($DB_ENV) { 3791 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3792 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3793 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3557 | BDB::LOG_AUTOREMOVE, 1); 3794 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3795 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3798
3561 cf::sync_job { 3799 cf::sync_job {
3562 eval { 3800 eval {
3572 3810
3573 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3812 };
3575 } 3813 }
3576 3814
3577 $BDB_DEADLOCK_WATCHER = Event->timer ( 3815 $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 { }; 3816 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 ); 3817 };
3587 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3818 $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 { }; 3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 ); 3820 };
3597 $BDB_TRICKLE_WATCHER = Event->timer ( 3821 $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 { }; 3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 ); 3823 };
3607} 3824}
3608 3825
3609{ 3826{
3827 # configure IO::AIO
3828
3610 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3611
3612 undef $Coro::AIO::WATCHER;
3613 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3614 $AIO_POLL_WATCHER = Event->io ( 3831 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} 3832}
3623 3833
3624my $_log_backtrace; 3834my $_log_backtrace;
3625 3835
3626sub _log_backtrace { 3836sub _log_backtrace {
3629 $msg =~ s/\n//; 3839 $msg =~ s/\n//;
3630 3840
3631 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3632 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3633 ++$_log_backtrace; 3843 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg;
3634 async { 3845 async {
3635 $Coro::current->{desc} = "abt $msg"; 3846 $Coro::current->{desc} = "abt $msg";
3636 3847
3637 my @bt = fork_call { 3848 my @bt = fork_call {
3638 @addr = map { sprintf "%x", $_ } @addr; 3849 @addr = map { sprintf "%x", $_ } @addr;
3649 } 3860 }
3650 3861
3651 @funcs 3862 @funcs
3652 }; 3863 };
3653 3864
3654 LOG llevInfo, "[ABT] $msg\n"; 3865 LOG llevInfo, "[ABT] $perl_bt\n";
3866 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3655 LOG llevInfo, "[ABT] $_\n" for @bt; 3867 LOG llevInfo, "[ABT] $_\n" for @bt;
3656 --$_log_backtrace; 3868 --$_log_backtrace;
3657 }; 3869 };
3658 } else { 3870 } else {
3659 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines