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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

… …
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 = AE::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) {
… …
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
… …
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
… …
1606 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1607 1725
1608 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1609 $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
1610 1728
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1730 $pl->deactivate;
1731
1613 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;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1616 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1617 1737
1618 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1674 \@logins 1794 \@logins
1675} 1795}
1676 1796
1677=item $player->maps 1797=item $player->maps
1678 1798
1799=item cf::player::maps $login
1800
1679Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1680player. May block. 1802player. May block.
1681 1803
1682=cut 1804=cut
1683 1805
… …
1745=cut 1867=cut
1746 1868
1747sub find_by_path($) { 1869sub find_by_path($) {
1748 my ($path) = @_; 1870 my ($path) = @_;
1749 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1750 my ($match, $specificity); 1874 my ($match, $specificity);
1751 1875
1752 for my $region (list) { 1876 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1754 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1782sub generate_random_map { 1906sub generate_random_map {
1783 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1784 1908
1785 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
1786 1910
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1912}
1802 1913
1803=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1804 1915
1805Register 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
… …
1810 1921
1811sub register { 1922sub register {
1812 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1924 my $pkg = caller;
1814 1925
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1927
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1929}
1820 1930
1821# also paths starting with '/' 1931# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1933
1824sub thawer_merge { 1934sub thawer_merge {
1825 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1826 1936
1827 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1832} 1942}
1833 1943
1834sub normalise { 1944sub normalise {
1835 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1836 1946
1837 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1838 1948
1839 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1840 1950
1841 # map plan: 1951 # map plan:
1842 # 1952 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1968 $path = "$base/$path";
1859 } 1969 }
1860 1970
1861 for ($path) { 1971 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1865 } 1974 }
1866 1975
1867 $path 1976 $path
… …
1881 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1882 return $self; 1991 return $self;
1883 } 1992 }
1884 } 1993 }
1885 1994
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1996 ()
1888} 1997}
1889 1998
1999# may re-bless or do other evil things
1890sub init { 2000sub init {
1891 my ($self) = @_; 2001 my ($self) = @_;
1892 2002
1893 $self 2003 $self
1894} 2004}
… …
2013} 2123}
2014 2124
2015sub find; 2125sub find;
2016sub find { 2126sub find {
2017 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
2018 2130
2019 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
2020 2132
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2107 2219
2108 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2221 }
2110 2222
2111 $self->post_load; 2223 $self->post_load;
2224
2225 1
2112} 2226}
2113 2227
2114# customize the map for a given player, i.e. 2228# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2229# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2230# maps to change the path to ~playername/mappath
… …
2137 or next; 2251 or next;
2138 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2139 or next; 2253 or next;
2140 $neigh->load; 2254 $neigh->load;
2141 2255
2256 # now find the diagonal neighbours
2142 push @neigh, 2257 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2260 }
2146 2261
… …
2153} 2268}
2154 2269
2155sub find_sync { 2270sub find_sync {
2156 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2157 2272
2158 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2159} 2277}
2160 2278
2161sub do_load_sync { 2279sub do_load_sync {
2162 my ($map) = @_; 2280 my ($map) = @_;
2163 2281
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2166 2284
2167 cf::sync_job { $map->load }; 2285 $map->load;
2168} 2286}
2169 2287
2170our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2172 2290
… …
2198 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2199 2317
2200 () 2318 ()
2201} 2319}
2202 2320
2321# common code, used by both ->save and ->swapout
2203sub save { 2322sub _save {
2204 my ($self) = @_; 2323 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2324
2208 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2209 2326
2210 return unless $self->dirty; 2327 return unless $self->dirty;
2211 2328
… …
2231 } else { 2348 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2350 }
2234} 2351}
2235 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2236sub swap_out { 2361sub swap_out {
2237 my ($self) = @_; 2362 my ($self) = @_;
2238 2363
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2365
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2247 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
2379 $self->clear;
2380}
2381
2382sub reset_at {
2383 my ($self) = @_;
2384
2385 # TODO: safety, remove and allow resettable per-player maps
2386 return 1e99 if $self->{deny_reset};
2387
2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2390
2391 $time + $to
2392}
2393
2394sub should_reset {
2395 my ($self) = @_;
2396
2397 $self->reset_at <= $cf::RUNTIME
2398}
2399
2400sub reset {
2401 my ($self) = @_;
2402
2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2404
2405 return if $self->players;
2406
2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
2418
2419 delete $cf::MAP{$self->path};
2249 2420
2250 $self->deactivate; 2421 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2423 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2424
2298 $self->unlink_save; 2425 $self->unlink_save;
2299 $self->destroy; 2426 $self->destroy;
2300} 2427}
2301 2428
… …
2309 2436
2310 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2311 2438
2312 $self->unlink_save; 2439 $self->unlink_save;
2313 2440
2314 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2446
… …
2549 2676
2550Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
2551 2678
2552The player should be reasonably safe there for short amounts of time (e.g. 2679The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2681though, as the player cannot control the character while it is on the link
2555map. 2682map.
2556 2683
2557Will never block. 2684Will never block.
2558 2685
2559=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2581 my ($self) = @_; 2708 my ($self) = @_;
2582 2709
2583 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2584 2711
2712 ++$self->{_link_recursion};
2713
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2715
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2589 2718
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2720}
2592 2721
2593sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2595 2724
… …
2620 $map->load_neighbours; 2749 $map->load_neighbours;
2621 2750
2622 return unless $self->contr->active; 2751 return unless $self->contr->active;
2623 2752
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2626 2755 # entering was successful
2756 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2758 $self->activate_recursive;
2629} 2759 }
2630 2760
2761}
2762
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2764
2633Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
… …
2643 2775
2644our $GOTOGEN; 2776our $GOTOGEN;
2645 2777
2646sub cf::object::player::goto { 2778sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2648 2786
2649 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2789
2652 $self->enter_link; 2790 $self->enter_link;
… …
2676 my $map = eval { 2814 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2678 2816
2679 if ($map) { 2817 if ($map) {
2680 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2820 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2822 }
2685 2823
2686 $map 2824 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2697 } 2835 }
2698 2836
2699 $done->() if $done; 2837 $done->($self) if $done;
2700 })->prio (1); 2838 })->prio (1);
2701} 2839}
2702 2840
2703=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2704 2842
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2939
2802 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2941 $self->leave_link;
2804 } 2942 }
2805 })->prio (1); 2943 })->prio (1);
2806} 2944}
2807 2945
… …
3120 3258
3121 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3260 if $reply;
3123 3261
3124 } else { 3262 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3264 }
3127 3265
3128 cf::override; 3266 cf::override;
3129 }, 3267 },
3130); 3268);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3351 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3215) { 3353) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3356 for @funs;
3220} 3357}
3221 3358
… …
3260 local @cf::_safe_eval_args = values %vars; 3397 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3398 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3399 }
3263 3400
3264 if ($@) { 3401 if ($@) {
3265 warn "$@"; 3402 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3268 } 3405 }
3269 3406
3270 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3271} 3408}
3272 3409
… …
3306 # for this (global event?) 3443 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3445
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3447
3311 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3312 3449
3313 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3314 0 < aio_load $path, $facedata
3315 or die "$path: $!";
3316
3317 $facedata = Coro::Storable::thaw $facedata;
3318 3451
3319 $facedata->{version} == 2 3452 $facedata->{version} == 2
3320 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3321 3454
3322 # patch in the exptable 3455 # patch in the exptable
… …
3336 3469
3337 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3338 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3341 3475
3342 cf::cede_to_tick; 3476 cf::cede_to_tick;
3343 } 3477 }
3344 3478
3345 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
… …
3350 3484
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3488 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3490 }
3357 3491
3358 cf::cede_to_tick; 3492 cf::cede_to_tick;
3359 } 3493 }
3360 } 3494 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3513
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3382 } else { 3516 } else {
3383 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3384 } 3518 }
3385 3519
3386 cf::cede_to_tick; 3520 cf::cede_to_tick;
3387 } 3521 }
3388 } 3522 }
3389 3523
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3525
3392 1 3526 1
3393} 3527}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3528
3415register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3417 3531
3418 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3571sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3460} 3574}
3461 3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3462sub reload_resources { 3596sub reload_resources {
3463 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3464 3598
3599 reload_exp_table;
3600 reload_materials;
3465 reload_facedata; 3601 reload_facedata;
3602 reload_sound;
3466 reload_archetypes; 3603 reload_archetypes;
3467 reload_regions; 3604 reload_regions;
3468 reload_treasures; 3605 reload_treasures;
3469 3606
3470 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3471} 3608}
3472 3609
3473sub reload_config { 3610sub reload_config {
3474 warn "reloading config file...\n"; 3611 trace "reloading config file...\n";
3475 3612
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3613 my $config = load_file "$CONFDIR/config";
3477 or return; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3478 3616
3479 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>;
3481
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3618
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3621
3487 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3624 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3625 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3626 };
3492 warn $@ if $@; 3627 warn $@ if $@;
3493 } 3628 }
3494
3495 warn "finished reloading resource files\n";
3496} 3629}
3497 3630
3498sub pidfile() { 3631sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3632 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3633 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3646 seek $fh, 0, 0;
3514 print $fh $$; 3647 print $fh $$;
3515} 3648}
3516 3649
3517sub main_loop { 3650sub main_loop {
3518 warn "EV::loop starting\n"; 3651 trace "EV::loop starting\n";
3519 if (1) { 3652 if (1) {
3520 EV::loop; 3653 EV::loop;
3521 } 3654 }
3522 warn "EV::loop returned\n"; 3655 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3656 goto &main_loop unless $REALLY_UNLOOP;
3524} 3657}
3525 3658
3526sub main { 3659sub main {
3527 cf::init_globals; # initialise logging 3660 cf::init_globals; # initialise logging
3528 3661
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3666
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3668
3541 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
… …
3548 }; 3676 };
3549 3677
3550 evthread_start IO::AIO::poll_fileno; 3678 evthread_start IO::AIO::poll_fileno;
3551 3679
3552 cf::sync_job { 3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3553 cf::load_settings; 3687 cf::load_settings;
3554 cf::load_materials;
3555 3688
3556 reload_resources; 3689 reload_resources;
3557 reload_config; 3690 reload_config;
3558 db_init; 3691 db_init;
3559 3692
… …
3571 3704
3572 # no (long-running) fork's whatsoever before this point(!) 3705 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3706 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3708
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3709 cf::_post_init 0;
3577 }; 3710 };
3578 3711
3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3579 main_loop; 3720 goto &main_loop;
3580} 3721}
3581 3722
3582############################################################################# 3723#############################################################################
3583# initialisation and cleanup 3724# initialisation and cleanup
3584 3725
… …
3623 or return; 3764 or return;
3624 3765
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3767 and return;
3627 3768
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3770
3630 1 3771 1
3631} 3772}
3632 3773
3633our $uuid_lock; 3774our $uuid_lock;
… …
3645 or return; 3786 or return;
3646 3787
3647 my $value = uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3648 3789
3649 unless ($value) { 3790 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3791 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3792 return;
3652 } 3793 }
3653 3794
3654 my $value = uuid_str $value + $uuid_skip; 3795 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3796 $uuid_skip = 0;
… …
3665 or return; 3806 or return;
3666 3807
3667 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3668 and return; 3809 and return;
3669 3810
3670 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3671 3812
3672 1 3813 1
3673 3814
3674} 3815}
3675 3816
… …
3681} 3822}
3682 3823
3683sub emergency_save() { 3824sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3685 3826
3686 warn "emergency_perl_save: enter\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
3687 3833
3688 cf::sync_job { 3834 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3835 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3836
3694 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3843 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3845 $pl->save;
3703 } 3846 }
3704 warn "emergency_perl_save: end player save\n"; 3847 info "emergency_perl_save: end player save\n";
3705 3848
3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3706 warn "emergency_perl_save: begin map save\n"; 3851 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3854 $map->valid or next;
3710 $map->save; 3855 $map->save;
3711 } 3856 }
3712 warn "emergency_perl_save: end map save\n"; 3857 info "emergency_perl_save: end map save\n";
3713 3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3861 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3717 3864
3718 warn "emergency_perl_save: begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3866 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3887 };
3722 3888
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3889 info "emergency_perl_save: leave\n";
3729} 3890}
3730 3891
3731sub post_cleanup { 3892sub post_cleanup {
3732 my ($make_core) = @_; 3893 my ($make_core) = @_;
3733 3894
3895 IO::AIO::flush;
3896
3734 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3898 if $make_core;
3736 3899
3737 my $fh = pidfile; 3900 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3901 unlink $PIDFILE if <$fh> == $$;
3739} 3902}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3923 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3924 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3926 }
3764 warn "cleared package $pkg\n";#d#
3765} 3927}
3766 3928
3767sub do_reload_perl() { 3929sub do_reload_perl() {
3768 # can/must only be called in main 3930 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3771 return; 3933 return;
3772 } 3934 }
3773 3935
3774 return if $RELOAD++; 3936 return if $RELOAD++;
3775 3937
3776 my $t1 = AE::time; 3938 my $t1 = AE::time;
3777 3939
3778 while ($RELOAD) { 3940 while ($RELOAD) {
3779 warn "reloading..."; 3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3780 3943
3781 warn "entering sync_job"; 3944 trace "perl_reload: entering sync_job";
3782 3945
3783 cf::sync_job { 3946 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3947 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3948
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3951 %EXT_CORO = ();
3801 3952
3802 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3803 %COMMAND = (); 3954 %COMMAND = ();
3804 3955
3805 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 3957 %EXTCMD = ();
3807 %EXTICMD = (); 3958 %EXTICMD = ();
3808 3959
3809 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3812 3963
3813 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3965 eval {
3815 $cb->($pkg); 3966 $cb->($pkg);
3816 1 3967 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3818 } 3969 }
3819 3970
3820 warn "... clearing $pkg"; 3971 trace "... clearing $pkg";
3821 clear_package $pkg; 3972 clear_package $pkg;
3822 } 3973 }
3823 3974
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3978
3828 warn "... unloading $k"; 3979 trace "... unloading $k";
3829 delete $INC{$k}; 3980 delete $INC{$k};
3830 3981
3831 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3833 3984
… …
3836 } 3987 }
3837 3988
3838 clear_package $k; 3989 clear_package $k;
3839 } 3990 }
3840 3991
3841 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3993 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3995
3845 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3999
3849 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3850 # and global variables created in xs 4001 # and global variables created in xs
3851 #clear_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3852 4003
3853 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3854 4005
3855 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3856 require cf; 4007 require cf;
3857 cf::_connect_to_perl_1; 4008 cf::_connect_to_perl_1;
3858 4009
3859 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 4011 cf::reload_config;
3861 4012
3862 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 4014 cf::load_extensions;
3864 4015
3865 if ($REATTACH_ON_RELOAD) { 4016 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
3872 } 4023 }
3873 4024
3874 warn "running post_init jobs"; 4025 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4026
3877 warn "leaving sync_job"; 4027 trace "perl_reload: leaving sync_job";
3878 4028
3879 1 4029 1
3880 } or do { 4030 } or do {
3881 warn $@; 4031 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4033 };
3884 4034
3885 warn "reloaded";
3886 --$RELOAD; 4035 --$RELOAD;
3887 } 4036 }
3888 4037
3889 $t1 = AE::time - $t1; 4038 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4039 info "perl_reload: completed in ${t1}s\n";
3891}; 4040};
3892 4041
3893our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3894 4043
3895sub reload_perl() { 4044sub reload_perl() {
… …
3916 reload_perl; 4065 reload_perl;
3917 }; 4066 };
3918 } 4067 }
3919}; 4068};
3920 4069
3921unshift @INC, $LIBDIR; 4070#############################################################################
3922 4071
3923my $bug_warning = 0; 4072my $bug_warning = 0;
3924 4073
3925our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3927 4076
3928sub wait_for_tick { 4077sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4079
3931 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4082 $signal->wait;
3934} 4083}
3935 4084
3936sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4087
3939 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4090 $signal->wait;
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4106 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4108 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3961 }; 4110 };
3962 } 4111 }
3963 4112
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4114 $sig->send;
… …
3973 4122
3974 if (0) { 4123 if (0) {
3975 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3979 } 4128 }
3980 } 4129 }
3981} 4130}
3982 4131
3983{ 4132{
… …
4028 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
4031} 4180}
4032 4181
4033my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
4034 4184
4035sub _log_backtrace { 4185sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
4037 4187
4038 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
4039 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4196 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
4044 async { 4198 async {
4045 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
4046 4200
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4221 --$_log_backtrace;
4068 }; 4222 };
4069 } else { 4223 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4226 }
4073} 4227}
4074 4228
4075# load additional modules 4229# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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