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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.452 by root, Tue Sep 23 00:24:52 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines