ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.374 by root, Wed Sep 19 22:07:16 2007 UTC vs.
Revision 1.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 Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
56our %EXTCMD = (); 81our %EXTCMD = ();
57our %EXTICMD = (); 82our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 113our $DB_ENV;
89 114
90our %CFG; 115our %CFG;
91 116
92our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 118our $RUNTIME;
119our $NOW;
94 120
95our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
98 124
99# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 127
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
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>:
373 } 445 }
374 } 446 }
375 } 447 }
376 448
377 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 452 $signal->wait;
381 } else { 453 } else {
382 Coro::schedule; 454 Coro::schedule;
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 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 507
434 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
435 509
436 my $busy = 1; 510 my $busy = 1;
437 my @res; 511 my @res;
438 512
442 warn $@ if $@; 516 warn $@ if $@;
443 undef $busy; 517 undef $busy;
444 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
445 519
446 while ($busy) { 520 while ($busy) {
447 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
448 } 525 }
526 }
449 527
450 $time = Event::time - $time; 528 my $time = EV::time - $time;
451 529
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
456 531
457 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
458 } else { 533 } else {
459 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
460 535
485=item fork_call { }, $args 560=item fork_call { }, $args
486 561
487Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
491 566
492=cut 567=cut
493 568
494sub fork_call(&@) { 569sub fork_call(&@) {
495 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
502 reset_signals; 577 reset_signals;
503 &$cb 578 &$cb
504 }, @args; 579 }, @args;
505 580
506 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
507} 609}
508 610
509=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
510 612
511Returns a single value from the environment database. 613Returns a single value from the environment database.
650 752
651############################################################################# 753#############################################################################
652 754
653=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
654 756
655Many 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
656attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
658 760
659In 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>
660C<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
661Crossfire TRT). 763Deliantra).
662 764
663=over 4 765=over 4
664 766
665=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
666 768
710=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
711 813
712Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
714 816
715Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
716that 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.
717 819
718These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
719 821
720=over 4 822=over 4
948 } 1050 }
949 1051
950 0 1052 0
951} 1053}
952 1054
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1056
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1058
957Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
958 1060
964 1066
965=cut 1067=cut
966 1068
967############################################################################# 1069#############################################################################
968# object support 1070# object support
969#
970 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#
971sub _can_merge { 1105sub _can_merge {
972 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
973 1107
974 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1109
978 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
979} 1112}
980 1113
981sub reattach { 1114sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1116 my ($obj) = @_;
984 1117
1118 # no longer needed after getting rid of delete_package?
985 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
986 1120
987 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
988 1122
989 @$registry = (); 1123 @$registry = ();
990 1124
1005cf::attachable->attach ( 1139cf::attachable->attach (
1006 prio => -1000000, 1140 prio => -1000000,
1007 on_instantiate => sub { 1141 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1009 1143
1010 $data = from_json $data; 1144 $data = decode_json $data;
1011 1145
1012 for (@$data) { 1146 for (@$data) {
1013 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1014 1148
1015 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1039 1173
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1177 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1178 aio_close $fh;
1045 1179
1046 if (@$objs) { 1180 if (@$objs) {
1047 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) {
1048 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1184 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1185 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1186 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1187 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1188 }
1055 } else { 1189 } else {
1056 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1057 } 1191 }
1058 1192
1059 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1197 } else {
1061 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1062 } 1199 }
1063 } else { 1200 } else {
1064 aio_unlink $filename; 1201 aio_unlink $filename;
1085 1222
1086 unless (aio_stat "$filename.pst") { 1223 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1224 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1225 or return;
1089 1226
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1227 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs};
1091 } 1229 }
1092 1230
1093 utf8::decode (my $decname = $filename); 1231 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1232 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1233 $decname, length $data, scalar @{$av || []};
1156 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1157 1295
1158 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1159} 1297}
1160 1298
1299use File::Glob ();
1300
1161cf::player->attach ( 1301cf::player->attach (
1162 on_command => sub { 1302 on_command => sub {
1163 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1164 1304
1165 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
1197 1337
1198 cf::override; 1338 cf::override;
1199 }, 1339 },
1200); 1340);
1201 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
1202sub load_extensions { 1355sub load_extensions {
1203 cf::sync_job { 1356 cf::sync_job {
1204 my %todo; 1357 my %todo;
1205 1358
1206 for my $path (<$LIBDIR/*.ext>) { 1359 for my $path (<$LIBDIR/*.ext>) {
1225 1378
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1381
1229 $ext{source} = 1382 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1232 . $source 1385 . $source
1233 . "\n};\n1"; 1386 . "\n};\n1";
1234 1387
1235 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
1251 my $msg = $@ ? "$v->{path}: $@\n" 1404 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1405 : "$v->{base}: extension inactive.\n";
1253 1406
1254 if (exists $v->{meta}{mandatory}) { 1407 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1408 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1409 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1410 }
1259 1411
1260 warn $msg; 1412 warn $msg;
1261 } 1413 }
1262 1414
1276 1428
1277=back 1429=back
1278 1430
1279=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1280 1432
1281Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1282 1434
1283=cut 1435=cut
1284 1436
1285package cf::player; 1437package cf::player;
1286 1438
1329 1481
1330sub exists($) { 1482sub exists($) {
1331 my ($login) = @_; 1483 my ($login) = @_;
1332 1484
1333 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1335} 1487}
1336 1488
1337sub find($) { 1489sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1491 my $login = $_[0];
1351 my $f = new_from_file cf::object::thawer path $login 1503 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1504 or return;
1353 1505
1354 my $pl = cf::player::load_pl $f 1506 my $pl = cf::player::load_pl $f
1355 or return; 1507 or return;
1508
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1509 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1510 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1511 $cf::PLAYER{$login} = $pl
1359 } 1512 }
1360 } 1513 }
1370 1523
1371 return if $pl->{deny_save}; 1524 return if $pl->{deny_save};
1372 1525
1373 aio_mkdir playerdir $pl, 0770; 1526 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1527 $pl->{last_save} = $cf::RUNTIME;
1528
1529 cf::get_slot 0.01;
1375 1530
1376 $pl->save_pl ($path); 1531 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1532 cf::cede_to_tick;
1378} 1533}
1379 1534
1411 my ($pl) = @_; 1566 my ($pl) = @_;
1412 1567
1413 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1414 1569
1415 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1416 $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
1417 1572
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1574 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1577 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1578 $pl->ns->destroy if $pl->ns;
1422 1579
1423 my $path = playerdir $pl; 1580 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1581 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1620
1464 for my $login (@$dirs) { 1621 for my $login (@$dirs) {
1465 my $path = path $login; 1622 my $path = path $login;
1466 1623
1467 # a .pst is a dead give-away for a valid player 1624 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1625 # if no pst file found, open and chekc for blocked users
1626 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1627 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1628 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1629 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1630 }
1473 1631
1504 } 1662 }
1505 1663
1506 \@paths 1664 \@paths
1507} 1665}
1508 1666
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1668
1511Expand crossfire pod fragments into protocol xml. 1669Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1670
1560=item $player->ext_reply ($msgid, @msg) 1671=item $player->ext_reply ($msgid, @msg)
1561 1672
1562Sends an ext reply to the player. 1673Sends an ext reply to the player.
1563 1674
1630our $MAX_RESET = 3600; 1741our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1742our $DEFAULT_RESET = 3000;
1632 1743
1633sub generate_random_map { 1744sub generate_random_map {
1634 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
1635 # mit "rum" bekleckern, nicht 1749 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1750 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1875
1762# the temporary/swap location 1876# the temporary/swap location
1763sub save_path { 1877sub save_path {
1764 my ($self) = @_; 1878 my ($self) = @_;
1765 1879
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1881 "$TMPDIR/$path.map"
1768} 1882}
1769 1883
1770# the unique path, undef == no special unique path 1884# the unique path, undef == no special unique path
1771sub uniq_path { 1885sub uniq_path {
1772 my ($self) = @_; 1886 my ($self) = @_;
1773 1887
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1889 "$UNIQUEDIR/$path"
1776} 1890}
1777 1891
1778# and all this just because we cannot iterate over 1892# and all this just because we cannot iterate over
1779# all maps in C++... 1893# all maps in C++...
1877 1991
1878 cf::lock_wait "map_data:$path";#d#remove 1992 cf::lock_wait "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 1993 cf::lock_wait "map_find:$path";
1880 1994
1881 $cf::MAP{$path} || do { 1995 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1998
1885 my $map = new_from_path cf::map $path 1999 my $map = new_from_path cf::map $path
1886 or return; 2000 or return;
1887 2001
1888 $map->{last_save} = $cf::RUNTIME; 2002 $map->{last_save} = $cf::RUNTIME;
1891 or return; 2005 or return;
1892 2006
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2007 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2008 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2009 #$cf::WAIT_FOR_TICK->wait;
2010 undef $guard2;
1896 undef $guard1; 2011 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2012 $map->reset;
1899 return find $path; 2013 return find $path;
1900 } 2014 }
1901 2015
1902 $cf::MAP{$path} = $map 2016 $cf::MAP{$path} = $map
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2043 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2044 $f->skip_block;
1931 $self->_load_objects ($f) 2045 $self->_load_objects ($f)
1932 or return; 2046 or return;
1933 2047
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
1935 if delete $self->{load_original}; 2049 if delete $self->{load_original};
1936 2050
1937 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2052 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2053 unless (aio_stat $uniq) {
1965 } 2079 }
1966 2080
1967 $self->{last_save} = $cf::RUNTIME; 2081 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2082 $self->last_access ($cf::RUNTIME);
1969 2083
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2084 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2085 }
1972 2086
1973 $self->post_load; 2087 $self->post_load;
1974} 2088}
1975 2089
2033 my ($path, $origin, $load) = @_; 2147 my ($path, $origin, $load) = @_;
2034 2148
2035 $path = normalise $path, $origin && $origin->{path}; 2149 $path = normalise $path, $origin && $origin->{path};
2036 2150
2037 if (my $map = $cf::MAP{$path}) { 2151 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2153 }
2040 2154
2041 $MAP_PREFETCH{$path} |= $load; 2155 $MAP_PREFETCH{$path} |= $load;
2042 2156
2043 $MAP_PREFETCHER ||= cf::async { 2157 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2194 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2195 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2196 $_->contr->save for $self->players;
2083 }; 2197 };
2084 2198
2199 cf::get_slot 0.02;
2200
2085 if ($uniq) { 2201 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2202 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2203 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2204 } else {
2089 $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);
2097 $self->save; 2213 $self->save;
2098 2214
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2215 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2216
2101 return if $self->players; 2217 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2218 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2219 return if $self->{deny_save};
2104 2220
2105 $self->in_memory (cf::MAP_SWAPPED); 2221 $self->in_memory (cf::MAP_SWAPPED);
2106 2222
2107 $self->deactivate; 2223 $self->deactivate;
2225 2341
2226sub unique_maps() { 2342sub unique_maps() {
2227 [ 2343 [
2228 map { 2344 map {
2229 utf8::decode $_; 2345 utf8::decode $_;
2230 /\.map$/ 2346 s/\.map$//; # TODO future compatibility hack
2347 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2348 ? ()
2231 ? normalise $_ 2349 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2350 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2351 ]
2235} 2352}
2236 2353
2237package cf;
2238
2239=back 2354=back
2240 2355
2241=head3 cf::object 2356=head3 cf::object
2242 2357
2243=cut 2358=cut
2246 2361
2247=over 4 2362=over 4
2248 2363
2249=item $ob->inv_recursive 2364=item $ob->inv_recursive
2250 2365
2251Returns 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.
2252 2368
2253=cut 2369=cut
2254 2370
2255sub inv_recursive_; 2371sub inv_recursive_;
2256sub inv_recursive_ { 2372sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2377 inv_recursive_ inv $_[0]
2262} 2378}
2263 2379
2264=item $ref = $ob->ref 2380=item $ref = $ob->ref
2265 2381
2266creates 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.
2267 2383
2268=item $ob = cf::object::deref ($refstring) 2384=item $ob = cf::object::deref ($refstring)
2269 2385
2270returns 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,
2271even if the object actually exists. May block. 2387even if the object actually exists. May block.
2273=cut 2389=cut
2274 2390
2275sub deref { 2391sub deref {
2276 my ($ref) = @_; 2392 my ($ref) = @_;
2277 2393
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2394 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2395 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2396 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2397 or return;
2285 $pl->ob->uuid eq $uuid 2398 $pl->ob->uuid eq $uuid
2286 or return; 2399 or return;
2306can 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
2307dialogue with the given NPC character. 2420dialogue with the given NPC character.
2308 2421
2309=cut 2422=cut
2310 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
2311# rough implementation of a future "reply" method that works 2438# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2439# with dialog boxes.
2313#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
2314sub cf::object::player::reply($$$;$) { 2441sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2442 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2453 my $dialog = $pl->{npc_dialog};
2327 $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));
2328 2455
2329 } else { 2456 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2457 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2458 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2459 }
2333 } 2460 }
2334} 2461}
2335 2462
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2463=item $object->send_msg ($channel, $msg, $color, [extra...])
2361 2488
2362=item $player_object->enter_link 2489=item $player_object->enter_link
2363 2490
2364Freezes 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}>).
2365 2492
2366The 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.
2367I<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.
2368 2497
2369Will never block. 2498Will never block.
2370 2499
2371=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2372 2501
2430 2559
2431 $map->load; 2560 $map->load;
2432 $map->load_neighbours; 2561 $map->load_neighbours;
2433 2562
2434 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2435 $self->activate_recursive; 2565 $self->activate_recursive;
2436 2566
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2439} 2569}
2443Moves 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
2444her, loading and preparing them map, calling the provided $check callback 2574her, loading and preparing them map, calling the provided $check callback
2445that 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
2446the 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
2447be 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 >>.
2448 2581
2449=cut 2582=cut
2450 2583
2451our $GOTOGEN; 2584our $GOTOGEN;
2452 2585
2531} 2664}
2532 2665
2533sub prepare_random_map { 2666sub prepare_random_map {
2534 my ($exit) = @_; 2667 my ($exit) = @_;
2535 2668
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2669 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2670 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2671 # that depends on the exit object
2541 2672
2542 my $rmp = parse_random_map_params $exit->msg; 2673 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2675 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2676 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2677 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2678 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2679 $rmp->{origin_y} = $exit->y;
2680
2681 $exit->map->touch;
2549 } 2682 }
2550 2683
2551 $rmp->{random_seed} ||= $exit->random_seed; 2684 $rmp->{random_seed} ||= $exit->random_seed;
2552 2685
2553 my $data = cf::to_json $rmp; 2686 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2687 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2688 my $meta = "$RANDOMDIR/$md5.meta";
2556 2689
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2690 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2691 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2692 undef $fh;
2560 aio_rename "$meta~", $meta; 2693 aio_rename "$meta~", $meta;
2561 2694
2695 my $slaying = "?random/$md5";
2696
2697 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2698 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2699 $exit->msg (undef);
2700 }
2564 } 2701 }
2565} 2702}
2566 2703
2567sub cf::object::player::enter_exit { 2704sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2705 my ($self, $exit) = @_;
2569 2706
2570 return unless $self->type == cf::PLAYER; 2707 return unless $self->type == cf::PLAYER;
2571 2708
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2709 $self->enter_link;
2584 2710
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2711 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2712 $Coro::current->{desc} = "enter_exit";
2591 2713
2592 $self->deactivate_recursive; # just to be sure
2593 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
2594 $self->goto ($slaying, $hp, $sp); 2729 $self->goto ($map, $x, $y);
2595 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
2596 1; 2735 1
2597 }) { 2736 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "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. "
2600 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2602 2741
2603 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
2631the 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
2632the message unless the client supports the msg packet. 2771the message unless the client supports the msg packet.
2633 2772
2634=cut 2773=cut
2635 2774
2775# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2776our %CHANNEL = (
2637 "c/identify" => { 2777 "c/identify" => {
2638 id => "identify", 2778 id => "infobox",
2639 title => "Identify", 2779 title => "Identify",
2640 reply => undef, 2780 reply => undef,
2641 tooltip => "Items recently identified", 2781 tooltip => "Items recently identified",
2642 }, 2782 },
2643 "c/examine" => { 2783 "c/examine" => {
2644 id => "examine", 2784 id => "infobox",
2645 title => "Examine", 2785 title => "Examine",
2646 reply => undef, 2786 reply => undef,
2647 tooltip => "Signs and other items you examined", 2787 tooltip => "Signs and other items you examined",
2648 }, 2788 },
2789 "c/book" => {
2790 id => "infobox",
2791 title => "Book",
2792 reply => undef,
2793 tooltip => "The contents of a note or book",
2794 },
2795 "c/lookat" => {
2796 id => "infobox",
2797 title => "Look",
2798 reply => undef,
2799 tooltip => "What you saw there",
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 },
2649); 2837);
2650 2838
2651sub cf::client::send_msg { 2839sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2653 2841
2654 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2655 2844
2656 $color &= cf::NDI_CLIENT_MASK; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657 2846
2658 # check predefined channels, for the benefit of C 2847 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2848 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel};
2660 2850
2851 $self->ext_msg (channel_info => $channel)
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id};
2855
2661 if (ref $channel) { 2856 } elsif (ref $channel) {
2662 # send meta info to client, if not yet sent 2857 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) { 2858 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel; 2859 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg; 2861 if $self->can_msg;
2674 if ($self->can_msg) { 2869 if ($self->can_msg) {
2675 # default colour, mask it out 2870 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF; 2872 if $color & cf::NDI_DEF;
2678 2873
2679 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2680 [$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);
2681 } else { 2890 } else {
2682 if ($color >= 0) { 2891 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones 2892 # replace some tags by gcfclient-compatible ones
2684 for ($msg) { 2893 for ($msg) {
2685 1 while 2894 1 while
2883=pod 3092=pod
2884 3093
2885The following functions and methods are available within a safe environment: 3094The following functions and methods are available within a safe environment:
2886 3095
2887 cf::object 3096 cf::object
2888 contr pay_amount pay_player map x y force_find force_add 3097 contr pay_amount pay_player map x y force_find force_add destroy
2889 insert remove name archname title slaying race decrease_ob_nr 3098 insert remove name archname title slaying race decrease split
2890 3099
2891 cf::object::player 3100 cf::object::player
2892 player 3101 player
2893 3102
2894 cf::player 3103 cf::player
2899 3108
2900=cut 3109=cut
2901 3110
2902for ( 3111for (
2903 ["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
2904 insert remove inv name archname title slaying race 3113 insert remove inv nrof name archname title slaying race
2905 decrease_ob_nr)], 3114 decrease split destroy change_exp)],
2906 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
2907 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
2908 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
2909) { 3118) {
2910 no strict 'refs'; 3119 no strict 'refs';
3015 { 3224 {
3016 my $faces = $facedata->{faceinfo}; 3225 my $faces = $facedata->{faceinfo};
3017 3226
3018 while (my ($face, $info) = each %$faces) { 3227 while (my ($face, $info) = each %$faces) {
3019 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3228 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229
3020 cf::face::set_visibility $idx, $info->{visibility}; 3230 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap}; 3231 cf::face::set_magicmap $idx, $info->{magicmap};
3022 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};
3023 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};
3024 3234
3025 cf::cede_to_tick; 3235 cf::cede_to_tick;
3026 } 3236 }
3027 3237
3028 while (my ($face, $info) = each %$faces) { 3238 while (my ($face, $info) = each %$faces) {
3029 next unless $info->{smooth}; 3239 next unless $info->{smooth};
3240
3030 my $idx = cf::face::find $face 3241 my $idx = cf::face::find $face
3031 or next; 3242 or next;
3243
3032 if (my $smooth = cf::face::find $info->{smooth}) { 3244 if (my $smooth = cf::face::find $info->{smooth}) {
3033 cf::face::set_smooth $idx, $smooth; 3245 cf::face::set_smooth $idx, $smooth;
3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3035 } else { 3247 } else {
3036 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3248 warn "smooth face '$info->{smooth}' not found for face '$face'";
3054 { 3266 {
3055 # TODO: for gcfclient pleasure, we should give resources 3267 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index. 3268 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource}; 3269 my $res = $facedata->{resource};
3058 3270
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) { 3271 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3273 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data; 3274 my $data;
3064 3275
3065 if ($info->{type} & 1) { 3276 if ($info->{type} & 1) {
3066 # prepend meta info 3277 # prepend meta info
3067 3278
3068 my $meta = $enc->encode ({ 3279 my $meta = $enc->encode ({
3069 name => $name, 3280 name => $name,
3070 %{ $info->{meta} || {} }, 3281 %{ $info->{meta} || {} },
3071 }); 3282 });
3072 3283
3073 $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};
3074 } else { 3291 } else {
3075 $data = $info->{data}; 3292 $RESOURCE{$name} = $info;
3076 } 3293 }
3077 3294
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3079 cf::face::set_type $idx, $info->{type};
3080
3081 cf::cede_to_tick; 3295 cf::cede_to_tick;
3082 } 3296 }
3083
3084 if ($soundconf) {
3085 $soundconf = $enc->decode (delete $soundconf->{data});
3086
3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3088 my $sound = $soundconf->{compat}[$_]
3089 or next;
3090
3091 my $face = cf::face::find "sound/$sound->[1]";
3092 cf::sound::set $sound->[0] => $face;
3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3094 }
3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
3099 }
3100 }
3101 } 3297 }
3298
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3102 3300
3103 1 3301 1
3104} 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});
3105 3323
3106register_exticmd fx_want => sub { 3324register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_; 3325 my ($ns, $want) = @_;
3108 3326
3109 while (my ($k, $v) = each %$want) { 3327 while (my ($k, $v) = each %$want) {
3110 $ns->fx_want ($k, $v); 3328 $ns->fx_want ($k, $v);
3111 } 3329 }
3112}; 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}
3113 3341
3114sub reload_regions { 3342sub reload_regions {
3115 # 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
3116 # for this (global event?) 3344 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = (); 3345 %ext::player_env::MUSIC_FACE_CACHE = ();
3131} 3359}
3132 3360
3133sub reload_archetypes { 3361sub reload_archetypes {
3134 load_resource_file "$DATADIR/archetypes" 3362 load_resource_file "$DATADIR/archetypes"
3135 or die "unable to load archetypes\n"; 3363 or die "unable to load archetypes\n";
3136 #d# NEED to laod twice to resolve forward references
3137 # this really needs to be done in an extra post-pass
3138 # (which needs to be synchronous, so solve it differently)
3139 load_resource_file "$DATADIR/archetypes"
3140 or die "unable to load archetypes\n";
3141} 3364}
3142 3365
3143sub reload_treasures { 3366sub reload_treasures {
3144 load_resource_file "$DATADIR/treasures" 3367 load_resource_file "$DATADIR/treasures"
3145 or die "unable to load treasurelists\n"; 3368 or die "unable to load treasurelists\n";
3146} 3369}
3147 3370
3148sub reload_resources { 3371sub reload_resources {
3149 warn "reloading resource files...\n"; 3372 warn "reloading resource files...\n";
3150 3373
3374 reload_facedata;
3375 reload_archetypes;
3151 reload_regions; 3376 reload_regions;
3152 reload_facedata;
3153 #reload_archetypes;#d#
3154 reload_archetypes;
3155 reload_treasures; 3377 reload_treasures;
3156 3378
3157 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
3158}
3159
3160sub init {
3161 reload_resources;
3162} 3380}
3163 3381
3164sub reload_config { 3382sub reload_config {
3165 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
3166 or return; 3384 or return;
3167 3385
3168 local $/; 3386 local $/;
3169 *CFG = YAML::Syck::Load <$fh>; 3387 *CFG = YAML::Load <$fh>;
3170 3388
3171 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3172 3390
3173 $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};
3174 $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};
3180 }; 3398 };
3181 warn $@ if $@; 3399 warn $@ if $@;
3182 } 3400 }
3183} 3401}
3184 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
3185sub 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
3186 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
3187 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
3188 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#
3189 (async { 3441 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3191 Event::one_event; 3443 EV::loop EV::LOOP_ONESHOT;
3192 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
3193 }; 3445 };
3194 3446
3447 evthread_start IO::AIO::poll_fileno;
3448
3449 cf::sync_job {
3450 reload_resources;
3195 reload_config; 3451 reload_config;
3196 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
3197 load_extensions; 3465 load_extensions;
3198 3466
3199 $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
3200 Event::loop; 3475 EV::loop;
3201} 3476}
3202 3477
3203############################################################################# 3478#############################################################################
3204# initialisation and cleanup 3479# initialisation and cleanup
3205 3480
3206# install some emergency cleanup handlers 3481# install some emergency cleanup handlers
3207BEGIN { 3482BEGIN {
3483 our %SIGWATCHER = ();
3208 for my $signal (qw(INT HUP TERM)) { 3484 for my $signal (qw(INT HUP TERM)) {
3209 Event->signal ( 3485 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3210 reentrant => 0,
3211 data => WF_AUTOCANCEL,
3212 signal => $signal,
3213 prio => 0,
3214 cb => sub {
3215 cf::cleanup "SIG$signal"; 3486 cf::cleanup "SIG$signal";
3216 },
3217 ); 3487 };
3218 } 3488 }
3219} 3489}
3220 3490
3221sub write_runtime { 3491sub write_runtime_sync {
3222 my $runtime = "$LOCALDIR/runtime";
3223
3224 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
3225 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
3226 3494
3227 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3228 3496
3229 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
3230 3498
3231 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3232 or return; 3500 or return;
3233 3501
3234 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
3235 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
3236 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
3246 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
3247 3515
3248 close $fh 3516 close $fh
3249 or return; 3517 or return;
3250 3518
3251 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3252 and return; 3520 and return;
3253 3521
3254 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
3255 3523
3256 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 };
3257} 3575}
3258 3576
3259sub emergency_save() { 3577sub emergency_save() {
3260 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
3261 3579
3262 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
3263 3581
3264 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
3265 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
3266 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
3267 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
3268 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
3269 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
3270 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
3271 $pl->valid or next; 3594 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3272 $pl->save; 3596 $pl->save;
3273 } 3597 }
3274 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
3275 3599
3276 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
3277 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
3278 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
3279 $map->valid or next; 3603 $map->valid or next;
3280 $map->save; 3604 $map->save;
3281 } 3605 }
3282 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
3283 3607
3284 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
3285 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3286 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";
3287 }; 3615 };
3288 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
3289 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
3290} 3623}
3291 3624
3292sub post_cleanup { 3625sub post_cleanup {
3293 my ($make_core) = @_; 3626 my ($make_core) = @_;
3294 3627
3295 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3296 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#
3297} 3659}
3298 3660
3299sub do_reload_perl() { 3661sub do_reload_perl() {
3300 # can/must only be called in main 3662 # can/must only be called in main
3301 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3302 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3303 return; 3665 return;
3304 } 3666 }
3305 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3306 warn "reloading..."; 3673 warn "reloading...";
3307 3674
3308 warn "entering sync_job"; 3675 warn "entering sync_job";
3309 3676
3310 cf::sync_job { 3677 cf::sync_job {
3311 cf::write_runtime; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3312 cf::emergency_save; 3679 cf::emergency_save;
3313 cf::write_runtime; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3314 3681
3315 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3316 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3317 3684
3318 # 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
3319 3686
3320 warn "cancelling all WF_AUTOCANCEL watchers";
3321 for (Event::all_watchers) {
3322 $_->cancel if $_->data & WF_AUTOCANCEL;
3323 }
3324
3325 warn "flushing outstanding aio requests"; 3687 warn "flushing outstanding aio requests";
3326 for (;;) {
3327 BDB::flush;
3328 IO::AIO::flush;
3329 Coro::cede;
3330 last unless IO::AIO::nreqs || BDB::nreqs; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3331 warn "iterate..."; 3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3332 }
3333
3334 ++$RELOAD;
3335
3336 warn "cancelling all extension coros";
3337 $_->cancel for values %EXT_CORO;
3338 %EXT_CORO = ();
3339
3340 warn "removing commands";
3341 %COMMAND = ();
3342
3343 warn "removing ext/exti commands";
3344 %EXTCMD = ();
3345 %EXTICMD = ();
3346
3347 warn "unloading/nuking all extensions";
3348 for my $pkg (@EXTS) {
3349 warn "... unloading $pkg";
3350
3351 if (my $cb = $pkg->can ("unload")) {
3352 eval {
3353 $cb->($pkg);
3354 1
3355 } or warn "$pkg unloaded, but with errors: $@";
3356 } 3690 }
3357 3691
3358 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3359 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3360 } 3694 %EXT_CORO = ();
3361 3695
3362 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3363 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3364 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3365 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3366 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3367 delete $INC{$k};
3368 3706
3369 $k =~ s/\.pm$//;
3370 $k =~ s/\//::/g;
3371
3372 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3373 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3374 } 3716 }
3375 3717
3376 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;
3377 } 3733 }
3378 3734
3379 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3380 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3381 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);
3382 3738
3383 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3384 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3385 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3386 3742
3387 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3388 # and global variables created in xs 3744 # and global variables created in xs
3389 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3390 3746
3391 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3392 3748
3393 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3394 require cf; 3750 require cf;
3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3396 3752
3397 warn "loading config and database again"; 3753 warn "loading config and database again";
3398 cf::reload_config; 3754 cf::reload_config;
3399 3755
3400 warn "loading extensions"; 3756 warn "loading extensions";
3401 cf::load_extensions; 3757 cf::load_extensions;
3402 3758
3759 if ($REATTACH_ON_RELOAD) {
3403 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3404 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3405 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3406 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3407 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3408 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3409 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3410 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3411 3772
3412 1 3773 1
3413 } or do { 3774 } or do {
3414 warn $@; 3775 warn $@;
3415 warn "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3416 exit 1;
3417 }; 3777 };
3418 3778
3419 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3420}; 3785};
3421 3786
3422our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3423 3788
3424sub reload_perl() { 3789sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3427 3792
3428 $RELOAD_WATCHER ||= Event->timer ( 3793 $RELOAD_WATCHER ||= cf::async {
3429 reentrant => 0, 3794 Coro::AIO::aio_wait cache_extensions;
3430 after => 0, 3795
3431 data => WF_AUTOCANCEL, 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3432 cb => sub {
3433 do_reload_perl; 3797 do_reload_perl;
3434 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3435 }, 3799 };
3436 ); 3800 };
3437} 3801}
3438 3802
3439register_command "reload" => sub { 3803register_command "reload" => sub {
3440 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
3441 3805
3454 3818
3455our @WAIT_FOR_TICK; 3819our @WAIT_FOR_TICK;
3456our @WAIT_FOR_TICK_BEGIN; 3820our @WAIT_FOR_TICK_BEGIN;
3457 3821
3458sub wait_for_tick { 3822sub wait_for_tick {
3459 return unless $TICK_WATCHER->is_active;
3460 return if $Coro::current == $Coro::main; 3823 return if tick_inhibit || $Coro::current == $Coro::main;
3461 3824
3462 my $signal = new Coro::Signal; 3825 my $signal = new Coro::Signal;
3463 push @WAIT_FOR_TICK, $signal; 3826 push @WAIT_FOR_TICK, $signal;
3464 $signal->wait; 3827 $signal->wait;
3465} 3828}
3466 3829
3467sub wait_for_tick_begin { 3830sub wait_for_tick_begin {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 3831 return if tick_inhibit || $Coro::current == $Coro::main;
3470 3832
3471 my $signal = new Coro::Signal; 3833 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal; 3834 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait; 3835 $signal->wait;
3474} 3836}
3475 3837
3476$TICK_WATCHER = Event->timer ( 3838sub tick {
3477 reentrant => 0,
3478 parked => 1,
3479 prio => 0,
3480 at => $NEXT_TICK || $TICK,
3481 data => WF_AUTOCANCEL,
3482 cb => sub {
3483 if ($Coro::current != $Coro::main) { 3839 if ($Coro::current != $Coro::main) {
3484 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"
3485 unless ++$bug_warning > 10; 3841 unless ++$bug_warning > 10;
3486 return; 3842 return;
3487 } 3843 }
3488 3844
3489 $NOW = $tick_start = Event::time;
3490
3491 cf::server_tick; # one server iteration 3845 cf::server_tick; # one server iteration
3492 3846
3493 $RUNTIME += $TICK;
3494 $NEXT_TICK += $TICK;
3495
3496 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3847 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3497 $NEXT_RUNTIME_WRITE = $NOW + 10; 3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3498 Coro::async_pool { 3849 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver"; 3850 $Coro::current->{desc} = "runtime saver";
3500 write_runtime 3851 write_runtime_sync
3501 or warn "ERROR: unable to write runtime file: $!"; 3852 or warn "ERROR: unable to write runtime file: $!";
3502 };
3503 } 3853 };
3854 }
3504 3855
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3857 $sig->send;
3507 } 3858 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3859 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3860 $sig->send;
3510 } 3861 }
3511 3862
3512 $NOW = Event::time; 3863 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3865
3523 _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 }
3524 }, 3872 }
3525); 3873}
3526 3874
3527{ 3875{
3876 # configure BDB
3877
3528 BDB::min_parallel 8; 3878 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3879 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3880 $AnyEvent::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 3881
3554 unless ($DB_ENV) { 3882 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3883 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3557 | 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;
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3887 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3888 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3889
3561 cf::sync_job { 3890 cf::sync_job {
3562 eval { 3891 eval {
3572 3901
3573 cf::cleanup "db_env_open(db): $@" if $@; 3902 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3903 };
3575 } 3904 }
3576 3905
3577 $BDB_DEADLOCK_WATCHER = Event->timer ( 3906 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3907 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 ); 3908 };
3587 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3909 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3910 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 ); 3911 };
3597 $BDB_TRICKLE_WATCHER = Event->timer ( 3912 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3913 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 ); 3914 };
3607} 3915}
3608 3916
3609{ 3917{
3918 # configure IO::AIO
3919
3610 IO::AIO::min_parallel 8; 3920 IO::AIO::min_parallel 8;
3611
3612 undef $Coro::AIO::WATCHER;
3613 IO::AIO::max_poll_time $TICK * 0.1; 3921 IO::AIO::max_poll_time $TICK * 0.1;
3614 $AIO_POLL_WATCHER = Event->io ( 3922 undef $AnyEvent::AIO::WATCHER;
3615 reentrant => 0,
3616 data => WF_AUTOCANCEL,
3617 fd => IO::AIO::poll_fileno,
3618 poll => 'r',
3619 prio => 6,
3620 cb => \&IO::AIO::poll_cb,
3621 );
3622} 3923}
3623 3924
3624my $_log_backtrace; 3925my $_log_backtrace;
3625 3926
3626sub _log_backtrace { 3927sub _log_backtrace {
3629 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3630 3931
3631 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3632 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3633 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3634 async { 3936 async {
3635 $Coro::current->{desc} = "abt $msg"; 3937 $Coro::current->{desc} = "abt $msg";
3636 3938
3637 my @bt = fork_call { 3939 my @bt = fork_call {
3638 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
3649 } 3951 }
3650 3952
3651 @funcs 3953 @funcs
3652 }; 3954 };
3653 3955
3654 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3655 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3656 --$_log_backtrace; 3959 --$_log_backtrace;
3657 }; 3960 };
3658 } else { 3961 } else {
3659 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines