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.527 by root, Fri Apr 23 04:32:47 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 = 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
117our $VERBOSE_IO = 0;#d# 119our $VERBOSE_IO = 1;
118 120
119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
121our $NEXT_TICK; 123our $NEXT_TICK;
122our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
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->ob->check_score;
1641 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1642 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1643 1737
1644 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1645 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1646 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1812sub generate_random_map { 1906sub generate_random_map {
1813 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1814 1908
1815 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
1816 1910
1817 # mit "rum" bekleckern, nicht
1818 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822 $rmp->{exit_on_final_map},
1823 $rmp->{xsize}, $rmp->{ysize},
1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829 (cf::region::find $rmp->{region}), $rmp->{custom}
1830 )
1831} 1912}
1832 1913
1833=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1834 1915
1835Register 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
… …
1840 1921
1841sub register { 1922sub register {
1842 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1843 my $pkg = caller; 1924 my $pkg = caller;
1844 1925
1845 no strict;
1846 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1847 1927
1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849} 1929}
1850 1930
… …
1862} 1942}
1863 1943
1864sub normalise { 1944sub normalise {
1865 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1866 1946
1867 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1868 1948
1869 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1870 1950
1871 # map plan: 1951 # map plan:
1872 # 1952 #
… …
1874 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1875 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1876 # ?random/... random maps 1956 # ?random/... random maps
1877 # /... normal maps 1957 # /... normal maps
1878 # ~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
1879 1960
1880 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1881 1962
1882 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1883 # something that looks reasonable 1964 # something that looks reasonable
1884 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1885 $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'";
1886 1967
1887 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1888 $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;
1889 } 1984 }
1890 1985
1891 for ($path) { 1986 for ($path) {
1892 redo if s{//}{/};
1893 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1894 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1895 } 1989 }
1896 1990
1897 $path 1991 $path
… …
1911 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1912 return $self; 2006 return $self;
1913 } 2007 }
1914 } 2008 }
1915 2009
1916 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1917 () 2011 ()
1918} 2012}
1919 2013
2014# may re-bless or do other evil things
1920sub init { 2015sub init {
1921 my ($self) = @_; 2016 my ($self) = @_;
1922 2017
1923 $self 2018 $self
1924} 2019}
… …
2044 2139
2045sub find; 2140sub find;
2046sub find { 2141sub find {
2047 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
2048 2143
2144 cf::cede_to_tick;
2145
2049 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
2050 2147
2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052 my $guard2 = cf::lock_acquire "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
2053 2150
2054 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
… …
2094 $self->alloc; 2191 $self->alloc;
2095 2192
2096 $self->pre_load; 2193 $self->pre_load;
2097 cf::cede_to_tick; 2194 cf::cede_to_tick;
2098 2195
2196 if (exists $self->{load_path}) {
2099 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2100 $f->skip_block; 2198 $f->skip_block;
2101 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2102 or return; 2200 or return;
2103 2201
2104 $self->post_load_original 2202 $self->post_load_original
2105 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2106 2204
2107 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2108 utf8::encode $uniq; 2206 utf8::encode $uniq;
2109 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2110 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2111 $self->clear_unique_items; 2209 $self->clear_unique_items;
2112 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2113 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2114 } 2213 }
2115 } 2214 }
2116 }
2117 2215
2118 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2119 2218
2120 cf::cede_to_tick; 2219 cf::cede_to_tick;
2121 # now do the right thing for maps 2220 # now do the right thing for maps
2122 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2123 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
… …
2137 2236
2138 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2139 } 2238 }
2140 2239
2141 $self->post_load; 2240 $self->post_load;
2241
2242 1
2142} 2243}
2143 2244
2144# customize the map for a given player, i.e. 2245# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player 2246# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath 2247# maps to change the path to ~playername/mappath
… …
2184} 2285}
2185 2286
2186sub find_sync { 2287sub find_sync {
2187 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2188 2289
2189 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
2190} 2294}
2191 2295
2192sub do_load_sync { 2296sub do_load_sync {
2193 my ($map) = @_; 2297 my ($map) = @_;
2194 2298
2195 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2197 2301
2198 cf::sync_job { $map->load }; 2302 $map->load;
2199} 2303}
2200 2304
2201our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2202our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2203 2307
2204sub find_async { 2308sub find_async {
2205 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2206 2310
2207 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2208 2312
2209 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2210 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2211 } 2315 }
2212 2316
… …
2315 2419
2316 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317 2421
2318 return if $self->players; 2422 return if $self->players;
2319 2423
2320 warn "resetting map ", $self->path, "\n"; 2424 cf::trace "resetting map ", $self->path, "\n";
2321 2425
2322 $self->in_memory (cf::MAP_SWAPPED); 2426 $self->in_memory (cf::MAP_SWAPPED);
2323 2427
2324 # need to save uniques path 2428 # need to save uniques path
2325 unless ($self->{deny_save}) { 2429 unless ($self->{deny_save}) {
… …
2690 2794
2691sub cf::object::player::goto { 2795sub cf::object::player::goto {
2692 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2693 2797
2694 if ($self->{_link_recursion} >= $MAX_LINKS) { 2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION; 2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 } 2802 }
2699 2803
2700 # 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
… …
2723 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2724 } 2828 }
2725 } 2829 }
2726 2830
2727 my $map = eval { 2831 my $map = eval {
2728 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729 2833
2730 if ($map) { 2834 if ($map) {
2731 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2732 $map = $check->($map, $x, $y, $self) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2733 } else { 2837 } else {
… …
2831 2935
2832 prepare_random_map $exit 2936 prepare_random_map $exit
2833 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2834 } 2938 }
2835 2939
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2837 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2839 2943
2840 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2841 2945
… …
2848 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2849 . "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. "
2850 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2851 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2852 2956
2853 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2854 $self->leave_link; 2958 $self->leave_link;
2855 } 2959 }
2856 })->prio (1); 2960 })->prio (1);
2857} 2961}
2858 2962
… …
3171 3275
3172 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3173 if $reply; 3277 if $reply;
3174 3278
3175 } else { 3279 } else {
3176 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";
3177 } 3281 }
3178 3282
3179 cf::override; 3283 cf::override;
3180 }, 3284 },
3181); 3285);
… …
3262 decrease split destroy change_exp value msg lore send_msg)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3263 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3264 ["cf::player" => qw(peaceful send_msg)], 3368 ["cf::player" => qw(peaceful send_msg)],
3265 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3266) { 3370) {
3267 no strict 'refs';
3268 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270 for @funs; 3373 for @funs;
3271} 3374}
3272 3375
… …
3311 local @cf::_safe_eval_args = values %vars; 3414 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval; 3415 @res = wantarray ? eval eval : scalar eval $eval;
3313 } 3416 }
3314 3417
3315 if ($@) { 3418 if ($@) {
3316 warn "$@"; 3419 warn "$@",
3317 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3318 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3319 } 3422 }
3320 3423
3321 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3322} 3425}
3323 3426
… …
3357 # for this (global event?) 3460 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3359 3462
3360 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361 3464
3362 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3363 3466
3364 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3365 0 < aio_load $path, $facedata
3366 or die "$path: $!";
3367
3368 $facedata = Coro::Storable::thaw $facedata;
3369 3468
3370 $facedata->{version} == 2 3469 $facedata->{version} == 2
3371 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3372 3471
3373 # patch in the exptable 3472 # patch in the exptable
… …
3387 3486
3388 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3389 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3391 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} ;
3392 3492
3393 cf::cede_to_tick; 3493 cf::cede_to_tick;
3394 } 3494 }
3395 3495
3396 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
… …
3401 3501
3402 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3403 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405 } else { 3505 } else {
3406 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3407 } 3507 }
3408 3508
3409 cf::cede_to_tick; 3509 cf::cede_to_tick;
3410 } 3510 }
3411 } 3511 }
… …
3429 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430 3530
3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3433 } else { 3533 } else {
3434 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3435 } 3535 }
3436 3536
3437 cf::cede_to_tick; 3537 cf::cede_to_tick;
3438 } 3538 }
3439 } 3539 }
3440 3540
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442 3542
3443 1 3543 1
3444} 3544}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3465 3545
3466register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3467 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3468 3548
3469 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
… …
3508sub reload_treasures { 3588sub reload_treasures {
3509 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3510 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3511} 3591}
3512 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
3513sub reload_resources { 3613sub reload_resources {
3514 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3515 3615
3616 reload_exp_table;
3617 reload_materials;
3516 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3517 reload_archetypes; 3620 reload_archetypes;
3518 reload_regions; 3621 reload_regions;
3519 reload_treasures; 3622 reload_treasures;
3520 3623
3521 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3522} 3625}
3523 3626
3524sub reload_config { 3627sub reload_config {
3525 warn "reloading config file...\n"; 3628 trace "reloading config file...\n";
3526 3629
3527 open my $fh, "<:utf8", "$CONFDIR/config" 3630 my $config = load_file "$CONFDIR/config";
3528 or return; 3631 utf8::decode $config;
3529 3632 *CFG = decode_yaml $config;
3530 local $/;
3531 *CFG = YAML::XS::Load scalar <$fh>;
3532 3633
3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534 3635
3535 $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};
3536 $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};
… …
3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3641 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541 and die "WARNING: m(un)lockall failed: $!\n"; 3642 and die "WARNING: m(un)lockall failed: $!\n";
3542 }; 3643 };
3543 warn $@ if $@; 3644 warn $@ if $@;
3544 } 3645 }
3545
3546 warn "finished reloading resource files\n";
3547} 3646}
3548 3647
3549sub pidfile() { 3648sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!"; 3650 or die "$PIDFILE: $!";
… …
3564 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3565 print $fh $$; 3664 print $fh $$;
3566} 3665}
3567 3666
3568sub main_loop { 3667sub main_loop {
3569 warn "EV::loop starting\n"; 3668 trace "EV::loop starting\n";
3570 if (1) { 3669 if (1) {
3571 EV::loop; 3670 EV::loop;
3572 } 3671 }
3573 warn "EV::loop returned\n"; 3672 trace "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP; 3673 goto &main_loop unless $REALLY_UNLOOP;
3575} 3674}
3576 3675
3577sub main { 3676sub main {
3578 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3579 3678
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 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.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584 3683
3585 $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
3586 3685
… …
3594 }; 3693 };
3595 3694
3596 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3597 3696
3598 cf::sync_job { 3697 cf::sync_job {
3599 cf::init_experience; 3698 cf::incloader::init ();
3699
3600 cf::init_anim; 3700 cf::init_anim;
3601 cf::init_attackmess; 3701 cf::init_attackmess;
3602 cf::init_dynamic; 3702 cf::init_dynamic;
3603 3703
3604 cf::load_settings; 3704 cf::load_settings;
3605 cf::load_materials;
3606 3705
3607 reload_resources; 3706 reload_resources;
3608 reload_config; 3707 reload_config;
3609 db_init; 3708 db_init;
3610 3709
… …
3622 3721
3623 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX (); 3723 use POSIX ();
3625 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};
3626 3725
3627 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3628 }; 3727 };
3629 3728
3630 cf::object::thawer::errors_are_fatal 0; 3729 cf::object::thawer::errors_are_fatal 0;
3631 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";
3632 3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3633 main_loop; 3737 goto &main_loop;
3634} 3738}
3635 3739
3636############################################################################# 3740#############################################################################
3637# initialisation and cleanup 3741# initialisation and cleanup
3638 3742
… …
3677 or return; 3781 or return;
3678 3782
3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680 and return; 3784 and return;
3681 3785
3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683 3787
3684 1 3788 1
3685} 3789}
3686 3790
3687our $uuid_lock; 3791our $uuid_lock;
… …
3699 or return; 3803 or return;
3700 3804
3701 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3702 3806
3703 unless ($value) { 3807 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3705 return; 3809 return;
3706 } 3810 }
3707 3811
3708 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0; 3813 $uuid_skip = 0;
… …
3719 or return; 3823 or return;
3720 3824
3721 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3722 and return; 3826 and return;
3723 3827
3724 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3725 3829
3726 1 3830 1
3727 3831
3728} 3832}
3729 3833
… …
3735} 3839}
3736 3840
3737sub emergency_save() { 3841sub emergency_save() {
3738 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3739 3843
3740 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;
3741 3850
3742 cf::sync_job { 3851 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so 3852 cf::write_runtime_sync; # external watchdog should not bark
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747 3853
3748 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3749 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3750 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3751 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3752 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3753 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3754 $pl->valid or next; 3860 $pl->valid or next;
3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756 $pl->save; 3862 $pl->save;
3757 } 3863 }
3758 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3759 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3760 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3761 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3762 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3763 $map->valid or next; 3871 $map->valid or next;
3764 $map->save; 3872 $map->save;
3765 } 3873 }
3766 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3767 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3768 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3769 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3770 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3771 3881
3772 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1; 3883 write_uuid_sync 1;
3774 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
3775 }; 3904 };
3776 3905
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3782 warn "emergency_perl_save: leave\n"; 3906 info "emergency_perl_save: leave\n";
3783} 3907}
3784 3908
3785sub post_cleanup { 3909sub post_cleanup {
3786 my ($make_core) = @_; 3910 my ($make_core) = @_;
3787 3911
3912 IO::AIO::flush;
3913
3788 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3789 if $make_core; 3915 if $make_core;
3790 3916
3791 my $fh = pidfile; 3917 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3793} 3919}
… …
3817 } 3943 }
3818} 3944}
3819 3945
3820sub do_reload_perl() { 3946sub do_reload_perl() {
3821 # can/must only be called in main 3947 # can/must only be called in main
3822 if (in_main) { 3948 unless (in_main) {
3823 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3824 return; 3950 return;
3825 } 3951 }
3826 3952
3827 return if $RELOAD++; 3953 return if $RELOAD++;
3828 3954
3829 my $t1 = AE::time; 3955 my $t1 = AE::time;
3830 3956
3831 while ($RELOAD) { 3957 while ($RELOAD) {
3832 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3833 3960
3834 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3835 3962
3836 cf::sync_job { 3963 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838 cf::emergency_save; 3964 #cf::emergency_save;
3839 cf::write_runtime_sync; # external watchdog should not bark
3840 3965
3841 warn "syncing database to disk";
3842 BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844 # if anything goes wrong in here, we should simply crash as we already saved
3845
3846 warn "flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3852 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3853 %EXT_CORO = (); 3968 %EXT_CORO = ();
3854 3969
3855 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3856 %COMMAND = (); 3971 %COMMAND = ();
3857 3972
3858 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3859 %EXTCMD = (); 3974 %EXTCMD = ();
3860 %EXTICMD = (); 3975 %EXTICMD = ();
3861 3976
3862 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3863 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3864 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3865 3980
3866 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3867 eval { 3982 eval {
3868 $cb->($pkg); 3983 $cb->($pkg);
3869 1 3984 1
3870 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3871 } 3986 }
3872 3987
3873 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3874 clear_package $pkg; 3989 clear_package $pkg;
3875 } 3990 }
3876 3991
3877 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880 3995
3881 warn "... unloading $k"; 3996 trace "... unloading $k";
3882 delete $INC{$k}; 3997 delete $INC{$k};
3883 3998
3884 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3886 4001
… …
3889 } 4004 }
3890 4005
3891 clear_package $k; 4006 clear_package $k;
3892 } 4007 }
3893 4008
3894 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3895 clear_package "safe::$_" 4010 clear_package "safe::$_"
3896 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);
3897 4012
3898 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3899 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901 4016
3902 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3903 # and global variables created in xs 4018 # and global variables created in xs
3904 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3905 4020
3906 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3907 4022
3908 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3909 require cf; 4024 require cf;
3910 cf::_connect_to_perl_1; 4025 cf::_connect_to_perl_1;
3911 4026
3912 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3913 cf::reload_config; 4028 cf::reload_config;
3914 4029
3915 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3916 cf::load_extensions; 4031 cf::load_extensions;
3917 4032
3918 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3919 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3920 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3921 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3922 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3923 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3924 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3925 } 4040 }
3926 4041
3927 warn "running post_init jobs"; 4042 cf::_post_init 1;
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929 4043
3930 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3931 4045
3932 1 4046 1
3933 } or do { 4047 } or do {
3934 warn $@; 4048 error $@;
3935 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3936 }; 4050 };
3937 4051
3938 warn "reloaded";
3939 --$RELOAD; 4052 --$RELOAD;
3940 } 4053 }
3941 4054
3942 $t1 = AE::time - $t1; 4055 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3944}; 4057};
3945 4058
3946our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3947 4060
3948sub reload_perl() { 4061sub reload_perl() {
… …
3969 reload_perl; 4082 reload_perl;
3970 }; 4083 };
3971 } 4084 }
3972}; 4085};
3973 4086
3974unshift @INC, $LIBDIR; 4087#############################################################################
3975 4088
3976my $bug_warning = 0; 4089my $bug_warning = 0;
3977 4090
3978our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3979our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3980 4093
3981sub wait_for_tick { 4094sub wait_for_tick() {
3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3983 4096
3984 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3985 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3986 $signal->wait; 4099 $signal->wait;
3987} 4100}
3988 4101
3989sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3991 4104
3992 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3993 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3994 $signal->wait; 4107 $signal->wait;
… …
4008 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009 $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.;
4010 Coro::async_pool { 4123 Coro::async_pool {
4011 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
4012 write_runtime_sync 4125 write_runtime_sync
4013 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
4014 }; 4127 };
4015 } 4128 }
4016 4129
4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018 $sig->send; 4131 $sig->send;
… …
4026 4139
4027 if (0) { 4140 if (0) {
4028 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
4032 } 4145 }
4033 } 4146 }
4034} 4147}
4035 4148
4036{ 4149{
… …
4081 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
4082 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
4083 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
4084} 4197}
4085 4198
4086my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
4087 4201
4088sub _log_backtrace { 4202sub _log_backtrace {
4089 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
4090 4204
4091 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
4092 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
4094 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
4095 ++$_log_backtrace; 4213 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
4097 async { 4215 async {
4098 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
4099 4217
… …
4119 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
4120 --$_log_backtrace; 4238 --$_log_backtrace;
4121 }; 4239 };
4122 } else { 4240 } else {
4123 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
4124 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125 } 4243 }
4126} 4244}
4127 4245
4128# load additional modules 4246# load additional modules
4129require "cf/$_.pm" for @EXTRA_MODULES; 4247require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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