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.479 by root, Thu Oct 8 05:04:27 2009 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
92our @EVENT; 93our @EVENT;
93our @REFLECT; # set by XS 94our @REFLECT; # set by XS
94our %REFLECT; # set by us 95our %REFLECT; # set by us
95 96
96our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
97our $DATADIR = datadir; 99our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
101our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 112
110our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
111 120
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 123our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 129our $DB_ENV;
121 130
122our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 132
124our %CFG; 133our %CFG;
125 134
126our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 136our $RUNTIME;
161 170
162our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
163 172
164sub cf::map::normalise; 173sub cf::map::normalise;
165 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
166############################################################################# 179#############################################################################
167 180
168%REFLECT = (); 181%REFLECT = ();
169for (@REFLECT) { 182for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 184 $REFLECT{$reflect->{class}} = $reflect;
172} 185}
173 186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
189
174############################################################################# 190#############################################################################
175 191
176=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
177 193
178=over 4 194=over 4
219from wherever your confdir points to. 235from wherever your confdir points to.
220 236
221=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
222 238
223These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
224returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
225per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
226 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
227=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
228 249
229This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
230C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
231that call. 252that call.
232 253
233=item %cf::REFLECT 254=item %cf::REFLECT
234 255
235Contains, for each (C++) class name, a hash reference with information 256Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 257about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 258metadata, which is useful for introspection.
238 259
239=back 260=back
240 261
241=cut 262=cut
263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
242 269
243$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
244 my $msg = join "", @_; 271 my $msg = join "", @_;
245 272
246 $msg .= "\n" 273 $msg .= "\n"
247 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
248 275
249 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
250 277
251 LOG llevError, $msg; 278 LOG llevWarn, $msg;
252}; 279};
253 280
254$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
255 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
256 283
257 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
258 285
259 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
260 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
261 return;#d# 288 return;#d#
262 }#d# 289 }#d#
263 290
264 # kill coroutine otherwise 291 # kill coroutine otherwise
265 Coro::terminate 292 Coro::terminate
285)) { 312)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 314}
288 315
289$EV::DIED = sub { 316$EV::DIED = sub {
290 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
291}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
292 324
293############################################################################# 325#############################################################################
294 326
295=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
296 328
317 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
318 $d 350 $d
319 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
320} 352}
321 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
322=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
323 369
324Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
325 371
326=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
332our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
333 379
334sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
335sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
336 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
337=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
338 415
339Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
340but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
341 418
342The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
343is a reload or not. 420is a reload or not.
344 421
345=cut 422=cut
346 423
347sub post_init(&) { 424sub post_init(&) {
348 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
349} 443}
350 444
351=item cf::lock_wait $string 445=item cf::lock_wait $string
352 446
353Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
392} 486}
393 487
394=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
395 489
396Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
397get spread over timer. 491get spread over time.
398 492
399=cut 493=cut
400 494
401sub periodic($$) { 495sub periodic($$) {
402 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
406 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
407} 501}
408 502
409=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
410 504
411Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
412This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
413of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
414 512
415The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
416used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
417 515
418Useful for short background jobs. 516Useful for short background jobs.
419 517
420=cut 518=cut
421 519
422our @SLOT_QUEUE; 520our @SLOT_QUEUE;
423our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
424 523
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
428 527
429 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
430 530
431 while () { 531 while () {
432 next_job: 532 next_job:
533
433 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 535
435 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 540 $job->[2]->send;
439 Coro::cede; 541 Coro::cede;
440 goto next_job; 542 goto next_job;
441 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 545 }
443 } 546 }
444 547
445 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
446 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
447 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
448 $signal->wait; 551 $signal->wait;
449 } else { 552 } else {
553 $busy = 0;
450 Coro::schedule; 554 Coro::schedule;
451 } 555 }
452 } 556 }
453}; 557};
454 558
455sub get_slot($;$$) { 559sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
457 561
458 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
459 563
460 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
461 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
462 567
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
491=cut 596=cut
492 597
493sub sync_job(&) { 598sub sync_job(&) {
494 my ($job) = @_; 599 my ($job) = @_;
495 600
496 if ($Coro::current == $Coro::main) { 601 if (in_main) {
497 my $time = EV::time; 602 my $time = AE::time;
498 603
499 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
500 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
501 606
502 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
503 608
504 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
505 610
506 my $busy = 1; 611 my $busy = 1;
507 my @res; 612 my @res;
508 613
509 (async { 614 (async {
510 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
511 @res = eval { $job->() }; 616 @res = eval { $job->() };
512 warn $@ if $@; 617 error $@ if $@;
513 undef $busy; 618 undef $busy;
514 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
515 620
516 while ($busy) { 621 while ($busy) {
517 if (Coro::nready) { 622 if (Coro::nready) {
519 } else { 624 } else {
520 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
521 } 626 }
522 } 627 }
523 628
524 my $time = EV::time - $time; 629 my $time = AE::time - $time;
525 630
526 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
527 632
528 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
529 } else { 634 } else {
551 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
552 657
553 $coro 658 $coro
554} 659}
555 660
556=item fork_call { }, $args 661=item fork_call { }, @args
557 662
558Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
559process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
560Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
561never block itself or use any form of event handling. 666never block itself or use any form of event handling.
562 667
563=cut 668=cut
564 669
670sub post_fork {
671 reset_signals;
672}
673
565sub fork_call(&@) { 674sub fork_call(&@) {
566 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
567 676
568 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
569 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
570 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
571 680
572 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
573 reset_signals; 682 cf::post_fork;
574 &$cb 683 &$cb
575 }, @args; 684 } @args;
576 685
577 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
578} 698}
579 699
580=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
581 701
582=cut 702=cut
619within each server. 739within each server.
620 740
621=cut 741=cut
622 742
623sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
624 my ($name) = @_; 747 my ($name) = @_;
625 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
626 749
627 eval { 750 eval {
628 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
638} 761}
639 762
640our $DB; 763our $DB;
641 764
642sub db_init { 765sub db_init {
643 cf::sync_job {
644 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
645 };
646} 767}
647 768
648sub db_get($$) { 769sub db_get($$) {
649 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
650 771
651 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
652 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
653 776
654 $! ? () 777 $! ? ()
655 : $data 778 : $data
656 }
657} 779}
658 780
659sub db_put($$$) { 781sub db_put($$$) {
660 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
661 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
689 811
690 my @data; 812 my @data;
691 my $md5; 813 my $md5;
692 814
693 for (0 .. $#$src) { 815 for (0 .. $#$src) {
694 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
695 or Carp::croak "$src->[$_]: $!";
696 } 817 }
697 818
698 # if processing is expensive, check 819 # if processing is expensive, check
699 # checksum first 820 # checksum first
700 if (1) { 821 if (1) {
717 838
718 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
719 my $data = $process->(\@data); 840 my $data = $process->(\@data);
720 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
721 842
722 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
723 844
724 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
725 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
726 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
727 848
737 858
738=cut 859=cut
739 860
740sub datalog($@) { 861sub datalog($@) {
741 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
742 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
743} 864}
744 865
745=back 866=back
746 867
747=cut 868=cut
942 1063
943 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
944 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
945 1066
946 } elsif (ref $type) { 1067 } elsif (ref $type) {
947 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
948 1069
949 } else { 1070 } else {
950 shift @arg; 1071 shift @arg;
951 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
952 } 1073 }
953 } 1074 }
954} 1075}
955 1076
956sub _object_attach { 1077sub _object_attach {
966 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
967 } 1088 }
968 1089
969 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
970 } else { 1091 } else {
971 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
972 } 1093 }
973 1094
974 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
975} 1096}
976 1097
1035 1156
1036 for (@$callbacks) { 1157 for (@$callbacks) {
1037 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1038 1159
1039 if ($@) { 1160 if ($@) {
1040 warn "$@";
1041 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1042 override; 1162 override;
1043 } 1163 }
1044 1164
1045 return 1 if $override; 1165 return 1 if $override;
1046 } 1166 }
1125 for (@$attach) { 1245 for (@$attach) {
1126 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1127 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1128 } 1248 }
1129 } else { 1249 } else {
1130 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1131 } 1251 }
1132 } 1252 }
1133} 1253}
1134 1254
1135cf::attachable->attach ( 1255cf::attachable->attach (
1162 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1163 1283
1164 sync_job { 1284 sync_job {
1165 if (length $$rdata) { 1285 if (length $$rdata) {
1166 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1167 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1168 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1169 1290
1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1171 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1173 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
1195 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1196 1317
1197 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1199 } else { 1320 } else {
1200 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1201 } 1322 }
1202 } else { 1323 } else {
1203 aio_unlink $filename; 1324 aio_unlink $filename;
1204 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1205 } 1326 }
1229 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1230 $av = $st->{objs}; 1351 $av = $st->{objs};
1231 } 1352 }
1232 1353
1233 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1234 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1235 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1236 1358
1237 ($data, $av) 1359 ($data, $av)
1238} 1360}
1239 1361
1240=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1299} 1421}
1300 1422
1301use File::Glob (); 1423use File::Glob ();
1302 1424
1303cf::player->attach ( 1425cf::player->attach (
1304 on_command => sub { 1426 on_unknown_command => sub {
1305 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1306 1428
1307 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1308 or return; 1430 or return;
1309 1431
1332 1454
1333 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1334 if $reply; 1456 if $reply;
1335 1457
1336 } else { 1458 } else {
1337 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1338 } 1460 }
1339 1461
1340 cf::override; 1462 cf::override;
1341 }, 1463 },
1342); 1464);
1353 1475
1354 $grp 1476 $grp
1355} 1477}
1356 1478
1357sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1358 cf::sync_job { 1482 cf::sync_job {
1359 my %todo; 1483 my %todo;
1360 1484
1361 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1362 next unless -r $path; 1486 next unless -r $path;
1380 1504
1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1383 1507
1384 $ext{source} = 1508 $ext{source} =
1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1386 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1387 . $source 1511 . $source
1388 . "\n};\n1"; 1512 . "\n};\n1";
1389 1513
1390 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1391 } 1515 }
1392 1516
1517 my $pass = 0;
1393 my %done; 1518 my %done;
1394 while (%todo) { 1519 while (%todo) {
1395 my $progress; 1520 my $progress;
1396 1521
1522 ++$pass;
1523
1524 ext:
1397 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1527 next ext
1400 unless exists $done{$_}; 1528 unless exists $done{$_};
1401 } 1529 }
1402 1530
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1532
1405 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1537
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1539 if exists $v->{meta}{mandatory};
1413 1540
1414 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1415 } 1550 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1551 }
1421 1552
1422 skip: 1553 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1425 } 1563 }
1426 }; 1564 };
1427} 1565}
1428 1566
1429############################################################################# 1567#############################################################################
1513 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1514 } 1652 }
1515 } 1653 }
1516} 1654}
1517 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1518sub save($) { 1669sub save($) {
1519 my ($pl) = @_; 1670 my ($pl) = @_;
1520 1671
1521 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1522 1673
1527 1678
1528 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1529 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1530 1681
1531 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1532 1686
1533 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1534 cf::cede_to_tick; 1688 cf::cede_to_tick;
1535} 1689}
1536 1690
1570 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1571 1725
1572 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1573 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1574 1728
1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1576 $pl->deactivate; 1730 $pl->deactivate;
1731
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1579 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1580 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1581 1737
1582 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1583 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1584 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1638 \@logins 1794 \@logins
1639} 1795}
1640 1796
1641=item $player->maps 1797=item $player->maps
1642 1798
1799=item cf::player::maps $login
1800
1643Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1644player. May block. 1802player. May block.
1645 1803
1646=cut 1804=cut
1647 1805
1709=cut 1867=cut
1710 1868
1711sub find_by_path($) { 1869sub find_by_path($) {
1712 my ($path) = @_; 1870 my ($path) = @_;
1713 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1714 my ($match, $specificity); 1874 my ($match, $specificity);
1715 1875
1716 for my $region (list) { 1876 for my $region (list) {
1717 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1718 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1746sub generate_random_map { 1906sub generate_random_map {
1747 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1748 1908
1749 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1750 1910
1751 # mit "rum" bekleckern, nicht
1752 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1756 $rmp->{exit_on_final_map},
1757 $rmp->{xsize}, $rmp->{ysize},
1758 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1759 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1760 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1761 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1762 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1763 (cf::region::find $rmp->{region}), $rmp->{custom}
1764 )
1765} 1912}
1766 1913
1767=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1768 1915
1769Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1774 1921
1775sub register { 1922sub register {
1776 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1777 my $pkg = caller; 1924 my $pkg = caller;
1778 1925
1779 no strict;
1780 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1781 1927
1782 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1783} 1929}
1784 1930
1785# also paths starting with '/' 1931# also paths starting with '/'
1786$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1787 1933
1788sub thawer_merge { 1934sub thawer_merge {
1789 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1790 1936
1791 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1796} 1942}
1797 1943
1798sub normalise { 1944sub normalise {
1799 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1800 1946
1801 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1802 1948
1803 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1804 1950
1805 # map plan: 1951 # map plan:
1806 # 1952 #
1821 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1822 $path = "$base/$path"; 1968 $path = "$base/$path";
1823 } 1969 }
1824 1970
1825 for ($path) { 1971 for ($path) {
1826 redo if s{//}{/};
1827 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1828 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1829 } 1974 }
1830 1975
1831 $path 1976 $path
1845 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1846 return $self; 1991 return $self;
1847 } 1992 }
1848 } 1993 }
1849 1994
1850 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1851 () 1996 ()
1852} 1997}
1853 1998
1999# may re-bless or do other evil things
1854sub init { 2000sub init {
1855 my ($self) = @_; 2001 my ($self) = @_;
1856 2002
1857 $self 2003 $self
1858} 2004}
1977} 2123}
1978 2124
1979sub find; 2125sub find;
1980sub find { 2126sub find {
1981 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
1982 2130
1983 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1984 2132
1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
2005 2153
2006 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
2007 } 2155 }
2008} 2156}
2009 2157
2010sub pre_load { } 2158sub pre_load { }
2011sub post_load { } 2159#sub post_load { } # XS
2012 2160
2013sub load { 2161sub load {
2014 my ($self) = @_; 2162 my ($self) = @_;
2015 2163
2016 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2071 2219
2072 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2073 } 2221 }
2074 2222
2075 $self->post_load; 2223 $self->post_load;
2076}
2077 2224
2225 1
2226}
2227
2228# customize the map for a given player, i.e.
2229# return the _real_ map. used by e.g. per-player
2230# maps to change the path to ~playername/mappath
2078sub customise_for { 2231sub customise_for {
2079 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
2080 2233
2081 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2235 if $self->per_player;
2098 or next; 2251 or next;
2099 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2100 or next; 2253 or next;
2101 $neigh->load; 2254 $neigh->load;
2102 2255
2256 # now find the diagonal neighbours
2103 push @neigh, 2257 push @neigh,
2104 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2105 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2106 } 2260 }
2107 2261
2114} 2268}
2115 2269
2116sub find_sync { 2270sub find_sync {
2117 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2118 2272
2119 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2120} 2277}
2121 2278
2122sub do_load_sync { 2279sub do_load_sync {
2123 my ($map) = @_; 2280 my ($map) = @_;
2124 2281
2125 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2126 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2127 2284
2128 cf::sync_job { $map->load }; 2285 $map->load;
2129} 2286}
2130 2287
2131our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2132our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2133 2290
2159 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2160 2317
2161 () 2318 ()
2162} 2319}
2163 2320
2321# common code, used by both ->save and ->swapout
2164sub save { 2322sub _save {
2165 my ($self) = @_; 2323 my ($self) = @_;
2166
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168 2324
2169 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2170 2326
2171 return unless $self->dirty; 2327 return unless $self->dirty;
2172 2328
2192 } else { 2348 } else {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2194 } 2350 }
2195} 2351}
2196 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2197sub swap_out { 2361sub swap_out {
2198 my ($self) = @_; 2362 my ($self) = @_;
2199 2363
2200 # save first because save cedes
2201 $self->save;
2202
2203 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204 2365
2205 return if $self->players;
2206 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2207 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2208 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->in_memory (cf::MAP_SWAPPED); 2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
2379 $self->clear;
2380}
2381
2382sub reset_at {
2383 my ($self) = @_;
2384
2385 # TODO: safety, remove and allow resettable per-player maps
2386 return 1e99 if $self->{deny_reset};
2387
2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2390
2391 $time + $to
2392}
2393
2394sub should_reset {
2395 my ($self) = @_;
2396
2397 $self->reset_at <= $cf::RUNTIME
2398}
2399
2400sub reset {
2401 my ($self) = @_;
2402
2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2404
2405 return if $self->players;
2406
2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
2418
2419 delete $cf::MAP{$self->path};
2210 2420
2211 $self->deactivate; 2421 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->clear; 2423 $self->clear;
2214}
2215
2216sub reset_at {
2217 my ($self) = @_;
2218
2219 # TODO: safety, remove and allow resettable per-player maps
2220 return 1e99 if $self->{deny_reset};
2221
2222 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2223 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2224
2225 $time + $to
2226}
2227
2228sub should_reset {
2229 my ($self) = @_;
2230
2231 $self->reset_at <= $cf::RUNTIME
2232}
2233
2234sub reset {
2235 my ($self) = @_;
2236
2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2238
2239 return if $self->players;
2240
2241 warn "resetting map ", $self->path, "\n";
2242
2243 $self->in_memory (cf::MAP_SWAPPED);
2244
2245 # need to save uniques path
2246 unless ($self->{deny_save}) {
2247 my $uniq = $self->uniq_path; utf8::encode $uniq;
2248
2249 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2250 if $uniq;
2251 }
2252
2253 delete $cf::MAP{$self->path};
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear;
2258 2424
2259 $self->unlink_save; 2425 $self->unlink_save;
2260 $self->destroy; 2426 $self->destroy;
2261} 2427}
2262 2428
2270 2436
2271 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2272 2438
2273 $self->unlink_save; 2439 $self->unlink_save;
2274 2440
2275 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2276 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2277 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2278 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2280 2446
2337 : normalise $_ 2503 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2504 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2505 ]
2340} 2506}
2341 2507
2508=item cf::map::static_maps
2509
2510Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2511file in the shared directory excluding F</styles> and F</editor>). May
2512block.
2513
2514=cut
2515
2516sub static_maps() {
2517 my @dirs = "";
2518 my @maps;
2519
2520 while (@dirs) {
2521 my $dir = shift @dirs;
2522
2523 next if $dir eq "/styles" || $dir eq "/editor";
2524
2525 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2526 or return;
2527
2528 for (@$files) {
2529 s/\.map$// or next;
2530 utf8::decode $_;
2531 push @maps, "$dir/$_";
2532 }
2533
2534 push @dirs, map "$dir/$_", @$dirs;
2535 }
2536
2537 \@maps
2538}
2539
2342=back 2540=back
2343 2541
2344=head3 cf::object 2542=head3 cf::object
2345 2543
2346=cut 2544=cut
2478 2676
2479Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
2480 2678
2481The player should be reasonably safe there for short amounts of time (e.g. 2679The player should be reasonably safe there for short amounts of time (e.g.
2482for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2483though, as the palyer cannot control the character while it is on the link 2681though, as the player cannot control the character while it is on the link
2484map. 2682map.
2485 2683
2486Will never block. 2684Will never block.
2487 2685
2488=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
2509sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2510 my ($self) = @_; 2708 my ($self) = @_;
2511 2709
2512 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2513 2711
2712 ++$self->{_link_recursion};
2713
2514 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2515 2715
2516 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2517 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2518 2718
2519 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2520} 2720}
2521 2721
2522sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2523 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2524 2724
2541 ($x, $y) = (-1, -1) 2741 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2742 unless (defined $x) && (defined $y);
2543 2743
2544 # use -1 or undef as default coordinates, not 0, 0 2744 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2745 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2746 if $x <= 0 && $y <= 0;
2547 2747
2548 $map->load; 2748 $map->load;
2549 $map->load_neighbours; 2749 $map->load_neighbours;
2550 2750
2551 return unless $self->contr->active; 2751 return unless $self->contr->active;
2552 2752
2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2554 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2555 2755 # entering was successful
2756 delete $self->{_link_recursion};
2556 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive; 2758 $self->activate_recursive;
2558} 2759 }
2559 2760
2761}
2762
2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2561 2764
2562Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2563her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2564that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2565the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2572 2775
2573our $GOTOGEN; 2776our $GOTOGEN;
2574 2777
2575sub cf::object::player::goto { 2778sub cf::object::player::goto {
2576 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2577 2786
2578 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2580 2789
2581 $self->enter_link; 2790 $self->enter_link;
2605 my $map = eval { 2814 my $map = eval {
2606 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2607 2816
2608 if ($map) { 2817 if ($map) {
2609 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2610 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2611 } else { 2820 } else {
2612 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2613 } 2822 }
2614 2823
2615 $map 2824 $map
2623 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2624 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2625 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2626 } 2835 }
2627 2836
2628 $done->() if $done; 2837 $done->($self) if $done;
2629 })->prio (1); 2838 })->prio (1);
2630} 2839}
2631 2840
2632=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2633 2842
2726 $self->message ("Something went wrong deep within the deliantra server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2727 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
2728 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2729 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2730 2939
2731 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2732 $self->leave_link; 2941 $self->leave_link;
2733 } 2942 }
2734 })->prio (1); 2943 })->prio (1);
2735} 2944}
2736 2945
2748sub cf::client::send_drawinfo { 2957sub cf::client::send_drawinfo {
2749 my ($self, $text, $flags) = @_; 2958 my ($self, $text, $flags) = @_;
2750 2959
2751 utf8::encode $text; 2960 utf8::encode $text;
2752 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2961 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2962}
2963
2964=item $client->send_big_packet ($pkt)
2965
2966Like C<send_packet>, but tries to compress large packets, and fragments
2967them as required.
2968
2969=cut
2970
2971our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2972
2973sub cf::client::send_big_packet {
2974 my ($self, $pkt) = @_;
2975
2976 # try lzf for large packets
2977 $pkt = "lzf " . Compress::LZF::compress $pkt
2978 if 1024 <= length $pkt and $self->{can_lzf};
2979
2980 # split very large packets
2981 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2982 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2983 $pkt = "frag";
2984 }
2985
2986 $self->send_packet ($pkt);
2753} 2987}
2754 2988
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 2989=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 2990
2757Send a drawinfo or msg packet to the client, formatting the msg for the 2991Send a drawinfo or msg packet to the client, formatting the msg for the
2761 2995
2762=cut 2996=cut
2763 2997
2764# non-persistent channels (usually the info channel) 2998# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 2999our %CHANNEL = (
3000 "c/motd" => {
3001 id => "infobox",
3002 title => "MOTD",
3003 reply => undef,
3004 tooltip => "The message of the day",
3005 },
2766 "c/identify" => { 3006 "c/identify" => {
2767 id => "infobox", 3007 id => "infobox",
2768 title => "Identify", 3008 title => "Identify",
2769 reply => undef, 3009 reply => undef,
2770 tooltip => "Items recently identified", 3010 tooltip => "Items recently identified",
2772 "c/examine" => { 3012 "c/examine" => {
2773 id => "infobox", 3013 id => "infobox",
2774 title => "Examine", 3014 title => "Examine",
2775 reply => undef, 3015 reply => undef,
2776 tooltip => "Signs and other items you examined", 3016 tooltip => "Signs and other items you examined",
3017 },
3018 "c/shopinfo" => {
3019 id => "infobox",
3020 title => "Shop Info",
3021 reply => undef,
3022 tooltip => "What your bargaining skill tells you about the shop",
2777 }, 3023 },
2778 "c/book" => { 3024 "c/book" => {
2779 id => "infobox", 3025 id => "infobox",
2780 title => "Book", 3026 title => "Book",
2781 reply => undef, 3027 reply => undef,
2897 my $pkt = "msg " 3143 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 3144 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3145 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 3146 );
2901 3147
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 3148 $self->send_big_packet ($pkt);
2913} 3149}
2914 3150
2915=item $client->ext_msg ($type, @msg) 3151=item $client->ext_msg ($type, @msg)
2916 3152
2917Sends an ext event to the client. 3153Sends an ext event to the client.
2920 3156
2921sub cf::client::ext_msg($$@) { 3157sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3158 my ($self, $type, @msg) = @_;
2923 3159
2924 if ($self->extcmd == 2) { 3160 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove 3162 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type"; 3163 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3164 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3165 }
2930} 3166}
2931 3167
2932=item $client->ext_reply ($msgid, @msg) 3168=item $client->ext_reply ($msgid, @msg)
2933 3169
2937 3173
2938sub cf::client::ext_reply($$@) { 3174sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_; 3175 my ($self, $id, @msg) = @_;
2940 3176
2941 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) { 3179 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove 3180 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id; 3181 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3183 }
2948} 3184}
2949 3185
2950=item $success = $client->query ($flags, "text", \&cb) 3186=item $success = $client->query ($flags, "text", \&cb)
2951 3187
3022 3258
3023 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
3024 if $reply; 3260 if $reply;
3025 3261
3026 } else { 3262 } else {
3027 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3028 } 3264 }
3029 3265
3030 cf::override; 3266 cf::override;
3031 }, 3267 },
3032); 3268);
3052 3288
3053 $coro 3289 $coro
3054} 3290}
3055 3291
3056cf::client->attach ( 3292cf::client->attach (
3057 on_destroy => sub { 3293 on_client_destroy => sub {
3058 my ($ns) = @_; 3294 my ($ns) = @_;
3059 3295
3060 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3061 }, 3297 },
3062); 3298);
3078our $safe_hole = new Safe::Hole; 3314our $safe_hole = new Safe::Hole;
3079 3315
3080$SIG{FPE} = 'IGNORE'; 3316$SIG{FPE} = 'IGNORE';
3081 3317
3082$safe->permit_only (Opcode::opset qw( 3318$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3319 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3320 grepstart grepwhile mapstart mapwhile
3085 sort time 3321 sort time
3086)); 3322));
3087 3323
3088# here we export the classes and methods available to script code 3324# here we export the classes and methods available to script code
3113 decrease split destroy change_exp value msg lore send_msg)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3114 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3115 ["cf::player" => qw(peaceful send_msg)], 3351 ["cf::player" => qw(peaceful send_msg)],
3116 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3117) { 3353) {
3118 no strict 'refs';
3119 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3121 for @funs; 3356 for @funs;
3122} 3357}
3123 3358
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3375 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3376 $qcode =~ s/\n/\\n/g;
3142 3377
3143 %vars = (_dummy => 0) unless %vars; 3378 %vars = (_dummy => 0) unless %vars;
3144 3379
3380 my @res;
3145 local $_; 3381 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3382
3148 my $eval = 3383 my $eval =
3149 "do {\n" 3384 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3385 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3386 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3387 . $code
3153 . "\n}" 3388 . "\n}"
3154 ; 3389 ;
3155 3390
3391 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3392 sub_generation_inc;
3393 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3394 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3395 sub_generation_inc;
3396 } else {
3397 local @cf::_safe_eval_args = values %vars;
3398 @res = wantarray ? eval eval : scalar eval $eval;
3399 }
3159 3400
3160 if ($@) { 3401 if ($@) {
3161 warn "$@"; 3402 warn "$@",
3162 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3164 } 3405 }
3165 3406
3166 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3167} 3408}
3168 3409
3182=cut 3423=cut
3183 3424
3184sub register_script_function { 3425sub register_script_function {
3185 my ($fun, $cb) = @_; 3426 my ($fun, $cb) = @_;
3186 3427
3187 no strict 'refs'; 3428 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3429 *$fun = $safe_hole->wrap ($cb);
3189} 3430}
3190 3431
3191=back 3432=back
3192 3433
3193=cut 3434=cut
3202 # for this (global event?) 3443 # for this (global event?)
3203 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3204 3445
3205 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3206 3447
3207 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3208 3449
3209 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3210 0 < aio_load $path, $facedata
3211 or die "$path: $!";
3212
3213 $facedata = Coro::Storable::thaw $facedata;
3214 3451
3215 $facedata->{version} == 2 3452 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3454
3218 # patch in the exptable 3455 # patch in the exptable
3456 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3457 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3458 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3459 data => $exp_table,
3460 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3461 };
3223 cf::cede_to_tick; 3462 cf::cede_to_tick;
3224 3463
3225 { 3464 {
3226 my $faces = $facedata->{faceinfo}; 3465 my $faces = $facedata->{faceinfo};
3228 while (my ($face, $info) = each %$faces) { 3467 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3468 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3469
3231 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3235 3475
3236 cf::cede_to_tick; 3476 cf::cede_to_tick;
3237 } 3477 }
3238 3478
3239 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
3244 3484
3245 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3246 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3248 } else { 3488 } else {
3249 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3250 } 3490 }
3251 3491
3252 cf::cede_to_tick; 3492 cf::cede_to_tick;
3253 } 3493 }
3254 } 3494 }
3263 3503
3264 cf::anim::invalidate_all; # d'oh 3504 cf::anim::invalidate_all; # d'oh
3265 } 3505 }
3266 3506
3267 { 3507 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3508 my $res = $facedata->{resource};
3271 3509
3272 while (my ($name, $info) = each %$res) { 3510 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3511 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3513
3277 if ($info->{type} & 1) { 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3292 } else { 3516 } else {
3293 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3294 } 3518 }
3295 3519
3296 cf::cede_to_tick; 3520 cf::cede_to_tick;
3297 } 3521 }
3298 } 3522 }
3299 3523
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301 3525
3302 1 3526 1
3303} 3527}
3304
3305cf::global->attach (on_resource_update => sub {
3306 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3307 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3308
3309 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3310 my $sound = $soundconf->{compat}[$_]
3311 or next;
3312
3313 my $face = cf::face::find "sound/$sound->[1]";
3314 cf::sound::set $sound->[0] => $face;
3315 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3316 }
3317
3318 while (my ($k, $v) = each %{$soundconf->{event}}) {
3319 my $face = cf::face::find "sound/$v";
3320 cf::sound::set $k => $face;
3321 }
3322 }
3323});
3324 3528
3325register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3326 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3327 3531
3328 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
3367sub reload_treasures { 3571sub reload_treasures {
3368 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3369 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3370} 3574}
3371 3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3372sub reload_resources { 3596sub reload_resources {
3373 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3374 3598
3599 reload_exp_table;
3600 reload_materials;
3375 reload_facedata; 3601 reload_facedata;
3602 reload_sound;
3376 reload_archetypes; 3603 reload_archetypes;
3377 reload_regions; 3604 reload_regions;
3378 reload_treasures; 3605 reload_treasures;
3379 3606
3380 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3381} 3608}
3382 3609
3383sub reload_config { 3610sub reload_config {
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3611 trace "reloading config file...\n";
3385 or return;
3386 3612
3387 local $/; 3613 my $config = load_file "$CONFDIR/config";
3388 *CFG = YAML::Load <$fh>; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3389 3616
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3391 3618
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3394 3621
3395 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
3419 seek $fh, 0, 0; 3646 seek $fh, 0, 0;
3420 print $fh $$; 3647 print $fh $$;
3421} 3648}
3422 3649
3423sub main_loop { 3650sub main_loop {
3424 warn "EV::loop starting\n"; 3651 trace "EV::loop starting\n";
3425 if (1) { 3652 if (1) {
3426 EV::loop; 3653 EV::loop;
3427 } 3654 }
3428 warn "EV::loop returned\n"; 3655 trace "EV::loop returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP; 3656 goto &main_loop unless $REALLY_UNLOOP;
3430} 3657}
3431 3658
3432sub main { 3659sub main {
3433 cf::init_globals; # initialise logging 3660 cf::init_globals; # initialise logging
3434 3661
3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444 3666
3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3446 3668
3447 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3448 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
3454 }; 3676 };
3455 3677
3456 evthread_start IO::AIO::poll_fileno; 3678 evthread_start IO::AIO::poll_fileno;
3457 3679
3458 cf::sync_job { 3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3687 cf::load_settings;
3688
3459 reload_resources; 3689 reload_resources;
3460 reload_config; 3690 reload_config;
3461 db_init; 3691 db_init;
3462 3692
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3693 cf::init_uuid;
3466 cf::init_signals; 3694 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills; 3695 cf::init_skills;
3469 3696
3470 cf::init_beforeplay; 3697 cf::init_beforeplay;
3471 3698
3472 atomic; 3699 atomic;
3477 3704
3478 # no (long-running) fork's whatsoever before this point(!) 3705 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX (); 3706 use POSIX ();
3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3481 3708
3482 (pop @POST_INIT)->(0) while @POST_INIT; 3709 cf::_post_init 0;
3483 }; 3710 };
3484 3711
3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3485 main_loop; 3720 goto &main_loop;
3486} 3721}
3487 3722
3488############################################################################# 3723#############################################################################
3489# initialisation and cleanup 3724# initialisation and cleanup
3490 3725
3491# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
3492BEGIN { 3727BEGIN {
3493 our %SIGWATCHER = (); 3728 our %SIGWATCHER = ();
3494 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
3495 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3496 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
3497 }; 3732 };
3498 } 3733 }
3499} 3734}
3500 3735
3501sub write_runtime_sync { 3736sub write_runtime_sync {
3737 my $t0 = AE::time;
3738
3502 # first touch the runtime file to show we are still running: 3739 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 3740 # the fsync below can take a very very long time.
3504 3741
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 3743
3507 my $guard = cf::lock_acquire "write_runtime"; 3744 my $guard = cf::lock_acquire "write_runtime";
3508 3745
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 3747 or return;
3511 3748
3512 my $value = $cf::RUNTIME + 90 + 10; 3749 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 3750 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 3751 # 60 allows for the watchdog to kill the server.
3527 or return; 3764 or return;
3528 3765
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 3767 and return;
3531 3768
3532 warn "runtime file written.\n"; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3533 3770
3534 1 3771 1
3535} 3772}
3536 3773
3537our $uuid_lock; 3774our $uuid_lock;
3549 or return; 3786 or return;
3550 3787
3551 my $value = uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3552 3789
3553 unless ($value) { 3790 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n"; 3791 info "cowardly refusing to write zero uuid value!\n";
3555 return; 3792 return;
3556 } 3793 }
3557 3794
3558 my $value = uuid_str $value + $uuid_skip; 3795 my $value = uuid_str $value + $uuid_skip;
3559 $uuid_skip = 0; 3796 $uuid_skip = 0;
3569 or return; 3806 or return;
3570 3807
3571 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3572 and return; 3809 and return;
3573 3810
3574 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3575 3812
3576 1 3813 1
3577 3814
3578} 3815}
3579 3816
3585} 3822}
3586 3823
3587sub emergency_save() { 3824sub emergency_save() {
3588 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3589 3826
3590 warn "emergency_perl_save: enter\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
3591 3833
3592 cf::sync_job { 3834 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so 3835 cf::write_runtime_sync; # external watchdog should not bark
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597 3836
3598 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3599 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3600 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3601 warn "emergency_perl_save: begin player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3602 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3603 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3604 $pl->valid or next; 3843 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3606 $pl->save; 3845 $pl->save;
3607 } 3846 }
3608 warn "emergency_perl_save: end player save\n"; 3847 info "emergency_perl_save: end player save\n";
3609 3848
3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3610 warn "emergency_perl_save: begin map save\n"; 3851 info "emergency_perl_save: begin map save\n";
3611 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3612 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3613 $map->valid or next; 3854 $map->valid or next;
3614 $map->save; 3855 $map->save;
3615 } 3856 }
3616 warn "emergency_perl_save: end map save\n"; 3857 info "emergency_perl_save: end map save\n";
3617 3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3618 warn "emergency_perl_save: begin database checkpoint\n"; 3861 info "emergency_perl_save: begin database checkpoint\n";
3619 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3620 warn "emergency_perl_save: end database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3621 3864
3622 warn "emergency_perl_save: begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3623 write_uuid_sync 1; 3866 write_uuid_sync 1;
3624 warn "emergency_perl_save: end write uuid\n"; 3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3625 }; 3887 };
3626 3888
3627 warn "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n";
3630 };
3631
3632 warn "emergency_perl_save: leave\n"; 3889 info "emergency_perl_save: leave\n";
3633} 3890}
3634 3891
3635sub post_cleanup { 3892sub post_cleanup {
3636 my ($make_core) = @_; 3893 my ($make_core) = @_;
3637 3894
3895 IO::AIO::flush;
3896
3638 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3639 if $make_core; 3898 if $make_core;
3640 3899
3641 my $fh = pidfile; 3900 my $fh = pidfile;
3642 unlink $PIDFILE if <$fh> == $$; 3901 unlink $PIDFILE if <$fh> == $$;
3643} 3902}
3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3664 for my $name (keys %$leaf_symtab) { 3923 for my $name (keys %$leaf_symtab) {
3665 _gv_clear *{"$pkg$name"}; 3924 _gv_clear *{"$pkg$name"};
3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3667 } 3926 }
3668 warn "cleared package $pkg\n";#d#
3669} 3927}
3670 3928
3671sub do_reload_perl() { 3929sub do_reload_perl() {
3672 # can/must only be called in main 3930 # can/must only be called in main
3673 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3674 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3675 return; 3933 return;
3676 } 3934 }
3677 3935
3678 return if $RELOAD++; 3936 return if $RELOAD++;
3679 3937
3680 my $t1 = EV::time; 3938 my $t1 = AE::time;
3681 3939
3682 while ($RELOAD) { 3940 while ($RELOAD) {
3683 warn "reloading..."; 3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3684 3943
3685 warn "entering sync_job"; 3944 trace "perl_reload: entering sync_job";
3686 3945
3687 cf::sync_job { 3946 cf::sync_job {
3688 cf::write_runtime_sync; # external watchdog should not bark
3689 cf::emergency_save; 3947 #cf::emergency_save;
3690 cf::write_runtime_sync; # external watchdog should not bark
3691 3948
3692 warn "syncing database to disk";
3693 BDB::db_env_txn_checkpoint $DB_ENV;
3694
3695 # if anything goes wrong in here, we should simply crash as we already saved
3696
3697 warn "flushing outstanding aio requests";
3698 while (IO::AIO::nreqs || BDB::nreqs) {
3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3700 }
3701
3702 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3703 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3704 %EXT_CORO = (); 3951 %EXT_CORO = ();
3705 3952
3706 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3707 %COMMAND = (); 3954 %COMMAND = ();
3708 3955
3709 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3710 %EXTCMD = (); 3957 %EXTCMD = ();
3711 %EXTICMD = (); 3958 %EXTICMD = ();
3712 3959
3713 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3714 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3715 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3716 3963
3717 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3718 eval { 3965 eval {
3719 $cb->($pkg); 3966 $cb->($pkg);
3720 1 3967 1
3721 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3722 } 3969 }
3723 3970
3724 warn "... clearing $pkg"; 3971 trace "... clearing $pkg";
3725 clear_package $pkg; 3972 clear_package $pkg;
3726 } 3973 }
3727 3974
3728 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3729 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3730 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3731 3978
3732 warn "... unloading $k"; 3979 trace "... unloading $k";
3733 delete $INC{$k}; 3980 delete $INC{$k};
3734 3981
3735 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3736 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3737 3984
3740 } 3987 }
3741 3988
3742 clear_package $k; 3989 clear_package $k;
3743 } 3990 }
3744 3991
3745 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3746 clear_package "safe::$_" 3993 clear_package "safe::$_"
3747 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3748 3995
3749 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3750 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3752 3999
3753 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3754 # and global variables created in xs 4001 # and global variables created in xs
3755 #clear_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3756 4003
3757 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3758 4005
3759 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3760 require cf; 4007 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4008 cf::_connect_to_perl_1;
3762 4009
3763 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3764 cf::reload_config; 4011 cf::reload_config;
3765 4012
3766 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3767 cf::load_extensions; 4014 cf::load_extensions;
3768 4015
3769 if ($REATTACH_ON_RELOAD) { 4016 if ($REATTACH_ON_RELOAD) {
3770 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3771 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3772 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3773 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3774 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3775 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
3776 } 4023 }
3777 4024
3778 warn "running post_init jobs"; 4025 cf::_post_init 1;
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780 4026
3781 warn "leaving sync_job"; 4027 trace "perl_reload: leaving sync_job";
3782 4028
3783 1 4029 1
3784 } or do { 4030 } or do {
3785 warn $@; 4031 error $@;
3786 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
3787 }; 4033 };
3788 4034
3789 warn "reloaded";
3790 --$RELOAD; 4035 --$RELOAD;
3791 } 4036 }
3792 4037
3793 $t1 = EV::time - $t1; 4038 $t1 = AE::time - $t1;
3794 warn "reload completed in ${t1}s\n"; 4039 info "perl_reload: completed in ${t1}s\n";
3795}; 4040};
3796 4041
3797our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3798 4043
3799sub reload_perl() { 4044sub reload_perl() {
3801 # coro crashes during coro_state_free->destroy here. 4046 # coro crashes during coro_state_free->destroy here.
3802 4047
3803 $RELOAD_WATCHER ||= cf::async { 4048 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions; 4049 Coro::AIO::aio_wait cache_extensions;
3805 4050
3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3807 do_reload_perl; 4052 do_reload_perl;
3808 undef $RELOAD_WATCHER; 4053 undef $RELOAD_WATCHER;
3809 }; 4054 };
3810 }; 4055 };
3811} 4056}
3820 reload_perl; 4065 reload_perl;
3821 }; 4066 };
3822 } 4067 }
3823}; 4068};
3824 4069
3825unshift @INC, $LIBDIR; 4070#############################################################################
3826 4071
3827my $bug_warning = 0; 4072my $bug_warning = 0;
3828 4073
3829our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3831 4076
3832sub wait_for_tick { 4077sub wait_for_tick() {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3834 4079
3835 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3836 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait; 4082 $signal->wait;
3838} 4083}
3839 4084
3840sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3842 4087
3843 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 4090 $signal->wait;
3846} 4091}
3852 return; 4097 return;
3853 } 4098 }
3854 4099
3855 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
3856 4101
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3859 Coro::async_pool { 4106 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3861 write_runtime_sync 4108 write_runtime_sync
3862 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3863 }; 4110 };
3864 } 4111 }
3865 4112
3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3867 $sig->send; 4114 $sig->send;
3875 4122
3876 if (0) { 4123 if (0) {
3877 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3878 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3881 } 4128 }
3882 } 4129 }
3883} 4130}
3884 4131
3885{ 4132{
3886 # configure BDB 4133 # configure BDB
3887 4134
3888 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 4137 $AnyEvent::BDB::WATCHER->priority (1);
3891 4138
3892 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3930 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3931 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3932 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3933} 4180}
3934 4181
3935my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3936 4184
3937sub _log_backtrace { 4185sub _log_backtrace {
3938 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3939 4187
3940 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3941 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3942 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3943 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3944 ++$_log_backtrace; 4196 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3946 async { 4198 async {
3947 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3948 4200
3968 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3969 --$_log_backtrace; 4221 --$_log_backtrace;
3970 }; 4222 };
3971 } else { 4223 } else {
3972 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3973 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3974 } 4226 }
3975} 4227}
3976 4228
3977# load additional modules 4229# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3979 4232
3980END { cf::emergency_save } 4233END { cf::emergency_save }
3981 4234
39821 42351
3983 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines