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.493 by root, Mon Oct 26 02:34:37 2009 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 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;
… …
53use Coro::Util (); 51use Coro::Util ();
54 52
55use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
56use BDB (); 54use BDB ();
57use Data::Dumper; 55use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 56use Fcntl;
60use YAML::XS (); 57use YAML::XS ();
61use IO::AIO (); 58use IO::AIO ();
62use Time::HiRes; 59use Time::HiRes;
63use Compress::LZF; 60use Compress::LZF;
… …
78 75
79# strictly for debugging 76# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 78
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
83 82
84our %COMMAND = (); 83our %COMMAND = ();
85our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
86 85
87our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
… …
107our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
113 118
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 121our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
119our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 127our $DB_ENV;
123 128
124our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 130
126our %CFG; 131our %CFG;
127 132
128our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 134our $RUNTIME;
… …
163 168
164our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
165 170
166sub cf::map::normalise; 171sub cf::map::normalise;
167 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
168############################################################################# 177#############################################################################
169 178
170%REFLECT = (); 179%REFLECT = ();
171for (@REFLECT) { 180for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
224from wherever your confdir points to. 233from wherever your confdir points to.
225 234
226=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
227 236
228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
229returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
230per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
231 245
232=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
233 247
234This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
243 257
244=back 258=back
245 259
246=cut 260=cut
247 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
248$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 269 my $msg = join "", @_;
250 270
251 $msg .= "\n" 271 $msg .= "\n"
252 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
253 273
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 275
256 LOG llevError, $msg; 276 LOG llevWarn, $msg;
257}; 277};
258 278
259$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
261 281
262 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
263 283
264 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 286 return;#d#
267 }#d# 287 }#d#
268 288
269 # kill coroutine otherwise 289 # kill coroutine otherwise
270 Coro::terminate 290 Coro::terminate
… …
337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
338 358
339sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
340sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
341 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
342=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
343 375
344Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
346 378
347The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
348is a reload or not. 380is a reload or not.
349 381
350=cut 382=cut
351 383
352sub post_init(&) { 384sub post_init(&) {
353 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
354} 403}
355 404
356=item cf::lock_wait $string 405=item cf::lock_wait $string
357 406
358Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
397} 446}
398 447
399=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
400 449
401Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 451get spread over time.
403 452
404=cut 453=cut
405 454
406sub periodic($$) { 455sub periodic($$) {
407 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
424 473
425=cut 474=cut
426 475
427our @SLOT_QUEUE; 476our @SLOT_QUEUE;
428our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
429 479
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
433 483
434 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
435 486
436 while () { 487 while () {
437 next_job: 488 next_job:
489
438 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 491
440 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 496 $job->[2]->send;
444 Coro::cede; 497 Coro::cede;
445 goto next_job; 498 goto next_job;
446 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 501 }
448 } 502 }
449 503
450 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 507 $signal->wait;
454 } else { 508 } else {
509 $busy = 0;
455 Coro::schedule; 510 Coro::schedule;
456 } 511 }
457 } 512 }
458}; 513};
459 514
460sub get_slot($;$$) { 515sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
462 517
463 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
464 519
465 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
466 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
467 523
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
… …
496=cut 552=cut
497 553
498sub sync_job(&) { 554sub sync_job(&) {
499 my ($job) = @_; 555 my ($job) = @_;
500 556
501 if ($Coro::current == $Coro::main) { 557 if (in_main) {
502 my $time = EV::time; 558 my $time = AE::time;
503 559
504 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
506 562
507 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
508 564
509 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
510 566
511 my $busy = 1; 567 my $busy = 1;
512 my @res; 568 my @res;
513 569
514 (async { 570 (async {
515 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 572 @res = eval { $job->() };
517 warn $@ if $@; 573 error $@ if $@;
518 undef $busy; 574 undef $busy;
519 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
520 576
521 while ($busy) { 577 while ($busy) {
522 if (Coro::nready) { 578 if (Coro::nready) {
… …
524 } else { 580 } else {
525 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
526 } 582 }
527 } 583 }
528 584
529 my $time = EV::time - $time; 585 my $time = AE::time - $time;
530 586
531 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
532 588
533 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
534 } else { 590 } else {
… …
556 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
557 613
558 $coro 614 $coro
559} 615}
560 616
561=item fork_call { }, $args 617=item fork_call { }, @args
562 618
563Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 622never block itself or use any form of event handling.
567 623
568=cut 624=cut
569 625
626sub post_fork {
627 reset_signals;
628}
629
570sub fork_call(&@) { 630sub fork_call(&@) {
571 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
572 632
573 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
576 636
577 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
578 reset_signals; 638 cf::post_fork;
579 &$cb 639 &$cb
580 }, @args; 640 } @args;
581 641
582 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
583} 654}
584 655
585=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
586 657
587=cut 658=cut
… …
624within each server. 695within each server.
625 696
626=cut 697=cut
627 698
628sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
629 my ($name) = @_; 703 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
631 705
632 eval { 706 eval {
633 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
643} 717}
644 718
645our $DB; 719our $DB;
646 720
647sub db_init { 721sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
650 };
651} 723}
652 724
653sub db_get($$) { 725sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
655 727
656 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
657 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
658 732
659 $! ? () 733 $! ? ()
660 : $data 734 : $data
661 }
662} 735}
663 736
664sub db_put($$$) { 737sub db_put($$$) {
665 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
722 795
723 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 797 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
726 799
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 801
729 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
732 805
… …
742 815
743=cut 816=cut
744 817
745sub datalog($@) { 818sub datalog($@) {
746 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 821}
749 822
750=back 823=back
751 824
752=cut 825=cut
… …
947 1020
948 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1023
951 } elsif (ref $type) { 1024 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
953 1026
954 } else { 1027 } else {
955 shift @arg; 1028 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
957 } 1030 }
958 } 1031 }
959} 1032}
960 1033
961sub _object_attach { 1034sub _object_attach {
… …
971 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
972 } 1045 }
973 1046
974 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
975 } else { 1048 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1050 }
978 1051
979 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
980} 1053}
981 1054
… …
1040 1113
1041 for (@$callbacks) { 1114 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1043 1116
1044 if ($@) { 1117 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1119 override;
1048 } 1120 }
1049 1121
1050 return 1 if $override; 1122 return 1 if $override;
1051 } 1123 }
… …
1130 for (@$attach) { 1202 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1133 } 1205 }
1134 } else { 1206 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1208 }
1137 } 1209 }
1138} 1210}
1139 1211
1140cf::attachable->attach ( 1212cf::attachable->attach (
… …
1167 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1168 1240
1169 sync_job { 1241 sync_job {
1170 if (length $$rdata) { 1242 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1174 1247
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1200 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1201 1274
1202 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1277 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1206 } 1279 }
1207 } else { 1280 } else {
1208 aio_unlink $filename; 1281 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1210 } 1283 }
… …
1234 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1308 $av = $st->{objs};
1236 } 1309 }
1237 1310
1238 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1241 1315
1242 ($data, $av) 1316 ($data, $av)
1243} 1317}
1244 1318
1245=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1304} 1378}
1305 1379
1306use File::Glob (); 1380use File::Glob ();
1307 1381
1308cf::player->attach ( 1382cf::player->attach (
1309 on_command => sub { 1383 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1311 1385
1312 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1313 or return; 1387 or return;
1314 1388
… …
1337 1411
1338 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1413 if $reply;
1340 1414
1341 } else { 1415 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1417 }
1344 1418
1345 cf::override; 1419 cf::override;
1346 }, 1420 },
1347); 1421);
… …
1358 1432
1359 $grp 1433 $grp
1360} 1434}
1361 1435
1362sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1363 cf::sync_job { 1439 cf::sync_job {
1364 my %todo; 1440 my %todo;
1365 1441
1366 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1443 next unless -r $path;
… …
1385 1461
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1464
1389 $ext{source} = 1465 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1392 . $source 1468 . $source
1393 . "\n};\n1"; 1469 . "\n};\n1";
1394 1470
1395 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1396 } 1472 }
1397 1473
1474 my $pass = 0;
1398 my %done; 1475 my %done;
1399 while (%todo) { 1476 while (%todo) {
1400 my $progress; 1477 my $progress;
1401 1478
1479 ++$pass;
1480
1481 ext:
1402 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1484 next ext
1405 unless exists $done{$_}; 1485 unless exists $done{$_};
1406 } 1486 }
1407 1487
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1489
1410 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1494
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1496 if exists $v->{meta}{mandatory};
1418 1497
1419 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1420 } 1507 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1508 }
1426 1509
1427 skip: 1510 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1430 } 1518 }
1431 }; 1519 };
1432} 1520}
1433 1521
1434############################################################################# 1522#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1519 } 1607 }
1520 } 1608 }
1521} 1609}
1522 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1523sub save($) { 1624sub save($) {
1524 my ($pl) = @_; 1625 my ($pl) = @_;
1525 1626
1526 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1527 1628
… …
1532 1633
1533 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1535 1636
1536 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1641
1538 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1643 cf::cede_to_tick;
1540} 1644}
1541 1645
… …
1575 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1576 1680
1577 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1683
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1685 $pl->deactivate;
1686
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1585 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1586 1692
1587 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1643 \@logins 1749 \@logins
1644} 1750}
1645 1751
1646=item $player->maps 1752=item $player->maps
1647 1753
1754=item cf::player::maps $login
1755
1648Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1649player. May block. 1757player. May block.
1650 1758
1651=cut 1759=cut
1652 1760
… …
1714=cut 1822=cut
1715 1823
1716sub find_by_path($) { 1824sub find_by_path($) {
1717 my ($path) = @_; 1825 my ($path) = @_;
1718 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1719 my ($match, $specificity); 1829 my ($match, $specificity);
1720 1830
1721 for my $region (list) { 1831 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1751sub generate_random_map { 1861sub generate_random_map {
1752 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1753 1863
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1865
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1766 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1767 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1768 (cf::region::find $rmp->{region}), $rmp->{custom}
1769 )
1770} 1867}
1771 1868
1772=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1773 1870
1774Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1779 1876
1780sub register { 1877sub register {
1781 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1879 my $pkg = caller;
1783 1880
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1882
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1884}
1789 1885
1790# also paths starting with '/' 1886# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1888
1793sub thawer_merge { 1889sub thawer_merge {
1794 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1795 1891
1796 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
… …
1801} 1897}
1802 1898
1803sub normalise { 1899sub normalise {
1804 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1805 1901
1806 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1807 1903
1808 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1809 1905
1810 # map plan: 1906 # map plan:
1811 # 1907 #
… …
1826 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 1923 $path = "$base/$path";
1828 } 1924 }
1829 1925
1830 for ($path) { 1926 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1834 } 1929 }
1835 1930
1836 $path 1931 $path
… …
1850 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1851 return $self; 1946 return $self;
1852 } 1947 }
1853 } 1948 }
1854 1949
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 1951 ()
1857} 1952}
1858 1953
1859sub init { 1954sub init {
1860 my ($self) = @_; 1955 my ($self) = @_;
… …
1982} 2077}
1983 2078
1984sub find; 2079sub find;
1985sub find { 2080sub find {
1986 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
1987 2084
1988 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1989 2086
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2010 2107
2011 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
2012 } 2109 }
2013} 2110}
2014 2111
2015sub pre_load { } 2112sub pre_load { }
2016sub post_load { } 2113#sub post_load { } # XS
2017 2114
2018sub load { 2115sub load {
2019 my ($self) = @_; 2116 my ($self) = @_;
2020 2117
2021 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 2173
2077 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2175 }
2079 2176
2080 $self->post_load; 2177 $self->post_load;
2081}
2082 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2083sub customise_for { 2185sub customise_for {
2084 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2085 2187
2086 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2189 if $self->per_player;
… …
2103 or next; 2205 or next;
2104 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2105 or next; 2207 or next;
2106 $neigh->load; 2208 $neigh->load;
2107 2209
2210 # now find the diagonal neighbours
2108 push @neigh, 2211 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2214 }
2112 2215
… …
2119} 2222}
2120 2223
2121sub find_sync { 2224sub find_sync {
2122 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2123 2226
2124 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2125} 2231}
2126 2232
2127sub do_load_sync { 2233sub do_load_sync {
2128 my ($map) = @_; 2234 my ($map) = @_;
2129 2235
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2132 2238
2133 cf::sync_job { $map->load }; 2239 $map->load;
2134} 2240}
2135 2241
2136our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2138 2244
… …
2164 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2165 2271
2166 () 2272 ()
2167} 2273}
2168 2274
2275# common code, used by both ->save and ->swapout
2169sub save { 2276sub _save {
2170 my ($self) = @_; 2277 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2278
2174 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2175 2280
2176 return unless $self->dirty; 2281 return unless $self->dirty;
2177 2282
… …
2197 } else { 2302 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2304 }
2200} 2305}
2201 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2202sub swap_out { 2315sub swap_out {
2203 my ($self) = @_; 2316 my ($self) = @_;
2204 2317
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2319
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2213 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2214 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2215 2374
2216 $self->deactivate; 2375 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2377 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2378
2264 $self->unlink_save; 2379 $self->unlink_save;
2265 $self->destroy; 2380 $self->destroy;
2266} 2381}
2267 2382
… …
2275 2390
2276 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2277 2392
2278 $self->unlink_save; 2393 $self->unlink_save;
2279 2394
2280 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2400
… …
2515 2630
2516Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2517 2632
2518The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2521map. 2636map.
2522 2637
2523Will never block. 2638Will never block.
2524 2639
2525=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2546sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2547 my ($self) = @_; 2662 my ($self) = @_;
2548 2663
2549 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2550 2665
2666 ++$self->{_link_recursion};
2667
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2669
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2555 2672
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2674}
2558 2675
2559sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2561 2678
… …
2586 $map->load_neighbours; 2703 $map->load_neighbours;
2587 2704
2588 return unless $self->contr->active; 2705 return unless $self->contr->active;
2589 2706
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2592 2709 # entering was successful
2710 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2712 $self->activate_recursive;
2595} 2713 }
2596 2714
2715}
2716
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2718
2599Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
… …
2609 2729
2610our $GOTOGEN; 2730our $GOTOGEN;
2611 2731
2612sub cf::object::player::goto { 2732sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2614 2740
2615 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2743
2618 $self->enter_link; 2744 $self->enter_link;
… …
2642 my $map = eval { 2768 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2644 2770
2645 if ($map) { 2771 if ($map) {
2646 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2774 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2776 }
2651 2777
2652 $map 2778 $map
… …
2660 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2663 } 2789 }
2664 2790
2665 $done->() if $done; 2791 $done->($self) if $done;
2666 })->prio (1); 2792 })->prio (1);
2667} 2793}
2668 2794
2669=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2670 2796
… …
2763 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2893
2768 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2895 $self->leave_link;
2770 } 2896 }
2771 })->prio (1); 2897 })->prio (1);
2772} 2898}
2773 2899
… …
2785sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2786 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2787 2913
2788 utf8::encode $text; 2914 utf8::encode $text;
2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2790} 2941}
2791 2942
2792=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2793 2944
2794Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2946 my $pkt = "msg " 3097 my $pkt = "msg "
2947 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2949 ); 3100 );
2950 3101
2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2954
2955 # split very large packets
2956 if (8192 < length $pkt and $self->{can_lzf}) {
2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2958 $pkt = "frag";
2959 }
2960
2961 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2962} 3103}
2963 3104
2964=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2965 3106
2966Sends an ext event to the client. 3107Sends an ext event to the client.
… …
2969 3110
2970sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2971 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2972 3113
2973 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2974 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2975 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2976 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2977 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2978 } 3119 }
2979} 3120}
2980 3121
2981=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2982 3123
… …
2986 3127
2987sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2988 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2989 3130
2990 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2991 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2992 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2993 #TODO: version 1, remove 3134 #TODO: version 1, remove
2994 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2995 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2996 } 3137 }
2997} 3138}
2998 3139
2999=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
3000 3141
… …
3071 3212
3072 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3073 if $reply; 3214 if $reply;
3074 3215
3075 } else { 3216 } else {
3076 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3077 } 3218 }
3078 3219
3079 cf::override; 3220 cf::override;
3080 }, 3221 },
3081); 3222);
… …
3101 3242
3102 $coro 3243 $coro
3103} 3244}
3104 3245
3105cf::client->attach ( 3246cf::client->attach (
3106 on_destroy => sub { 3247 on_client_destroy => sub {
3107 my ($ns) = @_; 3248 my ($ns) = @_;
3108 3249
3109 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3110 }, 3251 },
3111); 3252);
… …
3127our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3128 3269
3129$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3130 3271
3131$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3132 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3133 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3134 sort time 3275 sort time
3135)); 3276));
3136 3277
3137# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
… …
3162 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3163 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3164 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3165 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3166) { 3307) {
3167 no strict 'refs';
3168 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3170 for @funs; 3310 for @funs;
3171} 3311}
3172 3312
… …
3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3190 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3191 3331
3192 %vars = (_dummy => 0) unless %vars; 3332 %vars = (_dummy => 0) unless %vars;
3193 3333
3334 my @res;
3194 local $_; 3335 local $_;
3195 local @safe::cf::_safe_eval_args = values %vars;
3196 3336
3197 my $eval = 3337 my $eval =
3198 "do {\n" 3338 "do {\n"
3199 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3200 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3201 . $code 3341 . $code
3202 . "\n}" 3342 . "\n}"
3203 ; 3343 ;
3204 3344
3345 if ($CFG{safe_eval}) {
3205 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3206 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3207 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3208 3354
3209 if ($@) { 3355 if ($@) {
3210 warn "$@"; 3356 warn "$@",
3211 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3212 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3213 } 3359 }
3214 3360
3215 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3216} 3362}
3217 3363
… …
3231=cut 3377=cut
3232 3378
3233sub register_script_function { 3379sub register_script_function {
3234 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3235 3381
3236 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3237 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3238} 3384}
3239 3385
3240=back 3386=back
3241 3387
3242=cut 3388=cut
… …
3251 # for this (global event?) 3397 # for this (global event?)
3252 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3253 3399
3254 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3255 3401
3256 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3257 3403
3258 my $facedata;
3259 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3260 or die "$path: $!"; 3405 or die "$path: $!";
3261 3406
3262 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3263 3408
3264 $facedata->{version} == 2 3409 $facedata->{version} == 2
3265 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3266 3411
3267 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3268 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3269 type => FT_RSRC, 3415 type => FT_RSRC,
3270 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3271 }; 3418 };
3272 cf::cede_to_tick; 3419 cf::cede_to_tick;
3273 3420
3274 { 3421 {
3275 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
… …
3277 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3278 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279 3426
3280 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3281 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3282 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3283 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3284 3431
3285 cf::cede_to_tick; 3432 cf::cede_to_tick;
3286 } 3433 }
3287 3434
3288 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
… …
3293 3440
3294 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
3295 cf::face::set_smooth $idx, $smooth; 3442 cf::face::set_smooth $idx, $smooth;
3296 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3297 } else { 3444 } else {
3298 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
3299 } 3446 }
3300 3447
3301 cf::cede_to_tick; 3448 cf::cede_to_tick;
3302 } 3449 }
3303 } 3450 }
… …
3312 3459
3313 cf::anim::invalidate_all; # d'oh 3460 cf::anim::invalidate_all; # d'oh
3314 } 3461 }
3315 3462
3316 { 3463 {
3317 # TODO: for gcfclient pleasure, we should give resources
3318 # that gcfclient doesn't grok a >10000 face index.
3319 my $res = $facedata->{resource}; 3464 my $res = $facedata->{resource};
3320 3465
3321 while (my ($name, $info) = each %$res) { 3466 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) { 3467 if (defined $info->{type}) {
3323 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3324 my $data;
3325 3469
3326 if ($info->{type} & 1) { 3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3327 # prepend meta info
3328
3329 my $meta = $enc->encode ({
3330 name => $name,
3331 %{ $info->{meta} || {} },
3332 });
3333
3334 $data = pack "(w/a*)*", $meta, $info->{data};
3335 } else {
3336 $data = $info->{data};
3337 }
3338
3339 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3340 cf::face::set_type $idx, $info->{type}; 3471 cf::face::set_type $idx, $info->{type};
3341 } else { 3472 } else {
3342 $RESOURCE{$name} = $info; 3473 $RESOURCE{$name} = $info; # unused
3343 } 3474 }
3344 3475
3345 cf::cede_to_tick; 3476 cf::cede_to_tick;
3346 } 3477 }
3347 } 3478 }
3348 3479
3349 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3350 3481
3351 1 3482 1
3352} 3483}
3353
3354cf::global->attach (on_resource_update => sub {
3355 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3356 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3357
3358 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3359 my $sound = $soundconf->{compat}[$_]
3360 or next;
3361
3362 my $face = cf::face::find "sound/$sound->[1]";
3363 cf::sound::set $sound->[0] => $face;
3364 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3365 }
3366
3367 while (my ($k, $v) = each %{$soundconf->{event}}) {
3368 my $face = cf::face::find "sound/$v";
3369 cf::sound::set $k => $face;
3370 }
3371 }
3372});
3373 3484
3374register_exticmd fx_want => sub { 3485register_exticmd fx_want => sub {
3375 my ($ns, $want) = @_; 3486 my ($ns, $want) = @_;
3376 3487
3377 while (my ($k, $v) = each %$want) { 3488 while (my ($k, $v) = each %$want) {
… …
3416sub reload_treasures { 3527sub reload_treasures {
3417 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
3418 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
3419} 3530}
3420 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
3421sub reload_resources { 3555sub reload_resources {
3422 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
3423 3557
3558 reload_exp_table;
3559 reload_materials;
3424 reload_facedata; 3560 reload_facedata;
3561 reload_sound;
3425 reload_archetypes; 3562 reload_archetypes;
3426 reload_regions; 3563 reload_regions;
3427 reload_treasures; 3564 reload_treasures;
3428 3565
3429 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3430} 3567}
3431 3568
3432sub reload_config { 3569sub reload_config {
3433 warn "reloading config file...\n"; 3570 trace "reloading config file...\n";
3434 3571
3435 open my $fh, "<:utf8", "$CONFDIR/config" 3572 0 < aio_load "$CONFDIR/config", my $config
3436 or return; 3573 or die "$CONFDIR/config: $!";
3437 3574
3438 local $/; 3575 utf8::decode $config;
3439 *CFG = YAML::XS::Load scalar <$fh>; 3576 *CFG = yaml_load $config;
3440 3577
3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3442 3579
3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3445 3582
3446 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
… …
3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3585 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3449 and die "WARNING: m(un)lockall failed: $!\n"; 3586 and die "WARNING: m(un)lockall failed: $!\n";
3450 }; 3587 };
3451 warn $@ if $@; 3588 warn $@ if $@;
3452 } 3589 }
3453
3454 warn "finished reloading resource files\n";
3455} 3590}
3456 3591
3457sub pidfile() { 3592sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!"; 3594 or die "$PIDFILE: $!";
… …
3472 seek $fh, 0, 0; 3607 seek $fh, 0, 0;
3473 print $fh $$; 3608 print $fh $$;
3474} 3609}
3475 3610
3476sub main_loop { 3611sub main_loop {
3477 warn "EV::loop starting\n"; 3612 trace "EV::loop starting\n";
3478 if (1) { 3613 if (1) {
3479 EV::loop; 3614 EV::loop;
3480 } 3615 }
3481 warn "EV::loop returned\n"; 3616 trace "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP; 3617 goto &main_loop unless $REALLY_UNLOOP;
3483} 3618}
3484 3619
3485sub main { 3620sub main {
3486 cf::init_globals; # initialise logging 3621 cf::init_globals; # initialise logging
3487 3622
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497 3627
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499 3629
3500 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
3501 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
… …
3507 }; 3637 };
3508 3638
3509 evthread_start IO::AIO::poll_fileno; 3639 evthread_start IO::AIO::poll_fileno;
3510 3640
3511 cf::sync_job { 3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3648 cf::load_settings;
3649
3512 reload_resources; 3650 reload_resources;
3513 reload_config; 3651 reload_config;
3514 db_init; 3652 db_init;
3515 3653
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid; 3654 cf::init_uuid;
3519 cf::init_signals; 3655 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills; 3656 cf::init_skills;
3522 3657
3523 cf::init_beforeplay; 3658 cf::init_beforeplay;
3524 3659
3525 atomic; 3660 atomic;
… …
3530 3665
3531 # no (long-running) fork's whatsoever before this point(!) 3666 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX (); 3667 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534 3669
3535 (pop @POST_INIT)->(0) while @POST_INIT; 3670 cf::_post_init 0;
3536 }; 3671 };
3537 3672
3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3538 main_loop; 3681 goto &main_loop;
3539} 3682}
3540 3683
3541############################################################################# 3684#############################################################################
3542# initialisation and cleanup 3685# initialisation and cleanup
3543 3686
3544# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
3545BEGIN { 3688BEGIN {
3546 our %SIGWATCHER = (); 3689 our %SIGWATCHER = ();
3547 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
3548 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3549 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
3550 }; 3693 };
3551 } 3694 }
3552} 3695}
3553 3696
3554sub write_runtime_sync { 3697sub write_runtime_sync {
3698 my $t0 = AE::time;
3699
3555 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
3556 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
3557 3702
3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3559 3704
3560 my $guard = cf::lock_acquire "write_runtime"; 3705 my $guard = cf::lock_acquire "write_runtime";
3561 3706
3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3707 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3563 or return; 3708 or return;
3564 3709
3565 my $value = $cf::RUNTIME + 90 + 10; 3710 my $value = $cf::RUNTIME + 90 + 10;
3566 # 10 is the runtime save interval, for a monotonic clock 3711 # 10 is the runtime save interval, for a monotonic clock
3567 # 60 allows for the watchdog to kill the server. 3712 # 60 allows for the watchdog to kill the server.
… …
3580 or return; 3725 or return;
3581 3726
3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3583 and return; 3728 and return;
3584 3729
3585 warn "runtime file written.\n"; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3586 3731
3587 1 3732 1
3588} 3733}
3589 3734
3590our $uuid_lock; 3735our $uuid_lock;
… …
3602 or return; 3747 or return;
3603 3748
3604 my $value = uuid_seq uuid_cur; 3749 my $value = uuid_seq uuid_cur;
3605 3750
3606 unless ($value) { 3751 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n"; 3752 info "cowardly refusing to write zero uuid value!\n";
3608 return; 3753 return;
3609 } 3754 }
3610 3755
3611 my $value = uuid_str $value + $uuid_skip; 3756 my $value = uuid_str $value + $uuid_skip;
3612 $uuid_skip = 0; 3757 $uuid_skip = 0;
… …
3622 or return; 3767 or return;
3623 3768
3624 aio_rename "$uuid~", $uuid 3769 aio_rename "$uuid~", $uuid
3625 and return; 3770 and return;
3626 3771
3627 warn "uuid file written ($value).\n"; 3772 trace "uuid file written ($value).\n";
3628 3773
3629 1 3774 1
3630 3775
3631} 3776}
3632 3777
… …
3638} 3783}
3639 3784
3640sub emergency_save() { 3785sub emergency_save() {
3641 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3642 3787
3643 warn "emergency_perl_save: enter\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3644 3794
3645 cf::sync_job { 3795 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so 3796 cf::write_runtime_sync; # external watchdog should not bark
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650 3797
3651 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3652 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3653 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3654 warn "emergency_perl_save: begin player save\n"; 3801 info "emergency_perl_save: begin player save\n";
3655 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
3656 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
3657 $pl->valid or next; 3804 $pl->valid or next;
3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3659 $pl->save; 3806 $pl->save;
3660 } 3807 }
3661 warn "emergency_perl_save: end player save\n"; 3808 info "emergency_perl_save: end player save\n";
3662 3809
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3663 warn "emergency_perl_save: begin map save\n"; 3812 info "emergency_perl_save: begin map save\n";
3664 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3665 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3666 $map->valid or next; 3815 $map->valid or next;
3667 $map->save; 3816 $map->save;
3668 } 3817 }
3669 warn "emergency_perl_save: end map save\n"; 3818 info "emergency_perl_save: end map save\n";
3670 3819
3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3671 warn "emergency_perl_save: begin database checkpoint\n"; 3822 info "emergency_perl_save: begin database checkpoint\n";
3672 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3673 warn "emergency_perl_save: end database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3674 3825
3675 warn "emergency_perl_save: begin write uuid\n"; 3826 info "emergency_perl_save: begin write uuid\n";
3676 write_uuid_sync 1; 3827 write_uuid_sync 1;
3677 warn "emergency_perl_save: end write uuid\n"; 3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3678 }; 3848 };
3679 3849
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3685 warn "emergency_perl_save: leave\n"; 3850 info "emergency_perl_save: leave\n";
3686} 3851}
3687 3852
3688sub post_cleanup { 3853sub post_cleanup {
3689 my ($make_core) = @_; 3854 my ($make_core) = @_;
3690 3855
3856 IO::AIO::flush;
3857
3691 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3692 if $make_core; 3859 if $make_core;
3693 3860
3694 my $fh = pidfile; 3861 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$; 3862 unlink $PIDFILE if <$fh> == $$;
3696} 3863}
… …
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) { 3884 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"}; 3885 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 } 3887 }
3721 warn "cleared package $pkg\n";#d#
3722} 3888}
3723 3889
3724sub do_reload_perl() { 3890sub do_reload_perl() {
3725 # can/must only be called in main 3891 # can/must only be called in main
3726 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
3727 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3728 return; 3894 return;
3729 } 3895 }
3730 3896
3731 return if $RELOAD++; 3897 return if $RELOAD++;
3732 3898
3733 my $t1 = EV::time; 3899 my $t1 = AE::time;
3734 3900
3735 while ($RELOAD) { 3901 while ($RELOAD) {
3736 warn "reloading..."; 3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3737 3904
3738 warn "entering sync_job"; 3905 trace "perl_reload: entering sync_job";
3739 3906
3740 cf::sync_job { 3907 cf::sync_job {
3741 cf::write_runtime_sync; # external watchdog should not bark
3742 cf::emergency_save; 3908 #cf::emergency_save;
3743 cf::write_runtime_sync; # external watchdog should not bark
3744 3909
3745 warn "syncing database to disk";
3746 BDB::db_env_txn_checkpoint $DB_ENV;
3747
3748 # if anything goes wrong in here, we should simply crash as we already saved
3749
3750 warn "flushing outstanding aio requests";
3751 while (IO::AIO::nreqs || BDB::nreqs) {
3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3753 }
3754
3755 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3756 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3757 %EXT_CORO = (); 3912 %EXT_CORO = ();
3758 3913
3759 warn "removing commands"; 3914 trace "perl_reload: removing commands";
3760 %COMMAND = (); 3915 %COMMAND = ();
3761 3916
3762 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3763 %EXTCMD = (); 3918 %EXTCMD = ();
3764 %EXTICMD = (); 3919 %EXTICMD = ();
3765 3920
3766 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3767 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3768 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
3769 3924
3770 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3771 eval { 3926 eval {
3772 $cb->($pkg); 3927 $cb->($pkg);
3773 1 3928 1
3774 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3775 } 3930 }
3776 3931
3777 warn "... clearing $pkg"; 3932 trace "... clearing $pkg";
3778 clear_package $pkg; 3933 clear_package $pkg;
3779 } 3934 }
3780 3935
3781 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784 3939
3785 warn "... unloading $k"; 3940 trace "... unloading $k";
3786 delete $INC{$k}; 3941 delete $INC{$k};
3787 3942
3788 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
3790 3945
… …
3793 } 3948 }
3794 3949
3795 clear_package $k; 3950 clear_package $k;
3796 } 3951 }
3797 3952
3798 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3799 clear_package "safe::$_" 3954 clear_package "safe::$_"
3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3801 3956
3802 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3803 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3805 3960
3806 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3807 # and global variables created in xs 3962 # and global variables created in xs
3808 #clear_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3809 3964
3810 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3811 3966
3812 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3813 require cf; 3968 require cf;
3814 cf::_connect_to_perl_1; 3969 cf::_connect_to_perl_1;
3815 3970
3816 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3817 cf::reload_config; 3972 cf::reload_config;
3818 3973
3819 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
3820 cf::load_extensions; 3975 cf::load_extensions;
3821 3976
3822 if ($REATTACH_ON_RELOAD) { 3977 if ($REATTACH_ON_RELOAD) {
3823 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3824 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3825 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3826 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3827 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3828 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3829 } 3984 }
3830 3985
3831 warn "running post_init jobs"; 3986 cf::_post_init 1;
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833 3987
3834 warn "leaving sync_job"; 3988 trace "perl_reload: leaving sync_job";
3835 3989
3836 1 3990 1
3837 } or do { 3991 } or do {
3838 warn $@; 3992 error $@;
3839 cf::cleanup "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3840 }; 3994 };
3841 3995
3842 warn "reloaded";
3843 --$RELOAD; 3996 --$RELOAD;
3844 } 3997 }
3845 3998
3846 $t1 = EV::time - $t1; 3999 $t1 = AE::time - $t1;
3847 warn "reload completed in ${t1}s\n"; 4000 info "perl_reload: completed in ${t1}s\n";
3848}; 4001};
3849 4002
3850our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3851 4004
3852sub reload_perl() { 4005sub reload_perl() {
… …
3854 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3855 4008
3856 $RELOAD_WATCHER ||= cf::async { 4009 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions; 4010 Coro::AIO::aio_wait cache_extensions;
3858 4011
3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3860 do_reload_perl; 4013 do_reload_perl;
3861 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
3862 }; 4015 };
3863 }; 4016 };
3864} 4017}
… …
3873 reload_perl; 4026 reload_perl;
3874 }; 4027 };
3875 } 4028 }
3876}; 4029};
3877 4030
3878unshift @INC, $LIBDIR; 4031#############################################################################
3879 4032
3880my $bug_warning = 0; 4033my $bug_warning = 0;
3881 4034
3882our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3883our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3884 4037
3885sub wait_for_tick { 4038sub wait_for_tick() {
3886 return if tick_inhibit || $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3887 4040
3888 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3889 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3890 $signal->wait; 4043 $signal->wait;
3891} 4044}
3892 4045
3893sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3894 return if tick_inhibit || $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3895 4048
3896 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3897 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3898 $signal->wait; 4051 $signal->wait;
3899} 4052}
… …
3905 return; 4058 return;
3906 } 4059 }
3907 4060
3908 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3909 4062
4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4064
3910 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3912 Coro::async_pool { 4067 Coro::async_pool {
3913 $Coro::current->{desc} = "runtime saver"; 4068 $Coro::current->{desc} = "runtime saver";
3914 write_runtime_sync 4069 write_runtime_sync
3915 or warn "ERROR: unable to write runtime file: $!"; 4070 or error "ERROR: unable to write runtime file: $!";
3916 }; 4071 };
3917 } 4072 }
3918 4073
3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3920 $sig->send; 4075 $sig->send;
… …
3928 4083
3929 if (0) { 4084 if (0) {
3930 if ($NEXT_TICK) { 4085 if ($NEXT_TICK) {
3931 my $jitter = $TICK_START - $NEXT_TICK; 4086 my $jitter = $TICK_START - $NEXT_TICK;
3932 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3933 warn "jitter $JITTER\n";#d# 4088 debug "jitter $JITTER\n";#d#
3934 } 4089 }
3935 } 4090 }
3936} 4091}
3937 4092
3938{ 4093{
3939 # configure BDB 4094 # configure BDB
3940 4095
3941 BDB::min_parallel 8; 4096 BDB::min_parallel 16;
3942 BDB::max_poll_reqs $TICK * 0.1; 4097 BDB::max_poll_reqs $TICK * 0.1;
3943 $AnyEvent::BDB::WATCHER->priority (1); 4098 $AnyEvent::BDB::WATCHER->priority (1);
3944 4099
3945 unless ($DB_ENV) { 4100 unless ($DB_ENV) {
3946 $DB_ENV = BDB::db_env_create; 4101 $DB_ENV = BDB::db_env_create;
… …
3983 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
3984 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
3985 undef $AnyEvent::AIO::WATCHER; 4140 undef $AnyEvent::AIO::WATCHER;
3986} 4141}
3987 4142
3988my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
3989 4145
3990sub _log_backtrace { 4146sub _log_backtrace {
3991 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
3992 4148
3993 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
3994 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3995 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
3996 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
3997 ++$_log_backtrace; 4157 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg; 4158 my $perl_bt = Carp::longmess $msg;
3999 async { 4159 async {
4000 $Coro::current->{desc} = "abt $msg"; 4160 $Coro::current->{desc} = "abt $msg";
4001 4161
… …
4021 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
4022 --$_log_backtrace; 4182 --$_log_backtrace;
4023 }; 4183 };
4024 } else { 4184 } else {
4025 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
4026 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4027 } 4187 }
4028} 4188}
4029 4189
4030# load additional modules 4190# load additional modules
4031require "cf/$_.pm" for @EXTRA_MODULES; 4191require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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