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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.456 by root, Tue Sep 30 04:00:35 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;
105 134
106binmode STDOUT; 135binmode STDOUT;
107binmode STDERR; 136binmode STDERR;
108 137
109# read virtual server time, if available 138# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
114} 143}
115 144
116mkdir $_ 145mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 191
163The raw value load value from the last tick. 192The raw value load value from the last tick.
164 193
165=item %cf::CFG 194=item %cf::CFG
166 195
167Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 197from wherever your confdir points to.
169 198
170=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
171 200
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These 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; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 223
195 LOG llevError, $msg; 224 LOG llevError, $msg;
196 }; 225 };
197} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
198 242
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 253for my $pkg (qw(
210 cf::global cf::attachable 254 cf::global cf::attachable
211 cf::object cf::object::player 255 cf::object cf::object::player
212 cf::client cf::player 256 cf::client cf::player
213 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
214 cf::map cf::party cf::region 259 cf::party cf::region
215)) { 260)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 262}
219 263
220$Event::DIED = sub { 264$EV::DIED = sub {
221 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
222}; 266};
223 267
224############################################################################# 268#############################################################################
225 269
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 293 $d
250 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
251} 295}
252 296
253=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
254 298
255Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
256 300
257=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
258 302
259Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
260 304
261=cut 305=cut
262 306
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 308
265sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
267 325
268=item cf::lock_wait $string 326=item cf::lock_wait $string
269 327
270Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
271 329
299 return;#d# 357 return;#d#
300 }#d# 358 }#d#
301 359
302 # wait for lock, if any 360 # wait for lock, if any
303 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
304 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule; 364 Coro::schedule;
306 } 365 }
307} 366}
308 367
327 386
328 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
329} 388}
330 389
331sub freeze_mainloop { 390sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
333 392
334 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 394}
336 }; 395
337 $TICK_WATCHER->stop; 396=item cf::periodic $interval, $cb
338 $guard 397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
339} 409}
340 410
341=item cf::get_slot $time[, $priority[, $name]] 411=item cf::get_slot $time[, $priority[, $name]]
342 412
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 413Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 424our @SLOT_QUEUE;
355our $SLOT_QUEUE; 425our $SLOT_QUEUE;
356 426
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
359 my $signal = new Coro::Signal; 431 my $signal = new Coro::Signal;
360 432
361 while () { 433 while () {
362 next_job: 434 next_job:
363 my $avail = cf::till_tick; 435 my $avail = cf::till_tick;
371 } 443 }
372 } 444 }
373 } 445 }
374 446
375 if (@SLOT_QUEUE) { 447 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 449 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 450 $signal->wait;
379 } else { 451 } else {
380 Coro::schedule; 452 Coro::schedule;
381 } 453 }
382 } 454 }
383}; 455};
384 456
385sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
386 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
387 461
388 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
390 464
404 478
405BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
406 480
407=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
408 482
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 486acceptable.
413 487
414If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
420 494
421sub sync_job(&) { 495sub sync_job(&) {
422 my ($job) = @_; 496 my ($job) = @_;
423 497
424 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 499 my $time = EV::time;
426 500
427 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
429 503
430 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 505
432 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
433 507
434 my $busy = 1; 508 my $busy = 1;
435 my @res; 509 my @res;
436 510
437 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 513 @res = eval { $job->() };
439 warn $@ if $@; 514 warn $@ if $@;
440 undef $busy; 515 undef $busy;
441 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
442 517
443 while ($busy) { 518 while ($busy) {
444 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
445 } 523 }
524 }
446 525
447 $time = Event::time - $time; 526 my $time = EV::time - $time;
448 527
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
453 529
454 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
455 } else { 531 } else {
456 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
457 533
482=item fork_call { }, $args 558=item fork_call { }, $args
483 559
484Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
488 564
489=cut 565=cut
490 566
491sub fork_call(&@) { 567sub fork_call(&@) {
492 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
499 reset_signals; 575 reset_signals;
500 &$cb 576 &$cb
501 }, @args; 577 }, @args;
502 578
503 wantarray ? @res : $res[-1] 579 wantarray ? @res : $res[-1]
580}
581
582=item $coin = coin_from_name $name
583
584=cut
585
586our %coin_alias = (
587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
504} 607}
505 608
506=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
507 610
508Returns a single value from the environment database. 611Returns a single value from the environment database.
647 750
648############################################################################# 751#############################################################################
649 752
650=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
651 754
652Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
655 758
656In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 761Deliantra).
659 762
660=over 4 763=over 4
661 764
662=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
663 766
707=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
708 811
709Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
711 814
712Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
714 817
715These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
716 819
717=over 4 820=over 4
945 } 1048 }
946 1049
947 0 1050 0
948} 1051}
949 1052
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1054
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1056
954Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
955 1058
961 1064
962=cut 1065=cut
963 1066
964############################################################################# 1067#############################################################################
965# object support 1068# object support
966#
967 1069
1070sub _object_equal($$);
1071sub _object_equal($$) {
1072 my ($a, $b) = @_;
1073
1074 return 0 unless (ref $a) eq (ref $b);
1075
1076 if ("HASH" eq ref $a) {
1077 my @ka = keys %$a;
1078 my @kb = keys %$b;
1079
1080 return 0 if @ka != @kb;
1081
1082 for (0 .. $#ka) {
1083 return 0 unless $ka[$_] eq $kb[$_];
1084 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1085 }
1086
1087 } elsif ("ARRAY" eq ref $a) {
1088
1089 return 0 if @$a != @$b;
1090
1091 for (0 .. $#$a) {
1092 return 0 unless _object_equal $a->[$_], $b->[$_];
1093 }
1094
1095 } elsif ($a ne $b) {
1096 return 0;
1097 }
1098
1099 1
1100}
1101
1102our $SLOW_MERGES;#d#
968sub _can_merge { 1103sub _can_merge {
969 my ($ob1, $ob2) = @_; 1104 my ($ob1, $ob2) = @_;
970 1105
971 local $Storable::canonical = 1; 1106 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1107
975 $fob1 eq $fob2 1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
976} 1110}
977 1111
978sub reattach { 1112sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1114 my ($obj) = @_;
981 1115
1116 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1118
984 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
985 1120
986 @$registry = (); 1121 @$registry = ();
987 1122
1002cf::attachable->attach ( 1137cf::attachable->attach (
1003 prio => -1000000, 1138 prio => -1000000,
1004 on_instantiate => sub { 1139 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
1006 1141
1007 $data = from_json $data; 1142 $data = decode_json $data;
1008 1143
1009 for (@$data) { 1144 for (@$data) {
1010 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
1011 1146
1012 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1033 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1036 1171
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1041 close $fh; 1176 aio_close $fh;
1042 1177
1043 if (@$objs) { 1178 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1184 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1186 }
1052 } else { 1187 } else {
1053 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1054 } 1189 }
1055 1190
1056 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1057 } else { 1195 } else {
1058 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1059 } 1197 }
1060 } else { 1198 } else {
1061 aio_unlink $filename; 1199 aio_unlink $filename;
1082 1220
1083 unless (aio_stat "$filename.pst") { 1221 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1222 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1223 or return;
1086 1224
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1225 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs};
1088 } 1227 }
1089 1228
1090 utf8::decode (my $decname = $filename); 1229 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1230 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1231 $decname, length $data, scalar @{$av || []};
1222 1361
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1364
1226 $ext{source} = 1365 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1229 . $source 1368 . $source
1230 . "\n};\n1"; 1369 . "\n};\n1";
1231 1370
1232 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
1248 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1250 1389
1251 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1391 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1393 }
1256 1394
1257 warn $msg; 1395 warn $msg;
1258 } 1396 }
1259 1397
1273 1411
1274=back 1412=back
1275 1413
1276=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1277 1415
1278Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1279 1417
1280=cut 1418=cut
1281 1419
1282package cf::player; 1420package cf::player;
1283 1421
1326 1464
1327sub exists($) { 1465sub exists($) {
1328 my ($login) = @_; 1466 my ($login) = @_;
1329 1467
1330 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1331 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1332} 1470}
1333 1471
1334sub find($) { 1472sub find($) {
1335 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1336 my $login = $_[0]; 1474 my $login = $_[0];
1348 my $f = new_from_file cf::object::thawer path $login 1486 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1487 or return;
1350 1488
1351 my $pl = cf::player::load_pl $f 1489 my $pl = cf::player::load_pl $f
1352 or return; 1490 or return;
1491
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1492 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1493 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1356 } 1495 }
1357 } 1496 }
1367 1506
1368 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1369 1508
1370 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1511
1512 cf::get_slot 0.01;
1372 1513
1373 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1515 cf::cede_to_tick;
1375} 1516}
1376 1517
1408 my ($pl) = @_; 1549 my ($pl) = @_;
1409 1550
1410 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1411 1552
1412 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1414 1555
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1419 1562
1420 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1603
1461 for my $login (@$dirs) { 1604 for my $login (@$dirs) {
1462 my $path = path $login; 1605 my $path = path $login;
1463 1606
1464 # a .pst is a dead give-away for a valid player 1607 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1608 # if no pst file found, open and chekc for blocked users
1609 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1613 }
1470 1614
1501 } 1645 }
1502 1646
1503 \@paths 1647 \@paths
1504} 1648}
1505 1649
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1507 1651
1508Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1509
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556 1653
1557=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1558 1655
1559Sends an ext reply to the player. 1656Sends an ext reply to the player.
1560 1657
1627our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1629 1726
1630sub generate_random_map { 1727sub generate_random_map {
1631 my ($self, $rmp) = @_; 1728 my ($self, $rmp) = @_;
1729
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731
1632 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1733 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 1858
1759# the temporary/swap location 1859# the temporary/swap location
1760sub save_path { 1860sub save_path {
1761 my ($self) = @_; 1861 my ($self) = @_;
1762 1862
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1765} 1865}
1766 1866
1767# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1768sub uniq_path { 1868sub uniq_path {
1769 my ($self) = @_; 1869 my ($self) = @_;
1770 1870
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1773} 1873}
1774 1874
1775# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1776# all maps in C++... 1876# all maps in C++...
1874 1974
1875 cf::lock_wait "map_data:$path";#d#remove 1975 cf::lock_wait "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1877 1977
1878 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1881 1981
1882 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1883 or return; 1983 or return;
1884 1984
1885 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1888 or return; 1988 or return;
1889 1989
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
1893 undef $guard1; 1994 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 1995 $map->reset;
1896 return find $path; 1996 return find $path;
1897 } 1997 }
1898 1998
1899 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2027 $f->skip_block;
1928 $self->_load_objects ($f) 2028 $self->_load_objects ($f)
1929 or return; 2029 or return;
1930 2030
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
1932 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1933 2033
1934 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2035 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2036 unless (aio_stat $uniq) {
1962 } 2062 }
1963 2063
1964 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
1966 2066
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2068 }
1969 2069
1970 $self->post_load; 2070 $self->post_load;
1971} 2071}
1972 2072
2030 my ($path, $origin, $load) = @_; 2130 my ($path, $origin, $load) = @_;
2031 2131
2032 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
2033 2133
2034 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2136 }
2037 2137
2038 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2039 2139
2040 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
2041 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2145 if (my $map = find $k) {
2044 $map->load if $v; 2146 $map->load if $v;
2045 } 2147 }
2071 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2072 2174
2073 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2074 2176
2075 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2077 }; 2180 };
2181
2182 cf::get_slot 0.02;
2078 2183
2079 if ($uniq) { 2184 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2187 } else {
2091 $self->save; 2196 $self->save;
2092 2197
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2199
2095 return if $self->players; 2200 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
2097 return if $self->{deny_save}; 2202 return if $self->{deny_save};
2098 2203
2099 $self->in_memory (cf::MAP_SWAPPED); 2204 $self->in_memory (cf::MAP_SWAPPED);
2100 2205
2101 $self->deactivate; 2206 $self->deactivate;
2219 2324
2220sub unique_maps() { 2325sub unique_maps() {
2221 [ 2326 [
2222 map { 2327 map {
2223 utf8::decode $_; 2328 utf8::decode $_;
2224 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2225 ? normalise $_ 2332 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2334 ]
2229} 2335}
2230 2336
2231package cf;
2232
2233=back 2337=back
2234 2338
2235=head3 cf::object 2339=head3 cf::object
2236 2340
2237=cut 2341=cut
2240 2344
2241=over 4 2345=over 4
2242 2346
2243=item $ob->inv_recursive 2347=item $ob->inv_recursive
2244 2348
2245Returns the inventory of the object _and_ their inventories, recursively. 2349Returns the inventory of the object I<and> their inventories, recursively,
2350but I<not> the object itself.
2246 2351
2247=cut 2352=cut
2248 2353
2249sub inv_recursive_; 2354sub inv_recursive_;
2250sub inv_recursive_ { 2355sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2256} 2361}
2257 2362
2258=item $ref = $ob->ref 2363=item $ref = $ob->ref
2259 2364
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2365Creates and returns a persistent reference to an object that can be stored as a string.
2261 2366
2262=item $ob = cf::object::deref ($refstring) 2367=item $ob = cf::object::deref ($refstring)
2263 2368
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2369returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2370even if the object actually exists. May block.
2267=cut 2372=cut
2268 2373
2269sub deref { 2374sub deref {
2270 my ($ref) = @_; 2375 my ($ref) = @_;
2271 2376
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2377 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2378 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2379 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2380 or return;
2279 $pl->ob->uuid eq $uuid 2381 $pl->ob->uuid eq $uuid
2280 or return; 2382 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2402can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2403dialogue with the given NPC character.
2302 2404
2303=cut 2405=cut
2304 2406
2407our $SAY_CHANNEL = {
2408 id => "say",
2409 title => "Map",
2410 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2412};
2413
2414our $CHAT_CHANNEL = {
2415 id => "chat",
2416 title => "Chat",
2417 reply => "chat ",
2418 tooltip => "Player chat and shouts, global to the server.",
2419};
2420
2305# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2422# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2423#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2425 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2438
2323 } else { 2439 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2442 }
2327 } 2443 }
2328} 2444}
2329 2445
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2446=item $object->send_msg ($channel, $msg, $color, [extra...])
2355 2471
2356=item $player_object->enter_link 2472=item $player_object->enter_link
2357 2473
2358Freezes the player and moves him/her to a special map (C<{link}>). 2474Freezes the player and moves him/her to a special map (C<{link}>).
2359 2475
2360The player should be reasonably safe there for short amounts of time. You 2476The player should be reasonably safe there for short amounts of time (e.g.
2361I<MUST> call C<leave_link> as soon as possible, though. 2477for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link
2479map.
2362 2480
2363Will never block. 2481Will never block.
2364 2482
2365=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2366 2484
2424 2542
2425 $map->load; 2543 $map->load;
2426 $map->load_neighbours; 2544 $map->load_neighbours;
2427 2545
2428 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2429 $self->activate_recursive; 2548 $self->activate_recursive;
2430 2549
2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2432 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2433} 2552}
2438her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2558that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2559the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2560be called at the end of this process.
2442 2561
2562Note that $check will be called with a potentially non-loaded map, so if
2563it needs a loaded map it has to call C<< ->load >>.
2564
2443=cut 2565=cut
2444 2566
2445our $GOTOGEN; 2567our $GOTOGEN;
2446 2568
2447sub cf::object::player::goto { 2569sub cf::object::player::goto {
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2574
2453 $self->enter_link; 2575 $self->enter_link;
2454 2576
2455 (async { 2577 (async {
2578 $Coro::current->{desc} = "player::goto $path $x $y";
2579
2456 # *tag paths override both path and x|y 2580 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2581 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2582 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2583 my $ob = $obs[rand @obs];
2460 2584
2523} 2647}
2524 2648
2525sub prepare_random_map { 2649sub prepare_random_map {
2526 my ($exit) = @_; 2650 my ($exit) = @_;
2527 2651
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2654 # that depends on the exit object
2533 2655
2534 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2658 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2541 } 2665 }
2542 2666
2543 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2544 2668
2545 my $data = cf::to_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2548 2672
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2675 undef $fh;
2552 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2553 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2556 } 2684 }
2557} 2685}
2558 2686
2559sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2561 2689
2562 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2563 2691
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2692 $self->enter_link;
2576 2693
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2694 (async {
2582 $self->deactivate_recursive; # just to be sure 2695 $Coro::current->{desc} = "enter_exit";
2696
2583 unless (eval { 2697 unless (eval {
2698 $self->deactivate_recursive; # just to be sure
2699
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2709 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp;
2711
2584 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2585 2713
2714 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y)
2716 if $exit->flag (cf::FLAG_DAMNED);
2717
2586 1; 2718 1
2587 }) { 2719 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2721 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2724
2593 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2753the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2754the message unless the client supports the msg packet.
2623 2755
2624=cut 2756=cut
2625 2757
2758# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2759our %CHANNEL = (
2627 "c/identify" => { 2760 "c/identify" => {
2628 id => "identify", 2761 id => "infobox",
2629 title => "Identify", 2762 title => "Identify",
2630 reply => undef, 2763 reply => undef,
2631 tooltip => "Items recently identified", 2764 tooltip => "Items recently identified",
2632 }, 2765 },
2633 "c/examine" => { 2766 "c/examine" => {
2634 id => "examine", 2767 id => "infobox",
2635 title => "Examine", 2768 title => "Examine",
2636 reply => undef, 2769 reply => undef,
2637 tooltip => "Signs and other items you examined", 2770 tooltip => "Signs and other items you examined",
2638 }, 2771 },
2772 "c/book" => {
2773 id => "infobox",
2774 title => "Book",
2775 reply => undef,
2776 tooltip => "The contents of a note or book",
2777 },
2778 "c/lookat" => {
2779 id => "infobox",
2780 title => "Look",
2781 reply => undef,
2782 tooltip => "What you saw there",
2783 },
2784 "c/who" => {
2785 id => "infobox",
2786 title => "Players",
2787 reply => undef,
2788 tooltip => "Shows players who are currently online",
2789 },
2790 "c/body" => {
2791 id => "infobox",
2792 title => "Body Parts",
2793 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available",
2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2802 "c/uptime" => {
2803 id => "infobox",
2804 title => "Uptime",
2805 reply => undef,
2806 tooltip => "How long the server has been running since last restart",
2807 },
2808 "c/mapinfo" => {
2809 id => "infobox",
2810 title => "Map Info",
2811 reply => undef,
2812 tooltip => "Information related to the maps",
2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2639); 2820);
2640 2821
2641sub cf::client::send_msg { 2822sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2824
2644 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2645 2827
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2829
2648 # check predefined channels, for the benefit of C 2830 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2831 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel};
2650 2833
2834 $self->ext_msg (channel_info => $channel)
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id};
2838
2651 if (ref $channel) { 2839 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2840 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2841 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2842 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2843 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2844 if $self->can_msg;
2664 if ($self->can_msg) { 2852 if ($self->can_msg) {
2665 # default colour, mask it out 2853 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2668 2856
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2671 } else { 2873 } else {
2672 if ($color >= 0) { 2874 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones 2875 # replace some tags by gcfclient-compatible ones
2674 for ($msg) { 2876 for ($msg) {
2675 1 while 2877 1 while
2873=pod 3075=pod
2874 3076
2875The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
2876 3078
2877 cf::object 3079 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3080 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3081 insert remove name archname title slaying race decrease split
2880 3082
2881 cf::object::player 3083 cf::object::player
2882 player 3084 player
2883 3085
2884 cf::player 3086 cf::player
2889 3091
2890=cut 3092=cut
2891 3093
2892for ( 3094for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3097 decrease split destroy change_exp)],
2896 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
2899) { 3101) {
2900 no strict 'refs'; 3102 no strict 'refs';
3005 { 3207 {
3006 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
3007 3209
3008 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
3010 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3217
3015 cf::cede_to_tick; 3218 cf::cede_to_tick;
3016 } 3219 }
3017 3220
3018 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
3020 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
3021 or next; 3225 or next;
3226
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3230 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
3044 { 3249 {
3045 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
3048 3253
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3257 my $data;
3054 3258
3055 if ($info->{type} & 1) { 3259 if ($info->{type} & 1) {
3056 # prepend meta info 3260 # prepend meta info
3057 3261
3058 my $meta = $enc->encode ({ 3262 my $meta = $enc->encode ({
3059 name => $name, 3263 name => $name,
3060 %{ $info->{meta} || {} }, 3264 %{ $info->{meta} || {} },
3061 }); 3265 });
3062 3266
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
3064 } else { 3274 } else {
3065 $data = $info->{data}; 3275 $RESOURCE{$name} = $info;
3066 } 3276 }
3067 3277
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3278 cf::cede_to_tick;
3072 } 3279 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3283
3093 1 3284 1
3094} 3285}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3095 3306
3096register_exticmd fx_want => sub { 3307register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3308 my ($ns, $want) = @_;
3098 3309
3099 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3101 } 3312 }
3102}; 3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3103 3324
3104sub reload_regions { 3325sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3327 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3342}
3122 3343
3123sub reload_archetypes { 3344sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3347}
3132 3348
3133sub reload_treasures { 3349sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3136} 3352}
3137 3353
3138sub reload_resources { 3354sub reload_resources {
3139 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3140 3356
3357 reload_facedata;
3358 reload_archetypes;
3141 reload_regions; 3359 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3360 reload_treasures;
3146 3361
3147 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3148}
3149
3150sub init {
3151 reload_resources;
3152} 3363}
3153 3364
3154sub reload_config { 3365sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3367 or return;
3157 3368
3158 local $/; 3369 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
3160 3371
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3373
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3170 }; 3381 };
3171 warn $@ if $@; 3382 warn $@ if $@;
3172 } 3383 }
3173} 3384}
3174 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3175sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420
3176 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3424 (async {
3180 Event::one_event; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3426 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
3182 }; 3428 };
3183 3429
3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3184 reload_config; 3434 reload_config;
3185 db_init; 3435 db_init;
3436
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid;
3440 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills;
3443
3444 cf::init_beforeplay;
3445
3446 atomic;
3447
3186 load_extensions; 3448 load_extensions;
3187 3449
3188 $TICK_WATCHER->start; 3450 utime time, time, $RUNTIMEFILE;
3451
3452 # no (long-running) fork's whatsoever before this point(!)
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454
3455 (pop @POST_INIT)->(0) while @POST_INIT;
3456 };
3457
3189 Event::loop; 3458 EV::loop;
3190} 3459}
3191 3460
3192############################################################################# 3461#############################################################################
3193# initialisation and cleanup 3462# initialisation and cleanup
3194 3463
3195# install some emergency cleanup handlers 3464# install some emergency cleanup handlers
3196BEGIN { 3465BEGIN {
3466 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3467 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3468 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
3205 },
3206 ); 3470 };
3207 } 3471 }
3208} 3472}
3209 3473
3210sub write_runtime { 3474sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime";
3212
3213 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3215 3477
3216 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3479
3218 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3219 3481
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3221 or return; 3483 or return;
3222 3484
3223 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
3235 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3236 3498
3237 close $fh 3499 close $fh
3238 or return; 3500 or return;
3239 3501
3240 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3503 and return;
3242 3504
3243 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3244 3506
3245 1 3507 1
3508}
3509
3510our $uuid_lock;
3511our $uuid_skip;
3512
3513sub write_uuid_sync($) {
3514 $uuid_skip ||= $_[0];
3515
3516 return if $uuid_lock;
3517 local $uuid_lock = 1;
3518
3519 my $uuid = "$LOCALDIR/uuid";
3520
3521 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3522 or return;
3523
3524 my $value = uuid_seq uuid_cur;
3525
3526 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n";
3528 return;
3529 }
3530
3531 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0;
3533
3534 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3535 and return;
3536
3537 # always fsync - this file is important
3538 aio_fsync $fh
3539 and return;
3540
3541 close $fh
3542 or return;
3543
3544 aio_rename "$uuid~", $uuid
3545 and return;
3546
3547 warn "uuid file written ($value).\n";
3548
3549 1
3550
3551}
3552
3553sub write_uuid($$) {
3554 my ($skip, $sync) = @_;
3555
3556 $sync ? write_uuid_sync $skip
3557 : async { write_uuid_sync $skip };
3246} 3558}
3247 3559
3248sub emergency_save() { 3560sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
3250 3562
3256 # and maps saved/destroyed asynchronously. 3568 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3569 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3570 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3571 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3572 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3574 $pl->save;
3262 } 3575 }
3263 warn "end emergency player save\n"; 3576 warn "end emergency player save\n";
3264 3577
3265 warn "begin emergency map save\n"; 3578 warn "begin emergency map save\n";
3271 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
3272 3585
3273 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3588 warn "end emergency database checkpoint\n";
3589
3590 warn "begin write uuid\n";
3591 write_uuid_sync 1;
3592 warn "end write uuid\n";
3276 }; 3593 };
3277 3594
3278 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
3279} 3596}
3280 3597
3281sub post_cleanup { 3598sub post_cleanup {
3282 my ($make_core) = @_; 3599 my ($make_core) = @_;
3283 3600
3284 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3602 if $make_core;
3603
3604 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$;
3606}
3607
3608# a safer delete_package, copied from Symbol
3609sub clear_package($) {
3610 my $pkg = shift;
3611
3612 # expand to full symbol table name if needed
3613 unless ($pkg =~ /^main::.*::$/) {
3614 $pkg = "main$pkg" if $pkg =~ /^::/;
3615 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3616 $pkg .= '::' unless $pkg =~ /::$/;
3617 }
3618
3619 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3620 my $stem_symtab = *{$stem}{HASH};
3621
3622 defined $stem_symtab and exists $stem_symtab->{$leaf}
3623 or return;
3624
3625 # clear all symbols
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 }
3631 warn "cleared package $pkg\n";#d#
3286} 3632}
3287 3633
3288sub do_reload_perl() { 3634sub do_reload_perl() {
3289 # can/must only be called in main 3635 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3291 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3292 return; 3638 return;
3293 } 3639 }
3294 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3295 warn "reloading..."; 3644 warn "reloading...";
3296 3645
3297 warn "entering sync_job"; 3646 warn "entering sync_job";
3298 3647
3299 cf::sync_job { 3648 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3650 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3303 3652
3304 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3655
3307 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
3308 3657
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3320 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = ();
3328
3329 warn "removing commands";
3330 %COMMAND = ();
3331
3332 warn "removing ext/exti commands";
3333 %EXTCMD = ();
3334 %EXTICMD = ();
3335
3336 warn "unloading/nuking all extensions";
3337 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg";
3339
3340 if (my $cb = $pkg->can ("unload")) {
3341 eval {
3342 $cb->($pkg);
3343 1
3344 } or warn "$pkg unloaded, but with errors: $@";
3345 } 3661 }
3346 3662
3347 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3348 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3349 } 3665 %EXT_CORO = ();
3350 3666
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3352 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3355 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3356 delete $INC{$k};
3357 3677
3358 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g;
3360
3361 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3362 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3363 } 3687 }
3364 3688
3365 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3366 } 3704 }
3367 3705
3368 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3709
3372 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3375 3713
3376 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3715 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3379 3717
3380 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3381 3719
3382 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3383 require cf; 3721 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3385 3723
3386 warn "loading config and database again"; 3724 warn "loading config and database again";
3387 cf::reload_config; 3725 cf::reload_config;
3388 3726
3389 warn "loading extensions"; 3727 warn "loading extensions";
3390 cf::load_extensions; 3728 cf::load_extensions;
3391 3729
3392 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3395 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3398 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3399 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3400 3741
3401 1 3742 1
3402 } or do { 3743 } or do {
3403 warn $@; 3744 warn $@;
3404 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3746 };
3407 3747
3408 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3409}; 3751};
3410 3752
3411our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3412 3754
3413sub reload_perl() { 3755sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3416 3758
3417 $RELOAD_WATCHER ||= Event->timer ( 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3760 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3424 },
3425 ); 3762 };
3426} 3763}
3427 3764
3428register_command "reload" => sub { 3765register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3430 3767
3431 if ($who->flag (FLAG_WIZ)) { 3768 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3769 $who->message ("reloading server.");
3770 async {
3771 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3772 reload_perl;
3773 };
3434 } 3774 }
3435}; 3775};
3436 3776
3437unshift @INC, $LIBDIR; 3777unshift @INC, $LIBDIR;
3438 3778
3440 3780
3441our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3443 3783
3444sub wait_for_tick { 3784sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3447 3786
3448 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3789 $signal->wait;
3451} 3790}
3452 3791
3453sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3456 3794
3457 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3797 $signal->wait;
3460} 3798}
3461 3799
3462$TICK_WATCHER = Event->timer ( 3800sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3472 return; 3804 return;
3473 } 3805 }
3474 3806
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3478 3808
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3811 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3813 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3815 };
3816 }
3489 3817
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3819 $sig->send;
3492 } 3820 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3822 $sig->send;
3495 } 3823 }
3496 3824
3497 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3827
3508 _post_tick; 3828 if (0) {
3829 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3509 }, 3834 }
3510); 3835}
3511 3836
3512{ 3837{
3838 # configure BDB
3839
3513 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3842 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3843
3539 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3851
3546 cf::sync_job { 3852 cf::sync_job {
3547 eval { 3853 eval {
3557 3863
3558 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3865 };
3560 } 3866 }
3561 3867
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3868 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3869 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3870 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3871 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3873 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3876 };
3592} 3877}
3593 3878
3594{ 3879{
3880 # configure IO::AIO
3881
3595 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3885}
3608 3886
3609my $_log_backtrace; 3887my $_log_backtrace;
3610 3888
3611sub _log_backtrace { 3889sub _log_backtrace {
3614 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3615 3893
3616 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3619 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3620 my @bt = fork_call { 3901 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3905 or die "addr2line: $!";
3632 } 3913 }
3633 3914
3634 @funcs 3915 @funcs
3635 }; 3916 };
3636 3917
3637 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3638 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3639 --$_log_backtrace; 3921 --$_log_backtrace;
3640 }; 3922 };
3641 } else { 3923 } else {
3642 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines