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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines