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.529 by root, Wed Apr 28 11:28:22 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 = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME;
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These 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
238returns 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
239per 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();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
244C<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
… …
252 259
253=back 260=back
254 261
255=cut 262=cut
256 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
257$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 271 my $msg = join "", @_;
259 272
260 $msg .= "\n" 273 $msg .= "\n"
261 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
262 275
263 $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;
264 277
265 LOG llevError, $msg; 278 LOG llevWarn, $msg;
266}; 279};
267 280
268$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
270 283
271 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
272 285
273 if (in_main) {#d# 286 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 288 return;#d#
276 }#d# 289 }#d#
277 290
278 # kill coroutine otherwise 291 # kill coroutine otherwise
279 Coro::terminate 292 Coro::terminate
… …
301} 314}
302 315
303$EV::DIED = sub { 316$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
305}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
306 324
307############################################################################# 325#############################################################################
308 326
309=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
310 328
… …
331 $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;
332 $d 350 $d
333 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
334} 352}
335 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
336=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
337 369
338Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
339 371
340=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
346our $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
347 379
348sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
350 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
351=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
352 415
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
355 418
356The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 420is a reload or not.
358 421
359=cut 422=cut
360 423
361sub post_init(&) { 424sub post_init(&) {
362 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 }
363} 443}
364 444
365=item cf::lock_wait $string 445=item cf::lock_wait $string
366 446
367Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
420 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
421} 501}
422 502
423=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
424 504
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
426This 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
427of 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.
428 512
429The 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
430used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
431 515
432Useful for short background jobs. 516Useful for short background jobs.
… …
512=cut 596=cut
513 597
514sub sync_job(&) { 598sub sync_job(&) {
515 my ($job) = @_; 599 my ($job) = @_;
516 600
517 if ($Coro::current == $Coro::main) { 601 if (in_main) {
518 my $time = AE::time; 602 my $time = AE::time;
519 603
520 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
522 606
523 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
524 608
525 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
526 610
527 my $busy = 1; 611 my $busy = 1;
528 my @res; 612 my @res;
529 613
530 (async { 614 (async {
531 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 616 @res = eval { $job->() };
533 warn $@ if $@; 617 error $@ if $@;
534 undef $busy; 618 undef $busy;
535 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
536 620
537 while ($busy) { 621 while ($busy) {
538 if (Coro::nready) { 622 if (Coro::nready) {
… …
572 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
573 657
574 $coro 658 $coro
575} 659}
576 660
577=item fork_call { }, $args 661=item fork_call { }, @args
578 662
579Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 666never block itself or use any form of event handling.
583 667
584=cut 668=cut
585 669
670sub post_fork {
671 reset_signals;
672}
673
586sub fork_call(&@) { 674sub fork_call(&@) {
587 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
588 676
589 # 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,
590 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
592 680
593 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
594 reset_signals; 682 cf::post_fork;
595 &$cb 683 &$cb
596 }, @args; 684 } @args;
597 685
598 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
599} 687}
600 688
601sub objinfo { 689sub objinfo {
… …
651within each server. 739within each server.
652 740
653=cut 741=cut
654 742
655sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
656 my ($name) = @_; 747 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
658 749
659 eval { 750 eval {
660 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
670} 761}
671 762
672our $DB; 763our $DB;
673 764
674sub db_init { 765sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
677 };
678} 767}
679 768
680sub db_get($$) { 769sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
682 771
683 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
684 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
685 776
686 $! ? () 777 $! ? ()
687 : $data 778 : $data
688 }
689} 779}
690 780
691sub db_put($$$) { 781sub db_put($$$) {
692 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 811
722 my @data; 812 my @data;
723 my $md5; 813 my $md5;
724 814
725 for (0 .. $#$src) { 815 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 817 }
729 818
730 # if processing is expensive, check 819 # if processing is expensive, check
731 # checksum first 820 # checksum first
732 if (1) { 821 if (1) {
… …
749 838
750 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 840 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
753 842
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 844
756 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
759 848
… …
769 858
770=cut 859=cut
771 860
772sub datalog($@) { 861sub datalog($@) {
773 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 864}
776 865
777=back 866=back
778 867
779=cut 868=cut
… …
974 1063
975 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1066
978 } elsif (ref $type) { 1067 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
980 1069
981 } else { 1070 } else {
982 shift @arg; 1071 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
984 } 1073 }
985 } 1074 }
986} 1075}
987 1076
988sub _object_attach { 1077sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
999 } 1088 }
1000 1089
1001 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
1002 } else { 1091 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1093 }
1005 1094
1006 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
1007} 1096}
1008 1097
… …
1067 1156
1068 for (@$callbacks) { 1157 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1070 1159
1071 if ($@) { 1160 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1162 override;
1075 } 1163 }
1076 1164
1077 return 1 if $override; 1165 return 1 if $override;
1078 } 1166 }
… …
1157 for (@$attach) { 1245 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1160 } 1248 }
1161 } else { 1249 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1251 }
1164 } 1252 }
1165} 1253}
1166 1254
1167cf::attachable->attach ( 1255cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1195 1283
1196 sync_job { 1284 sync_job {
1197 if (length $$rdata) { 1285 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1288 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1289 if $VERBOSE_IO;
1202 1290
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1229 1317
1230 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1320 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1234 } 1322 }
1235 } else { 1323 } else {
1236 aio_unlink $filename; 1324 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1238 } 1326 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1351 $av = $st->{objs};
1264 } 1352 }
1265 1353
1266 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1356 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1357 if $VERBOSE_IO;
1270 1358
1271 ($data, $av) 1359 ($data, $av)
1272} 1360}
1273 1361
… …
1366 1454
1367 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1456 if $reply;
1369 1457
1370 } else { 1458 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1460 }
1373 1461
1374 cf::override; 1462 cf::override;
1375 }, 1463 },
1376); 1464);
… …
1387 1475
1388 $grp 1476 $grp
1389} 1477}
1390 1478
1391sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1392 cf::sync_job { 1482 cf::sync_job {
1393 my %todo; 1483 my %todo;
1394 1484
1395 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1486 next unless -r $path;
… …
1414 1504
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1507
1418 $ext{source} = 1508 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1421 . $source 1511 . $source
1422 . "\n};\n1"; 1512 . "\n};\n1";
1423 1513
1424 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1527 next ext
1438 unless exists $done{$_}; 1528 unless exists $done{$_};
1439 } 1529 }
1440 1530
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1532
1443 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1444 1534
1445 if (length $@) { 1535 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1447 1537
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1450 1540
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1543 } else {
1454 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1456 $progress = 1; 1546 $progress = 1;
1457 1547
1458 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1549 unless $active;
1460 } 1550 }
1461 } 1551 }
1462 1552
1463 unless ($progress) { 1553 unless ($progress) {
… …
1465 1555
1466 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1469 } 1559 }
1560
1561 last;
1470 } 1562 }
1471 } 1563 }
1472 }; 1564 };
1473} 1565}
1474 1566
… …
1632 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1633 1725
1634 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1635 $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
1636 1728
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1730 $pl->deactivate;
1731
1639 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;
1640 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1641 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1642 1737
1643 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1644 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1645 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1811sub generate_random_map { 1906sub generate_random_map {
1812 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1813 1908
1814 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
1815 1910
1816 # mit "rum" bekleckern, nicht
1817 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821 $rmp->{exit_on_final_map},
1822 $rmp->{xsize}, $rmp->{ysize},
1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828 (cf::region::find $rmp->{region}), $rmp->{custom}
1829 )
1830} 1912}
1831 1913
1832=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1833 1915
1834Register 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
… …
1839 1921
1840sub register { 1922sub register {
1841 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 1924 my $pkg = caller;
1843 1925
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 1927
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 1929}
1849 1930
… …
1861} 1942}
1862 1943
1863sub normalise { 1944sub normalise {
1864 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1865 1946
1866 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1867 1948
1868 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1869 1950
1870 # map plan: 1951 # map plan:
1871 # 1952 #
… …
1886 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1887 $path = "$base/$path"; 1968 $path = "$base/$path";
1888 } 1969 }
1889 1970
1890 for ($path) { 1971 for ($path) {
1891 redo if s{//}{/};
1892 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1893 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1894 } 1974 }
1895 1975
1896 $path 1976 $path
… …
1910 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1911 return $self; 1991 return $self;
1912 } 1992 }
1913 } 1993 }
1914 1994
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 1996 ()
1917} 1997}
1918 1998
1999# may re-bless or do other evil things
1919sub init { 2000sub init {
1920 my ($self) = @_; 2001 my ($self) = @_;
1921 2002
1922 $self 2003 $self
1923} 2004}
… …
1988 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1989 2070
1990 1 2071 1
1991} 2072}
1992 2073
2074# used to laod the header of an original map
1993sub load_header_orig { 2075sub load_header_orig {
1994 my ($self) = @_; 2076 my ($self) = @_;
1995 2077
1996 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1997} 2079}
1998 2080
2081# used to laod the header of an instantiated map
1999sub load_header_temp { 2082sub load_header_temp {
2000 my ($self) = @_; 2083 my ($self) = @_;
2001 2084
2002 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
2003} 2086}
2004 2087
2088# called after loading the header from an instantiated map
2005sub prepare_temp { 2089sub prepare_temp {
2006 my ($self) = @_; 2090 my ($self) = @_;
2007 2091
2008 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
2009 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
2010 # safety 2094 # safety
2011 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
2012 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
2013} 2097}
2014 2098
2099# called after loading the header from an original map
2015sub prepare_orig { 2100sub prepare_orig {
2016 my ($self) = @_; 2101 my ($self) = @_;
2017 2102
2018 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2019 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2043 2128
2044sub find; 2129sub find;
2045sub find { 2130sub find {
2046 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2047 2132
2133 cf::cede_to_tick;
2134
2048 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2049 2136
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2052 2139
2053 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2093 $self->alloc; 2180 $self->alloc;
2094 2181
2095 $self->pre_load; 2182 $self->pre_load;
2096 cf::cede_to_tick; 2183 cf::cede_to_tick;
2097 2184
2185 if (exists $self->{load_path}) {
2098 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2099 $f->skip_block; 2187 $f->skip_block;
2100 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2101 or return; 2189 or return;
2102 2190
2103 $self->post_load_original 2191 $self->post_load_original
2104 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2105 2193
2106 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2107 utf8::encode $uniq; 2195 utf8::encode $uniq;
2108 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2109 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2110 $self->clear_unique_items; 2198 $self->clear_unique_items;
2111 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2112 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2113 } 2202 }
2114 } 2203 }
2115 }
2116 2204
2117 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2118 2210
2119 cf::cede_to_tick; 2211 cf::cede_to_tick;
2120 # now do the right thing for maps 2212 # now do the right thing for maps
2121 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2122 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2126 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2127 $self->decay_objects; 2219 $self->decay_objects;
2128 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2129 $self->update_buttons; 2221 $self->update_buttons;
2130 cf::cede_to_tick; 2222 cf::cede_to_tick;
2131 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2132 } 2224 }
2133 2225
2134 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2135 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2136 2228
2137 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2138 } 2230 }
2139 2231
2140 $self->post_load; 2232 $self->post_load;
2233
2234 1
2141} 2235}
2142 2236
2143# customize the map for a given player, i.e. 2237# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player 2238# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath 2239# maps to change the path to ~playername/mappath
… …
2183} 2277}
2184 2278
2185sub find_sync { 2279sub find_sync {
2186 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2187 2281
2188 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
2189} 2286}
2190 2287
2191sub do_load_sync { 2288sub do_load_sync {
2192 my ($map) = @_; 2289 my ($map) = @_;
2193 2290
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2196 2293
2197 cf::sync_job { $map->load }; 2294 $map->load;
2198} 2295}
2199 2296
2200our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2202 2299
2203sub find_async { 2300sub find_async {
2204 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2205 2302
2206 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2207 2304
2208 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2210 } 2307 }
2211 2308
… …
2314 2411
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2413
2317 return if $self->players; 2414 return if $self->players;
2318 2415
2319 warn "resetting map ", $self->path, "\n"; 2416 cf::trace "resetting map ", $self->path, "\n";
2320 2417
2321 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->in_memory (cf::MAP_SWAPPED);
2322 2419
2323 # need to save uniques path 2420 # need to save uniques path
2324 unless ($self->{deny_save}) { 2421 unless ($self->{deny_save}) {
… …
2689 2786
2690sub cf::object::player::goto { 2787sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2789
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2794 }
2698 2795
2699 # 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
… …
2722 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2723 } 2820 }
2724 } 2821 }
2725 2822
2726 my $map = eval { 2823 my $map = eval {
2727 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728 2825
2729 if ($map) { 2826 if ($map) {
2730 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2731 $map = $check->($map, $x, $y, $self) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2732 } else { 2829 } else {
… …
2822 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2823 2920
2824 unless (eval { 2921 unless (eval {
2825 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2826 2923
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2836 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2837 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 }
2838 2948
2839 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2840 2950
2841 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "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. "
2849 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2961
2852 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2963 $self->leave_link;
2854 } 2964 }
2855 })->prio (1); 2965 })->prio (1);
2856} 2966}
2857 2967
… …
3170 3280
3171 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3282 if $reply;
3173 3283
3174 } else { 3284 } else {
3175 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";
3176 } 3286 }
3177 3287
3178 cf::override; 3288 cf::override;
3179 }, 3289 },
3180); 3290);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3371 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3373 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
3265) { 3375) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3378 for @funs;
3270} 3379}
3271 3380
… …
3310 local @cf::_safe_eval_args = values %vars; 3419 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3420 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3421 }
3313 3422
3314 if ($@) { 3423 if ($@) {
3315 warn "$@"; 3424 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
3318 } 3427 }
3319 3428
3320 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
3321} 3430}
3322 3431
… …
3356 # for this (global event?) 3465 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3467
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3469
3361 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3362 3471
3363 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3364 0 < aio_load $path, $facedata
3365 or die "$path: $!";
3366
3367 $facedata = Coro::Storable::thaw $facedata;
3368 3473
3369 $facedata->{version} == 2 3474 $facedata->{version} == 2
3370 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3371 3476
3372 # patch in the exptable 3477 # patch in the exptable
… …
3386 3491
3387 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3388 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3390 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} ;
3391 3497
3392 cf::cede_to_tick; 3498 cf::cede_to_tick;
3393 } 3499 }
3394 3500
3395 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
… …
3400 3506
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3510 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3512 }
3407 3513
3408 cf::cede_to_tick; 3514 cf::cede_to_tick;
3409 } 3515 }
3410 } 3516 }
… …
3428 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429 3535
3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431 cf::face::set_type $idx, $info->{type}; 3537 cf::face::set_type $idx, $info->{type};
3432 } else { 3538 } else {
3433 $RESOURCE{$name} = $info; 3539 $RESOURCE{$name} = $info; # unused
3434 } 3540 }
3435 3541
3436 cf::cede_to_tick; 3542 cf::cede_to_tick;
3437 } 3543 }
3438 } 3544 }
3439 3545
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441 3547
3442 1 3548 1
3443} 3549}
3444
3445cf::global->attach (on_resource_update => sub {
3446 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450 my $sound = $soundconf->{compat}[$_]
3451 or next;
3452
3453 my $face = cf::face::find "sound/$sound->[1]";
3454 cf::sound::set $sound->[0] => $face;
3455 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456 }
3457
3458 while (my ($k, $v) = each %{$soundconf->{event}}) {
3459 my $face = cf::face::find "sound/$v";
3460 cf::sound::set $k => $face;
3461 }
3462 }
3463});
3464 3550
3465register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3466 my ($ns, $want) = @_; 3552 my ($ns, $want) = @_;
3467 3553
3468 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
… …
3507sub reload_treasures { 3593sub reload_treasures {
3508 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3509 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3510} 3596}
3511 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
3512sub reload_resources { 3618sub reload_resources {
3513 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3514 3620
3621 reload_exp_table;
3622 reload_materials;
3515 reload_facedata; 3623 reload_facedata;
3624 reload_sound;
3516 reload_archetypes; 3625 reload_archetypes;
3517 reload_regions; 3626 reload_regions;
3518 reload_treasures; 3627 reload_treasures;
3519 3628
3520 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3521} 3630}
3522 3631
3523sub reload_config { 3632sub reload_config {
3524 warn "reloading config file...\n"; 3633 trace "reloading config file...\n";
3525 3634
3526 open my $fh, "<:utf8", "$CONFDIR/config" 3635 my $config = load_file "$CONFDIR/config";
3527 or return; 3636 utf8::decode $config;
3528 3637 *CFG = decode_yaml $config;
3529 local $/;
3530 *CFG = YAML::XS::Load scalar <$fh>;
3531 3638
3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3533 3640
3534 $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};
3535 $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};
… …
3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3646 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3540 and die "WARNING: m(un)lockall failed: $!\n"; 3647 and die "WARNING: m(un)lockall failed: $!\n";
3541 }; 3648 };
3542 warn $@ if $@; 3649 warn $@ if $@;
3543 } 3650 }
3544
3545 warn "finished reloading resource files\n";
3546} 3651}
3547 3652
3548sub pidfile() { 3653sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!"; 3655 or die "$PIDFILE: $!";
… …
3563 seek $fh, 0, 0; 3668 seek $fh, 0, 0;
3564 print $fh $$; 3669 print $fh $$;
3565} 3670}
3566 3671
3567sub main_loop { 3672sub main_loop {
3568 warn "EV::loop starting\n"; 3673 trace "EV::loop starting\n";
3569 if (1) { 3674 if (1) {
3570 EV::loop; 3675 EV::loop;
3571 } 3676 }
3572 warn "EV::loop returned\n"; 3677 trace "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP; 3678 goto &main_loop unless $REALLY_UNLOOP;
3574} 3679}
3575 3680
3576sub main { 3681sub main {
3577 cf::init_globals; # initialise logging 3682 cf::init_globals; # initialise logging
3578 3683
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 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.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583 3688
3584 $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
3585 3690
… …
3593 }; 3698 };
3594 3699
3595 evthread_start IO::AIO::poll_fileno; 3700 evthread_start IO::AIO::poll_fileno;
3596 3701
3597 cf::sync_job { 3702 cf::sync_job {
3598 cf::init_experience; 3703 cf::incloader::init ();
3704
3599 cf::init_anim; 3705 cf::init_anim;
3600 cf::init_attackmess; 3706 cf::init_attackmess;
3601 cf::init_dynamic; 3707 cf::init_dynamic;
3602 3708
3603 cf::load_settings; 3709 cf::load_settings;
3604 cf::load_materials;
3605 3710
3606 reload_resources; 3711 reload_resources;
3607 reload_config; 3712 reload_config;
3608 db_init; 3713 db_init;
3609 3714
… …
3621 3726
3622 # no (long-running) fork's whatsoever before this point(!) 3727 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX (); 3728 use POSIX ();
3624 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};
3625 3730
3626 (pop @POST_INIT)->(0) while @POST_INIT; 3731 cf::_post_init 0;
3627 }; 3732 };
3628 3733
3629 cf::object::thawer::errors_are_fatal 0; 3734 cf::object::thawer::errors_are_fatal 0;
3630 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";
3631 3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3632 main_loop; 3742 goto &main_loop;
3633} 3743}
3634 3744
3635############################################################################# 3745#############################################################################
3636# initialisation and cleanup 3746# initialisation and cleanup
3637 3747
… …
3676 or return; 3786 or return;
3677 3787
3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679 and return; 3789 and return;
3680 3790
3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682 3792
3683 1 3793 1
3684} 3794}
3685 3795
3686our $uuid_lock; 3796our $uuid_lock;
… …
3698 or return; 3808 or return;
3699 3809
3700 my $value = uuid_seq uuid_cur; 3810 my $value = uuid_seq uuid_cur;
3701 3811
3702 unless ($value) { 3812 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n"; 3813 info "cowardly refusing to write zero uuid value!\n";
3704 return; 3814 return;
3705 } 3815 }
3706 3816
3707 my $value = uuid_str $value + $uuid_skip; 3817 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0; 3818 $uuid_skip = 0;
… …
3718 or return; 3828 or return;
3719 3829
3720 aio_rename "$uuid~", $uuid 3830 aio_rename "$uuid~", $uuid
3721 and return; 3831 and return;
3722 3832
3723 warn "uuid file written ($value).\n"; 3833 trace "uuid file written ($value).\n";
3724 3834
3725 1 3835 1
3726 3836
3727} 3837}
3728 3838
… …
3734} 3844}
3735 3845
3736sub emergency_save() { 3846sub emergency_save() {
3737 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3738 3848
3739 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;
3740 3855
3741 cf::sync_job { 3856 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so 3857 cf::write_runtime_sync; # external watchdog should not bark
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746 3858
3747 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3748 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3749 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3750 warn "emergency_perl_save: begin player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3751 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3752 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3753 $pl->valid or next; 3865 $pl->valid or next;
3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755 $pl->save; 3867 $pl->save;
3756 } 3868 }
3757 warn "emergency_perl_save: end player save\n"; 3869 info "emergency_perl_save: end player save\n";
3758 3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3759 warn "emergency_perl_save: begin map save\n"; 3873 info "emergency_perl_save: begin map save\n";
3760 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3761 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3762 $map->valid or next; 3876 $map->valid or next;
3763 $map->save; 3877 $map->save;
3764 } 3878 }
3765 warn "emergency_perl_save: end map save\n"; 3879 info "emergency_perl_save: end map save\n";
3766 3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3767 warn "emergency_perl_save: begin database checkpoint\n"; 3883 info "emergency_perl_save: begin database checkpoint\n";
3768 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3769 warn "emergency_perl_save: end database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3770 3886
3771 warn "emergency_perl_save: begin write uuid\n"; 3887 info "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1; 3888 write_uuid_sync 1;
3773 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
3774 }; 3909 };
3775 3910
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3781 warn "emergency_perl_save: leave\n"; 3911 info "emergency_perl_save: leave\n";
3782} 3912}
3783 3913
3784sub post_cleanup { 3914sub post_cleanup {
3785 my ($make_core) = @_; 3915 my ($make_core) = @_;
3786 3916
3917 IO::AIO::flush;
3918
3787 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3788 if $make_core; 3920 if $make_core;
3789 3921
3790 my $fh = pidfile; 3922 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$; 3923 unlink $PIDFILE if <$fh> == $$;
3792} 3924}
… …
3816 } 3948 }
3817} 3949}
3818 3950
3819sub do_reload_perl() { 3951sub do_reload_perl() {
3820 # can/must only be called in main 3952 # can/must only be called in main
3821 if (in_main) { 3953 unless (in_main) {
3822 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3823 return; 3955 return;
3824 } 3956 }
3825 3957
3826 return if $RELOAD++; 3958 return if $RELOAD++;
3827 3959
3828 my $t1 = AE::time; 3960 my $t1 = AE::time;
3829 3961
3830 while ($RELOAD) { 3962 while ($RELOAD) {
3831 warn "reloading..."; 3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3832 3965
3833 warn "entering sync_job"; 3966 trace "perl_reload: entering sync_job";
3834 3967
3835 cf::sync_job { 3968 cf::sync_job {
3836 cf::write_runtime_sync; # external watchdog should not bark
3837 cf::emergency_save; 3969 #cf::emergency_save;
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 3970
3840 warn "syncing database to disk";
3841 BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843 # if anything goes wrong in here, we should simply crash as we already saved
3844
3845 warn "flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3851 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3852 %EXT_CORO = (); 3973 %EXT_CORO = ();
3853 3974
3854 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3855 %COMMAND = (); 3976 %COMMAND = ();
3856 3977
3857 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3858 %EXTCMD = (); 3979 %EXTCMD = ();
3859 %EXTICMD = (); 3980 %EXTICMD = ();
3860 3981
3861 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3862 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3863 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3864 3985
3865 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3866 eval { 3987 eval {
3867 $cb->($pkg); 3988 $cb->($pkg);
3868 1 3989 1
3869 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3870 } 3991 }
3871 3992
3872 warn "... clearing $pkg"; 3993 trace "... clearing $pkg";
3873 clear_package $pkg; 3994 clear_package $pkg;
3874 } 3995 }
3875 3996
3876 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879 4000
3880 warn "... unloading $k"; 4001 trace "... unloading $k";
3881 delete $INC{$k}; 4002 delete $INC{$k};
3882 4003
3883 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3885 4006
… …
3888 } 4009 }
3889 4010
3890 clear_package $k; 4011 clear_package $k;
3891 } 4012 }
3892 4013
3893 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3894 clear_package "safe::$_" 4015 clear_package "safe::$_"
3895 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);
3896 4017
3897 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3898 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900 4021
3901 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3902 # and global variables created in xs 4023 # and global variables created in xs
3903 #clear_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3904 4025
3905 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3906 4027
3907 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3908 require cf; 4029 require cf;
3909 cf::_connect_to_perl_1; 4030 cf::_connect_to_perl_1;
3910 4031
3911 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3912 cf::reload_config; 4033 cf::reload_config;
3913 4034
3914 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3915 cf::load_extensions; 4036 cf::load_extensions;
3916 4037
3917 if ($REATTACH_ON_RELOAD) { 4038 if ($REATTACH_ON_RELOAD) {
3918 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3919 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3920 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3921 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3922 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3923 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
3924 } 4045 }
3925 4046
3926 warn "running post_init jobs"; 4047 cf::_post_init 1;
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3928 4048
3929 warn "leaving sync_job"; 4049 trace "perl_reload: leaving sync_job";
3930 4050
3931 1 4051 1
3932 } or do { 4052 } or do {
3933 warn $@; 4053 error $@;
3934 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3935 }; 4055 };
3936 4056
3937 warn "reloaded";
3938 --$RELOAD; 4057 --$RELOAD;
3939 } 4058 }
3940 4059
3941 $t1 = AE::time - $t1; 4060 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n"; 4061 info "perl_reload: completed in ${t1}s\n";
3943}; 4062};
3944 4063
3945our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3946 4065
3947sub reload_perl() { 4066sub reload_perl() {
… …
3968 reload_perl; 4087 reload_perl;
3969 }; 4088 };
3970 } 4089 }
3971}; 4090};
3972 4091
3973unshift @INC, $LIBDIR; 4092#############################################################################
3974 4093
3975my $bug_warning = 0; 4094my $bug_warning = 0;
3976 4095
3977our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3978our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3979 4098
3980sub wait_for_tick { 4099sub wait_for_tick() {
3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3982 4101
3983 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3984 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3985 $signal->wait; 4104 $signal->wait;
3986} 4105}
3987 4106
3988sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3990 4109
3991 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3992 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3993 $signal->wait; 4112 $signal->wait;
… …
4007 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008 $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.;
4009 Coro::async_pool { 4128 Coro::async_pool {
4010 $Coro::current->{desc} = "runtime saver"; 4129 $Coro::current->{desc} = "runtime saver";
4011 write_runtime_sync 4130 write_runtime_sync
4012 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
4013 }; 4132 };
4014 } 4133 }
4015 4134
4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017 $sig->send; 4136 $sig->send;
… …
4025 4144
4026 if (0) { 4145 if (0) {
4027 if ($NEXT_TICK) { 4146 if ($NEXT_TICK) {
4028 my $jitter = $TICK_START - $NEXT_TICK; 4147 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d# 4149 debug "jitter $JITTER\n";#d#
4031 } 4150 }
4032 } 4151 }
4033} 4152}
4034 4153
4035{ 4154{
… …
4080 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
4081 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
4082 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
4083} 4202}
4084 4203
4085my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
4086 4206
4087sub _log_backtrace { 4207sub _log_backtrace {
4088 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
4089 4209
4090 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
4091 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4092 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
4093 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
4094 ++$_log_backtrace; 4218 ++$_log_backtrace;
4095 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
4096 async { 4220 async {
4097 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
4098 4222
… …
4118 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
4119 --$_log_backtrace; 4243 --$_log_backtrace;
4120 }; 4244 };
4121 } else { 4245 } else {
4122 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
4123 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4124 } 4248 }
4125} 4249}
4126 4250
4127# load additional modules 4251# load additional modules
4128require "cf/$_.pm" for @EXTRA_MODULES; 4252require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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