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.490 by root, Sat Oct 24 06:16:40 2009 UTC vs.
Revision 1.550 by root, Fri May 14 22:56:47 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)
… …
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 1866 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1867 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1778 1889
1779sub register { 1890sub register {
1780 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1892 my $pkg = caller;
1782 1893
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1895
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1897}
1788 1898
1789# also paths starting with '/' 1899# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1901
1792sub thawer_merge { 1902sub thawer_merge {
1793 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1794 1904
1795 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1800} 1910}
1801 1911
1802sub normalise { 1912sub normalise {
1803 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1804 1914
1805 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1806 1916
1807 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1808 1918
1809 # map plan: 1919 # map plan:
1810 # 1920 #
… …
1849 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1850 return $self; 1960 return $self;
1851 } 1961 }
1852 } 1962 }
1853 1963
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1965 ()
1856} 1966}
1857 1967
1858sub init { 1968sub init {
1859 my ($self) = @_; 1969 my ($self) = @_;
… …
1981} 2091}
1982 2092
1983sub find; 2093sub find;
1984sub find { 2094sub find {
1985 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
1986 2098
1987 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
1988 2100
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2121
2010 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
2011 } 2123 }
2012} 2124}
2013 2125
2014sub pre_load { } 2126sub pre_load { }
2015sub post_load { } 2127#sub post_load { } # XS
2016 2128
2017sub load { 2129sub load {
2018 my ($self) = @_; 2130 my ($self) = @_;
2019 2131
2020 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2189 }
2078 2190
2079 $self->post_load; 2191 $self->post_load;
2080} 2192}
2081 2193
2194# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath
2082sub customise_for { 2197sub customise_for {
2083 my ($self, $ob) = @_; 2198 my ($self, $ob) = @_;
2084 2199
2085 return find "~" . $ob->name . "/" . $self->{path} 2200 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2201 if $self->per_player;
… …
2102 or next; 2217 or next;
2103 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2104 or next; 2219 or next;
2105 $neigh->load; 2220 $neigh->load;
2106 2221
2222 # now find the diagonal neighbours
2107 push @neigh, 2223 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2226 }
2111 2227
… …
2118} 2234}
2119 2235
2120sub find_sync { 2236sub find_sync {
2121 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2122 2238
2123 cf::sync_job { find $path, $origin } 2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main;
2241
2242 find $path, $origin
2124} 2243}
2125 2244
2126sub do_load_sync { 2245sub do_load_sync {
2127 my ($map) = @_; 2246 my ($map) = @_;
2128 2247
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2131 2250
2132 cf::sync_job { $map->load }; 2251 $map->load;
2133} 2252}
2134 2253
2135our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2137 2256
… …
2163 $MAP_PREFETCHER->prio (6); 2282 $MAP_PREFETCHER->prio (6);
2164 2283
2165 () 2284 ()
2166} 2285}
2167 2286
2287# common code, used by both ->save and ->swapout
2168sub save { 2288sub _save {
2169 my ($self) = @_; 2289 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2290
2173 $self->{last_save} = $cf::RUNTIME; 2291 $self->{last_save} = $cf::RUNTIME;
2174 2292
2175 return unless $self->dirty; 2293 return unless $self->dirty;
2176 2294
… …
2196 } else { 2314 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2315 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2316 }
2199} 2317}
2200 2318
2319sub save {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 $self->_save;
2325}
2326
2201sub swap_out { 2327sub swap_out {
2202 my ($self) = @_; 2328 my ($self) = @_;
2203 2329
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2330 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2331
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2332 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2333 return if $self->{deny_save};
2334 return if $self->players;
2212 2335
2336 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # then atomically save
2342 $self->_save;
2343
2344 # then free the map
2345 $self->clear;
2346}
2347
2348sub reset_at {
2349 my ($self) = @_;
2350
2351 # TODO: safety, remove and allow resettable per-player maps
2352 return 1e99 if $self->{deny_reset};
2353
2354 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2355 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2356
2357 $time + $to
2358}
2359
2360sub should_reset {
2361 my ($self) = @_;
2362
2363 $self->reset_at <= $cf::RUNTIME
2364}
2365
2366sub reset {
2367 my ($self) = @_;
2368
2369 my $lock = cf::lock_acquire "map_data:$self->{path}";
2370
2371 return if $self->players;
2372
2373 cf::trace "resetting map ", $self->path, "\n";
2374
2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # need to save uniques path
2378 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380
2381 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2382 if $uniq;
2383 }
2384
2385 delete $cf::MAP{$self->path};
2214 2386
2215 $self->deactivate; 2387 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2388 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2389 $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 2390
2263 $self->unlink_save; 2391 $self->unlink_save;
2264 $self->destroy; 2392 $self->destroy;
2265} 2393}
2266 2394
… …
2274 2402
2275 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2276 2404
2277 $self->unlink_save; 2405 $self->unlink_save;
2278 2406
2279 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2412
… …
2344} 2472}
2345 2473
2346=item cf::map::static_maps 2474=item cf::map::static_maps
2347 2475
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map> 2476Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block. 2477file in the shared directory excluding F</styles> and F</editor>). May
2478block.
2350 2479
2351=cut 2480=cut
2352 2481
2353sub static_maps() { 2482sub static_maps() {
2354 my @dirs = ""; 2483 my @dirs = "";
2355 my @maps; 2484 my @maps;
2356 2485
2357 while (@dirs) { 2486 while (@dirs) {
2358 my $dir = shift @dirs; 2487 my $dir = shift @dirs;
2359 2488
2360 next if $dir eq "/styles"; 2489 next if $dir eq "/styles" || $dir eq "/editor";
2361 2490
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2 2491 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return; 2492 or return;
2364 2493
2365 for (@$files) { 2494 for (@$files) {
… …
2513 2642
2514Freezes the player and moves him/her to a special map (C<{link}>). 2643Freezes the player and moves him/her to a special map (C<{link}>).
2515 2644
2516The player should be reasonably safe there for short amounts of time (e.g. 2645The player should be reasonably safe there for short amounts of time (e.g.
2517for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2646for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2518though, as the palyer cannot control the character while it is on the link 2647though, as the player cannot control the character while it is on the link
2519map. 2648map.
2520 2649
2521Will never block. 2650Will never block.
2522 2651
2523=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
… …
2544sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2545 my ($self) = @_; 2674 my ($self) = @_;
2546 2675
2547 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2548 2677
2678 ++$self->{_link_recursion};
2679
2549 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2550 2681
2551 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2552 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2553 2684
2554 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2685 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2555} 2686}
2556 2687
2557sub cf::object::player::leave_link { 2688sub cf::object::player::leave_link {
2558 my ($self, $map, $x, $y) = @_; 2689 my ($self, $map, $x, $y) = @_;
2559 2690
… …
2576 ($x, $y) = (-1, -1) 2707 ($x, $y) = (-1, -1)
2577 unless (defined $x) && (defined $y); 2708 unless (defined $x) && (defined $y);
2578 2709
2579 # use -1 or undef as default coordinates, not 0, 0 2710 # use -1 or undef as default coordinates, not 0, 0
2580 ($x, $y) = ($map->enter_x, $map->enter_y) 2711 ($x, $y) = ($map->enter_x, $map->enter_y)
2581 if $x <=0 && $y <= 0; 2712 if $x <= 0 && $y <= 0;
2582 2713
2583 $map->load; 2714 $map->load;
2584 $map->load_neighbours; 2715 $map->load_neighbours;
2585 2716
2586 return unless $self->contr->active; 2717 return unless $self->contr->active;
2587 2718
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2590 2721 # entering was successful
2722 delete $self->{_link_recursion};
2591 # only activate afterwards, to support waiting in hooks 2723 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive; 2724 $self->activate_recursive;
2593} 2725 }
2594 2726
2727}
2728
2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2729=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2596 2730
2597Moves the player to the given map-path and coordinates by first freezing 2731Moves the player to the given map-path and coordinates by first freezing
2598her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2599that has to return the map if sucecssful, and then unfreezes the player on 2733that has to return the map if sucecssful, and then unfreezes the player on
2600the new (success) or old (failed) map position. In either case, $done will 2734the new (success) or old (failed) map position. In either case, $done will
… …
2607 2741
2608our $GOTOGEN; 2742our $GOTOGEN;
2609 2743
2610sub cf::object::player::goto { 2744sub cf::object::player::goto {
2611 my ($self, $path, $x, $y, $check, $done) = @_; 2745 my ($self, $path, $x, $y, $check, $done) = @_;
2746
2747 if ($self->{_link_recursion} >= $MAX_LINKS) {
2748 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2749 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2750 ($path, $x, $y) = @$EMERGENCY_POSITION;
2751 }
2612 2752
2613 # do generation counting so two concurrent goto's will be executed in-order 2753 # do generation counting so two concurrent goto's will be executed in-order
2614 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2615 2755
2616 $self->enter_link; 2756 $self->enter_link;
… …
2640 my $map = eval { 2780 my $map = eval {
2641 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2642 2782
2643 if ($map) { 2783 if ($map) {
2644 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2645 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2646 } else { 2786 } else {
2647 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2787 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 } 2788 }
2649 2789
2650 $map 2790 $map
… …
2658 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2659 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2660 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2661 } 2801 }
2662 2802
2663 $done->() if $done; 2803 $done->($self) if $done;
2664 })->prio (1); 2804 })->prio (1);
2665} 2805}
2666 2806
2667=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2668 2808
… …
2761 $self->message ("Something went wrong deep within the deliantra server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2762 . "I'll try to bring you back to the map you were before. " 2902 . "I'll try to bring you back to the map you were before. "
2763 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2764 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2765 2905
2766 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2767 $self->leave_link; 2907 $self->leave_link;
2768 } 2908 }
2769 })->prio (1); 2909 })->prio (1);
2770} 2910}
2771 2911
… …
2783sub cf::client::send_drawinfo { 2923sub cf::client::send_drawinfo {
2784 my ($self, $text, $flags) = @_; 2924 my ($self, $text, $flags) = @_;
2785 2925
2786 utf8::encode $text; 2926 utf8::encode $text;
2787 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2927 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2928}
2929
2930=item $client->send_big_packet ($pkt)
2931
2932Like C<send_packet>, but tries to compress large packets, and fragments
2933them as required.
2934
2935=cut
2936
2937our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2938
2939sub cf::client::send_big_packet {
2940 my ($self, $pkt) = @_;
2941
2942 # try lzf for large packets
2943 $pkt = "lzf " . Compress::LZF::compress $pkt
2944 if 1024 <= length $pkt and $self->{can_lzf};
2945
2946 # split very large packets
2947 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2948 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2949 $pkt = "frag";
2950 }
2951
2952 $self->send_packet ($pkt);
2788} 2953}
2789 2954
2790=item $client->send_msg ($channel, $msg, $color, [extra...]) 2955=item $client->send_msg ($channel, $msg, $color, [extra...])
2791 2956
2792Send a drawinfo or msg packet to the client, formatting the msg for the 2957Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2944 my $pkt = "msg " 3109 my $pkt = "msg "
2945 . $self->{json_coder}->encode ( 3110 . $self->{json_coder}->encode (
2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3111 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2947 ); 3112 );
2948 3113
2949 # try lzf for large packets
2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2951 if 1024 <= length $pkt and $self->{can_lzf};
2952
2953 # split very large packets
2954 if (8192 < length $pkt and $self->{can_lzf}) {
2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2956 $pkt = "frag";
2957 }
2958
2959 $self->send_packet ($pkt); 3114 $self->send_big_packet ($pkt);
2960} 3115}
2961 3116
2962=item $client->ext_msg ($type, @msg) 3117=item $client->ext_msg ($type, @msg)
2963 3118
2964Sends an ext event to the client. 3119Sends an ext event to the client.
… …
2967 3122
2968sub cf::client::ext_msg($$@) { 3123sub cf::client::ext_msg($$@) {
2969 my ($self, $type, @msg) = @_; 3124 my ($self, $type, @msg) = @_;
2970 3125
2971 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2973 } elsif ($self->extcmd == 1) { # TODO: remove 3128 } elsif ($self->extcmd == 1) { # TODO: remove
2974 push @msg, msgtype => "event_$type"; 3129 push @msg, msgtype => "event_$type";
2975 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3130 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2976 } 3131 }
2977} 3132}
2978 3133
2979=item $client->ext_reply ($msgid, @msg) 3134=item $client->ext_reply ($msgid, @msg)
2980 3135
… …
2984 3139
2985sub cf::client::ext_reply($$@) { 3140sub cf::client::ext_reply($$@) {
2986 my ($self, $id, @msg) = @_; 3141 my ($self, $id, @msg) = @_;
2987 3142
2988 if ($self->extcmd == 2) { 3143 if ($self->extcmd == 2) {
2989 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3144 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2990 } elsif ($self->extcmd == 1) { 3145 } elsif ($self->extcmd == 1) {
2991 #TODO: version 1, remove 3146 #TODO: version 1, remove
2992 unshift @msg, msgtype => "reply", msgid => $id; 3147 unshift @msg, msgtype => "reply", msgid => $id;
2993 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2994 } 3149 }
2995} 3150}
2996 3151
2997=item $success = $client->query ($flags, "text", \&cb) 3152=item $success = $client->query ($flags, "text", \&cb)
2998 3153
… …
3069 3224
3070 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
3071 if $reply; 3226 if $reply;
3072 3227
3073 } else { 3228 } else {
3074 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3229 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3075 } 3230 }
3076 3231
3077 cf::override; 3232 cf::override;
3078 }, 3233 },
3079); 3234);
… …
3099 3254
3100 $coro 3255 $coro
3101} 3256}
3102 3257
3103cf::client->attach ( 3258cf::client->attach (
3104 on_destroy => sub { 3259 on_client_destroy => sub {
3105 my ($ns) = @_; 3260 my ($ns) = @_;
3106 3261
3107 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3262 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3108 }, 3263 },
3109); 3264);
… …
3125our $safe_hole = new Safe::Hole; 3280our $safe_hole = new Safe::Hole;
3126 3281
3127$SIG{FPE} = 'IGNORE'; 3282$SIG{FPE} = 'IGNORE';
3128 3283
3129$safe->permit_only (Opcode::opset qw( 3284$safe->permit_only (Opcode::opset qw(
3130 :base_core :base_mem :base_orig :base_math 3285 :base_core :base_mem :base_orig :base_math :base_loop
3131 grepstart grepwhile mapstart mapwhile 3286 grepstart grepwhile mapstart mapwhile
3132 sort time 3287 sort time
3133)); 3288));
3134 3289
3135# here we export the classes and methods available to script code 3290# here we export the classes and methods available to script code
… …
3160 decrease split destroy change_exp value msg lore send_msg)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3161 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3162 ["cf::player" => qw(peaceful send_msg)], 3317 ["cf::player" => qw(peaceful send_msg)],
3163 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3164) { 3319) {
3165 no strict 'refs';
3166 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3168 for @funs; 3322 for @funs;
3169} 3323}
3170 3324
… …
3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3341 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3188 $qcode =~ s/\n/\\n/g; 3342 $qcode =~ s/\n/\\n/g;
3189 3343
3190 %vars = (_dummy => 0) unless %vars; 3344 %vars = (_dummy => 0) unless %vars;
3191 3345
3346 my @res;
3192 local $_; 3347 local $_;
3193 local @safe::cf::_safe_eval_args = values %vars;
3194 3348
3195 my $eval = 3349 my $eval =
3196 "do {\n" 3350 "do {\n"
3197 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3351 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3198 . "#line 0 \"{$qcode}\"\n" 3352 . "#line 0 \"{$qcode}\"\n"
3199 . $code 3353 . $code
3200 . "\n}" 3354 . "\n}"
3201 ; 3355 ;
3202 3356
3357 if ($CFG{safe_eval}) {
3203 sub_generation_inc; 3358 sub_generation_inc;
3359 local @safe::cf::_safe_eval_args = values %vars;
3204 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3360 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3205 sub_generation_inc; 3361 sub_generation_inc;
3362 } else {
3363 local @cf::_safe_eval_args = values %vars;
3364 @res = wantarray ? eval eval : scalar eval $eval;
3365 }
3206 3366
3207 if ($@) { 3367 if ($@) {
3208 warn "$@"; 3368 warn "$@",
3209 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3210 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3211 } 3371 }
3212 3372
3213 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3214} 3374}
3215 3375
… …
3229=cut 3389=cut
3230 3390
3231sub register_script_function { 3391sub register_script_function {
3232 my ($fun, $cb) = @_; 3392 my ($fun, $cb) = @_;
3233 3393
3234 no strict 'refs'; 3394 $fun = "safe::$fun" if $CFG{safe_eval};
3235 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3395 *$fun = $safe_hole->wrap ($cb);
3236} 3396}
3237 3397
3238=back 3398=back
3239 3399
3240=cut 3400=cut
… …
3249 # for this (global event?) 3409 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3251 3411
3252 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3253 3413
3254 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3255 3415
3256 my $facedata;
3257 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3258 or die "$path: $!"; 3417 or die "$path: $!";
3259 3418
3260 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3261 3420
3262 $facedata->{version} == 2 3421 $facedata->{version} == 2
3263 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3264 3423
3265 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3266 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3267 type => FT_RSRC, 3427 type => FT_RSRC,
3268 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3269 }; 3430 };
3270 cf::cede_to_tick; 3431 cf::cede_to_tick;
3271 3432
3272 { 3433 {
3273 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
… …
3275 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3276 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3277 3438
3278 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3279 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3280 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3281 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3282 3443
3283 cf::cede_to_tick; 3444 cf::cede_to_tick;
3284 } 3445 }
3285 3446
3286 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
… …
3291 3452
3292 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3293 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3294 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3295 } else { 3456 } else {
3296 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3297 } 3458 }
3298 3459
3299 cf::cede_to_tick; 3460 cf::cede_to_tick;
3300 } 3461 }
3301 } 3462 }
… …
3310 3471
3311 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3312 } 3473 }
3313 3474
3314 { 3475 {
3315 # TODO: for gcfclient pleasure, we should give resources
3316 # that gcfclient doesn't grok a >10000 face index.
3317 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3318 3477
3319 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3320 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3321 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3322 my $data;
3323 3481
3324 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3325 # prepend meta info
3326
3327 my $meta = $enc->encode ({
3328 name => $name,
3329 %{ $info->{meta} || {} },
3330 });
3331
3332 $data = pack "(w/a*)*", $meta, $info->{data};
3333 } else {
3334 $data = $info->{data};
3335 }
3336
3337 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3338 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3339 } else { 3484 } else {
3340 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3341 } 3486 }
3342 3487
3343 cf::cede_to_tick; 3488 cf::cede_to_tick;
3344 } 3489 }
3345 } 3490 }
3346 3491
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348 3493
3349 1 3494 1
3350} 3495}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
3371 3496
3372register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3373 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3374 3499
3375 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
… …
3414sub reload_treasures { 3539sub reload_treasures {
3415 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3416 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3417} 3542}
3418 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3419sub reload_resources { 3567sub reload_resources {
3420 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3421 3569
3570 reload_exp_table;
3571 reload_materials;
3422 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3423 reload_archetypes; 3574 reload_archetypes;
3424 reload_regions; 3575 reload_regions;
3425 reload_treasures; 3576 reload_treasures;
3426 3577
3427 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3428} 3579}
3429 3580
3430sub reload_config { 3581sub reload_config {
3431 warn "reloading config file...\n"; 3582 trace "reloading config file...\n";
3432 3583
3433 open my $fh, "<:utf8", "$CONFDIR/config" 3584 0 < aio_load "$CONFDIR/config", my $config
3434 or return; 3585 or die "$CONFDIR/config: $!";
3435 3586
3436 local $/; 3587 utf8::decode $config;
3437 *CFG = YAML::XS::Load scalar <$fh>; 3588 *CFG = yaml_load $config;
3438 3589
3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440 3591
3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3443 3594
3444 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3447 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3448 }; 3599 };
3449 warn $@ if $@; 3600 warn $@ if $@;
3450 } 3601 }
3451
3452 warn "finished reloading resource files\n";
3453} 3602}
3454 3603
3455sub pidfile() { 3604sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
… …
3470 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3471 print $fh $$; 3620 print $fh $$;
3472} 3621}
3473 3622
3474sub main_loop { 3623sub main_loop {
3475 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3476 if (1) { 3625 if (1) {
3477 EV::loop; 3626 EV::loop;
3478 } 3627 }
3479 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3481} 3630}
3482 3631
3483sub main { 3632sub main {
3484 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3485 3634
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495 3639
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497 3641
3498 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3499 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
… …
3505 }; 3649 };
3506 3650
3507 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3508 3652
3509 cf::sync_job { 3653 cf::sync_job {
3654 cf::incloader::init ();
3655
3656 cf::init_anim;
3657 cf::init_attackmess;
3658 cf::init_dynamic;
3659
3660 cf::load_settings;
3661
3510 reload_resources; 3662 reload_resources;
3511 reload_config; 3663 reload_config;
3512 db_init; 3664 db_init;
3513 3665
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid; 3666 cf::init_uuid;
3517 cf::init_signals; 3667 cf::init_signals;
3518 cf::init_commands;
3519 cf::init_skills; 3668 cf::init_skills;
3520 3669
3521 cf::init_beforeplay; 3670 cf::init_beforeplay;
3522 3671
3523 atomic; 3672 atomic;
… …
3528 3677
3529 # no (long-running) fork's whatsoever before this point(!) 3678 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX (); 3679 use POSIX ();
3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3680 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3532 3681
3533 (pop @POST_INIT)->(0) while @POST_INIT; 3682 cf::_post_init 0;
3534 }; 3683 };
3535 3684
3685 cf::object::thawer::errors_are_fatal 0;
3686 info "parse errors in files are no longer fatal from this point on.\n";
3687
3688 my $free_main; $free_main = EV::idle sub {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :)
3691 };
3692
3536 main_loop; 3693 goto &main_loop;
3537} 3694}
3538 3695
3539############################################################################# 3696#############################################################################
3540# initialisation and cleanup 3697# initialisation and cleanup
3541 3698
3542# install some emergency cleanup handlers 3699# install some emergency cleanup handlers
3543BEGIN { 3700BEGIN {
3544 our %SIGWATCHER = (); 3701 our %SIGWATCHER = ();
3545 for my $signal (qw(INT HUP TERM)) { 3702 for my $signal (qw(INT HUP TERM)) {
3546 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3703 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3547 cf::cleanup "SIG$signal"; 3704 cf::cleanup "SIG$signal";
3548 }; 3705 };
3549 } 3706 }
3550} 3707}
3551 3708
3552sub write_runtime_sync { 3709sub write_runtime_sync {
3710 my $t0 = AE::time;
3711
3553 # first touch the runtime file to show we are still running: 3712 # first touch the runtime file to show we are still running:
3554 # the fsync below can take a very very long time. 3713 # the fsync below can take a very very long time.
3555 3714
3556 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3715 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3557 3716
3558 my $guard = cf::lock_acquire "write_runtime"; 3717 my $guard = cf::lock_acquire "write_runtime";
3559 3718
3560 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3719 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3561 or return; 3720 or return;
3562 3721
3563 my $value = $cf::RUNTIME + 90 + 10; 3722 my $value = $cf::RUNTIME + 90 + 10;
3564 # 10 is the runtime save interval, for a monotonic clock 3723 # 10 is the runtime save interval, for a monotonic clock
3565 # 60 allows for the watchdog to kill the server. 3724 # 60 allows for the watchdog to kill the server.
… …
3578 or return; 3737 or return;
3579 3738
3580 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3581 and return; 3740 and return;
3582 3741
3583 warn "runtime file written.\n"; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3584 3743
3585 1 3744 1
3586} 3745}
3587 3746
3588our $uuid_lock; 3747our $uuid_lock;
… …
3600 or return; 3759 or return;
3601 3760
3602 my $value = uuid_seq uuid_cur; 3761 my $value = uuid_seq uuid_cur;
3603 3762
3604 unless ($value) { 3763 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n"; 3764 info "cowardly refusing to write zero uuid value!\n";
3606 return; 3765 return;
3607 } 3766 }
3608 3767
3609 my $value = uuid_str $value + $uuid_skip; 3768 my $value = uuid_str $value + $uuid_skip;
3610 $uuid_skip = 0; 3769 $uuid_skip = 0;
… …
3620 or return; 3779 or return;
3621 3780
3622 aio_rename "$uuid~", $uuid 3781 aio_rename "$uuid~", $uuid
3623 and return; 3782 and return;
3624 3783
3625 warn "uuid file written ($value).\n"; 3784 trace "uuid file written ($value).\n";
3626 3785
3627 1 3786 1
3628 3787
3629} 3788}
3630 3789
… …
3636} 3795}
3637 3796
3638sub emergency_save() { 3797sub emergency_save() {
3639 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3640 3799
3641 warn "emergency_perl_save: enter\n"; 3800 info "emergency_perl_save: enter\n";
3801
3802 # this is a trade-off: we want to be very quick here, so
3803 # save all maps without fsync, and later call a global sync
3804 # (which in turn might be very very slow)
3805 local $USE_FSYNC = 0;
3642 3806
3643 cf::sync_job { 3807 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so 3808 cf::write_runtime_sync; # external watchdog should not bark
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648 3809
3649 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3650 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3651 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3652 warn "emergency_perl_save: begin player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3653 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3654 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3655 $pl->valid or next; 3816 $pl->valid or next;
3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3657 $pl->save; 3818 $pl->save;
3658 } 3819 }
3659 warn "emergency_perl_save: end player save\n"; 3820 info "emergency_perl_save: end player save\n";
3660 3821
3822 cf::write_runtime_sync; # external watchdog should not bark
3823
3661 warn "emergency_perl_save: begin map save\n"; 3824 info "emergency_perl_save: begin map save\n";
3662 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3663 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3664 $map->valid or next; 3827 $map->valid or next;
3665 $map->save; 3828 $map->save;
3666 } 3829 }
3667 warn "emergency_perl_save: end map save\n"; 3830 info "emergency_perl_save: end map save\n";
3668 3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3669 warn "emergency_perl_save: begin database checkpoint\n"; 3834 info "emergency_perl_save: begin database checkpoint\n";
3670 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3671 warn "emergency_perl_save: end database checkpoint\n"; 3836 info "emergency_perl_save: end database checkpoint\n";
3672 3837
3673 warn "emergency_perl_save: begin write uuid\n"; 3838 info "emergency_perl_save: begin write uuid\n";
3674 write_uuid_sync 1; 3839 write_uuid_sync 1;
3675 warn "emergency_perl_save: end write uuid\n"; 3840 info "emergency_perl_save: end write uuid\n";
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3844 trace "emergency_perl_save: syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 info "emergency_perl_save: starting sync\n";
3848 IO::AIO::aio_sync sub {
3849 info "emergency_perl_save: finished sync\n";
3850 };
3851
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3854 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3857 }
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3676 }; 3860 };
3677 3861
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
3683 warn "emergency_perl_save: leave\n"; 3862 info "emergency_perl_save: leave\n";
3684} 3863}
3685 3864
3686sub post_cleanup { 3865sub post_cleanup {
3687 my ($make_core) = @_; 3866 my ($make_core) = @_;
3688 3867
3868 IO::AIO::flush;
3869
3689 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3690 if $make_core; 3871 if $make_core;
3691 3872
3692 my $fh = pidfile; 3873 my $fh = pidfile;
3693 unlink $PIDFILE if <$fh> == $$; 3874 unlink $PIDFILE if <$fh> == $$;
3694} 3875}
… …
3714 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3895 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3715 for my $name (keys %$leaf_symtab) { 3896 for my $name (keys %$leaf_symtab) {
3716 _gv_clear *{"$pkg$name"}; 3897 _gv_clear *{"$pkg$name"};
3717# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3898# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3718 } 3899 }
3719 warn "cleared package $pkg\n";#d#
3720} 3900}
3721 3901
3722sub do_reload_perl() { 3902sub do_reload_perl() {
3723 # can/must only be called in main 3903 # can/must only be called in main
3724 if ($Coro::current != $Coro::main) { 3904 unless (in_main) {
3725 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3726 return; 3906 return;
3727 } 3907 }
3728 3908
3729 return if $RELOAD++; 3909 return if $RELOAD++;
3730 3910
3731 my $t1 = EV::time; 3911 my $t1 = AE::time;
3732 3912
3733 while ($RELOAD) { 3913 while ($RELOAD) {
3734 warn "reloading..."; 3914 cf::get_slot 0.1, -1, "reload_perl";
3915 info "perl_reload: reloading...";
3735 3916
3736 warn "entering sync_job"; 3917 trace "perl_reload: entering sync_job";
3737 3918
3738 cf::sync_job { 3919 cf::sync_job {
3739 cf::write_runtime_sync; # external watchdog should not bark
3740 cf::emergency_save; 3920 #cf::emergency_save;
3741 cf::write_runtime_sync; # external watchdog should not bark
3742 3921
3743 warn "syncing database to disk";
3744 BDB::db_env_txn_checkpoint $DB_ENV;
3745
3746 # if anything goes wrong in here, we should simply crash as we already saved
3747
3748 warn "flushing outstanding aio requests";
3749 while (IO::AIO::nreqs || BDB::nreqs) {
3750 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3751 }
3752
3753 warn "cancelling all extension coros"; 3922 trace "perl_reload: cancelling all extension coros";
3754 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3755 %EXT_CORO = (); 3924 %EXT_CORO = ();
3756 3925
3757 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3758 %COMMAND = (); 3927 %COMMAND = ();
3759 3928
3760 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3761 %EXTCMD = (); 3930 %EXTCMD = ();
3762 %EXTICMD = (); 3931 %EXTICMD = ();
3763 3932
3764 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3765 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3766 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3767 3936
3768 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3769 eval { 3938 eval {
3770 $cb->($pkg); 3939 $cb->($pkg);
3771 1 3940 1
3772 } or warn "$pkg unloaded, but with errors: $@"; 3941 } or error "$pkg unloaded, but with errors: $@";
3773 } 3942 }
3774 3943
3775 warn "... clearing $pkg"; 3944 trace "... clearing $pkg";
3776 clear_package $pkg; 3945 clear_package $pkg;
3777 } 3946 }
3778 3947
3779 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3780 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3781 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3782 3951
3783 warn "... unloading $k"; 3952 trace "... unloading $k";
3784 delete $INC{$k}; 3953 delete $INC{$k};
3785 3954
3786 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3787 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3788 3957
… …
3791 } 3960 }
3792 3961
3793 clear_package $k; 3962 clear_package $k;
3794 } 3963 }
3795 3964
3796 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3797 clear_package "safe::$_" 3966 clear_package "safe::$_"
3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3967 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3799 3968
3800 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3801 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3803 3972
3804 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3805 # and global variables created in xs 3974 # and global variables created in xs
3806 #clear_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3807 3976
3808 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3809 3978
3810 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3811 require cf; 3980 require cf;
3812 cf::_connect_to_perl_1; 3981 cf::_connect_to_perl_1;
3813 3982
3814 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3815 cf::reload_config; 3984 cf::reload_config;
3816 3985
3817 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3818 cf::load_extensions; 3987 cf::load_extensions;
3819 3988
3820 if ($REATTACH_ON_RELOAD) { 3989 if ($REATTACH_ON_RELOAD) {
3821 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3822 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3823 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3824 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3825 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3826 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3827 } 3996 }
3828 3997
3829 warn "running post_init jobs"; 3998 cf::_post_init 1;
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3831 3999
3832 warn "leaving sync_job"; 4000 trace "perl_reload: leaving sync_job";
3833 4001
3834 1 4002 1
3835 } or do { 4003 } or do {
3836 warn $@; 4004 error $@;
3837 cf::cleanup "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
3838 }; 4006 };
3839 4007
3840 warn "reloaded";
3841 --$RELOAD; 4008 --$RELOAD;
3842 } 4009 }
3843 4010
3844 $t1 = EV::time - $t1; 4011 $t1 = AE::time - $t1;
3845 warn "reload completed in ${t1}s\n"; 4012 info "perl_reload: completed in ${t1}s\n";
3846}; 4013};
3847 4014
3848our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3849 4016
3850sub reload_perl() { 4017sub reload_perl() {
… …
3852 # coro crashes during coro_state_free->destroy here. 4019 # coro crashes during coro_state_free->destroy here.
3853 4020
3854 $RELOAD_WATCHER ||= cf::async { 4021 $RELOAD_WATCHER ||= cf::async {
3855 Coro::AIO::aio_wait cache_extensions; 4022 Coro::AIO::aio_wait cache_extensions;
3856 4023
3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4024 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3858 do_reload_perl; 4025 do_reload_perl;
3859 undef $RELOAD_WATCHER; 4026 undef $RELOAD_WATCHER;
3860 }; 4027 };
3861 }; 4028 };
3862} 4029}
… …
3871 reload_perl; 4038 reload_perl;
3872 }; 4039 };
3873 } 4040 }
3874}; 4041};
3875 4042
3876unshift @INC, $LIBDIR; 4043#############################################################################
3877 4044
3878my $bug_warning = 0; 4045my $bug_warning = 0;
3879 4046
3880our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3881our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3882 4049
3883sub wait_for_tick { 4050sub wait_for_tick() {
3884 return if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3885 4052
3886 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3887 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3888 $signal->wait; 4055 $signal->wait;
3889} 4056}
3890 4057
3891sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3892 return if tick_inhibit || $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3893 4060
3894 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3895 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3896 $signal->wait; 4063 $signal->wait;
3897} 4064}
… …
3903 return; 4070 return;
3904 } 4071 }
3905 4072
3906 cf::server_tick; # one server iteration 4073 cf::server_tick; # one server iteration
3907 4074
4075 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4076
3908 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3910 Coro::async_pool { 4079 Coro::async_pool {
3911 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3912 write_runtime_sync 4081 write_runtime_sync
3913 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3914 }; 4083 };
3915 } 4084 }
3916 4085
3917 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3918 $sig->send; 4087 $sig->send;
… …
3926 4095
3927 if (0) { 4096 if (0) {
3928 if ($NEXT_TICK) { 4097 if ($NEXT_TICK) {
3929 my $jitter = $TICK_START - $NEXT_TICK; 4098 my $jitter = $TICK_START - $NEXT_TICK;
3930 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3931 warn "jitter $JITTER\n";#d# 4100 debug "jitter $JITTER\n";#d#
3932 } 4101 }
3933 } 4102 }
3934} 4103}
3935 4104
3936{ 4105{
3937 # configure BDB 4106 # configure BDB
3938 4107
3939 BDB::min_parallel 8; 4108 BDB::min_parallel 16;
3940 BDB::max_poll_reqs $TICK * 0.1; 4109 BDB::max_poll_reqs $TICK * 0.1;
3941 $AnyEvent::BDB::WATCHER->priority (1); 4110 $AnyEvent::BDB::WATCHER->priority (1);
3942 4111
3943 unless ($DB_ENV) { 4112 unless ($DB_ENV) {
3944 $DB_ENV = BDB::db_env_create; 4113 $DB_ENV = BDB::db_env_create;

Diff Legend

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