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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines