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

Diff Legend

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