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.504 by root, Sat Jan 30 23:50:16 2010 UTC vs.
Revision 1.569 by root, Wed May 4 07:36:40 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;
1402 } 1515 }
1403 1516
1517 my $pass = 0;
1404 my %done; 1518 my %done;
1405 while (%todo) { 1519 while (%todo) {
1406 my $progress; 1520 my $progress;
1407 1521
1522 ++$pass;
1523
1524 ext:
1408 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1527 next ext
1411 unless exists $done{$_}; 1528 unless exists $done{$_};
1412 } 1529 }
1413 1530
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1532
1416 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1537
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1539 if exists $v->{meta}{mandatory};
1424 1540
1425 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;
1426 } 1550 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1551 }
1432 1552
1433 skip: 1553 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 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 }
1436 } 1563 }
1437 }; 1564 };
1438} 1565}
1439 1566
1440############################################################################# 1567#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1525 } 1652 }
1526 } 1653 }
1527} 1654}
1528 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
1529sub save($) { 1669sub save($) {
1530 my ($pl) = @_; 1670 my ($pl) = @_;
1531 1671
1532 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1533 1673
… …
1538 1678
1539 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1541 1681
1542 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];
1543 1686
1544 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1688 cf::cede_to_tick;
1546} 1689}
1547 1690
… …
1581 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1582 1725
1583 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1584 $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
1585 1728
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587 $pl->deactivate; 1730 $pl->deactivate;
1731
1588 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;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1591 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1592 1737
1593 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1595 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1649 \@logins 1794 \@logins
1650} 1795}
1651 1796
1652=item $player->maps 1797=item $player->maps
1653 1798
1799=item cf::player::maps $login
1800
1654Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1655player. May block. 1802player. May block.
1656 1803
1657=cut 1804=cut
1658 1805
… …
1720=cut 1867=cut
1721 1868
1722sub find_by_path($) { 1869sub find_by_path($) {
1723 my ($path) = @_; 1870 my ($path) = @_;
1724 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1725 my ($match, $specificity); 1874 my ($match, $specificity);
1726 1875
1727 for my $region (list) { 1876 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1757sub generate_random_map { 1906sub generate_random_map {
1758 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1759 1908
1760 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
1761 1910
1762 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1771 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1772 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1773 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1774 (cf::region::find $rmp->{region}), $rmp->{custom}
1775 )
1776} 1912}
1777 1913
1778=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1779 1915
1780Register 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
… …
1785 1921
1786sub register { 1922sub register {
1787 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 1924 my $pkg = caller;
1789 1925
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 1927
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1929}
1795 1930
1796# also paths starting with '/' 1931# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1933
1799sub thawer_merge { 1934sub thawer_merge {
1800 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1801 1936
1802 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1807} 1942}
1808 1943
1809sub normalise { 1944sub normalise {
1810 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1811 1946
1812 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1813 1948
1814 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1815 1950
1816 # map plan: 1951 # map plan:
1817 # 1952 #
… …
1832 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1833 $path = "$base/$path"; 1968 $path = "$base/$path";
1834 } 1969 }
1835 1970
1836 for ($path) { 1971 for ($path) {
1837 redo if s{//}{/};
1838 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1839 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1840 } 1974 }
1841 1975
1842 $path 1976 $path
… …
1856 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1857 return $self; 1991 return $self;
1858 } 1992 }
1859 } 1993 }
1860 1994
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 1996 ()
1863} 1997}
1864 1998
1999# may re-bless or do other evil things
1865sub init { 2000sub init {
1866 my ($self) = @_; 2001 my ($self) = @_;
1867 2002
1868 $self 2003 $self
1869} 2004}
… …
1934 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1935 2070
1936 1 2071 1
1937} 2072}
1938 2073
2074# used to laod the header of an original map
1939sub load_header_orig { 2075sub load_header_orig {
1940 my ($self) = @_; 2076 my ($self) = @_;
1941 2077
1942 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1943} 2079}
1944 2080
2081# used to laod the header of an instantiated map
1945sub load_header_temp { 2082sub load_header_temp {
1946 my ($self) = @_; 2083 my ($self) = @_;
1947 2084
1948 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1949} 2086}
1950 2087
2088# called after loading the header from an instantiated map
1951sub prepare_temp { 2089sub prepare_temp {
1952 my ($self) = @_; 2090 my ($self) = @_;
1953 2091
1954 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1956 # safety 2094 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2097}
1960 2098
2099# called after loading the header from an original map
1961sub prepare_orig { 2100sub prepare_orig {
1962 my ($self) = @_; 2101 my ($self) = @_;
1963 2102
1964 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
1989 2128
1990sub find; 2129sub find;
1991sub find { 2130sub find {
1992 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1993 2132
2133 cf::cede_to_tick;
2134
1994 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1995 2136
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2139
1999 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2032 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2033 2174
2034 return unless $self->valid; 2175 return unless $self->valid;
2035 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->in_memory == cf::MAP_SWAPPED;
2036 2177
2037 $self->in_memory (cf::MAP_LOADING);
2038
2039 $self->alloc; 2178 $self->alloc;
2040 2179
2041 $self->pre_load; 2180 $self->pre_load;
2042 cf::cede_to_tick; 2181 cf::cede_to_tick;
2043 2182
2183 if (exists $self->{load_path}) {
2044 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block; 2185 $f->skip_block;
2046 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2047 or return; 2187 or return;
2048 2188
2049 $self->post_load_original 2189 $self->post_load_original
2050 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2051 2191
2052 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2053 utf8::encode $uniq; 2193 utf8::encode $uniq;
2054 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2056 $self->clear_unique_items; 2196 $self->clear_unique_items;
2057 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2059 } 2200 }
2060 } 2201 }
2061 }
2062 2202
2063 $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->in_memory (cf::MAP_INACTIVE);
2064 2210
2065 cf::cede_to_tick; 2211 cf::cede_to_tick;
2066 # now do the right thing for maps 2212 # now do the right thing for maps
2067 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2068 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2072 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2219 $self->decay_objects;
2074 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2075 $self->update_buttons; 2221 $self->update_buttons;
2076 cf::cede_to_tick; 2222 cf::cede_to_tick;
2077 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2078 } 2224 }
2079 2225
2080 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2081 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2082
2083 $self->in_memory (cf::MAP_ACTIVE);
2084 } 2228 }
2085 2229
2086 $self->post_load; 2230 $self->post_load;
2087}
2088 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
2089sub customise_for { 2238sub customise_for {
2090 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
2091 2240
2092 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2242 if $self->per_player;
… …
2109 or next; 2258 or next;
2110 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2111 or next; 2260 or next;
2112 $neigh->load; 2261 $neigh->load;
2113 2262
2263 # now find the diagonal neighbours
2114 push @neigh, 2264 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 } 2267 }
2118 2268
… …
2125} 2275}
2126 2276
2127sub find_sync { 2277sub find_sync {
2128 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2129 2279
2130 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
2131} 2285}
2132 2286
2133sub do_load_sync { 2287sub do_load_sync {
2134 my ($map) = @_; 2288 my ($map) = @_;
2135 2289
2290 # it's a bug to call this from the main context
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2138 2293
2139 cf::sync_job { $map->load }; 2294 $map->load;
2140} 2295}
2141 2296
2142our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2144 2299
2145sub find_async { 2300sub find_async {
2146 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2147 2302
2148 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2149 2304
2150 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2152 } 2307 }
2153 2308
2154 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2155 2310
2156 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
… …
2170 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2171 2326
2172 () 2327 ()
2173} 2328}
2174 2329
2330# common code, used by both ->save and ->swapout
2175sub save { 2331sub _save {
2176 my ($self) = @_; 2332 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2333
2180 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2181 2335
2182 return unless $self->dirty; 2336 return unless $self->dirty;
2183 2337
… …
2203 } else { 2357 } else {
2204 $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);
2205 } 2359 }
2206} 2360}
2207 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2208sub swap_out { 2370sub swap_out {
2209 my ($self) = @_; 2371 my ($self) = @_;
2210 2372
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2216 return if $self->players; 2377 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE;
2218 return if $self->{deny_save};
2219 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2220 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (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
2395 return 1e99 if $self->{deny_reset};
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
2418 $self->in_memory (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};
2221 2429
2222 $self->deactivate; 2430 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2432 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2433
2270 $self->unlink_save; 2434 $self->unlink_save;
2271 $self->destroy; 2435 $self->destroy;
2272} 2436}
2273 2437
… …
2281 2445
2282 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2283 2447
2284 $self->unlink_save; 2448 $self->unlink_save;
2285 2449
2286 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2455
… …
2521 2685
2522Freezes 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}>).
2523 2687
2524The 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.
2525for 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,
2526though, 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
2527map. 2691map.
2528 2692
2529Will never block. 2693Will never block.
2530 2694
2531=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2553 my ($self) = @_; 2717 my ($self) = @_;
2554 2718
2555 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2556 2720
2721 ++$self->{_link_recursion};
2722
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2724
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2561 2727
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2729}
2564 2730
2565sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2567 2733
… …
2592 $map->load_neighbours; 2758 $map->load_neighbours;
2593 2759
2594 return unless $self->contr->active; 2760 return unless $self->contr->active;
2595 2761
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2598 2764 # entering was successful
2765 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2766 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2767 $self->activate_recursive;
2601} 2768 }
2602 2769
2770}
2771
2603=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)]])
2604 2773
2605Moves 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
2606her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2607that 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
2608the 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
… …
2615 2784
2616our $GOTOGEN; 2785our $GOTOGEN;
2617 2786
2618sub cf::object::player::goto { 2787sub cf::object::player::goto {
2619 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 }
2620 2795
2621 # 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
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2798
2624 $self->enter_link; 2799 $self->enter_link;
… …
2644 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2645 } 2820 }
2646 } 2821 }
2647 2822
2648 my $map = eval { 2823 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2650 2825
2651 if ($map) { 2826 if ($map) {
2652 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2829 } else {
2655 $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);
2656 } 2831 }
2657 2832
2658 $map 2833 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2669 } 2844 }
2670 2845
2671 $done->() if $done; 2846 $done->($self) if $done;
2672 })->prio (1); 2847 })->prio (1);
2673} 2848}
2674 2849
2675=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2676 2851
… …
2744 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2745 2920
2746 unless (eval { 2921 unless (eval {
2747 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2748 2923
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2758 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2759 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 }
2760 2950
2761 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2762 2952
2763 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
… …
2769 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "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. "
2771 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2773 2963
2774 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 2965 $self->leave_link;
2776 } 2966 }
2777 })->prio (1); 2967 })->prio (1);
2778} 2968}
2779 2969
… …
3092 3282
3093 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3284 if $reply;
3095 3285
3096 } else { 3286 } else {
3097 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";
3098 } 3288 }
3099 3289
3100 cf::override; 3290 cf::override;
3101 }, 3291 },
3102); 3292);
… …
3122 3312
3123 $coro 3313 $coro
3124} 3314}
3125 3315
3126cf::client->attach ( 3316cf::client->attach (
3127 on_destroy => sub { 3317 on_client_destroy => sub {
3128 my ($ns) = @_; 3318 my ($ns) = @_;
3129 3319
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3321 },
3132); 3322);
… …
3183 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3187) { 3377) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3380 for @funs;
3192} 3381}
3193 3382
… …
3232 local @cf::_safe_eval_args = values %vars; 3421 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3422 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3423 }
3235 3424
3236 if ($@) { 3425 if ($@) {
3237 warn "$@"; 3426 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3240 } 3429 }
3241 3430
3242 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3243} 3432}
3244 3433
… …
3278 # for this (global event?) 3467 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3469
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3471
3283 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3284 3473
3285 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3286 0 < aio_load $path, $facedata
3287 or die "$path: $!";
3288
3289 $facedata = Coro::Storable::thaw $facedata;
3290 3475
3291 $facedata->{version} == 2 3476 $facedata->{version} == 2
3292 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3293 3478
3294 # patch in the exptable 3479 # patch in the exptable
… …
3308 3493
3309 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3310 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3312 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} ;
3313 3499
3314 cf::cede_to_tick; 3500 cf::cede_to_tick;
3315 } 3501 }
3316 3502
3317 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3322 3508
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3512 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3514 }
3329 3515
3330 cf::cede_to_tick; 3516 cf::cede_to_tick;
3331 } 3517 }
3332 } 3518 }
… …
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3537
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3354 } else { 3540 } else {
3355 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3356 } 3542 }
3357 3543
3358 cf::cede_to_tick; 3544 cf::cede_to_tick;
3359 } 3545 }
3360 } 3546 }
3361 3547
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3549
3364 1 3550 1
3365} 3551}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3552
3387register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3389 3555
3390 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3595sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3432} 3598}
3433 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
3434sub reload_resources { 3620sub reload_resources {
3435 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3436 3622
3623 reload_exp_table;
3624 reload_materials;
3437 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3438 reload_archetypes; 3627 reload_archetypes;
3439 reload_regions; 3628 reload_regions;
3440 reload_treasures; 3629 reload_treasures;
3441 3630
3442 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3443} 3632}
3444 3633
3445sub reload_config { 3634sub reload_config {
3446 warn "reloading config file...\n"; 3635 trace "reloading config file...\n";
3447 3636
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3637 my $config = load_file "$CONFDIR/config";
3449 or return; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3450 3640
3451 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>;
3453
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3642
3456 $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};
3457 $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};
3458 3645
3459 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
… …
3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3648 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3649 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3650 };
3464 warn $@ if $@; 3651 warn $@ if $@;
3465 } 3652 }
3466
3467 warn "finished reloading resource files\n";
3468} 3653}
3469 3654
3470sub pidfile() { 3655sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3657 or die "$PIDFILE: $!";
… …
3485 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3486 print $fh $$; 3671 print $fh $$;
3487} 3672}
3488 3673
3489sub main_loop { 3674sub main_loop {
3490 warn "EV::loop starting\n"; 3675 trace "EV::loop starting\n";
3491 if (1) { 3676 if (1) {
3492 EV::loop; 3677 EV::loop;
3493 } 3678 }
3494 warn "EV::loop returned\n"; 3679 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3680 goto &main_loop unless $REALLY_UNLOOP;
3496} 3681}
3497 3682
3498sub main { 3683sub main {
3499 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3500 3685
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 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.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510 3690
3511 $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
3512 3692
3513 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
… …
3520 }; 3700 };
3521 3701
3522 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3523 3703
3524 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
3525 cf::load_settings; 3711 cf::load_settings;
3526 cf::load_materials;
3527 3712
3528 reload_resources; 3713 reload_resources;
3529 reload_config; 3714 reload_config;
3530 db_init; 3715 db_init;
3531 3716
3532 cf::init_uuid; 3717 cf::init_uuid;
3533 cf::init_signals; 3718 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3719 cf::init_skills;
3536 3720
3537 cf::init_beforeplay; 3721 cf::init_beforeplay;
3538 3722
3539 atomic; 3723 atomic;
… …
3544 3728
3545 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX (); 3730 use POSIX ();
3547 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};
3548 3732
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3550 }; 3734 };
3551 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
3552 main_loop; 3744 goto &main_loop;
3553} 3745}
3554 3746
3555############################################################################# 3747#############################################################################
3556# initialisation and cleanup 3748# initialisation and cleanup
3557 3749
3558# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3559BEGIN { 3751BEGIN {
3560 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3564 }; 3756 };
3565 } 3757 }
3566} 3758}
3567 3759
3568sub write_runtime_sync { 3760sub write_runtime_sync {
3761 my $t0 = AE::time;
3762
3569 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3571 3765
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3767
3574 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3575 3769
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3771 or return;
3578 3772
3579 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3788 or return;
3595 3789
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3791 and return;
3598 3792
3599 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3794
3601 1 3795 1
3602} 3796}
3603 3797
3604our $uuid_lock; 3798our $uuid_lock;
… …
3616 or return; 3810 or return;
3617 3811
3618 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3619 3813
3620 unless ($value) { 3814 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3816 return;
3623 } 3817 }
3624 3818
3625 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3820 $uuid_skip = 0;
… …
3636 or return; 3830 or return;
3637 3831
3638 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3639 and return; 3833 and return;
3640 3834
3641 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3642 3836
3643 1 3837 1
3644 3838
3645} 3839}
3646 3840
… …
3652} 3846}
3653 3847
3654sub emergency_save() { 3848sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3656 3850
3657 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;
3658 3857
3659 cf::sync_job { 3858 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3859 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 3860
3665 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3867 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3869 $pl->save;
3674 } 3870 }
3675 warn "emergency_perl_save: end player save\n"; 3871 info "emergency_perl_save: end player save\n";
3676 3872
3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3677 warn "emergency_perl_save: begin map save\n"; 3875 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3878 $map->valid or next;
3681 $map->save; 3879 $map->save;
3682 } 3880 }
3683 warn "emergency_perl_save: end map save\n"; 3881 info "emergency_perl_save: end map save\n";
3684 3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3885 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3688 3888
3689 warn "emergency_perl_save: begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3890 write_uuid_sync 1;
3691 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
3692 }; 3911 };
3693 3912
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 3913 info "emergency_perl_save: leave\n";
3700} 3914}
3701 3915
3702sub post_cleanup { 3916sub post_cleanup {
3703 my ($make_core) = @_; 3917 my ($make_core) = @_;
3704 3918
3919 IO::AIO::flush;
3920
3705 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3922 if $make_core;
3707 3923
3708 my $fh = pidfile; 3924 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3710} 3926}
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3950 }
3735 warn "cleared package $pkg\n";#d#
3736} 3951}
3737 3952
3738sub do_reload_perl() { 3953sub do_reload_perl() {
3739 # can/must only be called in main 3954 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3741 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3742 return; 3957 return;
3743 } 3958 }
3744 3959
3745 return if $RELOAD++; 3960 return if $RELOAD++;
3746 3961
3747 my $t1 = EV::time; 3962 my $t1 = AE::time;
3748 3963
3749 while ($RELOAD) { 3964 while ($RELOAD) {
3750 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3751 3967
3752 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3753 3969
3754 cf::sync_job { 3970 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 3971 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 3972
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 3975 %EXT_CORO = ();
3772 3976
3773 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3774 %COMMAND = (); 3978 %COMMAND = ();
3775 3979
3776 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3777 %EXTCMD = (); 3981 %EXTCMD = ();
3778 %EXTICMD = (); 3982 %EXTICMD = ();
3779 3983
3780 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3783 3987
3784 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3785 eval { 3989 eval {
3786 $cb->($pkg); 3990 $cb->($pkg);
3787 1 3991 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3789 } 3993 }
3790 3994
3791 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3792 clear_package $pkg; 3996 clear_package $pkg;
3793 } 3997 }
3794 3998
3795 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 4002
3799 warn "... unloading $k"; 4003 trace "... unloading $k";
3800 delete $INC{$k}; 4004 delete $INC{$k};
3801 4005
3802 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3804 4008
… …
3807 } 4011 }
3808 4012
3809 clear_package $k; 4013 clear_package $k;
3810 } 4014 }
3811 4015
3812 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 4017 clear_package "safe::$_"
3814 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);
3815 4019
3816 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 4023
3820 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3821 # and global variables created in xs 4025 # and global variables created in xs
3822 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3823 4027
3824 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3825 4029
3826 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3827 require cf; 4031 require cf;
3828 cf::_connect_to_perl_1; 4032 cf::_connect_to_perl_1;
3829 4033
3830 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3831 cf::reload_config; 4035 cf::reload_config;
3832 4036
3833 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3834 cf::load_extensions; 4038 cf::load_extensions;
3835 4039
3836 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3840 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3843 } 4047 }
3844 4048
3845 warn "running post_init jobs"; 4049 cf::_post_init 1;
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847 4050
3848 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3849 4052
3850 1 4053 1
3851 } or do { 4054 } or do {
3852 warn $@; 4055 error $@;
3853 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3854 }; 4057 };
3855 4058
3856 warn "reloaded";
3857 --$RELOAD; 4059 --$RELOAD;
3858 } 4060 }
3859 4061
3860 $t1 = EV::time - $t1; 4062 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3862}; 4064};
3863 4065
3864our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3865 4067
3866sub reload_perl() { 4068sub reload_perl() {
… …
3868 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3869 4071
3870 $RELOAD_WATCHER ||= cf::async { 4072 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 4073 Coro::AIO::aio_wait cache_extensions;
3872 4074
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 4076 do_reload_perl;
3875 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3876 }; 4078 };
3877 }; 4079 };
3878} 4080}
… …
3887 reload_perl; 4089 reload_perl;
3888 }; 4090 };
3889 } 4091 }
3890}; 4092};
3891 4093
3892unshift @INC, $LIBDIR; 4094#############################################################################
3893 4095
3894my $bug_warning = 0; 4096my $bug_warning = 0;
3895 4097
3896our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3898 4100
3899sub wait_for_tick { 4101sub wait_for_tick() {
3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3901 4103
3902 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3903 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3904 $signal->wait; 4106 $signal->wait;
3905} 4107}
3906 4108
3907sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3909 4111
3910 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3911 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3912 $signal->wait; 4114 $signal->wait;
… …
3919 return; 4121 return;
3920 } 4122 }
3921 4123
3922 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3923 4125
3924 #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#
3925 4127
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $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.;
3928 Coro::async_pool { 4130 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4132 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3932 }; 4134 };
3933 } 4135 }
3934 4136
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4138 $sig->send;
… …
3944 4146
3945 if (0) { 4147 if (0) {
3946 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3950 } 4152 }
3951 } 4153 }
3952} 4154}
3953 4155
3954{ 4156{
… …
3999 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
4000 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
4001 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
4002} 4204}
4003 4205
4004my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
4005 4208
4006sub _log_backtrace { 4209sub _log_backtrace {
4007 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
4008 4211
4009 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
4010 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4011 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
4012 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
4013 ++$_log_backtrace; 4220 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
4015 async { 4222 async {
4016 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
4017 4224
… …
4037 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
4038 --$_log_backtrace; 4245 --$_log_backtrace;
4039 }; 4246 };
4040 } else { 4247 } else {
4041 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
4042 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4043 } 4250 }
4044} 4251}
4045 4252
4046# load additional modules 4253# load additional modules
4047require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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