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.513 by root, Mon Apr 12 05:22:38 2010 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 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
112 114
113our $OUTPUT_RATE_MIN = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
129 134
130our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 136our $RUNTIME;
… …
165 170
166our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
167 172
168sub cf::map::normalise; 173sub cf::map::normalise;
169 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
170############################################################################# 179#############################################################################
171 180
172%REFLECT = (); 181%REFLECT = ();
173for (@REFLECT) { 182for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
226from wherever your confdir points to. 235from wherever your confdir points to.
227 236
228=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
229 238
230These 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
231returns 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
232per 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();
233 247
234=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
235 249
236This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
237C<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
… …
245 259
246=back 260=back
247 261
248=cut 262=cut
249 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
250$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 271 my $msg = join "", @_;
252 272
253 $msg .= "\n" 273 $msg .= "\n"
254 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
255 275
256 $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;
257 277
258 LOG llevError, $msg; 278 LOG llevWarn, $msg;
259}; 279};
260 280
261$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
263 283
264 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
265 285
266 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 288 return;#d#
269 }#d# 289 }#d#
270 290
271 # kill coroutine otherwise 291 # kill coroutine otherwise
272 Coro::terminate 292 Coro::terminate
… …
294} 314}
295 315
296$EV::DIED = sub { 316$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
298}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
299 324
300############################################################################# 325#############################################################################
301 326
302=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
303 328
… …
324 $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;
325 $d 350 $d
326 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
327} 352}
328 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
329=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
330 369
331Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
332 371
333=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
339our $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
340 379
341sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
343 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
344=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
345 415
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
348 418
349The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 420is a reload or not.
351 421
352=cut 422=cut
353 423
354sub post_init(&) { 424sub post_init(&) {
355 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 }
356} 443}
357 444
358=item cf::lock_wait $string 445=item cf::lock_wait $string
359 446
360Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
399} 486}
400 487
401=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
402 489
403Like 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
404get spread over timer. 491get spread over time.
405 492
406=cut 493=cut
407 494
408sub periodic($$) { 495sub periodic($$) {
409 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
413 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
414} 501}
415 502
416=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
417 504
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
419This 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
420of 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.
421 512
422The 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
423used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
424 515
425Useful for short background jobs. 516Useful for short background jobs.
… …
505=cut 596=cut
506 597
507sub sync_job(&) { 598sub sync_job(&) {
508 my ($job) = @_; 599 my ($job) = @_;
509 600
510 if ($Coro::current == $Coro::main) { 601 if (in_main) {
511 my $time = AE::time; 602 my $time = AE::time;
512 603
513 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
515 606
516 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
517 608
518 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
519 610
520 my $busy = 1; 611 my $busy = 1;
521 my @res; 612 my @res;
522 613
523 (async { 614 (async {
524 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 616 @res = eval { $job->() };
526 warn $@ if $@; 617 error $@ if $@;
527 undef $busy; 618 undef $busy;
528 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
529 620
530 while ($busy) { 621 while ($busy) {
531 if (Coro::nready) { 622 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
566 657
567 $coro 658 $coro
568} 659}
569 660
570=item fork_call { }, $args 661=item fork_call { }, @args
571 662
572Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 666never block itself or use any form of event handling.
576 667
577=cut 668=cut
578 669
670sub post_fork {
671 reset_signals;
672}
673
579sub fork_call(&@) { 674sub fork_call(&@) {
580 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
581 676
582 # 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,
583 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
585 680
586 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
587 reset_signals; 682 cf::post_fork;
588 &$cb 683 &$cb
589 }, @args; 684 } @args;
590 685
591 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 )
592} 698}
593 699
594=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
595 701
596=cut 702=cut
… …
633within each server. 739within each server.
634 740
635=cut 741=cut
636 742
637sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
638 my ($name) = @_; 747 my ($name) = @_;
639 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
640 749
641 eval { 750 eval {
642 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
652} 761}
653 762
654our $DB; 763our $DB;
655 764
656sub db_init { 765sub db_init {
657 cf::sync_job {
658 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
659 };
660} 767}
661 768
662sub db_get($$) { 769sub db_get($$) {
663 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
664 771
665 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
666 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
667 776
668 $! ? () 777 $! ? ()
669 : $data 778 : $data
670 }
671} 779}
672 780
673sub db_put($$$) { 781sub db_put($$$) {
674 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
675 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
703 811
704 my @data; 812 my @data;
705 my $md5; 813 my $md5;
706 814
707 for (0 .. $#$src) { 815 for (0 .. $#$src) {
708 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
709 or Carp::croak "$src->[$_]: $!";
710 } 817 }
711 818
712 # if processing is expensive, check 819 # if processing is expensive, check
713 # checksum first 820 # checksum first
714 if (1) { 821 if (1) {
… …
731 838
732 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
733 my $data = $process->(\@data); 840 my $data = $process->(\@data);
734 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
735 842
736 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
737 844
738 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
739 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
740 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
741 848
… …
751 858
752=cut 859=cut
753 860
754sub datalog($@) { 861sub datalog($@) {
755 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
756 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
757} 864}
758 865
759=back 866=back
760 867
761=cut 868=cut
… …
956 1063
957 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
958 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
959 1066
960 } elsif (ref $type) { 1067 } elsif (ref $type) {
961 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
962 1069
963 } else { 1070 } else {
964 shift @arg; 1071 shift @arg;
965 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
966 } 1073 }
967 } 1074 }
968} 1075}
969 1076
970sub _object_attach { 1077sub _object_attach {
… …
980 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
981 } 1088 }
982 1089
983 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
984 } else { 1091 } else {
985 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
986 } 1093 }
987 1094
988 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
989} 1096}
990 1097
… …
1049 1156
1050 for (@$callbacks) { 1157 for (@$callbacks) {
1051 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1052 1159
1053 if ($@) { 1160 if ($@) {
1054 warn "$@";
1055 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1056 override; 1162 override;
1057 } 1163 }
1058 1164
1059 return 1 if $override; 1165 return 1 if $override;
1060 } 1166 }
… …
1139 for (@$attach) { 1245 for (@$attach) {
1140 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1141 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1142 } 1248 }
1143 } else { 1249 } else {
1144 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1145 } 1251 }
1146 } 1252 }
1147} 1253}
1148 1254
1149cf::attachable->attach ( 1255cf::attachable->attach (
… …
1176 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1177 1283
1178 sync_job { 1284 sync_job {
1179 if (length $$rdata) { 1285 if (length $$rdata) {
1180 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1181 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1182 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1183 1290
1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1185 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1187 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1209 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1210 1317
1211 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1213 } else { 1320 } else {
1214 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1215 } 1322 }
1216 } else { 1323 } else {
1217 aio_unlink $filename; 1324 aio_unlink $filename;
1218 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1219 } 1326 }
… …
1243 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs}; 1351 $av = $st->{objs};
1245 } 1352 }
1246 1353
1247 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1248 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1249 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1250 1358
1251 ($data, $av) 1359 ($data, $av)
1252} 1360}
1253 1361
1254=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1346 1454
1347 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1348 if $reply; 1456 if $reply;
1349 1457
1350 } else { 1458 } else {
1351 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1352 } 1460 }
1353 1461
1354 cf::override; 1462 cf::override;
1355 }, 1463 },
1356); 1464);
… …
1367 1475
1368 $grp 1476 $grp
1369} 1477}
1370 1478
1371sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1372 cf::sync_job { 1482 cf::sync_job {
1373 my %todo; 1483 my %todo;
1374 1484
1375 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1376 next unless -r $path; 1486 next unless -r $path;
… …
1394 1504
1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1397 1507
1398 $ext{source} = 1508 $ext{source} =
1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1400 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1401 . $source 1511 . $source
1402 . "\n};\n1"; 1512 . "\n};\n1";
1403 1513
1404 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1416 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1417 next ext 1527 next ext
1418 unless exists $done{$_}; 1528 unless exists $done{$_};
1419 } 1529 }
1420 1530
1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1422 1532
1423 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1424 1534
1425 if (length $@) { 1535 if (length $@) {
1426 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1427 1537
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1429 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};
1430 } else { 1543 } else {
1431 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1433 $progress = 1; 1546 $progress = 1;
1434 1547
1435 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1436 unless $active; 1549 unless $active;
1437 } 1550 }
1438 } 1551 }
1439 1552
1440 unless ($progress) { 1553 unless ($progress) {
… …
1609 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1610 1723
1611 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1613 1726
1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1615 $pl->deactivate; 1728 $pl->deactivate;
1729
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1618 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1619 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1620 1735
1621 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1622 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1623 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1677 \@logins 1792 \@logins
1678} 1793}
1679 1794
1680=item $player->maps 1795=item $player->maps
1681 1796
1797=item cf::player::maps $login
1798
1682Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1683player. May block. 1800player. May block.
1684 1801
1685=cut 1802=cut
1686 1803
… …
1748=cut 1865=cut
1749 1866
1750sub find_by_path($) { 1867sub find_by_path($) {
1751 my ($path) = @_; 1868 my ($path) = @_;
1752 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1753 my ($match, $specificity); 1872 my ($match, $specificity);
1754 1873
1755 for my $region (list) { 1874 for my $region (list) {
1756 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1757 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
… …
1785sub generate_random_map { 1904sub generate_random_map {
1786 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1787 1906
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789 1908
1790 # mit "rum" bekleckern, nicht
1791 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1795 $rmp->{exit_on_final_map},
1796 $rmp->{xsize}, $rmp->{ysize},
1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1800 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1801 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1802 (cf::region::find $rmp->{region}), $rmp->{custom}
1803 )
1804} 1910}
1805 1911
1806=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1807 1913
1808Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
… …
1813 1919
1814sub register { 1920sub register {
1815 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1816 my $pkg = caller; 1922 my $pkg = caller;
1817 1923
1818 no strict;
1819 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1820 1925
1821 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1822} 1927}
1823 1928
1824# also paths starting with '/' 1929# also paths starting with '/'
1825$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1826 1931
1827sub thawer_merge { 1932sub thawer_merge {
1828 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1829 1934
1830 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
… …
1835} 1940}
1836 1941
1837sub normalise { 1942sub normalise {
1838 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1839 1944
1840 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1841 1946
1842 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1843 1948
1844 # map plan: 1949 # map plan:
1845 # 1950 #
… …
1860 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1861 $path = "$base/$path"; 1966 $path = "$base/$path";
1862 } 1967 }
1863 1968
1864 for ($path) { 1969 for ($path) {
1865 redo if s{//}{/};
1866 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1867 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1868 } 1972 }
1869 1973
1870 $path 1974 $path
… …
1884 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1885 return $self; 1989 return $self;
1886 } 1990 }
1887 } 1991 }
1888 1992
1889 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1890 () 1994 ()
1891} 1995}
1892 1996
1893sub init { 1997sub init {
1894 my ($self) = @_; 1998 my ($self) = @_;
… …
2016} 2120}
2017 2121
2018sub find; 2122sub find;
2019sub find { 2123sub find {
2020 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
2021 2127
2022 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
2023 2129
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2110 2216
2111 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2112 } 2218 }
2113 2219
2114 $self->post_load; 2220 $self->post_load;
2221
2222 1
2115} 2223}
2116 2224
2117# customize the map for a given player, i.e. 2225# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player 2226# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath 2227# maps to change the path to ~playername/mappath
… …
2140 or next; 2248 or next;
2141 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2142 or next; 2250 or next;
2143 $neigh->load; 2251 $neigh->load;
2144 2252
2253 # now find the diagonal neighbours
2145 push @neigh, 2254 push @neigh,
2146 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2147 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2148 } 2257 }
2149 2258
… …
2156} 2265}
2157 2266
2158sub find_sync { 2267sub find_sync {
2159 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2160 2269
2161 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2162} 2274}
2163 2275
2164sub do_load_sync { 2276sub do_load_sync {
2165 my ($map) = @_; 2277 my ($map) = @_;
2166 2278
2167 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2169 2281
2170 cf::sync_job { $map->load }; 2282 $map->load;
2171} 2283}
2172 2284
2173our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2174our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2175 2287
… …
2201 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2202 2314
2203 () 2315 ()
2204} 2316}
2205 2317
2318# common code, used by both ->save and ->swapout
2206sub save { 2319sub _save {
2207 my ($self) = @_; 2320 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2321
2211 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2212 2323
2213 return unless $self->dirty; 2324 return unless $self->dirty;
2214 2325
… …
2234 } else { 2345 } else {
2235 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2236 } 2347 }
2237} 2348}
2238 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2239sub swap_out { 2358sub swap_out {
2240 my ($self) = @_; 2359 my ($self) = @_;
2241 2360
2242 # save first because save cedes
2243 $self->save;
2244
2245 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246 2362
2247 return if $self->players;
2248 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2249 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2250 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2251 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2252 2417
2253 $self->deactivate; 2418 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2255 $self->clear; 2420 $self->clear;
2256}
2257
2258sub reset_at {
2259 my ($self) = @_;
2260
2261 # TODO: safety, remove and allow resettable per-player maps
2262 return 1e99 if $self->{deny_reset};
2263
2264 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2265 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2266
2267 $time + $to
2268}
2269
2270sub should_reset {
2271 my ($self) = @_;
2272
2273 $self->reset_at <= $cf::RUNTIME
2274}
2275
2276sub reset {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 return if $self->players;
2282
2283 warn "resetting map ", $self->path, "\n";
2284
2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # need to save uniques path
2288 unless ($self->{deny_save}) {
2289 my $uniq = $self->uniq_path; utf8::encode $uniq;
2290
2291 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2292 if $uniq;
2293 }
2294
2295 delete $cf::MAP{$self->path};
2296
2297 $self->deactivate;
2298 $_->clear_links_to ($self) for values %cf::MAP;
2299 $self->clear;
2300 2421
2301 $self->unlink_save; 2422 $self->unlink_save;
2302 $self->destroy; 2423 $self->destroy;
2303} 2424}
2304 2425
… …
2312 2433
2313 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2314 2435
2315 $self->unlink_save; 2436 $self->unlink_save;
2316 2437
2317 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2318 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2319 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2320 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322 2443
… …
2552 2673
2553Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2554 2675
2555The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2556for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2558map. 2679map.
2559 2680
2560Will never block. 2681Will never block.
2561 2682
2562=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
… …
2583sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2584 my ($self) = @_; 2705 my ($self) = @_;
2585 2706
2586 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2587 2708
2709 ++$self->{_link_recursion};
2710
2588 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2589 2712
2590 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2592 2715
2593 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2594} 2717}
2595 2718
2596sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2597 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2598 2721
… …
2623 $map->load_neighbours; 2746 $map->load_neighbours;
2624 2747
2625 return unless $self->contr->active; 2748 return unless $self->contr->active;
2626 2749
2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2629 2752 # entering was successful
2753 delete $self->{_link_recursion};
2630 # only activate afterwards, to support waiting in hooks 2754 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive; 2755 $self->activate_recursive;
2632} 2756 }
2633 2757
2758}
2759
2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2635 2761
2636Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2637her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2638that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2639the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
… …
2646 2772
2647our $GOTOGEN; 2773our $GOTOGEN;
2648 2774
2649sub cf::object::player::goto { 2775sub cf::object::player::goto {
2650 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2651 2783
2652 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654 2786
2655 $self->enter_link; 2787 $self->enter_link;
… …
2679 my $map = eval { 2811 my $map = eval {
2680 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2681 2813
2682 if ($map) { 2814 if ($map) {
2683 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2684 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2685 } else { 2817 } else {
2686 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2687 } 2819 }
2688 2820
2689 $map 2821 $map
… …
2697 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2698 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2699 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2700 } 2832 }
2701 2833
2702 $done->() if $done; 2834 $done->($self) if $done;
2703 })->prio (1); 2835 })->prio (1);
2704} 2836}
2705 2837
2706=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2707 2839
… …
2800 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2801 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2802 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2803 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2804 2936
2805 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2806 $self->leave_link; 2938 $self->leave_link;
2807 } 2939 }
2808 })->prio (1); 2940 })->prio (1);
2809} 2941}
2810 2942
… …
3123 3255
3124 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3125 if $reply; 3257 if $reply;
3126 3258
3127 } else { 3259 } else {
3128 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3129 } 3261 }
3130 3262
3131 cf::override; 3263 cf::override;
3132 }, 3264 },
3133); 3265);
… …
3214 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3215 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3216 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3217 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3218) { 3350) {
3219 no strict 'refs';
3220 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222 for @funs; 3353 for @funs;
3223} 3354}
3224 3355
… …
3263 local @cf::_safe_eval_args = values %vars; 3394 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval; 3395 @res = wantarray ? eval eval : scalar eval $eval;
3265 } 3396 }
3266 3397
3267 if ($@) { 3398 if ($@) {
3268 warn "$@"; 3399 warn "$@",
3269 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3270 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3271 } 3402 }
3272 3403
3273 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3274} 3405}
3275 3406
… …
3309 # for this (global event?) 3440 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3311 3442
3312 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313 3444
3314 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3315 3446
3316 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3317 0 < aio_load $path, $facedata
3318 or die "$path: $!";
3319
3320 $facedata = Coro::Storable::thaw $facedata;
3321 3448
3322 $facedata->{version} == 2 3449 $facedata->{version} == 2
3323 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3324 3451
3325 # patch in the exptable 3452 # patch in the exptable
… …
3339 3466
3340 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3341 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3344 3472
3345 cf::cede_to_tick; 3473 cf::cede_to_tick;
3346 } 3474 }
3347 3475
3348 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
… …
3353 3481
3354 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3355 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357 } else { 3485 } else {
3358 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3359 } 3487 }
3360 3488
3361 cf::cede_to_tick; 3489 cf::cede_to_tick;
3362 } 3490 }
3363 } 3491 }
… …
3381 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382 3510
3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3385 } else { 3513 } else {
3386 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3387 } 3515 }
3388 3516
3389 cf::cede_to_tick; 3517 cf::cede_to_tick;
3390 } 3518 }
3391 } 3519 }
3392 3520
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394 3522
3395 1 3523 1
3396} 3524}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3417 3525
3418register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3419 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3420 3528
3421 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
… …
3460sub reload_treasures { 3568sub reload_treasures {
3461 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3462 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3463} 3571}
3464 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3465sub reload_resources { 3593sub reload_resources {
3466 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3467 3595
3596 reload_exp_table;
3597 reload_materials;
3468 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3469 reload_archetypes; 3600 reload_archetypes;
3470 reload_regions; 3601 reload_regions;
3471 reload_treasures; 3602 reload_treasures;
3472 3603
3473 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3474} 3605}
3475 3606
3476sub reload_config { 3607sub reload_config {
3477 warn "reloading config file...\n"; 3608 trace "reloading config file...\n";
3478 3609
3479 open my $fh, "<:utf8", "$CONFDIR/config" 3610 my $config = load_file "$CONFDIR/config";
3480 or return; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3481 3613
3482 local $/;
3483 *CFG = YAML::XS::Load scalar <$fh>;
3484
3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486 3615
3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3489 3618
3490 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
… …
3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3621 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493 and die "WARNING: m(un)lockall failed: $!\n"; 3622 and die "WARNING: m(un)lockall failed: $!\n";
3494 }; 3623 };
3495 warn $@ if $@; 3624 warn $@ if $@;
3496 } 3625 }
3497
3498 warn "finished reloading resource files\n";
3499} 3626}
3500 3627
3501sub pidfile() { 3628sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!"; 3630 or die "$PIDFILE: $!";
… …
3516 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3517 print $fh $$; 3644 print $fh $$;
3518} 3645}
3519 3646
3520sub main_loop { 3647sub main_loop {
3521 warn "EV::loop starting\n"; 3648 trace "EV::loop starting\n";
3522 if (1) { 3649 if (1) {
3523 EV::loop; 3650 EV::loop;
3524 } 3651 }
3525 warn "EV::loop returned\n"; 3652 trace "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP; 3653 goto &main_loop unless $REALLY_UNLOOP;
3527} 3654}
3528 3655
3529sub main { 3656sub main {
3530 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3531 3658
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541 3663
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543 3665
3544 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3545 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
… …
3551 }; 3673 };
3552 3674
3553 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3554 3676
3555 cf::sync_job { 3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3556 cf::load_settings; 3684 cf::load_settings;
3557 cf::load_materials;
3558 3685
3559 reload_resources; 3686 reload_resources;
3560 reload_config; 3687 reload_config;
3561 db_init; 3688 db_init;
3562 3689
… …
3574 3701
3575 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX (); 3703 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578 3705
3579 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3580 }; 3707 };
3581 3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3582 main_loop; 3717 goto &main_loop;
3583} 3718}
3584 3719
3585############################################################################# 3720#############################################################################
3586# initialisation and cleanup 3721# initialisation and cleanup
3587 3722
… …
3626 or return; 3761 or return;
3627 3762
3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629 and return; 3764 and return;
3630 3765
3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632 3767
3633 1 3768 1
3634} 3769}
3635 3770
3636our $uuid_lock; 3771our $uuid_lock;
… …
3648 or return; 3783 or return;
3649 3784
3650 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3651 3786
3652 unless ($value) { 3787 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3654 return; 3789 return;
3655 } 3790 }
3656 3791
3657 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0; 3793 $uuid_skip = 0;
… …
3668 or return; 3803 or return;
3669 3804
3670 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3671 and return; 3806 and return;
3672 3807
3673 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3674 3809
3675 1 3810 1
3676 3811
3677} 3812}
3678 3813
… …
3684} 3819}
3685 3820
3686sub emergency_save() { 3821sub emergency_save() {
3687 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3688 3823
3689 warn "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3690 3830
3691 cf::sync_job { 3831 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696 3833
3697 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3698 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3699 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3700 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3701 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3702 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3703 $pl->valid or next; 3840 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705 $pl->save; 3842 $pl->save;
3706 } 3843 }
3707 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3708 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3709 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3710 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3711 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3712 $map->valid or next; 3851 $map->valid or next;
3713 $map->save; 3852 $map->save;
3714 } 3853 }
3715 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3716 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3717 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3718 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3719 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3720 3861
3721 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1; 3863 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3724 }; 3884 };
3725 3885
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3731 warn "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3732} 3887}
3733 3888
3734sub post_cleanup { 3889sub post_cleanup {
3735 my ($make_core) = @_; 3890 my ($make_core) = @_;
3736 3891
3892 IO::AIO::flush;
3893
3737 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3738 if $make_core; 3895 if $make_core;
3739 3896
3740 my $fh = pidfile; 3897 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3742} 3899}
… …
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 } 3923 }
3767 warn "cleared package $pkg\n";#d#
3768} 3924}
3769 3925
3770sub do_reload_perl() { 3926sub do_reload_perl() {
3771 # can/must only be called in main 3927 # can/must only be called in main
3772 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3773 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3774 return; 3930 return;
3775 } 3931 }
3776 3932
3777 return if $RELOAD++; 3933 return if $RELOAD++;
3778 3934
3779 my $t1 = AE::time; 3935 my $t1 = AE::time;
3780 3936
3781 while ($RELOAD) { 3937 while ($RELOAD) {
3782 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3783 3940
3784 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3785 3942
3786 cf::sync_job { 3943 cf::sync_job {
3787 cf::write_runtime_sync; # external watchdog should not bark
3788 cf::emergency_save; 3944 #cf::emergency_save;
3789 cf::write_runtime_sync; # external watchdog should not bark
3790 3945
3791 warn "syncing database to disk";
3792 BDB::db_env_txn_checkpoint $DB_ENV;
3793
3794 # if anything goes wrong in here, we should simply crash as we already saved
3795
3796 warn "flushing outstanding aio requests";
3797 while (IO::AIO::nreqs || BDB::nreqs) {
3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3799 }
3800
3801 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3802 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3803 %EXT_CORO = (); 3948 %EXT_CORO = ();
3804 3949
3805 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3806 %COMMAND = (); 3951 %COMMAND = ();
3807 3952
3808 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3809 %EXTCMD = (); 3954 %EXTCMD = ();
3810 %EXTICMD = (); 3955 %EXTICMD = ();
3811 3956
3812 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3813 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3814 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3815 3960
3816 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3817 eval { 3962 eval {
3818 $cb->($pkg); 3963 $cb->($pkg);
3819 1 3964 1
3820 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3821 } 3966 }
3822 3967
3823 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3824 clear_package $pkg; 3969 clear_package $pkg;
3825 } 3970 }
3826 3971
3827 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830 3975
3831 warn "... unloading $k"; 3976 trace "... unloading $k";
3832 delete $INC{$k}; 3977 delete $INC{$k};
3833 3978
3834 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3836 3981
… …
3839 } 3984 }
3840 3985
3841 clear_package $k; 3986 clear_package $k;
3842 } 3987 }
3843 3988
3844 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3845 clear_package "safe::$_" 3990 clear_package "safe::$_"
3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3847 3992
3848 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3849 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851 3996
3852 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3853 # and global variables created in xs 3998 # and global variables created in xs
3854 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3855 4000
3856 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3857 4002
3858 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3859 require cf; 4004 require cf;
3860 cf::_connect_to_perl_1; 4005 cf::_connect_to_perl_1;
3861 4006
3862 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3863 cf::reload_config; 4008 cf::reload_config;
3864 4009
3865 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3866 cf::load_extensions; 4011 cf::load_extensions;
3867 4012
3868 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3869 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3870 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3871 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3872 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3873 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3874 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3875 } 4020 }
3876 4021
3877 warn "running post_init jobs"; 4022 cf::_post_init 1;
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879 4023
3880 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3881 4025
3882 1 4026 1
3883 } or do { 4027 } or do {
3884 warn $@; 4028 error $@;
3885 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3886 }; 4030 };
3887 4031
3888 warn "reloaded";
3889 --$RELOAD; 4032 --$RELOAD;
3890 } 4033 }
3891 4034
3892 $t1 = AE::time - $t1; 4035 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3894}; 4037};
3895 4038
3896our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3897 4040
3898sub reload_perl() { 4041sub reload_perl() {
… …
3919 reload_perl; 4062 reload_perl;
3920 }; 4063 };
3921 } 4064 }
3922}; 4065};
3923 4066
3924unshift @INC, $LIBDIR; 4067#############################################################################
3925 4068
3926my $bug_warning = 0; 4069my $bug_warning = 0;
3927 4070
3928our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3929our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3930 4073
3931sub wait_for_tick { 4074sub wait_for_tick() {
3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3933 4076
3934 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3935 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3936 $signal->wait; 4079 $signal->wait;
3937} 4080}
3938 4081
3939sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3941 4084
3942 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3943 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3944 $signal->wait; 4087 $signal->wait;
… …
3958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3960 Coro::async_pool { 4103 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3962 write_runtime_sync 4105 write_runtime_sync
3963 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3964 }; 4107 };
3965 } 4108 }
3966 4109
3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968 $sig->send; 4111 $sig->send;
… …
3976 4119
3977 if (0) { 4120 if (0) {
3978 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3982 } 4125 }
3983 } 4126 }
3984} 4127}
3985 4128
3986{ 4129{
… …
4031 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
4032 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
4034} 4177}
4035 4178
4036my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
4037 4181
4038sub _log_backtrace { 4182sub _log_backtrace {
4039 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
4040 4184
4041 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
4042 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
4044 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
4045 ++$_log_backtrace; 4193 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
4047 async { 4195 async {
4048 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
4049 4197
… …
4069 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
4070 --$_log_backtrace; 4218 --$_log_backtrace;
4071 }; 4219 };
4072 } else { 4220 } else {
4073 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
4074 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075 } 4223 }
4076} 4224}
4077 4225
4078# load additional modules 4226# load additional modules
4079require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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