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.447 by root, Fri Sep 19 01:39:45 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines