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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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;
… …
230from wherever your confdir points to. 235from wherever your confdir points to.
231 236
232=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
233 238
234These 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
235returns 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
236per 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();
237 247
238=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
239 249
240This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
241C<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
… …
249 259
250=back 260=back
251 261
252=cut 262=cut
253 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
254$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 271 my $msg = join "", @_;
256 272
257 $msg .= "\n" 273 $msg .= "\n"
258 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
259 275
260 $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;
261 277
262 LOG llevError, $msg; 278 LOG llevWarn, $msg;
263}; 279};
264 280
265$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
267 283
268 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
269 285
270 if (in_main) {#d# 286 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 288 return;#d#
273 }#d# 289 }#d#
274 290
275 # kill coroutine otherwise 291 # kill coroutine otherwise
276 Coro::terminate 292 Coro::terminate
… …
298} 314}
299 315
300$EV::DIED = sub { 316$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
302}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
303 324
304############################################################################# 325#############################################################################
305 326
306=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
307 328
… …
328 $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;
329 $d 350 $d
330 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
331} 352}
332 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
333=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
334 369
335Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
336 371
337=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
343our $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
344 379
345sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
347 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
348=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
349 415
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
352 418
353The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 420is a reload or not.
355 421
356=cut 422=cut
357 423
358sub post_init(&) { 424sub post_init(&) {
359 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 }
360} 443}
361 444
362=item cf::lock_wait $string 445=item cf::lock_wait $string
363 446
364Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
417 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
418} 501}
419 502
420=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
421 504
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
423This 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
424of 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.
425 512
426The 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
427used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
428 515
429Useful for short background jobs. 516Useful for short background jobs.
… …
509=cut 596=cut
510 597
511sub sync_job(&) { 598sub sync_job(&) {
512 my ($job) = @_; 599 my ($job) = @_;
513 600
514 if ($Coro::current == $Coro::main) { 601 if (in_main) {
515 my $time = AE::time; 602 my $time = AE::time;
516 603
517 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
519 606
520 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
521 608
522 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
523 610
524 my $busy = 1; 611 my $busy = 1;
525 my @res; 612 my @res;
526 613
527 (async { 614 (async {
528 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 616 @res = eval { $job->() };
530 warn $@ if $@; 617 error $@ if $@;
531 undef $busy; 618 undef $busy;
532 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
533 620
534 while ($busy) { 621 while ($busy) {
535 if (Coro::nready) { 622 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
570 657
571 $coro 658 $coro
572} 659}
573 660
574=item fork_call { }, $args 661=item fork_call { }, @args
575 662
576Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 666never block itself or use any form of event handling.
580 667
581=cut 668=cut
582 669
670sub post_fork {
671 reset_signals;
672}
673
583sub fork_call(&@) { 674sub fork_call(&@) {
584 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
585 676
586 # 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,
587 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
589 680
590 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
591 reset_signals; 682 cf::post_fork;
592 &$cb 683 &$cb
593 }, @args; 684 } @args;
594 685
595 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
596} 687}
597 688
598sub objinfo { 689sub objinfo {
… …
648within each server. 739within each server.
649 740
650=cut 741=cut
651 742
652sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
653 my ($name) = @_; 747 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
655 749
656 eval { 750 eval {
657 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
667} 761}
668 762
669our $DB; 763our $DB;
670 764
671sub db_init { 765sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
674 };
675} 767}
676 768
677sub db_get($$) { 769sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
679 771
680 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
681 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
682 776
683 $! ? () 777 $! ? ()
684 : $data 778 : $data
685 }
686} 779}
687 780
688sub db_put($$$) { 781sub db_put($$$) {
689 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
718 811
719 my @data; 812 my @data;
720 my $md5; 813 my $md5;
721 814
722 for (0 .. $#$src) { 815 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 817 }
726 818
727 # if processing is expensive, check 819 # if processing is expensive, check
728 # checksum first 820 # checksum first
729 if (1) { 821 if (1) {
… …
746 838
747 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 840 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
750 842
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 844
753 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
756 848
… …
766 858
767=cut 859=cut
768 860
769sub datalog($@) { 861sub datalog($@) {
770 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 864}
773 865
774=back 866=back
775 867
776=cut 868=cut
… …
971 1063
972 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1066
975 } elsif (ref $type) { 1067 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
977 1069
978 } else { 1070 } else {
979 shift @arg; 1071 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
981 } 1073 }
982 } 1074 }
983} 1075}
984 1076
985sub _object_attach { 1077sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
996 } 1088 }
997 1089
998 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
999 } else { 1091 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1093 }
1002 1094
1003 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
1004} 1096}
1005 1097
… …
1064 1156
1065 for (@$callbacks) { 1157 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1067 1159
1068 if ($@) { 1160 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1162 override;
1072 } 1163 }
1073 1164
1074 return 1 if $override; 1165 return 1 if $override;
1075 } 1166 }
… …
1154 for (@$attach) { 1245 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1157 } 1248 }
1158 } else { 1249 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1251 }
1161 } 1252 }
1162} 1253}
1163 1254
1164cf::attachable->attach ( 1255cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1192 1283
1193 sync_job { 1284 sync_job {
1194 if (length $$rdata) { 1285 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1198 1290
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1225 1317
1226 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1320 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1230 } 1322 }
1231 } else { 1323 } else {
1232 aio_unlink $filename; 1324 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1234 } 1326 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1351 $av = $st->{objs};
1260 } 1352 }
1261 1353
1262 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1265 1358
1266 ($data, $av) 1359 ($data, $av)
1267} 1360}
1268 1361
1269=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1361 1454
1362 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1456 if $reply;
1364 1457
1365 } else { 1458 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1460 }
1368 1461
1369 cf::override; 1462 cf::override;
1370 }, 1463 },
1371); 1464);
… …
1382 1475
1383 $grp 1476 $grp
1384} 1477}
1385 1478
1386sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1387 cf::sync_job { 1482 cf::sync_job {
1388 my %todo; 1483 my %todo;
1389 1484
1390 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1486 next unless -r $path;
… …
1409 1504
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1507
1413 $ext{source} = 1508 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1416 . $source 1511 . $source
1417 . "\n};\n1"; 1512 . "\n};\n1";
1418 1513
1419 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1527 next ext
1433 unless exists $done{$_}; 1528 unless exists $done{$_};
1434 } 1529 }
1435 1530
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1532
1438 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1439 1534
1440 if (length $@) { 1535 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1442 1537
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1445 1540
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1543 } else {
1449 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1451 $progress = 1; 1546 $progress = 1;
1452 1547
1453 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1549 unless $active;
1455 } 1550 }
1456 } 1551 }
1457 1552
1458 unless ($progress) { 1553 unless ($progress) {
… …
1460 1555
1461 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1464 } 1559 }
1560
1561 last;
1465 } 1562 }
1466 } 1563 }
1467 }; 1564 };
1468} 1565}
1469 1566
… …
1627 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1628 1725
1629 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1630 $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
1631 1728
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1730 $pl->deactivate;
1731
1634 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;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1637 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1638 1737
1639 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1906sub generate_random_map {
1808 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1809 1908
1810 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
1811 1910
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1912}
1827 1913
1828=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1829 1915
1830Register 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
… …
1835 1921
1836sub register { 1922sub register {
1837 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1924 my $pkg = caller;
1839 1925
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1927
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1929}
1845 1930
1846# also paths starting with '/' 1931# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1933
1849sub thawer_merge { 1934sub thawer_merge {
1850 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1851 1936
1852 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1857} 1942}
1858 1943
1859sub normalise { 1944sub normalise {
1860 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1861 1946
1862 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1863 1948
1864 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1865 1950
1866 # map plan: 1951 # map plan:
1867 # 1952 #
… …
1869 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1870 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1871 # ?random/... random maps 1956 # ?random/... random maps
1872 # /... normal maps 1957 # /... normal maps
1873 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1874 1960
1875 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1876 1962
1877 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1878 # something that looks reasonable 1964 # something that looks reasonable
1879 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1880 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1881 1967
1882 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1884 } 1984 }
1885 1985
1886 for ($path) { 1986 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1890 } 1989 }
1891 1990
1892 $path 1991 $path
… …
1906 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1907 return $self; 2006 return $self;
1908 } 2007 }
1909 } 2008 }
1910 2009
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 2011 ()
1913} 2012}
1914 2013
2014# may re-bless or do other evil things
1915sub init { 2015sub init {
1916 my ($self) = @_; 2016 my ($self) = @_;
1917 2017
1918 $self 2018 $self
1919} 2019}
… …
2039 2139
2040sub find; 2140sub find;
2041sub find { 2141sub find {
2042 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
2043 2143
2144 cf::cede_to_tick;
2145
2044 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
2045 2147
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
2048 2150
2049 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
… …
2089 $self->alloc; 2191 $self->alloc;
2090 2192
2091 $self->pre_load; 2193 $self->pre_load;
2092 cf::cede_to_tick; 2194 cf::cede_to_tick;
2093 2195
2196 if (exists $self->{load_path}) {
2094 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block; 2198 $f->skip_block;
2096 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2097 or return; 2200 or return;
2098 2201
2099 $self->post_load_original 2202 $self->post_load_original
2100 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2101 2204
2102 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2103 utf8::encode $uniq; 2206 utf8::encode $uniq;
2104 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2106 $self->clear_unique_items; 2209 $self->clear_unique_items;
2107 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2109 } 2213 }
2110 } 2214 }
2111 }
2112 2215
2113 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2114 2218
2115 cf::cede_to_tick; 2219 cf::cede_to_tick;
2116 # now do the right thing for maps 2220 # now do the right thing for maps
2117 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2118 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
… …
2132 2236
2133 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2238 }
2135 2239
2136 $self->post_load; 2240 $self->post_load;
2241
2242 1
2137} 2243}
2138 2244
2139# customize the map for a given player, i.e. 2245# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2246# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2247# maps to change the path to ~playername/mappath
… …
2162 or next; 2268 or next;
2163 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2164 or next; 2270 or next;
2165 $neigh->load; 2271 $neigh->load;
2166 2272
2273 # now find the diagonal neighbours
2167 push @neigh, 2274 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2277 }
2171 2278
… …
2178} 2285}
2179 2286
2180sub find_sync { 2287sub find_sync {
2181 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2182 2289
2183 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2184} 2294}
2185 2295
2186sub do_load_sync { 2296sub do_load_sync {
2187 my ($map) = @_; 2297 my ($map) = @_;
2188 2298
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2191 2301
2192 cf::sync_job { $map->load }; 2302 $map->load;
2193} 2303}
2194 2304
2195our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2197 2307
2198sub find_async { 2308sub find_async {
2199 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2200 2310
2201 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2202 2312
2203 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2205 } 2315 }
2206 2316
… …
2309 2419
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2421
2312 return if $self->players; 2422 return if $self->players;
2313 2423
2314 warn "resetting map ", $self->path, "\n"; 2424 cf::trace "resetting map ", $self->path, "\n";
2315 2425
2316 $self->in_memory (cf::MAP_SWAPPED); 2426 $self->in_memory (cf::MAP_SWAPPED);
2317 2427
2318 # need to save uniques path 2428 # need to save uniques path
2319 unless ($self->{deny_save}) { 2429 unless ($self->{deny_save}) {
… …
2343 2453
2344 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2345 2455
2346 $self->unlink_save; 2456 $self->unlink_save;
2347 2457
2348 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2463
… …
2583 2693
2584Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2585 2695
2586The player should be reasonably safe there for short amounts of time (e.g. 2696The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2698though, as the player cannot control the character while it is on the link
2589map. 2699map.
2590 2700
2591Will never block. 2701Will never block.
2592 2702
2593=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2615 my ($self) = @_; 2725 my ($self) = @_;
2616 2726
2617 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2618 2728
2729 ++$self->{_link_recursion};
2730
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2732
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2623 2735
… …
2654 $map->load_neighbours; 2766 $map->load_neighbours;
2655 2767
2656 return unless $self->contr->active; 2768 return unless $self->contr->active;
2657 2769
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2660 2772 # entering was successful
2773 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2774 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2775 $self->activate_recursive;
2663} 2776 }
2664 2777
2778}
2779
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2781
2667Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
… …
2677 2792
2678our $GOTOGEN; 2793our $GOTOGEN;
2679 2794
2680sub cf::object::player::goto { 2795sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2682 2803
2683 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2806
2686 $self->enter_link; 2807 $self->enter_link;
… …
2706 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2707 } 2828 }
2708 } 2829 }
2709 2830
2710 my $map = eval { 2831 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712 2833
2713 if ($map) { 2834 if ($map) {
2714 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2837 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2839 }
2719 2840
2720 $map 2841 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2731 } 2852 }
2732 2853
2733 $done->() if $done; 2854 $done->($self) if $done;
2734 })->prio (1); 2855 })->prio (1);
2735} 2856}
2736 2857
2737=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2738 2859
… …
2814 2935
2815 prepare_random_map $exit 2936 prepare_random_map $exit
2816 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2817 } 2938 }
2818 2939
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2820 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2822 2943
2823 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2824 2945
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2956
2836 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2958 $self->leave_link;
2838 } 2959 }
2839 })->prio (1); 2960 })->prio (1);
2840} 2961}
2841 2962
… …
3154 3275
3155 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3277 if $reply;
3157 3278
3158 } else { 3279 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3281 }
3161 3282
3162 cf::override; 3283 cf::override;
3163 }, 3284 },
3164); 3285);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3368 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3249) { 3370) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3373 for @funs;
3254} 3374}
3255 3375
… …
3294 local @cf::_safe_eval_args = values %vars; 3414 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3415 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3416 }
3297 3417
3298 if ($@) { 3418 if ($@) {
3299 warn "$@"; 3419 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3302 } 3422 }
3303 3423
3304 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3305} 3425}
3306 3426
… …
3340 # for this (global event?) 3460 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3462
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3464
3345 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3346 3466
3347 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3348 0 < aio_load $path, $facedata
3349 or die "$path: $!";
3350
3351 $facedata = Coro::Storable::thaw $facedata;
3352 3468
3353 $facedata->{version} == 2 3469 $facedata->{version} == 2
3354 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3355 3471
3356 # patch in the exptable 3472 # patch in the exptable
… …
3370 3486
3371 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3372 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3375 3492
3376 cf::cede_to_tick; 3493 cf::cede_to_tick;
3377 } 3494 }
3378 3495
3379 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
… …
3384 3501
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3505 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3507 }
3391 3508
3392 cf::cede_to_tick; 3509 cf::cede_to_tick;
3393 } 3510 }
3394 } 3511 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3530
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3416 } else { 3533 } else {
3417 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3418 } 3535 }
3419 3536
3420 cf::cede_to_tick; 3537 cf::cede_to_tick;
3421 } 3538 }
3422 } 3539 }
3423 3540
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3542
3426 1 3543 1
3427} 3544}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3545
3449register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3451 3548
3452 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3588sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3494} 3591}
3495 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3496sub reload_resources { 3613sub reload_resources {
3497 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3498 3615
3616 reload_exp_table;
3617 reload_materials;
3499 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3500 reload_archetypes; 3620 reload_archetypes;
3501 reload_regions; 3621 reload_regions;
3502 reload_treasures; 3622 reload_treasures;
3503 3623
3504 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3505} 3625}
3506 3626
3507sub reload_config { 3627sub reload_config {
3508 warn "reloading config file...\n"; 3628 trace "reloading config file...\n";
3509 3629
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3630 my $config = load_file "$CONFDIR/config";
3511 or return; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3512 3633
3513 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>;
3515
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3635
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3638
3521 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3641 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3642 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3643 };
3526 warn $@ if $@; 3644 warn $@ if $@;
3527 } 3645 }
3528
3529 warn "finished reloading resource files\n";
3530} 3646}
3531 3647
3532sub pidfile() { 3648sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3650 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3548 print $fh $$; 3664 print $fh $$;
3549} 3665}
3550 3666
3551sub main_loop { 3667sub main_loop {
3552 warn "EV::loop starting\n"; 3668 trace "EV::loop starting\n";
3553 if (1) { 3669 if (1) {
3554 EV::loop; 3670 EV::loop;
3555 } 3671 }
3556 warn "EV::loop returned\n"; 3672 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3673 goto &main_loop unless $REALLY_UNLOOP;
3558} 3674}
3559 3675
3560sub main { 3676sub main {
3561 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3562 3678
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3683
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3685
… …
3577 }; 3693 };
3578 3694
3579 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3580 3696
3581 cf::sync_job { 3697 cf::sync_job {
3582 cf::init_experience; 3698 cf::incloader::init ();
3699
3583 cf::init_anim; 3700 cf::init_anim;
3584 cf::init_attackmess; 3701 cf::init_attackmess;
3585 cf::init_dynamic; 3702 cf::init_dynamic;
3586 3703
3587 cf::load_settings; 3704 cf::load_settings;
3588 cf::load_materials;
3589 3705
3590 reload_resources; 3706 reload_resources;
3591 reload_config; 3707 reload_config;
3592 db_init; 3708 db_init;
3593 3709
… …
3605 3721
3606 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3723 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3725
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3611 }; 3727 };
3612 3728
3613 cf::object::thawer::errors_are_fatal 0; 3729 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3730 info "parse errors in files are no longer fatal from this point on.\n";
3615 3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3616 main_loop; 3737 goto &main_loop;
3617} 3738}
3618 3739
3619############################################################################# 3740#############################################################################
3620# initialisation and cleanup 3741# initialisation and cleanup
3621 3742
… …
3660 or return; 3781 or return;
3661 3782
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3784 and return;
3664 3785
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3787
3667 1 3788 1
3668} 3789}
3669 3790
3670our $uuid_lock; 3791our $uuid_lock;
… …
3682 or return; 3803 or return;
3683 3804
3684 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3685 3806
3686 unless ($value) { 3807 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3809 return;
3689 } 3810 }
3690 3811
3691 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3813 $uuid_skip = 0;
… …
3702 or return; 3823 or return;
3703 3824
3704 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3705 and return; 3826 and return;
3706 3827
3707 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3708 3829
3709 1 3830 1
3710 3831
3711} 3832}
3712 3833
… …
3718} 3839}
3719 3840
3720sub emergency_save() { 3841sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3722 3843
3723 warn "emergency_perl_save: enter\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3724 3850
3725 cf::sync_job { 3851 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3852 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3853
3731 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3860 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3862 $pl->save;
3740 } 3863 }
3741 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3742 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3743 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3871 $map->valid or next;
3747 $map->save; 3872 $map->save;
3748 } 3873 }
3749 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3750 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3754 3881
3755 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3883 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3904 };
3759 3905
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3906 info "emergency_perl_save: leave\n";
3766} 3907}
3767 3908
3768sub post_cleanup { 3909sub post_cleanup {
3769 my ($make_core) = @_; 3910 my ($make_core) = @_;
3770 3911
3912 IO::AIO::flush;
3913
3771 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3915 if $make_core;
3773 3916
3774 my $fh = pidfile; 3917 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3776} 3919}
… …
3800 } 3943 }
3801} 3944}
3802 3945
3803sub do_reload_perl() { 3946sub do_reload_perl() {
3804 # can/must only be called in main 3947 # can/must only be called in main
3805 if (in_main) { 3948 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3807 return; 3950 return;
3808 } 3951 }
3809 3952
3810 return if $RELOAD++; 3953 return if $RELOAD++;
3811 3954
3812 my $t1 = AE::time; 3955 my $t1 = AE::time;
3813 3956
3814 while ($RELOAD) { 3957 while ($RELOAD) {
3815 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3816 3960
3817 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3818 3962
3819 cf::sync_job { 3963 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3964 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3965
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3968 %EXT_CORO = ();
3837 3969
3838 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3839 %COMMAND = (); 3971 %COMMAND = ();
3840 3972
3841 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 3974 %EXTCMD = ();
3843 %EXTICMD = (); 3975 %EXTICMD = ();
3844 3976
3845 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3848 3980
3849 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3982 eval {
3851 $cb->($pkg); 3983 $cb->($pkg);
3852 1 3984 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3854 } 3986 }
3855 3987
3856 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3857 clear_package $pkg; 3989 clear_package $pkg;
3858 } 3990 }
3859 3991
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3995
3864 warn "... unloading $k"; 3996 trace "... unloading $k";
3865 delete $INC{$k}; 3997 delete $INC{$k};
3866 3998
3867 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3869 4001
… …
3872 } 4004 }
3873 4005
3874 clear_package $k; 4006 clear_package $k;
3875 } 4007 }
3876 4008
3877 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 4010 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 4012
3881 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 4016
3885 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3886 # and global variables created in xs 4018 # and global variables created in xs
3887 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3888 4020
3889 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3890 4022
3891 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3892 require cf; 4024 require cf;
3893 cf::_connect_to_perl_1; 4025 cf::_connect_to_perl_1;
3894 4026
3895 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 4028 cf::reload_config;
3897 4029
3898 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 4031 cf::load_extensions;
3900 4032
3901 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3908 } 4040 }
3909 4041
3910 warn "running post_init jobs"; 4042 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4043
3913 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3914 4045
3915 1 4046 1
3916 } or do { 4047 } or do {
3917 warn $@; 4048 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4050 };
3920 4051
3921 warn "reloaded";
3922 --$RELOAD; 4052 --$RELOAD;
3923 } 4053 }
3924 4054
3925 $t1 = AE::time - $t1; 4055 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3927}; 4057};
3928 4058
3929our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3930 4060
3931sub reload_perl() { 4061sub reload_perl() {
… …
3952 reload_perl; 4082 reload_perl;
3953 }; 4083 };
3954 } 4084 }
3955}; 4085};
3956 4086
3957unshift @INC, $LIBDIR; 4087#############################################################################
3958 4088
3959my $bug_warning = 0; 4089my $bug_warning = 0;
3960 4090
3961our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3963 4093
3964sub wait_for_tick { 4094sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3966 4096
3967 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait; 4099 $signal->wait;
3970} 4100}
3971 4101
3972sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3974 4104
3975 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4107 $signal->wait;
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4123 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4125 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3997 }; 4127 };
3998 } 4128 }
3999 4129
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4131 $sig->send;
… …
4009 4139
4010 if (0) { 4140 if (0) {
4011 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
4015 } 4145 }
4016 } 4146 }
4017} 4147}
4018 4148
4019{ 4149{
… …
4064 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
4065 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
4066 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
4067} 4197}
4068 4198
4069my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
4070 4201
4071sub _log_backtrace { 4202sub _log_backtrace {
4072 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
4073 4204
4074 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
4075 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
4077 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
4078 ++$_log_backtrace; 4213 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
4080 async { 4215 async {
4081 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
4082 4217
… …
4102 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
4103 --$_log_backtrace; 4238 --$_log_backtrace;
4104 }; 4239 };
4105 } else { 4240 } else {
4106 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
4107 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108 } 4243 }
4109} 4244}
4110 4245
4111# load additional modules 4246# load additional modules
4112require "cf/$_.pm" for @EXTRA_MODULES; 4247require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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