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.520 by root, Fri Apr 16 02:37:50 2010 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
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.
… …
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]
592} 687}
593 688
594sub objinfo { 689sub objinfo {
… …
644within each server. 739within each server.
645 740
646=cut 741=cut
647 742
648sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
649 my ($name) = @_; 747 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
651 749
652 eval { 750 eval {
653 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
663} 761}
664 762
665our $DB; 763our $DB;
666 764
667sub db_init { 765sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
670 };
671} 767}
672 768
673sub db_get($$) { 769sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
675 771
676 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
677 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
678 776
679 $! ? () 777 $! ? ()
680 : $data 778 : $data
681 }
682} 779}
683 780
684sub db_put($$$) { 781sub db_put($$$) {
685 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
714 811
715 my @data; 812 my @data;
716 my $md5; 813 my $md5;
717 814
718 for (0 .. $#$src) { 815 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 817 }
722 818
723 # if processing is expensive, check 819 # if processing is expensive, check
724 # checksum first 820 # checksum first
725 if (1) { 821 if (1) {
… …
742 838
743 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 840 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
746 842
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 844
749 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
752 848
… …
762 858
763=cut 859=cut
764 860
765sub datalog($@) { 861sub datalog($@) {
766 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 864}
769 865
770=back 866=back
771 867
772=cut 868=cut
… …
967 1063
968 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1066
971 } elsif (ref $type) { 1067 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
973 1069
974 } else { 1070 } else {
975 shift @arg; 1071 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
977 } 1073 }
978 } 1074 }
979} 1075}
980 1076
981sub _object_attach { 1077sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
992 } 1088 }
993 1089
994 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
995 } else { 1091 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1093 }
998 1094
999 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
1000} 1096}
1001 1097
… …
1060 1156
1061 for (@$callbacks) { 1157 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1063 1159
1064 if ($@) { 1160 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1162 override;
1068 } 1163 }
1069 1164
1070 return 1 if $override; 1165 return 1 if $override;
1071 } 1166 }
… …
1150 for (@$attach) { 1245 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1153 } 1248 }
1154 } else { 1249 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1251 }
1157 } 1252 }
1158} 1253}
1159 1254
1160cf::attachable->attach ( 1255cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1188 1283
1189 sync_job { 1284 sync_job {
1190 if (length $$rdata) { 1285 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1194 1290
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1221 1317
1222 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1320 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1226 } 1322 }
1227 } else { 1323 } else {
1228 aio_unlink $filename; 1324 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1230 } 1326 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1351 $av = $st->{objs};
1256 } 1352 }
1257 1353
1258 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1261 1358
1262 ($data, $av) 1359 ($data, $av)
1263} 1360}
1264 1361
1265=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1357 1454
1358 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1456 if $reply;
1360 1457
1361 } else { 1458 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1460 }
1364 1461
1365 cf::override; 1462 cf::override;
1366 }, 1463 },
1367); 1464);
… …
1378 1475
1379 $grp 1476 $grp
1380} 1477}
1381 1478
1382sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1383 cf::sync_job { 1482 cf::sync_job {
1384 my %todo; 1483 my %todo;
1385 1484
1386 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1486 next unless -r $path;
… …
1405 1504
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1507
1409 $ext{source} = 1508 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1412 . $source 1511 . $source
1413 . "\n};\n1"; 1512 . "\n};\n1";
1414 1513
1415 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1527 next ext
1429 unless exists $done{$_}; 1528 unless exists $done{$_};
1430 } 1529 }
1431 1530
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1532
1434 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1435 1534
1436 if (length $@) { 1535 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1438 1537
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 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};
1441 } else { 1543 } else {
1442 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1444 $progress = 1; 1546 $progress = 1;
1445 1547
1446 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1549 unless $active;
1448 } 1550 }
1449 } 1551 }
1450 1552
1451 unless ($progress) { 1553 unless ($progress) {
… …
1453 1555
1454 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1457 } 1559 }
1560
1561 last;
1458 } 1562 }
1459 } 1563 }
1460 }; 1564 };
1461} 1565}
1462 1566
… …
1620 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1621 1725
1622 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1623 $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
1624 1728
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1730 $pl->deactivate;
1731
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1630 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1631 1737
1632 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1688 \@logins 1794 \@logins
1689} 1795}
1690 1796
1691=item $player->maps 1797=item $player->maps
1692 1798
1799=item cf::player::maps $login
1800
1693Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1694player. May block. 1802player. May block.
1695 1803
1696=cut 1804=cut
1697 1805
… …
1759=cut 1867=cut
1760 1868
1761sub find_by_path($) { 1869sub find_by_path($) {
1762 my ($path) = @_; 1870 my ($path) = @_;
1763 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1764 my ($match, $specificity); 1874 my ($match, $specificity);
1765 1875
1766 for my $region (list) { 1876 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1768 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1796sub generate_random_map { 1906sub generate_random_map {
1797 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1798 1908
1799 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
1800 1910
1801 # mit "rum" bekleckern, nicht
1802 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom}
1814 )
1815} 1912}
1816 1913
1817=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1818 1915
1819Register 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
… …
1824 1921
1825sub register { 1922sub register {
1826 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1924 my $pkg = caller;
1828 1925
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1927
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1929}
1834 1930
1835# also paths starting with '/' 1931# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1933
1838sub thawer_merge { 1934sub thawer_merge {
1839 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1840 1936
1841 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1846} 1942}
1847 1943
1848sub normalise { 1944sub normalise {
1849 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1850 1946
1851 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1852 1948
1853 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1854 1950
1855 # map plan: 1951 # map plan:
1856 # 1952 #
… …
1871 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 1968 $path = "$base/$path";
1873 } 1969 }
1874 1970
1875 for ($path) { 1971 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1879 } 1974 }
1880 1975
1881 $path 1976 $path
… …
1895 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1896 return $self; 1991 return $self;
1897 } 1992 }
1898 } 1993 }
1899 1994
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 1996 ()
1902} 1997}
1903 1998
1999# may re-bless or do other evil things
1904sub init { 2000sub init {
1905 my ($self) = @_; 2001 my ($self) = @_;
1906 2002
1907 $self 2003 $self
1908} 2004}
… …
1973 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1974 2070
1975 1 2071 1
1976} 2072}
1977 2073
2074# used to laod the header of an original map
1978sub load_header_orig { 2075sub load_header_orig {
1979 my ($self) = @_; 2076 my ($self) = @_;
1980 2077
1981 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1982} 2079}
1983 2080
2081# used to laod the header of an instantiated map
1984sub load_header_temp { 2082sub load_header_temp {
1985 my ($self) = @_; 2083 my ($self) = @_;
1986 2084
1987 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1988} 2086}
1989 2087
2088# called after loading the header from an instantiated map
1990sub prepare_temp { 2089sub prepare_temp {
1991 my ($self) = @_; 2090 my ($self) = @_;
1992 2091
1993 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1995 # safety 2094 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2097}
1999 2098
2099# called after loading the header from an original map
2000sub prepare_orig { 2100sub prepare_orig {
2001 my ($self) = @_; 2101 my ($self) = @_;
2002 2102
2003 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2028 2128
2029sub find; 2129sub find;
2030sub find { 2130sub find {
2031 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2032 2132
2133 cf::cede_to_tick;
2134
2033 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2034 2136
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2139
2038 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2078 $self->alloc; 2180 $self->alloc;
2079 2181
2080 $self->pre_load; 2182 $self->pre_load;
2081 cf::cede_to_tick; 2183 cf::cede_to_tick;
2082 2184
2185 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2187 $f->skip_block;
2085 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2086 or return; 2189 or return;
2087 2190
2088 $self->post_load_original 2191 $self->post_load_original
2089 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2090 2193
2091 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2195 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2198 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2098 } 2202 }
2099 } 2203 }
2100 }
2101 2204
2102 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2103 2210
2104 cf::cede_to_tick; 2211 cf::cede_to_tick;
2105 # now do the right thing for maps 2212 # now do the right thing for maps
2106 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2111 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2219 $self->decay_objects;
2113 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2114 $self->update_buttons; 2221 $self->update_buttons;
2115 cf::cede_to_tick; 2222 cf::cede_to_tick;
2116 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2117 } 2224 }
2118 2225
2119 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2121 2228
2122 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2230 }
2124 2231
2125 $self->post_load; 2232 $self->post_load;
2233
2234 1
2126} 2235}
2127 2236
2128# customize the map for a given player, i.e. 2237# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2238# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2239# maps to change the path to ~playername/mappath
… …
2151 or next; 2260 or next;
2152 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
2153 or next; 2262 or next;
2154 $neigh->load; 2263 $neigh->load;
2155 2264
2265 # now find the diagonal neighbours
2156 push @neigh, 2266 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2269 }
2160 2270
… …
2167} 2277}
2168 2278
2169sub find_sync { 2279sub find_sync {
2170 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2171 2281
2172 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2173} 2286}
2174 2287
2175sub do_load_sync { 2288sub do_load_sync {
2176 my ($map) = @_; 2289 my ($map) = @_;
2177 2290
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2180 2293
2181 cf::sync_job { $map->load }; 2294 $map->load;
2182} 2295}
2183 2296
2184our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2186 2299
2187sub find_async { 2300sub find_async {
2188 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2189 2302
2190 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2191 2304
2192 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2194 } 2307 }
2195 2308
… …
2298 2411
2299 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2300 2413
2301 return if $self->players; 2414 return if $self->players;
2302 2415
2303 warn "resetting map ", $self->path, "\n"; 2416 cf::trace "resetting map ", $self->path, "\n";
2304 2417
2305 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->in_memory (cf::MAP_SWAPPED);
2306 2419
2307 # need to save uniques path 2420 # need to save uniques path
2308 unless ($self->{deny_save}) { 2421 unless ($self->{deny_save}) {
… …
2332 2445
2333 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2334 2447
2335 $self->unlink_save; 2448 $self->unlink_save;
2336 2449
2337 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2338 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2339 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2340 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2341 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342 2455
… …
2572 2685
2573Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2574 2687
2575The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2576for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2578map. 2691map.
2579 2692
2580Will never block. 2693Will never block.
2581 2694
2582=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
… …
2603sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2604 my ($self) = @_; 2717 my ($self) = @_;
2605 2718
2606 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2607 2720
2721 ++$self->{_link_recursion};
2722
2608 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2609 2724
2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2612 2727
… …
2643 $map->load_neighbours; 2758 $map->load_neighbours;
2644 2759
2645 return unless $self->contr->active; 2760 return unless $self->contr->active;
2646 2761
2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2649 2764 # entering was successful
2765 delete $self->{_link_recursion};
2650 # only activate afterwards, to support waiting in hooks 2766 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive; 2767 $self->activate_recursive;
2652} 2768 }
2653 2769
2770}
2771
2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2655 2773
2656Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2657her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2658that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2659the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
… …
2666 2784
2667our $GOTOGEN; 2785our $GOTOGEN;
2668 2786
2669sub cf::object::player::goto { 2787sub cf::object::player::goto {
2670 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2671 2795
2672 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2673 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674 2798
2675 $self->enter_link; 2799 $self->enter_link;
… …
2695 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2696 } 2820 }
2697 } 2821 }
2698 2822
2699 my $map = eval { 2823 my $map = eval {
2700 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2701 2825
2702 if ($map) { 2826 if ($map) {
2703 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2704 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2705 } else { 2829 } else {
2706 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2707 } 2831 }
2708 2832
2709 $map 2833 $map
… …
2717 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2718 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2719 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2720 } 2844 }
2721 2845
2722 $done->() if $done; 2846 $done->($self) if $done;
2723 })->prio (1); 2847 })->prio (1);
2724} 2848}
2725 2849
2726=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2727 2851
… …
2795 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2796 2920
2797 unless (eval { 2921 unless (eval {
2798 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2799 2923
2800 # random map handling
2801 {
2802 my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804 prepare_random_map $exit
2805 if $exit->slaying eq "/!";
2806 }
2807
2808 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2809 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2810 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2811 2948
2812 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2813 2950
2814 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2815 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
… …
2820 $self->message ("Something went wrong deep within the deliantra server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2821 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2822 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2823 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2824 2961
2825 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2826 $self->leave_link; 2963 $self->leave_link;
2827 } 2964 }
2828 })->prio (1); 2965 })->prio (1);
2829} 2966}
2830 2967
… …
3143 3280
3144 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
3145 if $reply; 3282 if $reply;
3146 3283
3147 } else { 3284 } else {
3148 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3149 } 3286 }
3150 3287
3151 cf::override; 3288 cf::override;
3152 }, 3289 },
3153); 3290);
… …
3234 decrease split destroy change_exp value msg lore send_msg)], 3371 decrease split destroy change_exp value msg lore send_msg)],
3235 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
3236 ["cf::player" => qw(peaceful send_msg)], 3373 ["cf::player" => qw(peaceful send_msg)],
3237 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
3238) { 3375) {
3239 no strict 'refs';
3240 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3242 for @funs; 3378 for @funs;
3243} 3379}
3244 3380
… …
3283 local @cf::_safe_eval_args = values %vars; 3419 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval; 3420 @res = wantarray ? eval eval : scalar eval $eval;
3285 } 3421 }
3286 3422
3287 if ($@) { 3423 if ($@) {
3288 warn "$@"; 3424 warn "$@",
3289 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
3290 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
3291 } 3427 }
3292 3428
3293 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
3294} 3430}
3295 3431
… …
3329 # for this (global event?) 3465 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3331 3467
3332 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333 3469
3334 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3335 3471
3336 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3337 0 < aio_load $path, $facedata
3338 or die "$path: $!";
3339
3340 $facedata = Coro::Storable::thaw $facedata;
3341 3473
3342 $facedata->{version} == 2 3474 $facedata->{version} == 2
3343 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3344 3476
3345 # patch in the exptable 3477 # patch in the exptable
… …
3359 3491
3360 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3361 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3364 3497
3365 cf::cede_to_tick; 3498 cf::cede_to_tick;
3366 } 3499 }
3367 3500
3368 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
… …
3373 3506
3374 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3375 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377 } else { 3510 } else {
3378 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3379 } 3512 }
3380 3513
3381 cf::cede_to_tick; 3514 cf::cede_to_tick;
3382 } 3515 }
3383 } 3516 }
… …
3401 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402 3535
3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404 cf::face::set_type $idx, $info->{type}; 3537 cf::face::set_type $idx, $info->{type};
3405 } else { 3538 } else {
3406 $RESOURCE{$name} = $info; 3539 $RESOURCE{$name} = $info; # unused
3407 } 3540 }
3408 3541
3409 cf::cede_to_tick; 3542 cf::cede_to_tick;
3410 } 3543 }
3411 } 3544 }
3412 3545
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414 3547
3415 1 3548 1
3416} 3549}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3437 3550
3438register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3439 my ($ns, $want) = @_; 3552 my ($ns, $want) = @_;
3440 3553
3441 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
… …
3480sub reload_treasures { 3593sub reload_treasures {
3481 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3482 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3483} 3596}
3484 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
3485sub reload_resources { 3618sub reload_resources {
3486 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3487 3620
3621 reload_exp_table;
3622 reload_materials;
3488 reload_facedata; 3623 reload_facedata;
3624 reload_sound;
3489 reload_archetypes; 3625 reload_archetypes;
3490 reload_regions; 3626 reload_regions;
3491 reload_treasures; 3627 reload_treasures;
3492 3628
3493 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3494} 3630}
3495 3631
3496sub reload_config { 3632sub reload_config {
3497 warn "reloading config file...\n"; 3633 trace "reloading config file...\n";
3498 3634
3499 open my $fh, "<:utf8", "$CONFDIR/config" 3635 my $config = load_file "$CONFDIR/config";
3500 or return; 3636 utf8::decode $config;
3637 *CFG = decode_yaml $config;
3501 3638
3502 local $/;
3503 *CFG = YAML::XS::Load scalar <$fh>;
3504
3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506 3640
3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3509 3643
3510 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
… …
3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3646 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3513 and die "WARNING: m(un)lockall failed: $!\n"; 3647 and die "WARNING: m(un)lockall failed: $!\n";
3514 }; 3648 };
3515 warn $@ if $@; 3649 warn $@ if $@;
3516 } 3650 }
3517
3518 warn "finished reloading resource files\n";
3519} 3651}
3520 3652
3521sub pidfile() { 3653sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!"; 3655 or die "$PIDFILE: $!";
… …
3536 seek $fh, 0, 0; 3668 seek $fh, 0, 0;
3537 print $fh $$; 3669 print $fh $$;
3538} 3670}
3539 3671
3540sub main_loop { 3672sub main_loop {
3541 warn "EV::loop starting\n"; 3673 trace "EV::loop starting\n";
3542 if (1) { 3674 if (1) {
3543 EV::loop; 3675 EV::loop;
3544 } 3676 }
3545 warn "EV::loop returned\n"; 3677 trace "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP; 3678 goto &main_loop unless $REALLY_UNLOOP;
3547} 3679}
3548 3680
3549sub main { 3681sub main {
3550 cf::init_globals; # initialise logging 3682 cf::init_globals; # initialise logging
3551 3683
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556 3688
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558 3690
… …
3566 }; 3698 };
3567 3699
3568 evthread_start IO::AIO::poll_fileno; 3700 evthread_start IO::AIO::poll_fileno;
3569 3701
3570 cf::sync_job { 3702 cf::sync_job {
3571 cf::init_experience; 3703 cf::incloader::init ();
3704
3572 cf::init_anim; 3705 cf::init_anim;
3573 cf::init_attackmess; 3706 cf::init_attackmess;
3574 cf::init_dynamic; 3707 cf::init_dynamic;
3575 3708
3576 cf::load_settings; 3709 cf::load_settings;
3577 cf::load_materials;
3578 3710
3579 reload_resources; 3711 reload_resources;
3580 reload_config; 3712 reload_config;
3581 db_init; 3713 db_init;
3582 3714
… …
3594 3726
3595 # no (long-running) fork's whatsoever before this point(!) 3727 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX (); 3728 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598 3730
3599 (pop @POST_INIT)->(0) while @POST_INIT; 3731 cf::_post_init 0;
3600 }; 3732 };
3601 3733
3602 cf::object::thawer::errors_are_fatal 0; 3734 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n"; 3735 info "parse errors in files are no longer fatal from this point on.\n";
3604 3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3605 main_loop; 3742 goto &main_loop;
3606} 3743}
3607 3744
3608############################################################################# 3745#############################################################################
3609# initialisation and cleanup 3746# initialisation and cleanup
3610 3747
… …
3649 or return; 3786 or return;
3650 3787
3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652 and return; 3789 and return;
3653 3790
3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655 3792
3656 1 3793 1
3657} 3794}
3658 3795
3659our $uuid_lock; 3796our $uuid_lock;
… …
3671 or return; 3808 or return;
3672 3809
3673 my $value = uuid_seq uuid_cur; 3810 my $value = uuid_seq uuid_cur;
3674 3811
3675 unless ($value) { 3812 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n"; 3813 info "cowardly refusing to write zero uuid value!\n";
3677 return; 3814 return;
3678 } 3815 }
3679 3816
3680 my $value = uuid_str $value + $uuid_skip; 3817 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0; 3818 $uuid_skip = 0;
… …
3691 or return; 3828 or return;
3692 3829
3693 aio_rename "$uuid~", $uuid 3830 aio_rename "$uuid~", $uuid
3694 and return; 3831 and return;
3695 3832
3696 warn "uuid file written ($value).\n"; 3833 trace "uuid file written ($value).\n";
3697 3834
3698 1 3835 1
3699 3836
3700} 3837}
3701 3838
… …
3707} 3844}
3708 3845
3709sub emergency_save() { 3846sub emergency_save() {
3710 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3711 3848
3712 warn "emergency_perl_save: enter\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3713 3855
3714 cf::sync_job { 3856 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so 3857 cf::write_runtime_sync; # external watchdog should not bark
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719 3858
3720 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3721 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3722 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3723 warn "emergency_perl_save: begin player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3724 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3725 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3726 $pl->valid or next; 3865 $pl->valid or next;
3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728 $pl->save; 3867 $pl->save;
3729 } 3868 }
3730 warn "emergency_perl_save: end player save\n"; 3869 info "emergency_perl_save: end player save\n";
3731 3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3732 warn "emergency_perl_save: begin map save\n"; 3873 info "emergency_perl_save: begin map save\n";
3733 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3734 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3735 $map->valid or next; 3876 $map->valid or next;
3736 $map->save; 3877 $map->save;
3737 } 3878 }
3738 warn "emergency_perl_save: end map save\n"; 3879 info "emergency_perl_save: end map save\n";
3739 3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3740 warn "emergency_perl_save: begin database checkpoint\n"; 3883 info "emergency_perl_save: begin database checkpoint\n";
3741 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3742 warn "emergency_perl_save: end database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3743 3886
3744 warn "emergency_perl_save: begin write uuid\n"; 3887 info "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1; 3888 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n"; 3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3747 }; 3909 };
3748 3910
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3754 warn "emergency_perl_save: leave\n"; 3911 info "emergency_perl_save: leave\n";
3755} 3912}
3756 3913
3757sub post_cleanup { 3914sub post_cleanup {
3758 my ($make_core) = @_; 3915 my ($make_core) = @_;
3759 3916
3917 IO::AIO::flush;
3918
3760 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3761 if $make_core; 3920 if $make_core;
3762 3921
3763 my $fh = pidfile; 3922 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$; 3923 unlink $PIDFILE if <$fh> == $$;
3765} 3924}
… …
3789 } 3948 }
3790} 3949}
3791 3950
3792sub do_reload_perl() { 3951sub do_reload_perl() {
3793 # can/must only be called in main 3952 # can/must only be called in main
3794 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3795 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3796 return; 3955 return;
3797 } 3956 }
3798 3957
3799 return if $RELOAD++; 3958 return if $RELOAD++;
3800 3959
3801 my $t1 = AE::time; 3960 my $t1 = AE::time;
3802 3961
3803 while ($RELOAD) { 3962 while ($RELOAD) {
3804 warn "reloading..."; 3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3805 3965
3806 warn "entering sync_job"; 3966 trace "perl_reload: entering sync_job";
3807 3967
3808 cf::sync_job { 3968 cf::sync_job {
3809 cf::write_runtime_sync; # external watchdog should not bark
3810 cf::emergency_save; 3969 #cf::emergency_save;
3811 cf::write_runtime_sync; # external watchdog should not bark
3812 3970
3813 warn "syncing database to disk";
3814 BDB::db_env_txn_checkpoint $DB_ENV;
3815
3816 # if anything goes wrong in here, we should simply crash as we already saved
3817
3818 warn "flushing outstanding aio requests";
3819 while (IO::AIO::nreqs || BDB::nreqs) {
3820 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3821 }
3822
3823 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3824 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3825 %EXT_CORO = (); 3973 %EXT_CORO = ();
3826 3974
3827 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3828 %COMMAND = (); 3976 %COMMAND = ();
3829 3977
3830 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3831 %EXTCMD = (); 3979 %EXTCMD = ();
3832 %EXTICMD = (); 3980 %EXTICMD = ();
3833 3981
3834 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3835 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3836 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3837 3985
3838 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3839 eval { 3987 eval {
3840 $cb->($pkg); 3988 $cb->($pkg);
3841 1 3989 1
3842 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3843 } 3991 }
3844 3992
3845 warn "... clearing $pkg"; 3993 trace "... clearing $pkg";
3846 clear_package $pkg; 3994 clear_package $pkg;
3847 } 3995 }
3848 3996
3849 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3850 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3851 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3852 4000
3853 warn "... unloading $k"; 4001 trace "... unloading $k";
3854 delete $INC{$k}; 4002 delete $INC{$k};
3855 4003
3856 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3857 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3858 4006
… …
3861 } 4009 }
3862 4010
3863 clear_package $k; 4011 clear_package $k;
3864 } 4012 }
3865 4013
3866 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3867 clear_package "safe::$_" 4015 clear_package "safe::$_"
3868 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3869 4017
3870 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3871 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3872 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3873 4021
3874 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3875 # and global variables created in xs 4023 # and global variables created in xs
3876 #clear_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3877 4025
3878 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3879 4027
3880 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3881 require cf; 4029 require cf;
3882 cf::_connect_to_perl_1; 4030 cf::_connect_to_perl_1;
3883 4031
3884 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3885 cf::reload_config; 4033 cf::reload_config;
3886 4034
3887 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3888 cf::load_extensions; 4036 cf::load_extensions;
3889 4037
3890 if ($REATTACH_ON_RELOAD) { 4038 if ($REATTACH_ON_RELOAD) {
3891 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3892 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3893 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3894 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3895 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3896 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
3897 } 4045 }
3898 4046
3899 warn "running post_init jobs"; 4047 cf::_post_init 1;
3900 (pop @POST_INIT)->(1) while @POST_INIT;
3901 4048
3902 warn "leaving sync_job"; 4049 trace "perl_reload: leaving sync_job";
3903 4050
3904 1 4051 1
3905 } or do { 4052 } or do {
3906 warn $@; 4053 error $@;
3907 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3908 }; 4055 };
3909 4056
3910 warn "reloaded";
3911 --$RELOAD; 4057 --$RELOAD;
3912 } 4058 }
3913 4059
3914 $t1 = AE::time - $t1; 4060 $t1 = AE::time - $t1;
3915 warn "reload completed in ${t1}s\n"; 4061 info "perl_reload: completed in ${t1}s\n";
3916}; 4062};
3917 4063
3918our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3919 4065
3920sub reload_perl() { 4066sub reload_perl() {
… …
3941 reload_perl; 4087 reload_perl;
3942 }; 4088 };
3943 } 4089 }
3944}; 4090};
3945 4091
3946unshift @INC, $LIBDIR; 4092#############################################################################
3947 4093
3948my $bug_warning = 0; 4094my $bug_warning = 0;
3949 4095
3950our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3951our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3952 4098
3953sub wait_for_tick { 4099sub wait_for_tick() {
3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3955 4101
3956 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3957 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3958 $signal->wait; 4104 $signal->wait;
3959} 4105}
3960 4106
3961sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3962 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3963 4109
3964 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3965 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3966 $signal->wait; 4112 $signal->wait;
… …
3980 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3981 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3982 Coro::async_pool { 4128 Coro::async_pool {
3983 $Coro::current->{desc} = "runtime saver"; 4129 $Coro::current->{desc} = "runtime saver";
3984 write_runtime_sync 4130 write_runtime_sync
3985 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
3986 }; 4132 };
3987 } 4133 }
3988 4134
3989 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3990 $sig->send; 4136 $sig->send;
… …
3998 4144
3999 if (0) { 4145 if (0) {
4000 if ($NEXT_TICK) { 4146 if ($NEXT_TICK) {
4001 my $jitter = $TICK_START - $NEXT_TICK; 4147 my $jitter = $TICK_START - $NEXT_TICK;
4002 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4003 warn "jitter $JITTER\n";#d# 4149 debug "jitter $JITTER\n";#d#
4004 } 4150 }
4005 } 4151 }
4006} 4152}
4007 4153
4008{ 4154{
… …
4053 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
4054 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
4055 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
4056} 4202}
4057 4203
4058my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
4059 4206
4060sub _log_backtrace { 4207sub _log_backtrace {
4061 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
4062 4209
4063 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
4064 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4065 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
4066 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
4067 ++$_log_backtrace; 4218 ++$_log_backtrace;
4068 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
4069 async { 4220 async {
4070 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
4071 4222
… …
4091 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
4092 --$_log_backtrace; 4243 --$_log_backtrace;
4093 }; 4244 };
4094 } else { 4245 } else {
4095 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
4096 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4097 } 4248 }
4098} 4249}
4099 4250
4100# load additional modules 4251# load additional modules
4101require "cf/$_.pm" for @EXTRA_MODULES; 4252require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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