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.507 by root, Sat Mar 20 02:24:38 2010 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 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.
… …
502=cut 596=cut
503 597
504sub sync_job(&) { 598sub sync_job(&) {
505 my ($job) = @_; 599 my ($job) = @_;
506 600
507 if ($Coro::current == $Coro::main) { 601 if (in_main) {
508 my $time = EV::time; 602 my $time = AE::time;
509 603
510 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
512 606
513 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
514 608
515 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
516 610
517 my $busy = 1; 611 my $busy = 1;
518 my @res; 612 my @res;
519 613
520 (async { 614 (async {
521 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 616 @res = eval { $job->() };
523 warn $@ if $@; 617 error $@ if $@;
524 undef $busy; 618 undef $busy;
525 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
526 620
527 while ($busy) { 621 while ($busy) {
528 if (Coro::nready) { 622 if (Coro::nready) {
… …
530 } else { 624 } else {
531 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
532 } 626 }
533 } 627 }
534 628
535 my $time = EV::time - $time; 629 my $time = AE::time - $time;
536 630
537 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
538 632
539 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
540 } else { 634 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
563 657
564 $coro 658 $coro
565} 659}
566 660
567=item fork_call { }, $args 661=item fork_call { }, @args
568 662
569Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 666never block itself or use any form of event handling.
573 667
574=cut 668=cut
575 669
670sub post_fork {
671 reset_signals;
672}
673
576sub fork_call(&@) { 674sub fork_call(&@) {
577 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
578 676
579 # 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,
580 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
582 680
583 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
584 reset_signals; 682 cf::post_fork;
585 &$cb 683 &$cb
586 }, @args; 684 } @args;
587 685
588 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 )
589} 698}
590 699
591=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
592 701
593=cut 702=cut
… …
630within each server. 739within each server.
631 740
632=cut 741=cut
633 742
634sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
635 my ($name) = @_; 747 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
637 749
638 eval { 750 eval {
639 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
649} 761}
650 762
651our $DB; 763our $DB;
652 764
653sub db_init { 765sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
656 };
657} 767}
658 768
659sub db_get($$) { 769sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
661 771
662 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
663 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
664 776
665 $! ? () 777 $! ? ()
666 : $data 778 : $data
667 }
668} 779}
669 780
670sub db_put($$$) { 781sub db_put($$$) {
671 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 811
701 my @data; 812 my @data;
702 my $md5; 813 my $md5;
703 814
704 for (0 .. $#$src) { 815 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 817 }
708 818
709 # if processing is expensive, check 819 # if processing is expensive, check
710 # checksum first 820 # checksum first
711 if (1) { 821 if (1) {
… …
728 838
729 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 840 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
732 842
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 844
735 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
738 848
… …
748 858
749=cut 859=cut
750 860
751sub datalog($@) { 861sub datalog($@) {
752 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 864}
755 865
756=back 866=back
757 867
758=cut 868=cut
… …
953 1063
954 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1066
957 } elsif (ref $type) { 1067 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
959 1069
960 } else { 1070 } else {
961 shift @arg; 1071 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
963 } 1073 }
964 } 1074 }
965} 1075}
966 1076
967sub _object_attach { 1077sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
978 } 1088 }
979 1089
980 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
981 } else { 1091 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1093 }
984 1094
985 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
986} 1096}
987 1097
… …
1046 1156
1047 for (@$callbacks) { 1157 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1049 1159
1050 if ($@) { 1160 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1162 override;
1054 } 1163 }
1055 1164
1056 return 1 if $override; 1165 return 1 if $override;
1057 } 1166 }
… …
1136 for (@$attach) { 1245 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1139 } 1248 }
1140 } else { 1249 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1251 }
1143 } 1252 }
1144} 1253}
1145 1254
1146cf::attachable->attach ( 1255cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1174 1283
1175 sync_job { 1284 sync_job {
1176 if (length $$rdata) { 1285 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1180 1290
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1207 1317
1208 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1320 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1212 } 1322 }
1213 } else { 1323 } else {
1214 aio_unlink $filename; 1324 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1216 } 1326 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1351 $av = $st->{objs};
1242 } 1352 }
1243 1353
1244 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1247 1358
1248 ($data, $av) 1359 ($data, $av)
1249} 1360}
1250 1361
1251=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1310} 1421}
1311 1422
1312use File::Glob (); 1423use File::Glob ();
1313 1424
1314cf::player->attach ( 1425cf::player->attach (
1315 on_command => sub { 1426 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1317 1428
1318 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1319 or return; 1430 or return;
1320 1431
… …
1343 1454
1344 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1456 if $reply;
1346 1457
1347 } else { 1458 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1460 }
1350 1461
1351 cf::override; 1462 cf::override;
1352 }, 1463 },
1353); 1464);
… …
1364 1475
1365 $grp 1476 $grp
1366} 1477}
1367 1478
1368sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1369 cf::sync_job { 1482 cf::sync_job {
1370 my %todo; 1483 my %todo;
1371 1484
1372 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1486 next unless -r $path;
… …
1391 1504
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1507
1395 $ext{source} = 1508 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1398 . $source 1511 . $source
1399 . "\n};\n1"; 1512 . "\n};\n1";
1400 1513
1401 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1527 next ext
1415 unless exists $done{$_}; 1528 unless exists $done{$_};
1416 } 1529 }
1417 1530
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1532
1420 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1421 1534
1422 if (length $@) { 1535 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1424 1537
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1540
1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1427 } else { 1543 } else {
1428 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1430 $progress = 1; 1546 $progress = 1;
1431 1547
1432 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1549 unless $active;
1434 } 1550 }
1435 } 1551 }
1436 1552
1437 unless ($progress) { 1553 unless ($progress) {
… …
1439 1555
1440 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1443 } 1559 }
1560
1561 last;
1444 } 1562 }
1445 } 1563 }
1446 }; 1564 };
1447} 1565}
1448 1566
… …
1533 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1534 } 1652 }
1535 } 1653 }
1536} 1654}
1537 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
1538sub save($) { 1669sub save($) {
1539 my ($pl) = @_; 1670 my ($pl) = @_;
1540 1671
1541 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1542 1673
… …
1547 1678
1548 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1550 1681
1551 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];
1552 1686
1553 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1688 cf::cede_to_tick;
1555} 1689}
1556 1690
… …
1590 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1591 1725
1592 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1593 $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
1594 1728
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1730 $pl->deactivate;
1731
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1600 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1601 1737
1602 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1658 \@logins 1794 \@logins
1659} 1795}
1660 1796
1661=item $player->maps 1797=item $player->maps
1662 1798
1799=item cf::player::maps $login
1800
1663Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1664player. May block. 1802player. May block.
1665 1803
1666=cut 1804=cut
1667 1805
… …
1729=cut 1867=cut
1730 1868
1731sub find_by_path($) { 1869sub find_by_path($) {
1732 my ($path) = @_; 1870 my ($path) = @_;
1733 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1734 my ($match, $specificity); 1874 my ($match, $specificity);
1735 1875
1736 for my $region (list) { 1876 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1766sub generate_random_map { 1906sub generate_random_map {
1767 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1768 1908
1769 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
1770 1910
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 1912}
1786 1913
1787=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1788 1915
1789Register 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
… …
1794 1921
1795sub register { 1922sub register {
1796 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1924 my $pkg = caller;
1798 1925
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1927
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1929}
1804 1930
1805# also paths starting with '/' 1931# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1933
1808sub thawer_merge { 1934sub thawer_merge {
1809 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1810 1936
1811 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1816} 1942}
1817 1943
1818sub normalise { 1944sub normalise {
1819 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1820 1946
1821 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1822 1948
1823 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1824 1950
1825 # map plan: 1951 # map plan:
1826 # 1952 #
… …
1841 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 1968 $path = "$base/$path";
1843 } 1969 }
1844 1970
1845 for ($path) { 1971 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1849 } 1974 }
1850 1975
1851 $path 1976 $path
… …
1865 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1866 return $self; 1991 return $self;
1867 } 1992 }
1868 } 1993 }
1869 1994
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1996 ()
1872} 1997}
1873 1998
1999# may re-bless or do other evil things
1874sub init { 2000sub init {
1875 my ($self) = @_; 2001 my ($self) = @_;
1876 2002
1877 $self 2003 $self
1878} 2004}
… …
1943 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1944 2070
1945 1 2071 1
1946} 2072}
1947 2073
2074# used to laod the header of an original map
1948sub load_header_orig { 2075sub load_header_orig {
1949 my ($self) = @_; 2076 my ($self) = @_;
1950 2077
1951 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1952} 2079}
1953 2080
2081# used to laod the header of an instantiated map
1954sub load_header_temp { 2082sub load_header_temp {
1955 my ($self) = @_; 2083 my ($self) = @_;
1956 2084
1957 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1958} 2086}
1959 2087
2088# called after loading the header from an instantiated map
1960sub prepare_temp { 2089sub prepare_temp {
1961 my ($self) = @_; 2090 my ($self) = @_;
1962 2091
1963 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1964 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1965 # safety 2094 # safety
1966 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1967 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1968} 2097}
1969 2098
2099# called after loading the header from an original map
1970sub prepare_orig { 2100sub prepare_orig {
1971 my ($self) = @_; 2101 my ($self) = @_;
1972 2102
1973 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1974 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
1998 2128
1999sub find; 2129sub find;
2000sub find { 2130sub find {
2001 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2002 2132
2133 cf::cede_to_tick;
2134
2003 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2004 2136
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2007 2139
2008 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2039 2171
2040 { 2172 {
2041 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2042 2174
2043 return unless $self->valid; 2175 return unless $self->valid;
2044 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->state == cf::MAP_SWAPPED;
2045
2046 $self->in_memory (cf::MAP_LOADING);
2047 2177
2048 $self->alloc; 2178 $self->alloc;
2049 2179
2050 $self->pre_load; 2180 $self->pre_load;
2051 cf::cede_to_tick; 2181 cf::cede_to_tick;
2052 2182
2183 if (exists $self->{load_path}) {
2053 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block; 2185 $f->skip_block;
2055 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2056 or return; 2187 or return;
2057 2188
2058 $self->post_load_original 2189 $self->post_load_original
2059 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2060 2191
2061 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2062 utf8::encode $uniq; 2193 utf8::encode $uniq;
2063 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2065 $self->clear_unique_items; 2196 $self->clear_unique_items;
2066 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2068 } 2200 }
2069 } 2201 }
2070 }
2071 2202
2072 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->state (cf::MAP_INACTIVE);
2073 2210
2074 cf::cede_to_tick; 2211 cf::cede_to_tick;
2075 # now do the right thing for maps 2212 # now do the right thing for maps
2076 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2077 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2081 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2082 $self->decay_objects; 2219 $self->decay_objects;
2083 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2084 $self->update_buttons; 2221 $self->update_buttons;
2085 cf::cede_to_tick; 2222 cf::cede_to_tick;
2086 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2087 } 2224 }
2088 2225
2089 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2091
2092 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2228 }
2094 2229
2095 $self->post_load; 2230 $self->post_load;
2231
2232 1
2096} 2233}
2097 2234
2098# customize the map for a given player, i.e. 2235# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2236# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2237# maps to change the path to ~playername/mappath
… …
2121 or next; 2258 or next;
2122 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2123 or next; 2260 or next;
2124 $neigh->load; 2261 $neigh->load;
2125 2262
2263 # now find the diagonal neighbours
2126 push @neigh, 2264 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2267 }
2130 2268
… …
2137} 2275}
2138 2276
2139sub find_sync { 2277sub find_sync {
2140 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2141 2279
2142 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2143} 2285}
2144 2286
2145sub do_load_sync { 2287sub do_load_sync {
2146 my ($map) = @_; 2288 my ($map) = @_;
2147 2289
2290 # it's a bug to call this from the main context
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2150 2293
2151 cf::sync_job { $map->load }; 2294 $map->load;
2152} 2295}
2153 2296
2154our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2156 2299
2157sub find_async { 2300sub find_async {
2158 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2159 2302
2160 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2161 2304
2162 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2164 } 2307 }
2165 2308
2166 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2167 2310
2168 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
… …
2182 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2183 2326
2184 () 2327 ()
2185} 2328}
2186 2329
2330# common code, used by both ->save and ->swapout
2187sub save { 2331sub _save {
2188 my ($self) = @_; 2332 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2333
2192 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2193 2335
2194 return unless $self->dirty; 2336 return unless $self->dirty;
2195 2337
… …
2215 } else { 2357 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2359 }
2218} 2360}
2219 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2220sub swap_out { 2370sub swap_out {
2221 my ($self) = @_; 2371 my ($self) = @_;
2222 2372
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2228 return if $self->players; 2377 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->state (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2230 return if $self->{deny_save}; 2395 return 1e99 if $self->{deny_reset};
2231 2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2232 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->state (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2233 2429
2234 $self->deactivate; 2430 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2432 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2433
2282 $self->unlink_save; 2434 $self->unlink_save;
2283 $self->destroy; 2435 $self->destroy;
2284} 2436}
2285 2437
… …
2293 2445
2294 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2295 2447
2296 $self->unlink_save; 2448 $self->unlink_save;
2297 2449
2298 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2455
… …
2533 2685
2534Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2535 2687
2536The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2537for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2539map. 2691map.
2540 2692
2541Will never block. 2693Will never block.
2542 2694
2543=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2565 my ($self) = @_; 2717 my ($self) = @_;
2566 2718
2567 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2568 2720
2721 ++$self->{_link_recursion};
2722
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2724
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2573 2727
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2729}
2576 2730
2577sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2579 2733
… …
2604 $map->load_neighbours; 2758 $map->load_neighbours;
2605 2759
2606 return unless $self->contr->active; 2760 return unless $self->contr->active;
2607 2761
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2610 2764 # entering was successful
2765 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2766 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2767 $self->activate_recursive;
2613} 2768 }
2614 2769
2770}
2771
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2773
2617Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2620the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
… …
2627 2784
2628our $GOTOGEN; 2785our $GOTOGEN;
2629 2786
2630sub cf::object::player::goto { 2787sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2632 2795
2633 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2798
2636 $self->enter_link; 2799 $self->enter_link;
… …
2656 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2657 } 2820 }
2658 } 2821 }
2659 2822
2660 my $map = eval { 2823 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662 2825
2663 if ($map) { 2826 if ($map) {
2664 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2829 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2831 }
2669 2832
2670 $map 2833 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2681 } 2844 }
2682 2845
2683 $done->() if $done; 2846 $done->($self) if $done;
2684 })->prio (1); 2847 })->prio (1);
2685} 2848}
2686 2849
2687=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2688 2851
… …
2756 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2757 2920
2758 unless (eval { 2921 unless (eval {
2759 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2760 2923
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2770 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2772 2950
2773 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2774 2952
2775 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2963
2786 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2965 $self->leave_link;
2788 } 2966 }
2789 })->prio (1); 2967 })->prio (1);
2790} 2968}
2791 2969
… …
3104 3282
3105 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3284 if $reply;
3107 3285
3108 } else { 3286 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3288 }
3111 3289
3112 cf::override; 3290 cf::override;
3113 }, 3291 },
3114); 3292);
… …
3134 3312
3135 $coro 3313 $coro
3136} 3314}
3137 3315
3138cf::client->attach ( 3316cf::client->attach (
3139 on_destroy => sub { 3317 on_client_destroy => sub {
3140 my ($ns) = @_; 3318 my ($ns) = @_;
3141 3319
3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143 }, 3321 },
3144); 3322);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3199) { 3377) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3380 for @funs;
3204} 3381}
3205 3382
… …
3244 local @cf::_safe_eval_args = values %vars; 3421 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3422 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3423 }
3247 3424
3248 if ($@) { 3425 if ($@) {
3249 warn "$@"; 3426 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3252 } 3429 }
3253 3430
3254 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3255} 3432}
3256 3433
… …
3290 # for this (global event?) 3467 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3469
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3471
3295 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3296 3473
3297 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3298 0 < aio_load $path, $facedata
3299 or die "$path: $!";
3300
3301 $facedata = Coro::Storable::thaw $facedata;
3302 3475
3303 $facedata->{version} == 2 3476 $facedata->{version} == 2
3304 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3305 3478
3306 # patch in the exptable 3479 # patch in the exptable
… …
3320 3493
3321 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3322 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3325 3499
3326 cf::cede_to_tick; 3500 cf::cede_to_tick;
3327 } 3501 }
3328 3502
3329 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3334 3508
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3512 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3514 }
3341 3515
3342 cf::cede_to_tick; 3516 cf::cede_to_tick;
3343 } 3517 }
3344 } 3518 }
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3537
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3366 } else { 3540 } else {
3367 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3368 } 3542 }
3369 3543
3370 cf::cede_to_tick; 3544 cf::cede_to_tick;
3371 } 3545 }
3372 } 3546 }
3373 3547
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3549
3376 1 3550 1
3377} 3551}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3552
3399register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3401 3555
3402 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3595sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3444} 3598}
3445 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3446sub reload_resources { 3620sub reload_resources {
3447 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3448 3622
3623 reload_exp_table;
3624 reload_materials;
3449 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3450 reload_archetypes; 3627 reload_archetypes;
3451 reload_regions; 3628 reload_regions;
3452 reload_treasures; 3629 reload_treasures;
3453 3630
3454 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3455} 3632}
3456 3633
3457sub reload_config { 3634sub reload_config {
3458 warn "reloading config file...\n"; 3635 trace "reloading config file...\n";
3459 3636
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3637 my $config = load_file "$CONFDIR/config";
3461 or return; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3462 3640
3463 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>;
3465
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3642
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3645
3471 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3648 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3649 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3650 };
3476 warn $@ if $@; 3651 warn $@ if $@;
3477 } 3652 }
3478
3479 warn "finished reloading resource files\n";
3480} 3653}
3481 3654
3482sub pidfile() { 3655sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3657 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3498 print $fh $$; 3671 print $fh $$;
3499} 3672}
3500 3673
3501sub main_loop { 3674sub main_loop {
3502 warn "EV::loop starting\n"; 3675 trace "EV::loop starting\n";
3503 if (1) { 3676 if (1) {
3504 EV::loop; 3677 EV::loop;
3505 } 3678 }
3506 warn "EV::loop returned\n"; 3679 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3680 goto &main_loop unless $REALLY_UNLOOP;
3508} 3681}
3509 3682
3510sub main { 3683sub main {
3511 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3512 3685
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3690
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3692
3525 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
… …
3532 }; 3700 };
3533 3701
3534 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3535 3703
3536 cf::sync_job { 3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3537 cf::load_settings; 3711 cf::load_settings;
3538 cf::load_materials;
3539 3712
3540 reload_resources; 3713 reload_resources;
3541 reload_config; 3714 reload_config;
3542 db_init; 3715 db_init;
3543 3716
3544 cf::init_uuid; 3717 cf::init_uuid;
3545 cf::init_signals; 3718 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3719 cf::init_skills;
3548 3720
3549 cf::init_beforeplay; 3721 cf::init_beforeplay;
3550 3722
3551 atomic; 3723 atomic;
… …
3556 3728
3557 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX (); 3730 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3732
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3562 }; 3734 };
3563 3735
3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3564 main_loop; 3744 goto &main_loop;
3565} 3745}
3566 3746
3567############################################################################# 3747#############################################################################
3568# initialisation and cleanup 3748# initialisation and cleanup
3569 3749
3570# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3571BEGIN { 3751BEGIN {
3572 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3576 }; 3756 };
3577 } 3757 }
3578} 3758}
3579 3759
3580sub write_runtime_sync { 3760sub write_runtime_sync {
3581 my $t0 = EV::time; 3761 my $t0 = AE::time;
3582 3762
3583 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3585 3765
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3788 or return;
3609 3789
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3791 and return;
3612 3792
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3794
3615 1 3795 1
3616} 3796}
3617 3797
3618our $uuid_lock; 3798our $uuid_lock;
… …
3630 or return; 3810 or return;
3631 3811
3632 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3633 3813
3634 unless ($value) { 3814 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3816 return;
3637 } 3817 }
3638 3818
3639 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3820 $uuid_skip = 0;
… …
3650 or return; 3830 or return;
3651 3831
3652 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3653 and return; 3833 and return;
3654 3834
3655 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3656 3836
3657 1 3837 1
3658 3838
3659} 3839}
3660 3840
… …
3666} 3846}
3667 3847
3668sub emergency_save() { 3848sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3670 3850
3671 warn "emergency_perl_save: enter\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3672 3857
3673 cf::sync_job { 3858 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3859 cf::write_runtime_sync; # external watchdog should not bark
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678 3860
3679 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3867 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3869 $pl->save;
3688 } 3870 }
3689 warn "emergency_perl_save: end player save\n"; 3871 info "emergency_perl_save: end player save\n";
3690 3872
3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3691 warn "emergency_perl_save: begin map save\n"; 3875 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3878 $map->valid or next;
3695 $map->save; 3879 $map->save;
3696 } 3880 }
3697 warn "emergency_perl_save: end map save\n"; 3881 info "emergency_perl_save: end map save\n";
3698 3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3885 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3702 3888
3703 warn "emergency_perl_save: begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3890 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3706 }; 3911 };
3707 3912
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3713 warn "emergency_perl_save: leave\n"; 3913 info "emergency_perl_save: leave\n";
3714} 3914}
3715 3915
3716sub post_cleanup { 3916sub post_cleanup {
3717 my ($make_core) = @_; 3917 my ($make_core) = @_;
3718 3918
3919 IO::AIO::flush;
3920
3719 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3922 if $make_core;
3721 3923
3722 my $fh = pidfile; 3924 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3724} 3926}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3950 }
3749 warn "cleared package $pkg\n";#d#
3750} 3951}
3751 3952
3752sub do_reload_perl() { 3953sub do_reload_perl() {
3753 # can/must only be called in main 3954 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3755 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3756 return; 3957 return;
3757 } 3958 }
3758 3959
3759 return if $RELOAD++; 3960 return if $RELOAD++;
3760 3961
3761 my $t1 = EV::time; 3962 my $t1 = AE::time;
3762 3963
3763 while ($RELOAD) { 3964 while ($RELOAD) {
3764 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3765 3967
3766 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3767 3969
3768 cf::sync_job { 3970 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 3971 #cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 3972
3773 warn "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776 # if anything goes wrong in here, we should simply crash as we already saved
3777
3778 warn "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 }
3782
3783 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 3975 %EXT_CORO = ();
3786 3976
3787 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3788 %COMMAND = (); 3978 %COMMAND = ();
3789 3979
3790 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3791 %EXTCMD = (); 3981 %EXTCMD = ();
3792 %EXTICMD = (); 3982 %EXTICMD = ();
3793 3983
3794 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3797 3987
3798 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3799 eval { 3989 eval {
3800 $cb->($pkg); 3990 $cb->($pkg);
3801 1 3991 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3803 } 3993 }
3804 3994
3805 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3806 clear_package $pkg; 3996 clear_package $pkg;
3807 } 3997 }
3808 3998
3809 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 4002
3813 warn "... unloading $k"; 4003 trace "... unloading $k";
3814 delete $INC{$k}; 4004 delete $INC{$k};
3815 4005
3816 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3818 4008
… …
3821 } 4011 }
3822 4012
3823 clear_package $k; 4013 clear_package $k;
3824 } 4014 }
3825 4015
3826 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 4017 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 4019
3830 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 4023
3834 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3835 # and global variables created in xs 4025 # and global variables created in xs
3836 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3837 4027
3838 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3839 4029
3840 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3841 require cf; 4031 require cf;
3842 cf::_connect_to_perl_1; 4032 cf::_connect_to_perl_1;
3843 4033
3844 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3845 cf::reload_config; 4035 cf::reload_config;
3846 4036
3847 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3848 cf::load_extensions; 4038 cf::load_extensions;
3849 4039
3850 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3854 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3857 } 4047 }
3858 4048
3859 warn "running post_init jobs"; 4049 cf::_post_init 1;
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861 4050
3862 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3863 4052
3864 1 4053 1
3865 } or do { 4054 } or do {
3866 warn $@; 4055 error $@;
3867 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3868 }; 4057 };
3869 4058
3870 warn "reloaded";
3871 --$RELOAD; 4059 --$RELOAD;
3872 } 4060 }
3873 4061
3874 $t1 = EV::time - $t1; 4062 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3876}; 4064};
3877 4065
3878our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3879 4067
3880sub reload_perl() { 4068sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3883 4071
3884 $RELOAD_WATCHER ||= cf::async { 4072 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 4073 Coro::AIO::aio_wait cache_extensions;
3886 4074
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 4076 do_reload_perl;
3889 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3890 }; 4078 };
3891 }; 4079 };
3892} 4080}
… …
3901 reload_perl; 4089 reload_perl;
3902 }; 4090 };
3903 } 4091 }
3904}; 4092};
3905 4093
3906unshift @INC, $LIBDIR; 4094#############################################################################
3907 4095
3908my $bug_warning = 0; 4096my $bug_warning = 0;
3909 4097
3910our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3912 4100
3913sub wait_for_tick { 4101sub wait_for_tick() {
3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3915 4103
3916 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3917 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3918 $signal->wait; 4106 $signal->wait;
3919} 4107}
3920 4108
3921sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3923 4111
3924 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3925 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3926 $signal->wait; 4114 $signal->wait;
… …
3933 return; 4121 return;
3934 } 4122 }
3935 4123
3936 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3937 4125
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4127
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4130 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4132 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3946 }; 4134 };
3947 } 4135 }
3948 4136
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4138 $sig->send;
… …
3958 4146
3959 if (0) { 4147 if (0) {
3960 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3964 } 4152 }
3965 } 4153 }
3966} 4154}
3967 4155
3968{ 4156{
… …
4013 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
4014 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
4015 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
4016} 4204}
4017 4205
4018my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
4019 4208
4020sub _log_backtrace { 4209sub _log_backtrace {
4021 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
4022 4211
4023 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
4024 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
4026 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
4027 ++$_log_backtrace; 4220 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
4029 async { 4222 async {
4030 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
4031 4224
… …
4051 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
4052 --$_log_backtrace; 4245 --$_log_backtrace;
4053 }; 4246 };
4054 } else { 4247 } else {
4055 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
4056 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057 } 4250 }
4058} 4251}
4059 4252
4060# load additional modules 4253# load additional modules
4061require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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