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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines