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.501 by root, Sat Jan 16 23:27:21 2010 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 it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %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;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME;
… …
162 170
163our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
164 172
165sub cf::map::normalise; 173sub cf::map::normalise;
166 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
167############################################################################# 179#############################################################################
168 180
169%REFLECT = (); 181%REFLECT = ();
170for (@REFLECT) { 182for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 235from wherever your confdir points to.
224 236
225=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
226 238
227These 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
228returns 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
229per 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.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
230 247
231=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
232 249
233This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
234C<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
… …
242 259
243=back 260=back
244 261
245=cut 262=cut
246 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 "", @_ }
269
247$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 271 my $msg = join "", @_;
249 272
250 $msg .= "\n" 273 $msg .= "\n"
251 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
252 275
253 $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;
254 277
255 LOG llevError, $msg; 278 LOG llevWarn, $msg;
256}; 279};
257 280
258$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
260 283
261 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
262 285
263 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 288 return;#d#
266 }#d# 289 }#d#
267 290
268 # kill coroutine otherwise 291 # kill coroutine otherwise
269 Coro::terminate 292 Coro::terminate
… …
291} 314}
292 315
293$EV::DIED = sub { 316$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
295}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
296 324
297############################################################################# 325#############################################################################
298 326
299=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
300 328
… …
321 $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;
322 $d 350 $d
323 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
324} 352}
325 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
326=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
327 369
328Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
329 371
330=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
336our $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
337 379
338sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
342 415
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
345 418
346The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 420is a reload or not.
348 421
349=cut 422=cut
350 423
351sub post_init(&) { 424sub post_init(&) {
352 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 }
353} 443}
354 444
355=item cf::lock_wait $string 445=item cf::lock_wait $string
356 446
357Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
396} 486}
397 487
398=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
399 489
400Like 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
401get spread over timer. 491get spread over time.
402 492
403=cut 493=cut
404 494
405sub periodic($$) { 495sub periodic($$) {
406 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
411} 501}
412 502
413=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
414 504
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 512
419The 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
420used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
421 515
422Useful for short background jobs. 516Useful for short background jobs.
423 517
424=cut 518=cut
425 519
426our @SLOT_QUEUE; 520our @SLOT_QUEUE;
427our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
428 523
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
432 527
433 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
434 530
435 while () { 531 while () {
436 next_job: 532 next_job:
533
437 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 535
439 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 540 $job->[2]->send;
443 Coro::cede; 541 Coro::cede;
444 goto next_job; 542 goto next_job;
445 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 545 }
447 } 546 }
448 547
449 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 551 $signal->wait;
453 } else { 552 } else {
553 $busy = 0;
454 Coro::schedule; 554 Coro::schedule;
455 } 555 }
456 } 556 }
457}; 557};
458 558
459sub get_slot($;$$) { 559sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
461 561
462 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
463 563
464 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
465 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
466 567
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
495=cut 596=cut
496 597
497sub sync_job(&) { 598sub sync_job(&) {
498 my ($job) = @_; 599 my ($job) = @_;
499 600
500 if ($Coro::current == $Coro::main) { 601 if (in_main) {
501 my $time = EV::time; 602 my $time = AE::time;
502 603
503 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
505 606
506 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
507 608
508 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
509 610
510 my $busy = 1; 611 my $busy = 1;
511 my @res; 612 my @res;
512 613
513 (async { 614 (async {
514 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 616 @res = eval { $job->() };
516 warn $@ if $@; 617 error $@ if $@;
517 undef $busy; 618 undef $busy;
518 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
519 620
520 while ($busy) { 621 while ($busy) {
521 if (Coro::nready) { 622 if (Coro::nready) {
… …
523 } else { 624 } else {
524 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
525 } 626 }
526 } 627 }
527 628
528 my $time = EV::time - $time; 629 my $time = AE::time - $time;
529 630
530 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
531 632
532 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
533 } else { 634 } else {
… …
555 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
556 657
557 $coro 658 $coro
558} 659}
559 660
560=item fork_call { }, $args 661=item fork_call { }, @args
561 662
562Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 666never block itself or use any form of event handling.
566 667
567=cut 668=cut
568 669
670sub post_fork {
671 reset_signals;
672}
673
569sub fork_call(&@) { 674sub fork_call(&@) {
570 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
571 676
572 # 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,
573 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
575 680
576 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
577 reset_signals; 682 cf::post_fork;
578 &$cb 683 &$cb
579 }, @args; 684 } @args;
580 685
581 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 )
582} 698}
583 699
584=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
585 701
586=cut 702=cut
… …
623within each server. 739within each server.
624 740
625=cut 741=cut
626 742
627sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
628 my ($name) = @_; 747 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
630 749
631 eval { 750 eval {
632 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
642} 761}
643 762
644our $DB; 763our $DB;
645 764
646sub db_init { 765sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
649 };
650} 767}
651 768
652sub db_get($$) { 769sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
654 771
655 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
656 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
657 776
658 $! ? () 777 $! ? ()
659 : $data 778 : $data
660 }
661} 779}
662 780
663sub db_put($$$) { 781sub db_put($$$) {
664 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
693 811
694 my @data; 812 my @data;
695 my $md5; 813 my $md5;
696 814
697 for (0 .. $#$src) { 815 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 817 }
701 818
702 # if processing is expensive, check 819 # if processing is expensive, check
703 # checksum first 820 # checksum first
704 if (1) { 821 if (1) {
… …
721 838
722 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 840 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
725 842
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 844
728 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
731 848
… …
741 858
742=cut 859=cut
743 860
744sub datalog($@) { 861sub datalog($@) {
745 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 864}
748 865
749=back 866=back
750 867
751=cut 868=cut
… …
946 1063
947 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1066
950 } elsif (ref $type) { 1067 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
952 1069
953 } else { 1070 } else {
954 shift @arg; 1071 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
956 } 1073 }
957 } 1074 }
958} 1075}
959 1076
960sub _object_attach { 1077sub _object_attach {
… …
970 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
971 } 1088 }
972 1089
973 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
974 } else { 1091 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1093 }
977 1094
978 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
979} 1096}
980 1097
… …
1039 1156
1040 for (@$callbacks) { 1157 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1042 1159
1043 if ($@) { 1160 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1162 override;
1047 } 1163 }
1048 1164
1049 return 1 if $override; 1165 return 1 if $override;
1050 } 1166 }
… …
1129 for (@$attach) { 1245 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1132 } 1248 }
1133 } else { 1249 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1251 }
1136 } 1252 }
1137} 1253}
1138 1254
1139cf::attachable->attach ( 1255cf::attachable->attach (
… …
1166 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1167 1283
1168 sync_job { 1284 sync_job {
1169 if (length $$rdata) { 1285 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1173 1290
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1199 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1200 1317
1201 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1320 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1205 } 1322 }
1206 } else { 1323 } else {
1207 aio_unlink $filename; 1324 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1209 } 1326 }
… …
1233 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1351 $av = $st->{objs};
1235 } 1352 }
1236 1353
1237 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1240 1358
1241 ($data, $av) 1359 ($data, $av)
1242} 1360}
1243 1361
1244=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1303} 1421}
1304 1422
1305use File::Glob (); 1423use File::Glob ();
1306 1424
1307cf::player->attach ( 1425cf::player->attach (
1308 on_command => sub { 1426 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1310 1428
1311 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1312 or return; 1430 or return;
1313 1431
… …
1336 1454
1337 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1456 if $reply;
1339 1457
1340 } else { 1458 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1460 }
1343 1461
1344 cf::override; 1462 cf::override;
1345 }, 1463 },
1346); 1464);
… …
1357 1475
1358 $grp 1476 $grp
1359} 1477}
1360 1478
1361sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1362 cf::sync_job { 1482 cf::sync_job {
1363 my %todo; 1483 my %todo;
1364 1484
1365 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1486 next unless -r $path;
… …
1384 1504
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1507
1388 $ext{source} = 1508 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1391 . $source 1511 . $source
1392 . "\n};\n1"; 1512 . "\n};\n1";
1393 1513
1394 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1395 } 1515 }
1396 1516
1517 my $pass = 0;
1397 my %done; 1518 my %done;
1398 while (%todo) { 1519 while (%todo) {
1399 my $progress; 1520 my $progress;
1400 1521
1522 ++$pass;
1523
1524 ext:
1401 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1527 next ext
1404 unless exists $done{$_}; 1528 unless exists $done{$_};
1405 } 1529 }
1406 1530
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1532
1409 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1537
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1539 if exists $v->{meta}{mandatory};
1417 1540
1418 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;
1419 } 1550 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1551 }
1425 1552
1426 skip: 1553 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 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 }
1429 } 1563 }
1430 }; 1564 };
1431} 1565}
1432 1566
1433############################################################################# 1567#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1518 } 1652 }
1519 } 1653 }
1520} 1654}
1521 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
1522sub save($) { 1669sub save($) {
1523 my ($pl) = @_; 1670 my ($pl) = @_;
1524 1671
1525 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1526 1673
… …
1531 1678
1532 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1534 1681
1535 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];
1536 1686
1537 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1688 cf::cede_to_tick;
1539} 1689}
1540 1690
… …
1574 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1575 1725
1576 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1577 $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
1578 1728
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1730 $pl->deactivate;
1731
1581 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;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1584 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1585 1737
1586 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1642 \@logins 1794 \@logins
1643} 1795}
1644 1796
1645=item $player->maps 1797=item $player->maps
1646 1798
1799=item cf::player::maps $login
1800
1647Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1648player. May block. 1802player. May block.
1649 1803
1650=cut 1804=cut
1651 1805
… …
1713=cut 1867=cut
1714 1868
1715sub find_by_path($) { 1869sub find_by_path($) {
1716 my ($path) = @_; 1870 my ($path) = @_;
1717 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1718 my ($match, $specificity); 1874 my ($match, $specificity);
1719 1875
1720 for my $region (list) { 1876 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1750sub generate_random_map { 1906sub generate_random_map {
1751 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1752 1908
1753 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
1754 1910
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom}
1768 )
1769} 1912}
1770 1913
1771=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1772 1915
1773Register 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
… …
1778 1921
1779sub register { 1922sub register {
1780 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1924 my $pkg = caller;
1782 1925
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1927
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1929}
1788 1930
1789# also paths starting with '/' 1931# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1933
1792sub thawer_merge { 1934sub thawer_merge {
1793 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1794 1936
1795 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1800} 1942}
1801 1943
1802sub normalise { 1944sub normalise {
1803 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1804 1946
1805 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1806 1948
1807 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1808 1950
1809 # map plan: 1951 # map plan:
1810 # 1952 #
… …
1825 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1968 $path = "$base/$path";
1827 } 1969 }
1828 1970
1829 for ($path) { 1971 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1833 } 1974 }
1834 1975
1835 $path 1976 $path
… …
1849 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1850 return $self; 1991 return $self;
1851 } 1992 }
1852 } 1993 }
1853 1994
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1996 ()
1856} 1997}
1857 1998
1999# may re-bless or do other evil things
1858sub init { 2000sub init {
1859 my ($self) = @_; 2001 my ($self) = @_;
1860 2002
1861 $self 2003 $self
1862} 2004}
… …
1981} 2123}
1982 2124
1983sub find; 2125sub find;
1984sub find { 2126sub find {
1985 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
1986 2130
1987 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1988 2132
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2075 2219
2076 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2221 }
2078 2222
2079 $self->post_load; 2223 $self->post_load;
2080}
2081 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
2082sub customise_for { 2231sub customise_for {
2083 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
2084 2233
2085 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2235 if $self->per_player;
… …
2102 or next; 2251 or next;
2103 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2104 or next; 2253 or next;
2105 $neigh->load; 2254 $neigh->load;
2106 2255
2256 # now find the diagonal neighbours
2107 push @neigh, 2257 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2260 }
2111 2261
… …
2118} 2268}
2119 2269
2120sub find_sync { 2270sub find_sync {
2121 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2122 2272
2123 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
2124} 2277}
2125 2278
2126sub do_load_sync { 2279sub do_load_sync {
2127 my ($map) = @_; 2280 my ($map) = @_;
2128 2281
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2131 2284
2132 cf::sync_job { $map->load }; 2285 $map->load;
2133} 2286}
2134 2287
2135our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2137 2290
… …
2163 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2164 2317
2165 () 2318 ()
2166} 2319}
2167 2320
2321# common code, used by both ->save and ->swapout
2168sub save { 2322sub _save {
2169 my ($self) = @_; 2323 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2324
2173 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2174 2326
2175 return unless $self->dirty; 2327 return unless $self->dirty;
2176 2328
… …
2196 } else { 2348 } else {
2197 $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);
2198 } 2350 }
2199} 2351}
2200 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2201sub swap_out { 2361sub swap_out {
2202 my ($self) = @_; 2362 my ($self) = @_;
2203 2363
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2365
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2212 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2213 $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};
2214 2420
2215 $self->deactivate; 2421 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2423 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2424
2263 $self->unlink_save; 2425 $self->unlink_save;
2264 $self->destroy; 2426 $self->destroy;
2265} 2427}
2266 2428
… …
2274 2436
2275 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2276 2438
2277 $self->unlink_save; 2439 $self->unlink_save;
2278 2440
2279 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2446
… …
2514 2676
2515Freezes 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}>).
2516 2678
2517The 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.
2518for 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,
2519though, 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
2520map. 2682map.
2521 2683
2522Will never block. 2684Will never block.
2523 2685
2524=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2546 my ($self) = @_; 2708 my ($self) = @_;
2547 2709
2548 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2549 2711
2712 ++$self->{_link_recursion};
2713
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2715
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2554 2718
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2720}
2557 2721
2558sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2560 2724
… …
2585 $map->load_neighbours; 2749 $map->load_neighbours;
2586 2750
2587 return unless $self->contr->active; 2751 return unless $self->contr->active;
2588 2752
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2591 2755 # entering was successful
2756 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2758 $self->activate_recursive;
2594} 2759 }
2595 2760
2761}
2762
2596=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)]])
2597 2764
2598Moves 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
2599her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2600that 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
2601the 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
… …
2608 2775
2609our $GOTOGEN; 2776our $GOTOGEN;
2610 2777
2611sub cf::object::player::goto { 2778sub cf::object::player::goto {
2612 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 }
2613 2786
2614 # 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
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2789
2617 $self->enter_link; 2790 $self->enter_link;
… …
2641 my $map = eval { 2814 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2643 2816
2644 if ($map) { 2817 if ($map) {
2645 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2820 } else {
2648 $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);
2649 } 2822 }
2650 2823
2651 $map 2824 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2662 } 2835 }
2663 2836
2664 $done->() if $done; 2837 $done->($self) if $done;
2665 })->prio (1); 2838 })->prio (1);
2666} 2839}
2667 2840
2668=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2669 2842
… …
2762 $self->message ("Something went wrong deep within the deliantra server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "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. "
2764 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2939
2767 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2941 $self->leave_link;
2769 } 2942 }
2770 })->prio (1); 2943 })->prio (1);
2771} 2944}
2772 2945
… …
3085 3258
3086 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3260 if $reply;
3088 3261
3089 } else { 3262 } else {
3090 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";
3091 } 3264 }
3092 3265
3093 cf::override; 3266 cf::override;
3094 }, 3267 },
3095); 3268);
… …
3115 3288
3116 $coro 3289 $coro
3117} 3290}
3118 3291
3119cf::client->attach ( 3292cf::client->attach (
3120 on_destroy => sub { 3293 on_client_destroy => sub {
3121 my ($ns) = @_; 3294 my ($ns) = @_;
3122 3295
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3297 },
3125); 3298);
… …
3176 decrease split destroy change_exp value msg lore send_msg)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3351 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3180) { 3353) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3356 for @funs;
3185} 3357}
3186 3358
… …
3225 local @cf::_safe_eval_args = values %vars; 3397 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval; 3398 @res = wantarray ? eval eval : scalar eval $eval;
3227 } 3399 }
3228 3400
3229 if ($@) { 3401 if ($@) {
3230 warn "$@"; 3402 warn "$@",
3231 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3232 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3233 } 3405 }
3234 3406
3235 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3236} 3408}
3237 3409
… …
3271 # for this (global event?) 3443 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3445
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275 3447
3276 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3277 3449
3278 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3279 0 < aio_load $path, $facedata
3280 or die "$path: $!";
3281
3282 $facedata = Coro::Storable::thaw $facedata;
3283 3451
3284 $facedata->{version} == 2 3452 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3286 3454
3287 # patch in the exptable 3455 # patch in the exptable
… …
3301 3469
3302 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3303 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3306 3475
3307 cf::cede_to_tick; 3476 cf::cede_to_tick;
3308 } 3477 }
3309 3478
3310 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
… …
3315 3484
3316 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3317 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3319 } else { 3488 } else {
3320 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3321 } 3490 }
3322 3491
3323 cf::cede_to_tick; 3492 cf::cede_to_tick;
3324 } 3493 }
3325 } 3494 }
… …
3343 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344 3513
3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3347 } else { 3516 } else {
3348 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3349 } 3518 }
3350 3519
3351 cf::cede_to_tick; 3520 cf::cede_to_tick;
3352 } 3521 }
3353 } 3522 }
3354 3523
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356 3525
3357 1 3526 1
3358} 3527}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379 3528
3380register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3382 3531
3383 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
… …
3422sub reload_treasures { 3571sub reload_treasures {
3423 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3424 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3425} 3574}
3426 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
3427sub reload_resources { 3596sub reload_resources {
3428 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3429 3598
3599 reload_exp_table;
3600 reload_materials;
3430 reload_facedata; 3601 reload_facedata;
3602 reload_sound;
3431 reload_archetypes; 3603 reload_archetypes;
3432 reload_regions; 3604 reload_regions;
3433 reload_treasures; 3605 reload_treasures;
3434 3606
3435 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3436} 3608}
3437 3609
3438sub reload_config { 3610sub reload_config {
3439 warn "reloading config file...\n"; 3611 trace "reloading config file...\n";
3440 3612
3441 open my $fh, "<:utf8", "$CONFDIR/config" 3613 my $config = load_file "$CONFDIR/config";
3442 or return; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3443 3616
3444 local $/;
3445 *CFG = YAML::XS::Load scalar <$fh>;
3446
3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448 3618
3449 $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};
3450 $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};
3451 3621
3452 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
… …
3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3624 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3455 and die "WARNING: m(un)lockall failed: $!\n"; 3625 and die "WARNING: m(un)lockall failed: $!\n";
3456 }; 3626 };
3457 warn $@ if $@; 3627 warn $@ if $@;
3458 } 3628 }
3459
3460 warn "finished reloading resource files\n";
3461} 3629}
3462 3630
3463sub pidfile() { 3631sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3632 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!"; 3633 or die "$PIDFILE: $!";
… …
3478 seek $fh, 0, 0; 3646 seek $fh, 0, 0;
3479 print $fh $$; 3647 print $fh $$;
3480} 3648}
3481 3649
3482sub main_loop { 3650sub main_loop {
3483 warn "EV::loop starting\n"; 3651 trace "EV::loop starting\n";
3484 if (1) { 3652 if (1) {
3485 EV::loop; 3653 EV::loop;
3486 } 3654 }
3487 warn "EV::loop returned\n"; 3655 trace "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP; 3656 goto &main_loop unless $REALLY_UNLOOP;
3489} 3657}
3490 3658
3491sub main { 3659sub main {
3492 cf::init_globals; # initialise logging 3660 cf::init_globals; # initialise logging
3493 3661
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 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.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503 3666
3504 $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
3505 3668
3506 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3507 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
… …
3513 }; 3676 };
3514 3677
3515 evthread_start IO::AIO::poll_fileno; 3678 evthread_start IO::AIO::poll_fileno;
3516 3679
3517 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
3518 cf::load_settings; 3687 cf::load_settings;
3519 cf::load_materials;
3520 3688
3521 reload_resources; 3689 reload_resources;
3522 reload_config; 3690 reload_config;
3523 db_init; 3691 db_init;
3524 3692
3525 cf::init_uuid; 3693 cf::init_uuid;
3526 cf::init_signals; 3694 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3695 cf::init_skills;
3529 3696
3530 cf::init_beforeplay; 3697 cf::init_beforeplay;
3531 3698
3532 atomic; 3699 atomic;
… …
3537 3704
3538 # no (long-running) fork's whatsoever before this point(!) 3705 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX (); 3706 use POSIX ();
3540 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};
3541 3708
3542 (pop @POST_INIT)->(0) while @POST_INIT; 3709 cf::_post_init 0;
3543 }; 3710 };
3544 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
3545 main_loop; 3720 goto &main_loop;
3546} 3721}
3547 3722
3548############################################################################# 3723#############################################################################
3549# initialisation and cleanup 3724# initialisation and cleanup
3550 3725
3551# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
3552BEGIN { 3727BEGIN {
3553 our %SIGWATCHER = (); 3728 our %SIGWATCHER = ();
3554 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
3555 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3556 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
3557 }; 3732 };
3558 } 3733 }
3559} 3734}
3560 3735
3561sub write_runtime_sync { 3736sub write_runtime_sync {
3737 my $t0 = AE::time;
3738
3562 # first touch the runtime file to show we are still running: 3739 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 3740 # the fsync below can take a very very long time.
3564 3741
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 3743
3567 my $guard = cf::lock_acquire "write_runtime"; 3744 my $guard = cf::lock_acquire "write_runtime";
3568 3745
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 3747 or return;
3571 3748
3572 my $value = $cf::RUNTIME + 90 + 10; 3749 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 3750 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 3751 # 60 allows for the watchdog to kill the server.
… …
3587 or return; 3764 or return;
3588 3765
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 3767 and return;
3591 3768
3592 warn "runtime file written.\n"; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593 3770
3594 1 3771 1
3595} 3772}
3596 3773
3597our $uuid_lock; 3774our $uuid_lock;
… …
3609 or return; 3786 or return;
3610 3787
3611 my $value = uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3612 3789
3613 unless ($value) { 3790 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n"; 3791 info "cowardly refusing to write zero uuid value!\n";
3615 return; 3792 return;
3616 } 3793 }
3617 3794
3618 my $value = uuid_str $value + $uuid_skip; 3795 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0; 3796 $uuid_skip = 0;
… …
3629 or return; 3806 or return;
3630 3807
3631 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3632 and return; 3809 and return;
3633 3810
3634 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3635 3812
3636 1 3813 1
3637 3814
3638} 3815}
3639 3816
… …
3645} 3822}
3646 3823
3647sub emergency_save() { 3824sub emergency_save() {
3648 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3649 3826
3650 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;
3651 3833
3652 cf::sync_job { 3834 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so 3835 cf::write_runtime_sync; # external watchdog should not bark
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657 3836
3658 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3659 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3660 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3661 warn "emergency_perl_save: begin player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3662 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3663 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3664 $pl->valid or next; 3843 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3666 $pl->save; 3845 $pl->save;
3667 } 3846 }
3668 warn "emergency_perl_save: end player save\n"; 3847 info "emergency_perl_save: end player save\n";
3669 3848
3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3670 warn "emergency_perl_save: begin map save\n"; 3851 info "emergency_perl_save: begin map save\n";
3671 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3672 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3673 $map->valid or next; 3854 $map->valid or next;
3674 $map->save; 3855 $map->save;
3675 } 3856 }
3676 warn "emergency_perl_save: end map save\n"; 3857 info "emergency_perl_save: end map save\n";
3677 3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3678 warn "emergency_perl_save: begin database checkpoint\n"; 3861 info "emergency_perl_save: begin database checkpoint\n";
3679 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3680 warn "emergency_perl_save: end database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3681 3864
3682 warn "emergency_perl_save: begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1; 3866 write_uuid_sync 1;
3684 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
3685 }; 3887 };
3686 3888
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3692 warn "emergency_perl_save: leave\n"; 3889 info "emergency_perl_save: leave\n";
3693} 3890}
3694 3891
3695sub post_cleanup { 3892sub post_cleanup {
3696 my ($make_core) = @_; 3893 my ($make_core) = @_;
3697 3894
3895 IO::AIO::flush;
3896
3698 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3699 if $make_core; 3898 if $make_core;
3700 3899
3701 my $fh = pidfile; 3900 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$; 3901 unlink $PIDFILE if <$fh> == $$;
3703} 3902}
… …
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) { 3923 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"}; 3924 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 } 3926 }
3728 warn "cleared package $pkg\n";#d#
3729} 3927}
3730 3928
3731sub do_reload_perl() { 3929sub do_reload_perl() {
3732 # can/must only be called in main 3930 # can/must only be called in main
3733 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3734 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3735 return; 3933 return;
3736 } 3934 }
3737 3935
3738 return if $RELOAD++; 3936 return if $RELOAD++;
3739 3937
3740 my $t1 = EV::time; 3938 my $t1 = AE::time;
3741 3939
3742 while ($RELOAD) { 3940 while ($RELOAD) {
3743 warn "reloading..."; 3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3744 3943
3745 warn "entering sync_job"; 3944 trace "perl_reload: entering sync_job";
3746 3945
3747 cf::sync_job { 3946 cf::sync_job {
3748 cf::write_runtime_sync; # external watchdog should not bark
3749 cf::emergency_save; 3947 #cf::emergency_save;
3750 cf::write_runtime_sync; # external watchdog should not bark
3751 3948
3752 warn "syncing database to disk";
3753 BDB::db_env_txn_checkpoint $DB_ENV;
3754
3755 # if anything goes wrong in here, we should simply crash as we already saved
3756
3757 warn "flushing outstanding aio requests";
3758 while (IO::AIO::nreqs || BDB::nreqs) {
3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3760 }
3761
3762 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3763 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3764 %EXT_CORO = (); 3951 %EXT_CORO = ();
3765 3952
3766 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3767 %COMMAND = (); 3954 %COMMAND = ();
3768 3955
3769 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3770 %EXTCMD = (); 3957 %EXTCMD = ();
3771 %EXTICMD = (); 3958 %EXTICMD = ();
3772 3959
3773 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3774 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3775 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3776 3963
3777 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3778 eval { 3965 eval {
3779 $cb->($pkg); 3966 $cb->($pkg);
3780 1 3967 1
3781 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3782 } 3969 }
3783 3970
3784 warn "... clearing $pkg"; 3971 trace "... clearing $pkg";
3785 clear_package $pkg; 3972 clear_package $pkg;
3786 } 3973 }
3787 3974
3788 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791 3978
3792 warn "... unloading $k"; 3979 trace "... unloading $k";
3793 delete $INC{$k}; 3980 delete $INC{$k};
3794 3981
3795 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3797 3984
… …
3800 } 3987 }
3801 3988
3802 clear_package $k; 3989 clear_package $k;
3803 } 3990 }
3804 3991
3805 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3806 clear_package "safe::$_" 3993 clear_package "safe::$_"
3807 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);
3808 3995
3809 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3810 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3812 3999
3813 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3814 # and global variables created in xs 4001 # and global variables created in xs
3815 #clear_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3816 4003
3817 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3818 4005
3819 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3820 require cf; 4007 require cf;
3821 cf::_connect_to_perl_1; 4008 cf::_connect_to_perl_1;
3822 4009
3823 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3824 cf::reload_config; 4011 cf::reload_config;
3825 4012
3826 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3827 cf::load_extensions; 4014 cf::load_extensions;
3828 4015
3829 if ($REATTACH_ON_RELOAD) { 4016 if ($REATTACH_ON_RELOAD) {
3830 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3831 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3832 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3833 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3834 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3835 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
3836 } 4023 }
3837 4024
3838 warn "running post_init jobs"; 4025 cf::_post_init 1;
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840 4026
3841 warn "leaving sync_job"; 4027 trace "perl_reload: leaving sync_job";
3842 4028
3843 1 4029 1
3844 } or do { 4030 } or do {
3845 warn $@; 4031 error $@;
3846 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
3847 }; 4033 };
3848 4034
3849 warn "reloaded";
3850 --$RELOAD; 4035 --$RELOAD;
3851 } 4036 }
3852 4037
3853 $t1 = EV::time - $t1; 4038 $t1 = AE::time - $t1;
3854 warn "reload completed in ${t1}s\n"; 4039 info "perl_reload: completed in ${t1}s\n";
3855}; 4040};
3856 4041
3857our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3858 4043
3859sub reload_perl() { 4044sub reload_perl() {
… …
3861 # coro crashes during coro_state_free->destroy here. 4046 # coro crashes during coro_state_free->destroy here.
3862 4047
3863 $RELOAD_WATCHER ||= cf::async { 4048 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions; 4049 Coro::AIO::aio_wait cache_extensions;
3865 4050
3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867 do_reload_perl; 4052 do_reload_perl;
3868 undef $RELOAD_WATCHER; 4053 undef $RELOAD_WATCHER;
3869 }; 4054 };
3870 }; 4055 };
3871} 4056}
… …
3880 reload_perl; 4065 reload_perl;
3881 }; 4066 };
3882 } 4067 }
3883}; 4068};
3884 4069
3885unshift @INC, $LIBDIR; 4070#############################################################################
3886 4071
3887my $bug_warning = 0; 4072my $bug_warning = 0;
3888 4073
3889our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3890our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3891 4076
3892sub wait_for_tick { 4077sub wait_for_tick() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 4079
3895 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3897 $signal->wait; 4082 $signal->wait;
3898} 4083}
3899 4084
3900sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 4087
3903 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3905 $signal->wait; 4090 $signal->wait;
… …
3912 return; 4097 return;
3913 } 4098 }
3914 4099
3915 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
3916 4101
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $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.;
3919 Coro::async_pool { 4106 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3921 write_runtime_sync 4108 write_runtime_sync
3922 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3923 }; 4110 };
3924 } 4111 }
3925 4112
3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3927 $sig->send; 4114 $sig->send;
… …
3935 4122
3936 if (0) { 4123 if (0) {
3937 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3938 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3941 } 4128 }
3942 } 4129 }
3943} 4130}
3944 4131
3945{ 4132{
3946 # configure BDB 4133 # configure BDB
3947 4134
3948 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 4137 $AnyEvent::BDB::WATCHER->priority (1);
3951 4138
3952 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
… …
3990 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3991 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3992 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3993} 4180}
3994 4181
3995my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3996 4184
3997sub _log_backtrace { 4185sub _log_backtrace {
3998 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3999 4187
4000 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
4001 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4002 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
4003 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4004 ++$_log_backtrace; 4196 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
4006 async { 4198 async {
4007 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
4008 4200
… …
4028 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4029 --$_log_backtrace; 4221 --$_log_backtrace;
4030 }; 4222 };
4031 } else { 4223 } else {
4032 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
4033 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4034 } 4226 }
4035} 4227}
4036 4228
4037# load additional modules 4229# load additional modules
4038require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines