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.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 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 Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 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.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
56our %EXTCMD = (); 81our %EXTCMD = ();
57our %EXTICMD = (); 82our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 113our $DB_ENV;
89 114
90our %CFG; 115our %CFG;
91 116
92our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 118our $RUNTIME;
119our $NOW;
94 120
95our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
98 124
99# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 127
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
134
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105 136
106binmode STDOUT; 137binmode STDOUT;
107binmode STDERR; 138binmode STDERR;
108 139
109# read virtual server time, if available 140# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 141unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 142 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 143 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 144 $RUNTIME = <$fh> + 0.;
114} 145}
115 146
116mkdir $_ 147mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 193
163The raw value load value from the last tick. 194The raw value load value from the last tick.
164 195
165=item %cf::CFG 196=item %cf::CFG
166 197
167Configuration for the server, loaded from C</etc/crossfire/config>, or 198Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 199from wherever your confdir points to.
169 200
170=item cf::wait_for_tick, cf::wait_for_tick_begin 201=item cf::wait_for_tick, cf::wait_for_tick_begin
171 202
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 203These 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; 224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 225
195 LOG llevError, $msg; 226 LOG llevError, $msg;
196 }; 227 };
197} 228}
229
230$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "=="
232
233 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d#
236 }#d#
237
238 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate
241};
242
243$SIG{__DIE__} = sub { }; #d#?
198 244
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 255for my $pkg (qw(
210 cf::global cf::attachable 256 cf::global cf::attachable
211 cf::object cf::object::player 257 cf::object cf::object::player
212 cf::client cf::player 258 cf::client cf::player
213 cf::arch cf::living 259 cf::arch cf::living
260 cf::map cf::mapspace
214 cf::map cf::party cf::region 261 cf::party cf::region
215)) { 262)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 264}
219 265
220$Event::DIED = sub { 266$EV::DIED = sub {
221 warn "error in event callback: @_"; 267 warn "error in event callback: @_";
222}; 268};
223 269
224############################################################################# 270#############################################################################
225 271
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 294 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 295 $d
250 } || "[unable to dump $_[0]: '$@']"; 296 } || "[unable to dump $_[0]: '$@']";
251} 297}
252 298
253=item $ref = cf::from_json $json 299=item $ref = cf::decode_json $json
254 300
255Converts a JSON string into the corresponding perl data structure. 301Converts a JSON string into the corresponding perl data structure.
256 302
257=item $json = cf::to_json $ref 303=item $json = cf::encode_json $ref
258 304
259Converts a perl data structure into its JSON representation. 305Converts a perl data structure into its JSON representation.
260 306
261=cut 307=cut
262 308
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 310
265sub to_json ($) { $json_coder->encode ($_[0]) } 311sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 312sub decode_json($) { $json_coder->decode ($_[0]) }
313
314=item cf::post_init { BLOCK }
315
316Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again.
318
319The cdoeblock will have a single boolean argument to indicate whether this
320is a reload or not.
321
322=cut
323
324sub post_init(&) {
325 push @POST_INIT, shift;
326}
267 327
268=item cf::lock_wait $string 328=item cf::lock_wait $string
269 329
270Wait until the given lock is available. See cf::lock_acquire. 330Wait until the given lock is available. See cf::lock_acquire.
271 331
299 return;#d# 359 return;#d#
300 }#d# 360 }#d#
301 361
302 # wait for lock, if any 362 # wait for lock, if any
303 while ($LOCK{$key}) { 363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
304 push @{ $LOCK{$key} }, $Coro::current; 365 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule; 366 Coro::schedule;
306 } 367 }
307} 368}
308 369
327 388
328 ! ! $LOCK{$key} 389 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 455 }
384 } 456 }
385}; 457};
386 458
387sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
388 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
389 463
390 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
392 466
406 480
407BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
408 482
409=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
410 484
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 488acceptable.
415 489
416If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
422 496
423sub sync_job(&) { 497sub sync_job(&) {
424 my ($job) = @_; 498 my ($job) = @_;
425 499
426 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 501 my $time = EV::time;
428 502
429 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
431 505
432 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
433 507
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
437 509
438 my $busy = 1; 510 my $busy = 1;
439 my @res; 511 my @res;
440 512
444 warn $@ if $@; 516 warn $@ if $@;
445 undef $busy; 517 undef $busy;
446 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
447 519
448 while ($busy) { 520 while ($busy) {
449 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
450 } 525 }
526 }
451 527
452 $time = Event::time - $time; 528 my $time = EV::time - $time;
453 529
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
458 531
459 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
460 } else { 533 } else {
461 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
462 535
487=item fork_call { }, $args 560=item fork_call { }, $args
488 561
489Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
493 566
494=cut 567=cut
495 568
496sub fork_call(&@) { 569sub fork_call(&@) {
497 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
504 reset_signals; 577 reset_signals;
505 &$cb 578 &$cb
506 }, @args; 579 }, @args;
507 580
508 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
509} 609}
510 610
511=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
512 612
513Returns a single value from the environment database. 613Returns a single value from the environment database.
652 752
653############################################################################# 753#############################################################################
654 754
655=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
656 756
657Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
660 760
661In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 763Deliantra).
664 764
665=over 4 765=over 4
666 766
667=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
668 768
712=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
713 813
714Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
716 816
717Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
719 819
720These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
721 821
722=over 4 822=over 4
950 } 1050 }
951 1051
952 0 1052 0
953} 1053}
954 1054
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1056
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1058
959Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
960 1060
966 1066
967=cut 1067=cut
968 1068
969############################################################################# 1069#############################################################################
970# object support 1070# object support
971#
972 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
973sub _can_merge { 1105sub _can_merge {
974 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
975 1107
976 return 1;#d# 1108 ++$SLOW_MERGES;#d#
977 1109
978 #todo#d# kill yourself and do some recursive checking manually without storable 1110 # we do the slow way here
979 sync_job { 1111 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1112}
987 1113
988sub reattach { 1114sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1116 my ($obj) = @_;
991 1117
1118 # no longer needed after getting rid of delete_package?
992 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
993 1120
994 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
995 1122
996 @$registry = (); 1123 @$registry = ();
997 1124
1012cf::attachable->attach ( 1139cf::attachable->attach (
1013 prio => -1000000, 1140 prio => -1000000,
1014 on_instantiate => sub { 1141 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1016 1143
1017 $data = from_json $data; 1144 $data = decode_json $data;
1018 1145
1019 for (@$data) { 1146 for (@$data) {
1020 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1021 1148
1022 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1043 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1044 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1045 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1046 1173
1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1177 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1178 aio_close $fh;
1052 1179
1053 if (@$objs) { 1180 if (@$objs) {
1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1055 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1184 aio_write $fh, 0, (length $data), $data, 0;
1058 aio_fsync $fh if $cf::USE_FSYNC; 1185 aio_fsync $fh if $cf::USE_FSYNC;
1059 close $fh; 1186 aio_close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1187 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1188 }
1062 } else { 1189 } else {
1063 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1064 } 1191 }
1065 1192
1066 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1067 } else { 1197 } else {
1068 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1069 } 1199 }
1070 } else { 1200 } else {
1071 aio_unlink $filename; 1201 aio_unlink $filename;
1092 1222
1093 unless (aio_stat "$filename.pst") { 1223 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1224 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1225 or return;
1096 1226
1097 my $st = eval { Coro::Storable::thaw $av } 1227 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1228 $av = $st->{objs};
1100 } 1229 }
1101 1230
1102 utf8::decode (my $decname = $filename); 1231 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1232 warn sprintf "loading %s (%d,%d)\n",
1165 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1166 1295
1167 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1168} 1297}
1169 1298
1299use File::Glob ();
1300
1170cf::player->attach ( 1301cf::player->attach (
1171 on_command => sub { 1302 on_command => sub {
1172 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1173 1304
1174 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
1206 1337
1207 cf::override; 1338 cf::override;
1208 }, 1339 },
1209); 1340);
1210 1341
1342# "readahead" all extensions
1343sub cache_extensions {
1344 my $grp = IO::AIO::aio_group;
1345
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1347 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 }
1350 };
1351
1352 $grp
1353}
1354
1211sub load_extensions { 1355sub load_extensions {
1212 cf::sync_job { 1356 cf::sync_job {
1213 my %todo; 1357 my %todo;
1214 1358
1215 for my $path (<$LIBDIR/*.ext>) { 1359 for my $path (<$LIBDIR/*.ext>) {
1234 1378
1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1237 1381
1238 $ext{source} = 1382 $ext{source} =
1239 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1240 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1241 . $source 1385 . $source
1242 . "\n};\n1"; 1386 . "\n};\n1";
1243 1387
1244 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
1260 my $msg = $@ ? "$v->{path}: $@\n" 1404 my $msg = $@ ? "$v->{path}: $@\n"
1261 : "$v->{base}: extension inactive.\n"; 1405 : "$v->{base}: extension inactive.\n";
1262 1406
1263 if (exists $v->{meta}{mandatory}) { 1407 if (exists $v->{meta}{mandatory}) {
1264 warn $msg; 1408 warn $msg;
1265 warn "mandatory extension failed to load, exiting.\n"; 1409 cf::cleanup "mandatory extension failed to load, exiting.";
1266 exit 1;
1267 } 1410 }
1268 1411
1269 warn $msg; 1412 warn $msg;
1270 } 1413 }
1271 1414
1285 1428
1286=back 1429=back
1287 1430
1288=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1289 1432
1290Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1291 1434
1292=cut 1435=cut
1293 1436
1294package cf::player; 1437package cf::player;
1295 1438
1338 1481
1339sub exists($) { 1482sub exists($) {
1340 my ($login) = @_; 1483 my ($login) = @_;
1341 1484
1342 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1343 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1344} 1487}
1345 1488
1346sub find($) { 1489sub find($) {
1347 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1348 my $login = $_[0]; 1491 my $login = $_[0];
1360 my $f = new_from_file cf::object::thawer path $login 1503 my $f = new_from_file cf::object::thawer path $login
1361 or return; 1504 or return;
1362 1505
1363 my $pl = cf::player::load_pl $f 1506 my $pl = cf::player::load_pl $f
1364 or return; 1507 or return;
1508
1365 local $cf::PLAYER_LOADING{$login} = $pl; 1509 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs; 1510 $f->resolve_delayed_derefs;
1367 $cf::PLAYER{$login} = $pl 1511 $cf::PLAYER{$login} = $pl
1368 } 1512 }
1369 } 1513 }
1379 1523
1380 return if $pl->{deny_save}; 1524 return if $pl->{deny_save};
1381 1525
1382 aio_mkdir playerdir $pl, 0770; 1526 aio_mkdir playerdir $pl, 0770;
1383 $pl->{last_save} = $cf::RUNTIME; 1527 $pl->{last_save} = $cf::RUNTIME;
1528
1529 cf::get_slot 0.01;
1384 1530
1385 $pl->save_pl ($path); 1531 $pl->save_pl ($path);
1386 cf::cede_to_tick; 1532 cf::cede_to_tick;
1387} 1533}
1388 1534
1420 my ($pl) = @_; 1566 my ($pl) = @_;
1421 1567
1422 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1423 1569
1424 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1425 $pl->password ("*"); # this should lock out the player until we nuked the dir 1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1426 1572
1427 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1428 $pl->deactivate; 1574 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1429 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1577 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1430 $pl->ns->destroy if $pl->ns; 1578 $pl->ns->destroy if $pl->ns;
1431 1579
1432 my $path = playerdir $pl; 1580 my $path = playerdir $pl;
1433 my $temp = "$path~$cf::RUNTIME~deleting~"; 1581 my $temp = "$path~$cf::RUNTIME~deleting~";
1472 1620
1473 for my $login (@$dirs) { 1621 for my $login (@$dirs) {
1474 my $path = path $login; 1622 my $path = path $login;
1475 1623
1476 # a .pst is a dead give-away for a valid player 1624 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") { 1625 # if no pst file found, open and chekc for blocked users
1626 if (aio_stat "$path.pst") {
1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1627 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1479 aio_read $fh, 0, 512, my $buf, 0 or next; 1628 aio_read $fh, 0, 512, my $buf, 0 or next;
1480 $buf !~ /^password -------------$/m or next; # official not-valid tag 1629 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 } 1630 }
1482 1631
1513 } 1662 }
1514 1663
1515 \@paths 1664 \@paths
1516} 1665}
1517 1666
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1519 1668
1520Expand crossfire pod fragments into protocol xml. 1669Expand deliantra pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568 1670
1569=item $player->ext_reply ($msgid, @msg) 1671=item $player->ext_reply ($msgid, @msg)
1570 1672
1571Sends an ext reply to the player. 1673Sends an ext reply to the player.
1572 1674
1639our $MAX_RESET = 3600; 1741our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1742our $DEFAULT_RESET = 3000;
1641 1743
1642sub generate_random_map { 1744sub generate_random_map {
1643 my ($self, $rmp) = @_; 1745 my ($self, $rmp) = @_;
1746
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748
1644 # mit "rum" bekleckern, nicht 1749 # mit "rum" bekleckern, nicht
1645 $self->_create_random_map ( 1750 $self->_create_random_map (
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1770 1875
1771# the temporary/swap location 1876# the temporary/swap location
1772sub save_path { 1877sub save_path {
1773 my ($self) = @_; 1878 my ($self) = @_;
1774 1879
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 1881 "$TMPDIR/$path.map"
1777} 1882}
1778 1883
1779# the unique path, undef == no special unique path 1884# the unique path, undef == no special unique path
1780sub uniq_path { 1885sub uniq_path {
1781 my ($self) = @_; 1886 my ($self) = @_;
1782 1887
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 1889 "$UNIQUEDIR/$path"
1785} 1890}
1786 1891
1787# and all this just because we cannot iterate over 1892# and all this just because we cannot iterate over
1788# all maps in C++... 1893# all maps in C++...
1886 1991
1887 cf::lock_wait "map_data:$path";#d#remove 1992 cf::lock_wait "map_data:$path";#d#remove
1888 cf::lock_wait "map_find:$path"; 1993 cf::lock_wait "map_find:$path";
1889 1994
1890 $cf::MAP{$path} || do { 1995 $cf::MAP{$path} || do {
1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1893 1998
1894 my $map = new_from_path cf::map $path 1999 my $map = new_from_path cf::map $path
1895 or return; 2000 or return;
1896 2001
1897 $map->{last_save} = $cf::RUNTIME; 2002 $map->{last_save} = $cf::RUNTIME;
1900 or return; 2005 or return;
1901 2006
1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2007 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1903 # doing this can freeze the server in a sync job, obviously 2008 # doing this can freeze the server in a sync job, obviously
1904 #$cf::WAIT_FOR_TICK->wait; 2009 #$cf::WAIT_FOR_TICK->wait;
2010 undef $guard2;
1905 undef $guard1; 2011 undef $guard1;
1906 undef $guard2;
1907 $map->reset; 2012 $map->reset;
1908 return find $path; 2013 return find $path;
1909 } 2014 }
1910 2015
1911 $cf::MAP{$path} = $map 2016 $cf::MAP{$path} = $map
1938 my $f = new_from_file cf::object::thawer $self->{load_path}; 2043 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block; 2044 $f->skip_block;
1940 $self->_load_objects ($f) 2045 $self->_load_objects ($f)
1941 or return; 2046 or return;
1942 2047
1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
1944 if delete $self->{load_original}; 2049 if delete $self->{load_original};
1945 2050
1946 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
1947 utf8::encode $uniq; 2052 utf8::encode $uniq;
1948 unless (aio_stat $uniq) { 2053 unless (aio_stat $uniq) {
1974 } 2079 }
1975 2080
1976 $self->{last_save} = $cf::RUNTIME; 2081 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME); 2082 $self->last_access ($cf::RUNTIME);
1978 2083
1979 $self->in_memory (cf::MAP_IN_MEMORY); 2084 $self->in_memory (cf::MAP_ACTIVE);
1980 } 2085 }
1981 2086
1982 $self->post_load; 2087 $self->post_load;
1983} 2088}
1984 2089
2042 my ($path, $origin, $load) = @_; 2147 my ($path, $origin, $load) = @_;
2043 2148
2044 $path = normalise $path, $origin && $origin->{path}; 2149 $path = normalise $path, $origin && $origin->{path};
2045 2150
2046 if (my $map = $cf::MAP{$path}) { 2151 if (my $map = $cf::MAP{$path}) {
2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2048 } 2153 }
2049 2154
2050 $MAP_PREFETCH{$path} |= $load; 2155 $MAP_PREFETCH{$path} |= $load;
2051 2156
2052 $MAP_PREFETCHER ||= cf::async { 2157 $MAP_PREFETCHER ||= cf::async {
2089 cf::async { 2194 cf::async {
2090 $Coro::current->{desc} = "map player save"; 2195 $Coro::current->{desc} = "map player save";
2091 $_->contr->save for $self->players; 2196 $_->contr->save for $self->players;
2092 }; 2197 };
2093 2198
2199 cf::get_slot 0.02;
2200
2094 if ($uniq) { 2201 if ($uniq) {
2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2202 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2096 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2203 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2097 } else { 2204 } else {
2098 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2106 $self->save; 2213 $self->save;
2107 2214
2108 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2215 my $lock = cf::lock_acquire "map_data:$self->{path}";
2109 2216
2110 return if $self->players; 2217 return if $self->players;
2111 return if $self->in_memory != cf::MAP_IN_MEMORY; 2218 return if $self->in_memory != cf::MAP_ACTIVE;
2112 return if $self->{deny_save}; 2219 return if $self->{deny_save};
2113 2220
2114 $self->in_memory (cf::MAP_SWAPPED); 2221 $self->in_memory (cf::MAP_SWAPPED);
2115 2222
2116 $self->deactivate; 2223 $self->deactivate;
2234 2341
2235sub unique_maps() { 2342sub unique_maps() {
2236 [ 2343 [
2237 map { 2344 map {
2238 utf8::decode $_; 2345 utf8::decode $_;
2239 /\.map$/ 2346 s/\.map$//; # TODO future compatibility hack
2347 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2348 ? ()
2240 ? normalise $_ 2349 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2350 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2351 ]
2244} 2352}
2245 2353
2246package cf;
2247
2248=back 2354=back
2249 2355
2250=head3 cf::object 2356=head3 cf::object
2251 2357
2252=cut 2358=cut
2255 2361
2256=over 4 2362=over 4
2257 2363
2258=item $ob->inv_recursive 2364=item $ob->inv_recursive
2259 2365
2260Returns the inventory of the object _and_ their inventories, recursively. 2366Returns the inventory of the object I<and> their inventories, recursively,
2367but I<not> the object itself.
2261 2368
2262=cut 2369=cut
2263 2370
2264sub inv_recursive_; 2371sub inv_recursive_;
2265sub inv_recursive_ { 2372sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2377 inv_recursive_ inv $_[0]
2271} 2378}
2272 2379
2273=item $ref = $ob->ref 2380=item $ref = $ob->ref
2274 2381
2275creates and returns a persistent reference to an objetc that can be stored as a string. 2382Creates and returns a persistent reference to an object that can be stored as a string.
2276 2383
2277=item $ob = cf::object::deref ($refstring) 2384=item $ob = cf::object::deref ($refstring)
2278 2385
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2386returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block. 2387even if the object actually exists. May block.
2312can be C<undef>. Does the right thing when the player is currently in a 2419can be C<undef>. Does the right thing when the player is currently in a
2313dialogue with the given NPC character. 2420dialogue with the given NPC character.
2314 2421
2315=cut 2422=cut
2316 2423
2424our $SAY_CHANNEL = {
2425 id => "say",
2426 title => "Map",
2427 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2429};
2430
2431our $CHAT_CHANNEL = {
2432 id => "chat",
2433 title => "Chat",
2434 reply => "chat ",
2435 tooltip => "Player chat and shouts, global to the server.",
2436};
2437
2317# rough implementation of a future "reply" method that works 2438# rough implementation of a future "reply" method that works
2318# with dialog boxes. 2439# with dialog boxes.
2319#TODO: the first argument must go, split into a $npc->reply_to ( method 2440#TODO: the first argument must go, split into a $npc->reply_to ( method
2320sub cf::object::player::reply($$$;$) { 2441sub cf::object::player::reply($$$;$) {
2321 my ($self, $npc, $msg, $flags) = @_; 2442 my ($self, $npc, $msg, $flags) = @_;
2332 my $dialog = $pl->{npc_dialog}; 2453 my $dialog = $pl->{npc_dialog};
2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2454 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2334 2455
2335 } else { 2456 } else {
2336 $msg = $npc->name . " says: $msg" if $npc; 2457 $msg = $npc->name . " says: $msg" if $npc;
2337 $self->message ($msg, $flags); 2458 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2338 } 2459 }
2339 } 2460 }
2340} 2461}
2341 2462
2342=item $object->send_msg ($channel, $msg, $color, [extra...]) 2463=item $object->send_msg ($channel, $msg, $color, [extra...])
2367 2488
2368=item $player_object->enter_link 2489=item $player_object->enter_link
2369 2490
2370Freezes the player and moves him/her to a special map (C<{link}>). 2491Freezes the player and moves him/her to a special map (C<{link}>).
2371 2492
2372The player should be reasonably safe there for short amounts of time. You 2493The player should be reasonably safe there for short amounts of time (e.g.
2373I<MUST> call C<leave_link> as soon as possible, though. 2494for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link
2496map.
2374 2497
2375Will never block. 2498Will never block.
2376 2499
2377=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2378 2501
2436 2559
2437 $map->load; 2560 $map->load;
2438 $map->load_neighbours; 2561 $map->load_neighbours;
2439 2562
2440 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2441 $self->activate_recursive; 2565 $self->activate_recursive;
2442 2566
2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2444 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2445} 2569}
2449Moves the player to the given map-path and coordinates by first freezing 2573Moves the player to the given map-path and coordinates by first freezing
2450her, loading and preparing them map, calling the provided $check callback 2574her, loading and preparing them map, calling the provided $check callback
2451that has to return the map if sucecssful, and then unfreezes the player on 2575that has to return the map if sucecssful, and then unfreezes the player on
2452the new (success) or old (failed) map position. In either case, $done will 2576the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process. 2577be called at the end of this process.
2578
2579Note that $check will be called with a potentially non-loaded map, so if
2580it needs a loaded map it has to call C<< ->load >>.
2454 2581
2455=cut 2582=cut
2456 2583
2457our $GOTOGEN; 2584our $GOTOGEN;
2458 2585
2537} 2664}
2538 2665
2539sub prepare_random_map { 2666sub prepare_random_map {
2540 my ($exit) = @_; 2667 my ($exit) = @_;
2541 2668
2542 my $guard = cf::lock_acquire "exit_prepare:$exit";
2543
2544 # all this does is basically replace the /! path by 2669 # all this does is basically replace the /! path by
2545 # a new random map path (?random/...) with a seed 2670 # a new random map path (?random/...) with a seed
2546 # that depends on the exit object 2671 # that depends on the exit object
2547 2672
2548 my $rmp = parse_random_map_params $exit->msg; 2673 my $rmp = parse_random_map_params $exit->msg;
2550 if ($exit->map) { 2675 if ($exit->map) {
2551 $rmp->{region} = $exit->region->name; 2676 $rmp->{region} = $exit->region->name;
2552 $rmp->{origin_map} = $exit->map->path; 2677 $rmp->{origin_map} = $exit->map->path;
2553 $rmp->{origin_x} = $exit->x; 2678 $rmp->{origin_x} = $exit->x;
2554 $rmp->{origin_y} = $exit->y; 2679 $rmp->{origin_y} = $exit->y;
2680
2681 $exit->map->touch;
2555 } 2682 }
2556 2683
2557 $rmp->{random_seed} ||= $exit->random_seed; 2684 $rmp->{random_seed} ||= $exit->random_seed;
2558 2685
2559 my $data = cf::to_json $rmp; 2686 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2560 my $md5 = Digest::MD5::md5_hex $data; 2687 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2688 my $meta = "$RANDOMDIR/$md5.meta";
2562 2689
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2690 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2691 aio_write $fh, 0, (length $data), $data, 0;
2565 undef $fh; 2692 undef $fh;
2566 aio_rename "$meta~", $meta; 2693 aio_rename "$meta~", $meta;
2567 2694
2695 my $slaying = "?random/$md5";
2696
2697 if ($exit->valid) {
2568 $exit->slaying ("?random/$md5"); 2698 $exit->slaying ("?random/$md5");
2569 $exit->msg (undef); 2699 $exit->msg (undef);
2700 }
2570 } 2701 }
2571} 2702}
2572 2703
2573sub cf::object::player::enter_exit { 2704sub cf::object::player::enter_exit {
2574 my ($self, $exit) = @_; 2705 my ($self, $exit) = @_;
2575 2706
2576 return unless $self->type == cf::PLAYER; 2707 return unless $self->type == cf::PLAYER;
2577 2708
2578 if ($exit->slaying eq "/!") {
2579 #TODO: this should de-fi-ni-te-ly not be a sync-job
2580 # the problem is that $exit might not survive long enough
2581 # so it needs to be done right now, right here
2582 cf::sync_job { prepare_random_map $exit };
2583 }
2584
2585 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2586 my $hp = $exit->stats->hp;
2587 my $sp = $exit->stats->sp;
2588
2589 $self->enter_link; 2709 $self->enter_link;
2590 2710
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2595 (async { 2711 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2712 $Coro::current->{desc} = "enter_exit";
2597 2713
2598 $self->deactivate_recursive; # just to be sure
2599 unless (eval { 2714 unless (eval {
2715 $self->deactivate_recursive; # just to be sure
2716
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2726 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp;
2728
2600 $self->goto ($slaying, $hp, $sp); 2729 $self->goto ($map, $x, $y);
2601 2730
2731 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y)
2733 if $exit->flag (cf::FLAG_DAMNED);
2734
2602 1; 2735 1
2603 }) { 2736 }) {
2604 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2605 . "I'll try to bring you back to the map you were before. " 2738 . "I'll try to bring you back to the map you were before. "
2606 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2607 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2608 2741
2609 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
2637the message, with C<log> being the default. If C<$color> is negative, suppress 2770the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet. 2771the message unless the client supports the msg packet.
2639 2772
2640=cut 2773=cut
2641 2774
2775# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2776our %CHANNEL = (
2643 "c/identify" => { 2777 "c/identify" => {
2644 id => "infobox", 2778 id => "infobox",
2645 title => "Identify", 2779 title => "Identify",
2646 reply => undef, 2780 reply => undef,
2650 id => "infobox", 2784 id => "infobox",
2651 title => "Examine", 2785 title => "Examine",
2652 reply => undef, 2786 reply => undef,
2653 tooltip => "Signs and other items you examined", 2787 tooltip => "Signs and other items you examined",
2654 }, 2788 },
2789 "c/book" => {
2790 id => "infobox",
2791 title => "Book",
2792 reply => undef,
2793 tooltip => "The contents of a note or book",
2794 },
2655 "c/lookat" => { 2795 "c/lookat" => {
2656 id => "infobox", 2796 id => "infobox",
2657 title => "Look", 2797 title => "Look",
2658 reply => undef, 2798 reply => undef,
2659 tooltip => "What you saw there", 2799 tooltip => "What you saw there",
2660 }, 2800 },
2801 "c/who" => {
2802 id => "infobox",
2803 title => "Players",
2804 reply => undef,
2805 tooltip => "Shows players who are currently online",
2806 },
2807 "c/body" => {
2808 id => "infobox",
2809 title => "Body Parts",
2810 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available",
2812 },
2813 "c/skills" => {
2814 id => "infobox",
2815 title => "Skills",
2816 reply => undef,
2817 tooltip => "Shows your experience per skill and item power",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2830 },
2831 "c/party" => {
2832 id => "party",
2833 title => "Party",
2834 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party",
2836 },
2661); 2837);
2662 2838
2663sub cf::client::send_msg { 2839sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2665 2841
2666 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2667 2844
2668 $color &= cf::NDI_CLIENT_MASK; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669 2846
2670 # check predefined channels, for the benefit of C 2847 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) { 2848 if ($CHANNEL{$channel}) {
2692 if ($self->can_msg) { 2869 if ($self->can_msg) {
2693 # default colour, mask it out 2870 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF; 2872 if $color & cf::NDI_DEF;
2696 2873
2697 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 );
2878
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt);
2699 } else { 2890 } else {
2700 if ($color >= 0) { 2891 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones 2892 # replace some tags by gcfclient-compatible ones
2702 for ($msg) { 2893 for ($msg) {
2703 1 while 2894 1 while
2902 3093
2903The following functions and methods are available within a safe environment: 3094The following functions and methods are available within a safe environment:
2904 3095
2905 cf::object 3096 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy 3097 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr 3098 insert remove name archname title slaying race decrease split
2908 3099
2909 cf::object::player 3100 cf::object::player
2910 player 3101 player
2911 3102
2912 cf::player 3103 cf::player
2917 3108
2918=cut 3109=cut
2919 3110
2920for ( 3111for (
2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race 3113 insert remove inv nrof name archname title slaying race
2923 decrease_ob_nr destroy)], 3114 decrease split destroy change_exp)],
2924 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
2925 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
2926 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
2927) { 3118) {
2928 no strict 'refs'; 3119 no strict 'refs';
3033 { 3224 {
3034 my $faces = $facedata->{faceinfo}; 3225 my $faces = $facedata->{faceinfo};
3035 3226
3036 while (my ($face, $info) = each %$faces) { 3227 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3228 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229
3038 cf::face::set_visibility $idx, $info->{visibility}; 3230 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3231 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3042 3234
3043 cf::cede_to_tick; 3235 cf::cede_to_tick;
3044 } 3236 }
3045 3237
3046 while (my ($face, $info) = each %$faces) { 3238 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3239 next unless $info->{smooth};
3240
3048 my $idx = cf::face::find $face 3241 my $idx = cf::face::find $face
3049 or next; 3242 or next;
3243
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3244 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3245 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3247 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3248 warn "smooth face '$info->{smooth}' not found for face '$face'";
3072 { 3266 {
3073 # TODO: for gcfclient pleasure, we should give resources 3267 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index. 3268 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3269 my $res = $facedata->{resource};
3076 3270
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3271 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3273 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data; 3274 my $data;
3082 3275
3083 if ($info->{type} & 1) { 3276 if ($info->{type} & 1) {
3084 # prepend meta info 3277 # prepend meta info
3085 3278
3086 my $meta = $enc->encode ({ 3279 my $meta = $enc->encode ({
3087 name => $name, 3280 name => $name,
3088 %{ $info->{meta} || {} }, 3281 %{ $info->{meta} || {} },
3089 }); 3282 });
3090 3283
3091 $data = pack "(w/a*)*", $meta, $info->{data}; 3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type};
3092 } else { 3291 } else {
3093 $data = $info->{data}; 3292 $RESOURCE{$name} = $info;
3094 } 3293 }
3095 3294
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3295 cf::cede_to_tick;
3100 } 3296 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3297 }
3298
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3300
3121 1 3301 1
3122} 3302}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3123 3323
3124register_exticmd fx_want => sub { 3324register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3325 my ($ns, $want) = @_;
3126 3326
3127 while (my ($k, $v) = each %$want) { 3327 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v); 3328 $ns->fx_want ($k, $v);
3129 } 3329 }
3130}; 3330};
3331
3332sub load_resource_file($) {
3333 my $guard = lock_acquire "load_resource_file";
3334
3335 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100;
3337 cf::arch::commit_load;
3338
3339 $status
3340}
3131 3341
3132sub reload_regions { 3342sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework 3343 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?) 3344 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = (); 3345 %ext::player_env::MUSIC_FACE_CACHE = ();
3149} 3359}
3150 3360
3151sub reload_archetypes { 3361sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes" 3362 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n"; 3363 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
3159} 3364}
3160 3365
3161sub reload_treasures { 3366sub reload_treasures {
3162 load_resource_file "$DATADIR/treasures" 3367 load_resource_file "$DATADIR/treasures"
3163 or die "unable to load treasurelists\n"; 3368 or die "unable to load treasurelists\n";
3164} 3369}
3165 3370
3166sub reload_resources { 3371sub reload_resources {
3167 warn "reloading resource files...\n"; 3372 warn "reloading resource files...\n";
3168 3373
3374 reload_facedata;
3375 reload_archetypes;
3169 reload_regions; 3376 reload_regions;
3170 reload_facedata;
3171 #reload_archetypes;#d#
3172 reload_archetypes;
3173 reload_treasures; 3377 reload_treasures;
3174 3378
3175 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
3176}
3177
3178sub init {
3179 reload_resources;
3180} 3380}
3181 3381
3182sub reload_config { 3382sub reload_config {
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3384 or return;
3185 3385
3186 local $/; 3386 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3387 *CFG = YAML::Load <$fh>;
3188 3388
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3390
3191 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3192 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3198 }; 3398 };
3199 warn $@ if $@; 3399 warn $@ if $@;
3200 } 3400 }
3201} 3401}
3202 3402
3403sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!";
3406 flock $fh, &Fcntl::LOCK_EX
3407 or die "$PIDFILE: flock: $!";
3408 $fh
3409}
3410
3411# make sure only one server instance is running at any one time
3412sub atomic {
3413 my $fh = pidfile;
3414
3415 my $pid = <$fh>;
3416 kill 9, $pid if $pid > 0;
3417
3418 seek $fh, 0, 0;
3419 print $fh $$;
3420}
3421
3203sub main { 3422sub main {
3423 cf::init_globals; # initialise logging
3424
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437
3204 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3207 (async { 3441 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3443 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
3211 }; 3445 };
3212 3446
3447 evthread_start IO::AIO::poll_fileno;
3448
3449 cf::sync_job {
3450 reload_resources;
3213 reload_config; 3451 reload_config;
3214 db_init; 3452 db_init;
3453
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid;
3457 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills;
3460
3461 cf::init_beforeplay;
3462
3463 atomic;
3464
3215 load_extensions; 3465 load_extensions;
3216 3466
3217 $TICK_WATCHER->start; 3467 utime time, time, $RUNTIMEFILE;
3468
3469 # no (long-running) fork's whatsoever before this point(!)
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471
3472 (pop @POST_INIT)->(0) while @POST_INIT;
3473 };
3474
3218 Event::loop; 3475 EV::loop;
3219} 3476}
3220 3477
3221############################################################################# 3478#############################################################################
3222# initialisation and cleanup 3479# initialisation and cleanup
3223 3480
3224# install some emergency cleanup handlers 3481# install some emergency cleanup handlers
3225BEGIN { 3482BEGIN {
3483 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3484 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3485 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3486 cf::cleanup "SIG$signal";
3234 },
3235 ); 3487 };
3236 } 3488 }
3237} 3489}
3238 3490
3239sub write_runtime { 3491sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime";
3241
3242 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
3244 3494
3245 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3246 3496
3247 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
3248 3498
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3250 or return; 3500 or return;
3251 3501
3252 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
3264 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
3265 3515
3266 close $fh 3516 close $fh
3267 or return; 3517 or return;
3268 3518
3269 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3270 and return; 3520 and return;
3271 3521
3272 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
3273 3523
3274 1 3524 1
3525}
3526
3527our $uuid_lock;
3528our $uuid_skip;
3529
3530sub write_uuid_sync($) {
3531 $uuid_skip ||= $_[0];
3532
3533 return if $uuid_lock;
3534 local $uuid_lock = 1;
3535
3536 my $uuid = "$LOCALDIR/uuid";
3537
3538 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3539 or return;
3540
3541 my $value = uuid_seq uuid_cur;
3542
3543 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n";
3545 return;
3546 }
3547
3548 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0;
3550
3551 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3552 and return;
3553
3554 # always fsync - this file is important
3555 aio_fsync $fh
3556 and return;
3557
3558 close $fh
3559 or return;
3560
3561 aio_rename "$uuid~", $uuid
3562 and return;
3563
3564 warn "uuid file written ($value).\n";
3565
3566 1
3567
3568}
3569
3570sub write_uuid($$) {
3571 my ($skip, $sync) = @_;
3572
3573 $sync ? write_uuid_sync $skip
3574 : async { write_uuid_sync $skip };
3275} 3575}
3276 3576
3277sub emergency_save() { 3577sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
3279 3579
3280 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
3281 3581
3282 cf::sync_job { 3582 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587
3283 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
3284 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
3285 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
3286 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
3287 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
3288 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
3289 $pl->valid or next; 3594 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3291 $pl->save; 3596 $pl->save;
3292 } 3597 }
3293 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
3294 3599
3295 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
3296 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
3297 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
3298 $map->valid or next; 3603 $map->valid or next;
3299 $map->save; 3604 $map->save;
3300 } 3605 }
3301 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
3302 3607
3303 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3305 warn "end emergency database checkpoint\n"; 3610 warn "emergency_perl_save: end database checkpoint\n";
3611
3612 warn "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n";
3306 }; 3615 };
3307 3616
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3308 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
3309} 3623}
3310 3624
3311sub post_cleanup { 3625sub post_cleanup {
3312 my ($make_core) = @_; 3626 my ($make_core) = @_;
3313 3627
3314 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3315 if $make_core; 3629 if $make_core;
3630
3631 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$;
3633}
3634
3635# a safer delete_package, copied from Symbol
3636sub clear_package($) {
3637 my $pkg = shift;
3638
3639 # expand to full symbol table name if needed
3640 unless ($pkg =~ /^main::.*::$/) {
3641 $pkg = "main$pkg" if $pkg =~ /^::/;
3642 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3643 $pkg .= '::' unless $pkg =~ /::$/;
3644 }
3645
3646 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3647 my $stem_symtab = *{$stem}{HASH};
3648
3649 defined $stem_symtab and exists $stem_symtab->{$leaf}
3650 or return;
3651
3652 # clear all symbols
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 }
3658 warn "cleared package $pkg\n";#d#
3316} 3659}
3317 3660
3318sub do_reload_perl() { 3661sub do_reload_perl() {
3319 # can/must only be called in main 3662 # can/must only be called in main
3320 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3321 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3322 return; 3665 return;
3323 } 3666 }
3324 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3325 warn "reloading..."; 3673 warn "reloading...";
3326 3674
3327 warn "entering sync_job"; 3675 warn "entering sync_job";
3328 3676
3329 cf::sync_job { 3677 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3331 cf::emergency_save; 3679 cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3333 3681
3334 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3684
3337 # if anything goes wrong in here, we should simply crash as we already saved 3685 # if anything goes wrong in here, we should simply crash as we already saved
3338 3686
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests"; 3687 warn "flushing outstanding aio requests";
3345 for (;;) {
3346 BDB::flush;
3347 IO::AIO::flush;
3348 Coro::cede;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3350 warn "iterate..."; 3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3351 }
3352
3353 ++$RELOAD;
3354
3355 warn "cancelling all extension coros";
3356 $_->cancel for values %EXT_CORO;
3357 %EXT_CORO = ();
3358
3359 warn "removing commands";
3360 %COMMAND = ();
3361
3362 warn "removing ext/exti commands";
3363 %EXTCMD = ();
3364 %EXTICMD = ();
3365
3366 warn "unloading/nuking all extensions";
3367 for my $pkg (@EXTS) {
3368 warn "... unloading $pkg";
3369
3370 if (my $cb = $pkg->can ("unload")) {
3371 eval {
3372 $cb->($pkg);
3373 1
3374 } or warn "$pkg unloaded, but with errors: $@";
3375 } 3690 }
3376 3691
3377 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3378 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3379 } 3694 %EXT_CORO = ();
3380 3695
3381 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3382 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3383 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3384 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3385 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3386 delete $INC{$k};
3387 3706
3388 $k =~ s/\.pm$//;
3389 $k =~ s/\//::/g;
3390
3391 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3392 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3393 } 3716 }
3394 3717
3395 Symbol::delete_package $k; 3718 warn "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721
3722 warn "... unloading $k";
3723 delete $INC{$k};
3724
3725 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g;
3727
3728 if (my $cb = $k->can ("unload_module")) {
3729 $cb->();
3730 }
3731
3732 clear_package $k;
3396 } 3733 }
3397 3734
3398 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3399 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3400 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3401 3738
3402 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3403 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3404 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3405 3742
3406 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3407 # and global variables created in xs 3744 # and global variables created in xs
3408 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3409 3746
3410 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3411 3748
3412 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3413 require cf; 3750 require cf;
3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3415 3752
3416 warn "loading config and database again"; 3753 warn "loading config and database again";
3417 cf::reload_config; 3754 cf::reload_config;
3418 3755
3419 warn "loading extensions"; 3756 warn "loading extensions";
3420 cf::load_extensions; 3757 cf::load_extensions;
3421 3758
3759 if ($REATTACH_ON_RELOAD) {
3422 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3423 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3424 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3425 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3426 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3427 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3428 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3429 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3430 3772
3431 1 3773 1
3432 } or do { 3774 } or do {
3433 warn $@; 3775 warn $@;
3434 warn "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3777 };
3437 3778
3438 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3439}; 3785};
3440 3786
3441our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3442 3788
3443sub reload_perl() { 3789sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3446 3792
3447 $RELOAD_WATCHER ||= Event->timer ( 3793 $RELOAD_WATCHER ||= cf::async {
3448 reentrant => 0, 3794 Coro::AIO::aio_wait cache_extensions;
3449 after => 0, 3795
3450 data => WF_AUTOCANCEL, 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3451 cb => sub {
3452 do_reload_perl; 3797 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3454 }, 3799 };
3455 ); 3800 };
3456} 3801}
3457 3802
3458register_command "reload" => sub { 3803register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
3460 3805
3473 3818
3474our @WAIT_FOR_TICK; 3819our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 3820our @WAIT_FOR_TICK_BEGIN;
3476 3821
3477sub wait_for_tick { 3822sub wait_for_tick {
3478 return unless $TICK_WATCHER->is_active;
3479 return if $Coro::current == $Coro::main; 3823 return if tick_inhibit || $Coro::current == $Coro::main;
3480 3824
3481 my $signal = new Coro::Signal; 3825 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 3826 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 3827 $signal->wait;
3484} 3828}
3485 3829
3486sub wait_for_tick_begin { 3830sub wait_for_tick_begin {
3487 return unless $TICK_WATCHER->is_active;
3488 return if $Coro::current == $Coro::main; 3831 return if tick_inhibit || $Coro::current == $Coro::main;
3489 3832
3490 my $signal = new Coro::Signal; 3833 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3834 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3835 $signal->wait;
3493} 3836}
3494 3837
3495$TICK_WATCHER = Event->timer ( 3838sub tick {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3839 if ($Coro::current != $Coro::main) {
3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3504 unless ++$bug_warning > 10; 3841 unless ++$bug_warning > 10;
3505 return; 3842 return;
3506 } 3843 }
3507 3844
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 3845 cf::server_tick; # one server iteration
3511 3846
3512 $RUNTIME += $TICK;
3513 $NEXT_TICK += $TICK;
3514
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3847 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3849 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3850 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3851 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 3852 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3853 };
3854 }
3523 3855
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3857 $sig->send;
3526 } 3858 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3859 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3860 $sig->send;
3529 } 3861 }
3530 3862
3531 $NOW = Event::time; 3863 $LOAD = ($NOW - $TICK_START) / $TICK;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3865
3542 _post_tick; 3866 if (0) {
3867 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d#
3871 }
3543 }, 3872 }
3544); 3873}
3545 3874
3546{ 3875{
3876 # configure BDB
3877
3547 BDB::min_parallel 8; 3878 BDB::min_parallel 8;
3548 BDB::max_poll_time $TICK * 0.1; 3879 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3880 $AnyEvent::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 3881
3573 unless ($DB_ENV) { 3882 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 3883 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3576 | BDB::LOG_AUTOREMOVE, 1); 3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3886 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3887 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3888 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3579 3889
3580 cf::sync_job { 3890 cf::sync_job {
3581 eval { 3891 eval {
3591 3901
3592 cf::cleanup "db_env_open(db): $@" if $@; 3902 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 3903 };
3594 } 3904 }
3595 3905
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 3906 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3907 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 3908 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3909 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3910 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 3911 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 3912 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3913 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 3914 };
3626} 3915}
3627 3916
3628{ 3917{
3918 # configure IO::AIO
3919
3629 IO::AIO::min_parallel 8; 3920 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 3921 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 3922 undef $AnyEvent::AIO::WATCHER;
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 3923}
3642 3924
3643my $_log_backtrace; 3925my $_log_backtrace;
3644 3926
3645sub _log_backtrace { 3927sub _log_backtrace {
3648 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3649 3931
3650 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3651 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3652 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3653 async { 3936 async {
3654 $Coro::current->{desc} = "abt $msg"; 3937 $Coro::current->{desc} = "abt $msg";
3655 3938
3656 my @bt = fork_call { 3939 my @bt = fork_call {
3657 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
3668 } 3951 }
3669 3952
3670 @funcs 3953 @funcs
3671 }; 3954 };
3672 3955
3673 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3674 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3675 --$_log_backtrace; 3959 --$_log_backtrace;
3676 }; 3960 };
3677 } else { 3961 } else {
3678 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines