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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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
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 68
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
49 87
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 89
52our %COMMAND = (); 90our %COMMAND = ();
53our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
59our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
60 98
61our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
62our @EVENT; 100our @EVENT;
63 101
64our $CONFDIR = confdir; 102our $CONFDIR = confdir;
65our $DATADIR = datadir; 103our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
75 117
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $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 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 120our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
83 122
84our $BDB_POLL_WATCHER; 123our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 124our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 125our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 126our $DB_ENV;
88 127
89our %CFG; 128our %CFG;
90 129
91our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 131our $RUNTIME;
132our $NOW;
93 133
94our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
97 137
98# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 140
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
104 145
105binmode STDOUT; 146binmode STDOUT;
106binmode STDERR; 147binmode STDERR;
107 148
108# read virtual server time, if available 149# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
113} 154}
114 155
115mkdir $_ 156mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
161 202
162The raw value load value from the last tick. 203The raw value load value from the last tick.
163 204
164=item %cf::CFG 205=item %cf::CFG
165 206
166Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 208from wherever your confdir points to.
168 209
169=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
170 211
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These 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; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 234
194 LOG llevError, $msg; 235 LOG llevError, $msg;
195 }; 236 };
196} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
197 253
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 264for my $pkg (qw(
209 cf::global cf::attachable 265 cf::global cf::attachable
210 cf::object cf::object::player 266 cf::object cf::object::player
211 cf::client cf::player 267 cf::client cf::player
212 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
213 cf::map cf::party cf::region 270 cf::party cf::region
214)) { 271)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 273}
218 274
219$Event::DIED = sub { 275$EV::DIED = sub {
220 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
221}; 277};
222 278
223############################################################################# 279#############################################################################
224 280
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 304 $d
249 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
250} 306}
251 307
252=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
253 309
254Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
255 311
256=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
257 313
258Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
259 315
260=cut 316=cut
261 317
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 319
264sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
266 322
267=item cf::lock_wait $string 323=item cf::lock_wait $string
268 324
269Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
270 326
326 382
327 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
328} 384}
329 385
330sub freeze_mainloop { 386sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
332 388
333 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start; 390}
335 }; 391
336 $TICK_WATCHER->stop; 392=item cf::periodic $interval, $cb
337 $guard 393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
338} 405}
339 406
340=item cf::get_slot $time[, $priority[, $name]] 407=item cf::get_slot $time[, $priority[, $name]]
341 408
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 409Allocate $time seconds of blocking CPU time at priority C<$priority>:
353our @SLOT_QUEUE; 420our @SLOT_QUEUE;
354our $SLOT_QUEUE; 421our $SLOT_QUEUE;
355 422
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
358 my $signal = new Coro::Signal; 427 my $signal = new Coro::Signal;
359 428
360 while () { 429 while () {
361 next_job: 430 next_job:
362 my $avail = cf::till_tick; 431 my $avail = cf::till_tick;
370 } 439 }
371 } 440 }
372 } 441 }
373 442
374 if (@SLOT_QUEUE) { 443 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 445 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 446 $signal->wait;
378 } else { 447 } else {
379 Coro::schedule; 448 Coro::schedule;
380 } 449 }
381 } 450 }
382}; 451};
383 452
384sub get_slot($;$$) { 453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
385 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
386 457
387 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
389 460
403 474
404BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
405 476
406=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
407 478
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 480is 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 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 482acceptable.
412 483
413If it must be done, put the blocking parts into C<sync_job>. This will run 484If 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 485the given BLOCK in another coroutine while waiting for the result. The
419 490
420sub sync_job(&) { 491sub sync_job(&) {
421 my ($job) = @_; 492 my ($job) = @_;
422 493
423 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 495 my $time = EV::time;
425 496
426 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
428 499
429 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 501
431 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
432 503
433 my $busy = 1; 504 my $busy = 1;
434 my @res; 505 my @res;
435 506
436 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 509 @res = eval { $job->() };
438 warn $@ if $@; 510 warn $@ if $@;
439 undef $busy; 511 undef $busy;
440 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
441 513
442 while ($busy) { 514 while ($busy) {
443 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
444 } 519 }
520 }
445 521
446 $time = Event::time - $time; 522 my $time = EV::time - $time;
447 523
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 524 $TICK_START += $time; # do not account sync jobs to server load
452 525
453 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
454 } else { 527 } else {
455 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
456 529
481=item fork_call { }, $args 554=item fork_call { }, $args
482 555
483Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
487 560
488=cut 561=cut
489 562
490sub fork_call(&@) { 563sub fork_call(&@) {
491 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
498 reset_signals; 571 reset_signals;
499 &$cb 572 &$cb
500 }, @args; 573 }, @args;
501 574
502 wantarray ? @res : $res[-1] 575 wantarray ? @res : $res[-1]
576}
577
578=item $coin = coin_from_name $name
579
580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
503} 603}
504 604
505=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
506 606
507Returns a single value from the environment database. 607Returns a single value from the environment database.
646 746
647############################################################################# 747#############################################################################
648 748
649=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
650 750
651Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
654 754
655In the following description, CLASS can be any of C<global>, C<object> 755In 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 756C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 757Deliantra).
658 758
659=over 4 759=over 4
660 760
661=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
662 762
706=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
707 807
708Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
710 810
711Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
713 813
714These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
715 815
716=over 4 816=over 4
944 } 1044 }
945 1045
946 0 1046 0
947} 1047}
948 1048
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1050
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1052
953Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
954 1054
960 1060
961=cut 1061=cut
962 1062
963############################################################################# 1063#############################################################################
964# object support 1064# object support
965#
966 1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
967sub _can_merge { 1099sub _can_merge {
968 my ($ob1, $ob2) = @_; 1100 my ($ob1, $ob2) = @_;
969 1101
970 local $Storable::canonical = 1; 1102 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1103
974 $fob1 eq $fob2 1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
975} 1106}
976 1107
977sub reattach { 1108sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1110 my ($obj) = @_;
980 1111
1112 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1114
983 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
984 1116
985 @$registry = (); 1117 @$registry = ();
986 1118
1001cf::attachable->attach ( 1133cf::attachable->attach (
1002 prio => -1000000, 1134 prio => -1000000,
1003 on_instantiate => sub { 1135 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
1005 1137
1006 $data = from_json $data; 1138 $data = decode_json $data;
1007 1139
1008 for (@$data) { 1140 for (@$data) {
1009 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
1010 1142
1011 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
1024 }, 1156 },
1025); 1157);
1026 1158
1027sub object_freezer_save { 1159sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1161
1032 sync_job { 1162 sync_job {
1033 if (length $$rdata) { 1163 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1164 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1037 1167
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1042 close $fh; 1172 aio_close $fh;
1043 1173
1044 if (@$objs) { 1174 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1180 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1182 }
1053 } else { 1183 } else {
1054 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1055 } 1185 }
1061 } else { 1191 } else {
1062 aio_unlink $filename; 1192 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
1064 } 1194 }
1065 }; 1195 };
1066
1067 undef $guard;
1068} 1196}
1069 1197
1070sub object_freezer_as_string { 1198sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
1072 1200
1077 1205
1078sub object_thawer_load { 1206sub object_thawer_load {
1079 my ($filename) = @_; 1207 my ($filename) = @_;
1080 1208
1081 my ($data, $av); 1209 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1210
1085 (aio_load $filename, $data) >= 0 1211 (aio_load $filename, $data) >= 0
1086 or return; 1212 or return;
1087 1213
1088 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1216 or return;
1091 1217
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1094 } 1220 }
1095 1221
1096 utf8::decode (my $decname = $filename); 1222 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1228 1354
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1357
1232 $ext{source} = 1358 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1235 . $source 1361 . $source
1236 . "\n};\n1"; 1362 . "\n};\n1";
1237 1363
1238 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1256 1382
1257 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1384 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1386 }
1262 1387
1263 warn $msg; 1388 warn $msg;
1264 } 1389 }
1265 1390
1279 1404
1280=back 1405=back
1281 1406
1282=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1283 1408
1284Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1285 1410
1286=cut 1411=cut
1287 1412
1288package cf::player; 1413package cf::player;
1289 1414
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1478
1354 my $f = new_from_file cf::object::thawer path $login 1479 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1480 or return;
1356 1481
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1482 my $pl = cf::player::load_pl $f
1359 or return; 1483 or return;
1484
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1485 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1486 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1363 } 1488 }
1364 } 1489 }
1374 1499
1375 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1376 1501
1377 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1504
1505 cf::get_slot 0.01;
1379 1506
1380 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1508 cf::cede_to_tick;
1382} 1509}
1383 1510
1415 my ($pl) = @_; 1542 my ($pl) = @_;
1416 1543
1417 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1418 1545
1419 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1548
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1426 1555
1427 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1596
1468 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1469 my $path = path $login; 1598 my $path = path $login;
1470 1599
1471 # a .pst is a dead give-away for a valid player 1600 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1606 }
1477 1607
1508 } 1638 }
1509 1639
1510 \@paths 1640 \@paths
1511} 1641}
1512 1642
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1644
1515Expand crossfire pod fragments into protocol xml. 1645Expand 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 1646
1564=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1565 1648
1566Sends an ext reply to the player. 1649Sends an ext reply to the player.
1567 1650
1634our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1636 1719
1637sub generate_random_map { 1720sub generate_random_map {
1638 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1639 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1726 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1851
1766# the temporary/swap location 1852# the temporary/swap location
1767sub save_path { 1853sub save_path {
1768 my ($self) = @_; 1854 my ($self) = @_;
1769 1855
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1772} 1858}
1773 1859
1774# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1775sub uniq_path { 1861sub uniq_path {
1776 my ($self) = @_; 1862 my ($self) = @_;
1777 1863
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1780} 1866}
1781 1867
1782# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1783# all maps in C++... 1869# all maps in C++...
1881 1967
1882 cf::lock_wait "map_data:$path";#d#remove 1968 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1884 1970
1885 $cf::MAP{$path} || do { 1971 $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 1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1888 1974
1889 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1890 or return; 1976 or return;
1891 1977
1892 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1895 or return; 1981 or return;
1896 1982
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1900 undef $guard1; 1987 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 1988 $map->reset;
1903 return find $path; 1989 return find $path;
1904 } 1990 }
1905 1991
1906 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2020 $f->skip_block;
1935 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
1936 or return; 2022 or return;
1937 2023
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1939 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1940 2026
1941 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2028 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
1969 } 2055 }
1970 2056
1971 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
1973 2059
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2061 }
1976 2062
1977 $self->post_load; 2063 $self->post_load;
1978} 2064}
1979 2065
2037 my ($path, $origin, $load) = @_; 2123 my ($path, $origin, $load) = @_;
2038 2124
2039 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
2040 2126
2041 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2129 }
2044 2130
2045 $MAP_PREFETCH{$path} |= $load; 2131 $MAP_PREFETCH{$path} |= $load;
2046 2132
2047 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
2048 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2138 if (my $map = find $k) {
2051 $map->load if $v; 2139 $map->load if $v;
2052 } 2140 }
2078 return if $self->{deny_save}; 2166 return if $self->{deny_save};
2079 2167
2080 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
2081 2169
2082 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2084 }; 2173 };
2174
2175 cf::get_slot 0.02;
2085 2176
2086 if ($uniq) { 2177 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2180 } else {
2098 $self->save; 2189 $self->save;
2099 2190
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2192
2102 return if $self->players; 2193 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2105 2196
2106 $self->in_memory (cf::MAP_SWAPPED); 2197 $self->in_memory (cf::MAP_SWAPPED);
2107 2198
2108 $self->deactivate; 2199 $self->deactivate;
2226 2317
2227sub unique_maps() { 2318sub unique_maps() {
2228 [ 2319 [
2229 map { 2320 map {
2230 utf8::decode $_; 2321 utf8::decode $_;
2231 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2232 ? normalise $_ 2325 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2327 ]
2236} 2328}
2237 2329
2238package cf;
2239
2240=back 2330=back
2241 2331
2242=head3 cf::object 2332=head3 cf::object
2243 2333
2244=cut 2334=cut
2247 2337
2248=over 4 2338=over 4
2249 2339
2250=item $ob->inv_recursive 2340=item $ob->inv_recursive
2251 2341
2252Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2253 2344
2254=cut 2345=cut
2255 2346
2256sub inv_recursive_; 2347sub inv_recursive_;
2257sub inv_recursive_ { 2348sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2263} 2354}
2264 2355
2265=item $ref = $ob->ref 2356=item $ref = $ob->ref
2266 2357
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2358Creates and returns a persistent reference to an object that can be stored as a string.
2268 2359
2269=item $ob = cf::object::deref ($refstring) 2360=item $ob = cf::object::deref ($refstring)
2270 2361
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2363even if the object actually exists. May block.
2274=cut 2365=cut
2275 2366
2276sub deref { 2367sub deref {
2277 my ($ref) = @_; 2368 my ($ref) = @_;
2278 2369
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2370 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2371 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2372 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2373 or return;
2286 $pl->ob->uuid eq $uuid 2374 $pl->ob->uuid eq $uuid
2287 or return; 2375 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2396dialogue with the given NPC character.
2309 2397
2310=cut 2398=cut
2311 2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2413
2312# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2415# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2418 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2431
2330 } else { 2432 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2435 }
2334 } 2436 }
2335} 2437}
2336 2438
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2464
2363=item $player_object->enter_link 2465=item $player_object->enter_link
2364 2466
2365Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2366 2468
2367The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2369 2473
2370Will never block. 2474Will never block.
2371 2475
2372=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2373 2477
2431 2535
2432 $map->load; 2536 $map->load;
2433 $map->load_neighbours; 2537 $map->load_neighbours;
2434 2538
2435 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2436 $self->activate_recursive; 2541 $self->activate_recursive;
2437 2542
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2440} 2545}
2445her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2551that 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 2552the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2553be called at the end of this process.
2449 2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2557
2450=cut 2558=cut
2451 2559
2452our $GOTOGEN; 2560our $GOTOGEN;
2453 2561
2454sub cf::object::player::goto { 2562sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2567
2460 $self->enter_link; 2568 $self->enter_link;
2461 2569
2462 (async { 2570 (async {
2571 $Coro::current->{desc} = "player::goto $path $x $y";
2572
2463 # *tag paths override both path and x|y 2573 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2574 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2575 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2576 my $ob = $obs[rand @obs];
2467 2577
2468 # see if we actually can go there 2578 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2579 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2580 $ob = $obs[rand @obs];
2581 } else {
2582 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 }
2584 # else put us there anyways for now #d#
2471 2585
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2586 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2587 } else {
2588 ($path, $x, $y) = (undef, undef, undef);
2473 } 2589 }
2474 } 2590 }
2475 2591
2476 my $map = eval { 2592 my $map = eval {
2477 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2478 2594
2479 if ($map) { 2595 if ($map) {
2480 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2482 } else { 2598 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2600 }
2485 2601
2486 $map 2602 $map
2487 }; 2603 };
2488 2604
2524} 2640}
2525 2641
2526sub prepare_random_map { 2642sub prepare_random_map {
2527 my ($exit) = @_; 2643 my ($exit) = @_;
2528 2644
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2647 # that depends on the exit object
2534 2648
2535 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2537 if ($exit->map) { 2651 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2542 } 2658 }
2543 2659
2544 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2545 2661
2546 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2549 2665
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2668 undef $fh;
2553 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2554 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2557 } 2677 }
2558} 2678}
2559 2679
2560sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2562 2682
2563 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2564 2684
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2685 $self->enter_link;
2577 2686
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2687 (async {
2583 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2584 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2585 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2586 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2587 1; 2711 1
2588 }) { 2712 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2590 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2593 2717
2594 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2622the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2624 2748
2625=cut 2749=cut
2626 2750
2751# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2752our %CHANNEL = (
2628 "c/identify" => { 2753 "c/identify" => {
2629 id => "identify", 2754 id => "infobox",
2630 title => "Identify", 2755 title => "Identify",
2631 reply => undef, 2756 reply => undef,
2632 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2633 }, 2758 },
2634 "c/examine" => { 2759 "c/examine" => {
2635 id => "examine", 2760 id => "infobox",
2636 title => "Examine", 2761 title => "Examine",
2637 reply => undef, 2762 reply => undef,
2638 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2639 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2640); 2807);
2641 2808
2642sub cf::client::send_msg { 2809sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2811
2645 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2646 2814
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2816
2649 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2651 2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2652 if (ref $channel) { 2826 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2827 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2828 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2829 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2830 $self->ext_msg (channel_info => $channel)
2657 if $self->can_msg; 2831 if $self->can_msg;
2665 if ($self->can_msg) { 2839 if ($self->can_msg) {
2666 # default colour, mask it out 2840 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2669 2843
2670 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2672 } else { 2860 } else {
2673 if ($color >= 0) { 2861 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2675 for ($msg) { 2863 for ($msg) {
2676 1 while 2864 1 while
2874=pod 3062=pod
2875 3063
2876The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2877 3065
2878 cf::object 3066 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3067 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
2881 3069
2882 cf::object::player 3070 cf::object::player
2883 player 3071 player
2884 3072
2885 cf::player 3073 cf::player
2890 3078
2891=cut 3079=cut
2892 3080
2893for ( 3081for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3084 decrease split destroy change_exp)],
2897 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2899 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2900) { 3088) {
2901 no strict 'refs'; 3089 no strict 'refs';
3006 { 3194 {
3007 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
3008 3196
3009 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
3011 cf::face::set_visibility $idx, $info->{visibility}; 3200 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3201 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3015 3204
3016 cf::cede_to_tick; 3205 cf::cede_to_tick;
3017 } 3206 }
3018 3207
3019 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
3021 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
3022 or next; 3212 or next;
3213
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3215 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3217 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
3045 { 3236 {
3046 # TODO: for gcfclient pleasure, we should give resources 3237 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index. 3238 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3239 my $res = $facedata->{resource};
3049 3240
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data; 3244 my $data;
3055 3245
3056 if ($info->{type} & 1) { 3246 if ($info->{type} & 1) {
3057 # prepend meta info 3247 # prepend meta info
3058 3248
3059 my $meta = $enc->encode ({ 3249 my $meta = $enc->encode ({
3060 name => $name, 3250 name => $name,
3061 %{ $info->{meta} || {} }, 3251 %{ $info->{meta} || {} },
3062 }); 3252 });
3063 3253
3064 $data = pack "(w/a*)*", $meta, $info->{data}; 3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
3065 } else { 3261 } else {
3066 $data = $info->{data}; 3262 $RESOURCE{$name} = $info;
3067 } 3263 }
3068 3264
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3265 cf::cede_to_tick;
3073 } 3266 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3270
3094 1 3271 1
3095} 3272}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3096 3293
3097register_exticmd fx_want => sub { 3294register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_; 3295 my ($ns, $want) = @_;
3099 3296
3100 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
3102 } 3299 }
3103}; 3300};
3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3104 3311
3105sub reload_regions { 3312sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3313 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3314 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3122} 3329}
3123 3330
3124sub reload_archetypes { 3331sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3334}
3133 3335
3134sub reload_treasures { 3336sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
3137} 3339}
3138 3340
3139sub reload_resources { 3341sub reload_resources {
3140 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
3141 3343
3344 reload_facedata;
3345 reload_archetypes;
3142 reload_regions; 3346 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3347 reload_treasures;
3147 3348
3148 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3149} 3350}
3150 3351
3151sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3152 reload_resources; 3357 reload_resources;
3153} 3358}
3154 3359
3155sub reload_config { 3360sub reload_config {
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3362 or return;
3158 3363
3159 local $/; 3364 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
3161 3366
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3163 3368
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3165 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3171 }; 3376 };
3172 warn $@ if $@; 3377 warn $@ if $@;
3173 } 3378 }
3174} 3379}
3175 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3176sub main { 3400sub main {
3401 atomic;
3402
3177 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3406 (async {
3181 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3183 }; 3410 };
3184 3411
3412 {
3413 my $guard = freeze_mainloop;
3185 reload_config; 3414 reload_config;
3186 db_init; 3415 db_init;
3187 load_extensions; 3416 load_extensions;
3188 3417
3189 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3190 Event::loop; 3426 EV::loop;
3191} 3427}
3192 3428
3193############################################################################# 3429#############################################################################
3194# initialisation and cleanup 3430# initialisation and cleanup
3195 3431
3196# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
3197BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
3206 },
3207 ); 3438 };
3208 } 3439 }
3209} 3440}
3210 3441
3211sub write_runtime { 3442sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime";
3213
3214 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3216 3445
3217 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3218 3447
3219 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3220 3449
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3222 or return; 3451 or return;
3223 3452
3224 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
3236 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3237 3466
3238 close $fh 3467 close $fh
3239 or return; 3468 or return;
3240 3469
3241 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3242 and return; 3471 and return;
3243 3472
3244 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3245 3474
3246 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
3247} 3519}
3248 3520
3249sub emergency_save() { 3521sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3251 3523
3257 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
3259 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3535 $pl->save;
3263 } 3536 }
3264 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
3265 3538
3266 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
3272 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3273 3546
3274 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
3277 }; 3554 };
3278 3555
3279 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3280} 3557}
3281 3558
3282sub post_cleanup { 3559sub post_cleanup {
3283 my ($make_core) = @_; 3560 my ($make_core) = @_;
3284 3561
3285 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3286 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3287} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3288 3596
3289sub do_reload_perl() { 3597sub do_reload_perl() {
3290 # can/must only be called in main 3598 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3292 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3293 return; 3601 return;
3294 } 3602 }
3295 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3296 warn "reloading..."; 3607 warn "reloading...";
3297 3608
3298 warn "entering sync_job"; 3609 warn "entering sync_job";
3299 3610
3300 cf::sync_job { 3611 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3302 cf::emergency_save; 3613 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3304 3615
3305 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3307 3618
3308 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3309 3620
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3321 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = ();
3329
3330 warn "removing commands";
3331 %COMMAND = ();
3332
3333 warn "removing ext/exti commands";
3334 %EXTCMD = ();
3335 %EXTICMD = ();
3336
3337 warn "unloading/nuking all extensions";
3338 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg";
3340
3341 if (my $cb = $pkg->can ("unload")) {
3342 eval {
3343 $cb->($pkg);
3344 1
3345 } or warn "$pkg unloaded, but with errors: $@";
3346 } 3624 }
3347 3625
3348 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3349 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3350 } 3628 %EXT_CORO = ();
3351 3629
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3353 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3356 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3357 delete $INC{$k};
3358 3640
3359 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g;
3361
3362 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3363 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3364 } 3650 }
3365 3651
3366 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3367 } 3667 }
3368 3668
3369 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3372 3672
3373 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3376 3676
3377 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3378 # and global variables created in xs 3678 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3380 3680
3381 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3382 3682
3383 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3384 require cf; 3684 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3386 3686
3387 warn "loading config and database again"; 3687 warn "loading config and database again";
3388 cf::reload_config; 3688 cf::reload_config;
3389 3689
3390 warn "loading extensions"; 3690 warn "loading extensions";
3391 cf::load_extensions; 3691 cf::load_extensions;
3392 3692
3393 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3396 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3399 3699
3400 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3401 3701
3402 1 3702 1
3403 } or do { 3703 } or do {
3404 warn $@; 3704 warn $@;
3405 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3406 exit 1;
3407 }; 3706 };
3408 3707
3409 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3410}; 3711};
3411 3712
3412our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3413 3714
3414sub reload_perl() { 3715sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3417 3718
3418 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3419 reentrant => 0,
3420 after => 0,
3421 data => WF_AUTOCANCEL,
3422 cb => sub {
3423 do_reload_perl; 3720 do_reload_perl;
3424 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3425 },
3426 ); 3722 };
3427} 3723}
3428 3724
3429register_command "reload" => sub { 3725register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3431 3727
3432 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3732 reload_perl;
3733 };
3435 } 3734 }
3436}; 3735};
3437 3736
3438unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
3439 3738
3441 3740
3442our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3444 3743
3445sub wait_for_tick { 3744sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3448 3746
3449 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 3749 $signal->wait;
3452} 3750}
3453 3751
3454sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3457 3754
3458 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3757 $signal->wait;
3461} 3758}
3462 3759
3463our $stat_fh; 3760sub tick {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3476 return; 3764 return;
3477 } 3765 }
3478 3766
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time;
3482
3483 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3484 3768
3485 $RUNTIME += $TICK;
3486 $NEXT_TICK += $TICK;
3487
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 3771 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3773 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 3774 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 } 3775 };
3776 }
3495 3777
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3779 $sig->send;
3501 } 3780 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3782 $sig->send;
3504 } 3783 }
3505 3784
3506 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3787
3517 _post_tick; 3788 if (0) {
3518 3789 if ($NEXT_TICK) {
3519 # gather some statistics#d# 3790 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3792 warn "jitter $JITTER\n";#d#
3793 }
3522 }, 3794 }
3523); 3795}
3524 3796
3525{ 3797{
3798 # configure BDB
3799
3526 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3527 BDB::max_poll_time $TICK * 0.1; 3801 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 3802 $AnyEvent::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 3803
3552 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 3811
3555 cf::sync_job { 3812 cf::sync_job {
3556 eval { 3813 eval {
3557 BDB::db_env_open 3814 BDB::db_env_open
3558 $DB_ENV, 3815 $DB_ENV,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3817 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3819 0666;
3563 3820
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 3822 };
3570 3823
3571 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3825 };
3573 } 3826 }
3574 3827
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 3830 };
3578 hard => 1, 3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 3833 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 3836 };
3595} 3837}
3596 3838
3597{ 3839{
3840 # configure IO::AIO
3841
3598 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 3845}
3611 3846
3612my $_log_backtrace; 3847my $_log_backtrace;
3613 3848
3614sub _log_backtrace { 3849sub _log_backtrace {
3617 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3618 3853
3619 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3622 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3623 my @bt = fork_call { 3861 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3864 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3635 } 3873 }
3636 3874
3637 @funcs 3875 @funcs
3638 }; 3876 };
3639 3877
3640 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace; 3881 --$_log_backtrace;
3643 }; 3882 };
3644 } else { 3883 } else {
3645 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines