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.482 by root, Sun Oct 11 05:31:54 2009 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
… …
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
… …
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
… …
105our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %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;
111 118
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 121our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
117our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 127our $DB_ENV;
121 128
122our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 130
124our %CFG; 131our %CFG;
125 132
126our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 134our $RUNTIME;
… …
161 168
162our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
163 170
164sub cf::map::normalise; 171sub cf::map::normalise;
165 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
166############################################################################# 177#############################################################################
167 178
168%REFLECT = (); 179%REFLECT = ();
169for (@REFLECT) { 180for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
222from wherever your confdir points to. 233from wherever your confdir points to.
223 234
224=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
225 236
226These 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
227returns 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
228per 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.
229 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
230=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
231 247
232This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
233C<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
234that call. 250that call.
235 251
236=item %cf::REFLECT 252=item %cf::REFLECT
237 253
… …
241 257
242=back 258=back
243 259
244=cut 260=cut
245 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
246$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 269 my $msg = join "", @_;
248 270
249 $msg .= "\n" 271 $msg .= "\n"
250 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
251 273
252 $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;
253 275
254 LOG llevError, $msg; 276 LOG llevWarn, $msg;
255}; 277};
256 278
257$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
259 281
260 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
261 283
262 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 286 return;#d#
265 }#d# 287 }#d#
266 288
267 # kill coroutine otherwise 289 # kill coroutine otherwise
268 Coro::terminate 290 Coro::terminate
… …
288)) { 310)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 312}
291 313
292$EV::DIED = sub { 314$EV::DIED = sub {
293 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
294}; 316};
295 317
296############################################################################# 318#############################################################################
297 319
298=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
395} 417}
396 418
397=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
398 420
399Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 422get spread over time.
401 423
402=cut 424=cut
403 425
404sub periodic($$) { 426sub periodic($$) {
405 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
422 444
423=cut 445=cut
424 446
425our @SLOT_QUEUE; 447our @SLOT_QUEUE;
426our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
427 450
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
431 454
432 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
433 457
434 while () { 458 while () {
435 next_job: 459 next_job:
460
436 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 462
438 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 467 $job->[2]->send;
442 Coro::cede; 468 Coro::cede;
443 goto next_job; 469 goto next_job;
444 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 472 }
446 } 473 }
447 474
448 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 478 $signal->wait;
452 } else { 479 } else {
480 $busy = 0;
453 Coro::schedule; 481 Coro::schedule;
454 } 482 }
455 } 483 }
456}; 484};
457 485
458sub get_slot($;$$) { 486sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
460 488
461 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
462 490
463 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
464 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
465 494
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
… …
494=cut 523=cut
495 524
496sub sync_job(&) { 525sub sync_job(&) {
497 my ($job) = @_; 526 my ($job) = @_;
498 527
499 if ($Coro::current == $Coro::main) { 528 if (in_main) {
500 my $time = EV::time; 529 my $time = AE::time;
501 530
502 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
504 533
505 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
506 535
507 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
508 537
509 my $busy = 1; 538 my $busy = 1;
510 my @res; 539 my @res;
511 540
512 (async { 541 (async {
513 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 543 @res = eval { $job->() };
515 warn $@ if $@; 544 error $@ if $@;
516 undef $busy; 545 undef $busy;
517 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
518 547
519 while ($busy) { 548 while ($busy) {
520 if (Coro::nready) { 549 if (Coro::nready) {
… …
522 } else { 551 } else {
523 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
524 } 553 }
525 } 554 }
526 555
527 my $time = EV::time - $time; 556 my $time = AE::time - $time;
528 557
529 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
530 559
531 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
532 } else { 561 } else {
… …
563Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 593never block itself or use any form of event handling.
565 594
566=cut 595=cut
567 596
597sub post_fork {
598 reset_signals;
599}
600
568sub fork_call(&@) { 601sub fork_call(&@) {
569 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
570 603
571 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
572 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
574 607
575 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
576 reset_signals; 609 cf::post_fork;
577 &$cb 610 &$cb
578 }, @args; 611 }, @args;
579 612
580 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
581} 625}
582 626
583=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
584 628
585=cut 629=cut
… …
622within each server. 666within each server.
623 667
624=cut 668=cut
625 669
626sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
627 my ($name) = @_; 674 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
629 676
630 eval { 677 eval {
631 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
641} 688}
642 689
643our $DB; 690our $DB;
644 691
645sub db_init { 692sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
648 };
649} 694}
650 695
651sub db_get($$) { 696sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
653 698
654 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
655 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
656 703
657 $! ? () 704 $! ? ()
658 : $data 705 : $data
659 }
660} 706}
661 707
662sub db_put($$$) { 708sub db_put($$$) {
663 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
720 766
721 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 768 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
724 770
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 772
727 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
730 776
… …
740 786
741=cut 787=cut
742 788
743sub datalog($@) { 789sub datalog($@) {
744 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 792}
747 793
748=back 794=back
749 795
750=cut 796=cut
… …
945 991
946 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 994
949 } elsif (ref $type) { 995 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
951 997
952 } else { 998 } else {
953 shift @arg; 999 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
955 } 1001 }
956 } 1002 }
957} 1003}
958 1004
959sub _object_attach { 1005sub _object_attach {
… …
969 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
970 } 1016 }
971 1017
972 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
973 } else { 1019 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1021 }
976 1022
977 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
978} 1024}
979 1025
… …
1038 1084
1039 for (@$callbacks) { 1085 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1041 1087
1042 if ($@) { 1088 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1090 override;
1046 } 1091 }
1047 1092
1048 return 1 if $override; 1093 return 1 if $override;
1049 } 1094 }
… …
1128 for (@$attach) { 1173 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1131 } 1176 }
1132 } else { 1177 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1179 }
1135 } 1180 }
1136} 1181}
1137 1182
1138cf::attachable->attach ( 1183cf::attachable->attach (
… …
1165 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1166 1211
1167 sync_job { 1212 sync_job {
1168 if (length $$rdata) { 1213 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1172 1218
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
… …
1198 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1199 1245
1200 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1248 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1204 } 1250 }
1205 } else { 1251 } else {
1206 aio_unlink $filename; 1252 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1208 } 1254 }
… …
1232 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1279 $av = $st->{objs};
1234 } 1280 }
1235 1281
1236 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1239 1286
1240 ($data, $av) 1287 ($data, $av)
1241} 1288}
1242 1289
1243=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1302} 1349}
1303 1350
1304use File::Glob (); 1351use File::Glob ();
1305 1352
1306cf::player->attach ( 1353cf::player->attach (
1307 on_command => sub { 1354 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1309 1356
1310 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1311 or return; 1358 or return;
1312 1359
… …
1335 1382
1336 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1384 if $reply;
1338 1385
1339 } else { 1386 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1388 }
1342 1389
1343 cf::override; 1390 cf::override;
1344 }, 1391 },
1345); 1392);
… …
1356 1403
1357 $grp 1404 $grp
1358} 1405}
1359 1406
1360sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1361 cf::sync_job { 1410 cf::sync_job {
1362 my %todo; 1411 my %todo;
1363 1412
1364 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1414 next unless -r $path;
… …
1383 1432
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1435
1387 $ext{source} = 1436 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1390 . $source 1439 . $source
1391 . "\n};\n1"; 1440 . "\n};\n1";
1392 1441
1393 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1394 } 1443 }
1395 1444
1445 my $pass = 0;
1396 my %done; 1446 my %done;
1397 while (%todo) { 1447 while (%todo) {
1398 my $progress; 1448 my $progress;
1399 1449
1450 ++$pass;
1451
1452 ext:
1400 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1455 next ext
1403 unless exists $done{$_}; 1456 unless exists $done{$_};
1404 } 1457 }
1405 1458
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1460
1408 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1465
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1467 if exists $v->{meta}{mandatory};
1416 1468
1417 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1418 } 1478 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1479 }
1424 1480
1425 skip: 1481 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1428 } 1489 }
1429 }; 1490 };
1430} 1491}
1431 1492
1432############################################################################# 1493#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1517 } 1578 }
1518 } 1579 }
1519} 1580}
1520 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1521sub save($) { 1595sub save($) {
1522 my ($pl) = @_; 1596 my ($pl) = @_;
1523 1597
1524 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1525 1599
… …
1530 1604
1531 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1533 1607
1534 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1612
1536 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1614 cf::cede_to_tick;
1538} 1615}
1539 1616
… …
1575 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1654
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1579 $pl->deactivate; 1656 $pl->deactivate;
1657
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1583 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1584 1663
1585 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1641 \@logins 1720 \@logins
1642} 1721}
1643 1722
1644=item $player->maps 1723=item $player->maps
1645 1724
1725=item cf::player::maps $login
1726
1646Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1647player. May block. 1728player. May block.
1648 1729
1649=cut 1730=cut
1650 1731
… …
1712=cut 1793=cut
1713 1794
1714sub find_by_path($) { 1795sub find_by_path($) {
1715 my ($path) = @_; 1796 my ($path) = @_;
1716 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1717 my ($match, $specificity); 1800 my ($match, $specificity);
1718 1801
1719 for my $region (list) { 1802 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1836
1754 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1838 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1777 1860
1778sub register { 1861sub register {
1779 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1863 my $pkg = caller;
1781 1864
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1866
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1868}
1787 1869
1788# also paths starting with '/' 1870# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1872
1791sub thawer_merge { 1873sub thawer_merge {
1792 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1793 1875
1794 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1799} 1881}
1800 1882
1801sub normalise { 1883sub normalise {
1802 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1803 1885
1804 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1805 1887
1806 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1807 1889
1808 # map plan: 1890 # map plan:
1809 # 1891 #
… …
1848 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1849 return $self; 1931 return $self;
1850 } 1932 }
1851 } 1933 }
1852 1934
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 1936 ()
1855} 1937}
1856 1938
1857sub init { 1939sub init {
1858 my ($self) = @_; 1940 my ($self) = @_;
… …
1980} 2062}
1981 2063
1982sub find; 2064sub find;
1983sub find { 2065sub find {
1984 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
1985 2069
1986 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1987 2071
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2008 2092
2009 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2010 } 2094 }
2011} 2095}
2012 2096
2013sub pre_load { } 2097sub pre_load { }
2014sub post_load { } 2098#sub post_load { } # XS
2015 2099
2016sub load { 2100sub load {
2017 my ($self) = @_; 2101 my ($self) = @_;
2018 2102
2019 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2160 }
2077 2161
2078 $self->post_load; 2162 $self->post_load;
2079} 2163}
2080 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2081sub customise_for { 2168sub customise_for {
2082 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2083 2170
2084 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2172 if $self->per_player;
… …
2101 or next; 2188 or next;
2102 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2103 or next; 2190 or next;
2104 $neigh->load; 2191 $neigh->load;
2105 2192
2193 # now find the diagonal neighbours
2106 push @neigh, 2194 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2197 }
2110 2198
… …
2117} 2205}
2118 2206
2119sub find_sync { 2207sub find_sync {
2120 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2121 2209
2122 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2123} 2214}
2124 2215
2125sub do_load_sync { 2216sub do_load_sync {
2126 my ($map) = @_; 2217 my ($map) = @_;
2127 2218
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2130 2221
2131 cf::sync_job { $map->load }; 2222 $map->load;
2132} 2223}
2133 2224
2134our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2136 2227
… …
2162 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2163 2254
2164 () 2255 ()
2165} 2256}
2166 2257
2258# common code, used by both ->save and ->swapout
2167sub save { 2259sub _save {
2168 my ($self) = @_; 2260 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2261
2172 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2173 2263
2174 return unless $self->dirty; 2264 return unless $self->dirty;
2175 2265
… …
2195 } else { 2285 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2287 }
2198} 2288}
2199 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2200sub swap_out { 2298sub swap_out {
2201 my ($self) = @_; 2299 my ($self) = @_;
2202 2300
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2302
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2211 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2213 2357
2214 $self->deactivate; 2358 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2360 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2361
2262 $self->unlink_save; 2362 $self->unlink_save;
2263 $self->destroy; 2363 $self->destroy;
2264} 2364}
2265 2365
… …
2273 2373
2274 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2275 2375
2276 $self->unlink_save; 2376 $self->unlink_save;
2277 2377
2278 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2383
… …
2340 : normalise $_ 2440 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2442 ]
2343} 2443}
2344 2444
2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2476
2345=back 2477=back
2346 2478
2347=head3 cf::object 2479=head3 cf::object
2348 2480
2349=cut 2481=cut
… …
2481 2613
2482Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2483 2615
2484The player should be reasonably safe there for short amounts of time (e.g. 2616The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2618though, as the player cannot control the character while it is on the link
2487map. 2619map.
2488 2620
2489Will never block. 2621Will never block.
2490 2622
2491=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
… …
2512sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2513 my ($self) = @_; 2645 my ($self) = @_;
2514 2646
2515 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2516 2648
2649 ++$self->{_link_recursion};
2650
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2652
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2521 2655
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2657}
2524 2658
2525sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2527 2661
… …
2544 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2546 2680
2547 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2550 2684
2551 $map->load; 2685 $map->load;
2552 $map->load_neighbours; 2686 $map->load_neighbours;
2553 2687
2554 return unless $self->contr->active; 2688 return unless $self->contr->active;
2555 2689
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2558 2692 # entering was successful
2693 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2694 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2695 $self->activate_recursive;
2561} 2696 }
2562 2697
2698}
2699
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2701
2565Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
… …
2575 2712
2576our $GOTOGEN; 2713our $GOTOGEN;
2577 2714
2578sub cf::object::player::goto { 2715sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2580 2723
2581 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2726
2584 $self->enter_link; 2727 $self->enter_link;
… …
2608 my $map = eval { 2751 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2610 2753
2611 if ($map) { 2754 if ($map) {
2612 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2757 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2759 }
2617 2760
2618 $map 2761 $map
… …
2626 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2629 } 2772 }
2630 2773
2631 $done->() if $done; 2774 $done->($self) if $done;
2632 })->prio (1); 2775 })->prio (1);
2633} 2776}
2634 2777
2635=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2636 2779
… …
2729 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2876
2734 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2878 $self->leave_link;
2736 } 2879 }
2737 })->prio (1); 2880 })->prio (1);
2738} 2881}
2739 2882
… …
2751sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2753 2896
2754 utf8::encode $text; 2897 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2756} 2924}
2757 2925
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2927
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2764 2932
2765=cut 2933=cut
2766 2934
2767# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2769 "c/identify" => { 2943 "c/identify" => {
2770 id => "infobox", 2944 id => "infobox",
2771 title => "Identify", 2945 title => "Identify",
2772 reply => undef, 2946 reply => undef,
2773 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2949 "c/examine" => {
2776 id => "infobox", 2950 id => "infobox",
2777 title => "Examine", 2951 title => "Examine",
2778 reply => undef, 2952 reply => undef,
2779 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2960 },
2781 "c/book" => { 2961 "c/book" => {
2782 id => "infobox", 2962 id => "infobox",
2783 title => "Book", 2963 title => "Book",
2784 reply => undef, 2964 reply => undef,
… …
2900 my $pkt = "msg " 3080 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3081 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3083 );
2904 3084
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3085 $self->send_big_packet ($pkt);
2916} 3086}
2917 3087
2918=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2919 3089
2920Sends an ext event to the client. 3090Sends an ext event to the client.
… …
2923 3093
2924sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2926 3096
2927 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3102 }
2933} 3103}
2934 3104
2935=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2936 3106
… …
2940 3110
2941sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2943 3113
2944 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3117 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3120 }
2951} 3121}
2952 3122
2953=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2954 3124
… …
3025 3195
3026 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3197 if $reply;
3028 3198
3029 } else { 3199 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3201 }
3032 3202
3033 cf::override; 3203 cf::override;
3034 }, 3204 },
3035); 3205);
… …
3055 3225
3056 $coro 3226 $coro
3057} 3227}
3058 3228
3059cf::client->attach ( 3229cf::client->attach (
3060 on_destroy => sub { 3230 on_client_destroy => sub {
3061 my ($ns) = @_; 3231 my ($ns) = @_;
3062 3232
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3234 },
3065); 3235);
… …
3081our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3082 3252
3083$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3084 3254
3085$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3088 sort time 3258 sort time
3089)); 3259));
3090 3260
3091# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
… …
3116 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3120) { 3290) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3293 for @funs;
3125} 3294}
3126 3295
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3145 3314
3146 %vars = (_dummy => 0) unless %vars; 3315 %vars = (_dummy => 0) unless %vars;
3147 3316
3317 my @res;
3148 local $_; 3318 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3319
3151 my $eval = 3320 my $eval =
3152 "do {\n" 3321 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3324 . $code
3156 . "\n}" 3325 . "\n}"
3157 ; 3326 ;
3158 3327
3328 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3162 3337
3163 if ($@) { 3338 if ($@) {
3164 warn "$@"; 3339 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3167 } 3342 }
3168 3343
3169 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3170} 3345}
3171 3346
… …
3185=cut 3360=cut
3186 3361
3187sub register_script_function { 3362sub register_script_function {
3188 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3189 3364
3190 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3192} 3367}
3193 3368
3194=back 3369=back
3195 3370
3196=cut 3371=cut
… …
3205 # for this (global event?) 3380 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3382
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3384
3210 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3211 3386
3212 my $facedata;
3213 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3214 or die "$path: $!"; 3388 or die "$path: $!";
3215 3389
3216 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3217 3391
3218 $facedata->{version} == 2 3392 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3394
3221 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3398 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3401 };
3226 cf::cede_to_tick; 3402 cf::cede_to_tick;
3227 3403
3228 { 3404 {
3229 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3409
3234 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3414
3239 cf::cede_to_tick; 3415 cf::cede_to_tick;
3240 } 3416 }
3241 3417
3242 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
… …
3247 3423
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3427 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3429 }
3254 3430
3255 cf::cede_to_tick; 3431 cf::cede_to_tick;
3256 } 3432 }
3257 } 3433 }
… …
3266 3442
3267 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3268 } 3444 }
3269 3445
3270 { 3446 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3274 3448
3275 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3452
3280 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3295 } else { 3455 } else {
3296 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3297 } 3457 }
3298 3458
3299 cf::cede_to_tick; 3459 cf::cede_to_tick;
3300 } 3460 }
3301 } 3461 }
3302 3462
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3464
3305 1 3465 1
3306} 3466}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3467
3328register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3330 3470
3331 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
… …
3370sub reload_treasures { 3510sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3373} 3513}
3374 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3375sub reload_resources { 3538sub reload_resources {
3376 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3377 3540
3541 reload_exp_table;
3542 reload_materials;
3378 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3379 reload_archetypes; 3545 reload_archetypes;
3380 reload_regions; 3546 reload_regions;
3381 reload_treasures; 3547 reload_treasures;
3382 3548
3383 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3384} 3550}
3385 3551
3386sub reload_config { 3552sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3388 or return;
3389 3554
3390 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3391 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3392 3562
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3564
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3567
3398 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3422 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3423 print $fh $$; 3593 print $fh $$;
3424} 3594}
3425 3595
3426sub main_loop { 3596sub main_loop {
3427 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3428 if (1) { 3598 if (1) {
3429 EV::loop; 3599 EV::loop;
3430 } 3600 }
3431 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3433} 3603}
3434 3604
3435sub main { 3605sub main {
3436 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3437 3607
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3612
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3614
3450 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
… …
3457 }; 3622 };
3458 3623
3459 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3460 3625
3461 cf::sync_job { 3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3462 reload_resources; 3635 reload_resources;
3463 reload_config; 3636 reload_config;
3464 db_init; 3637 db_init;
3465 3638
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3639 cf::init_uuid;
3469 cf::init_signals; 3640 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3641 cf::init_skills;
3472 3642
3473 cf::init_beforeplay; 3643 cf::init_beforeplay;
3474 3644
3475 atomic; 3645 atomic;
… …
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3654
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3486 }; 3656 };
3487 3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3488 main_loop; 3666 goto &main_loop;
3489} 3667}
3490 3668
3491############################################################################# 3669#############################################################################
3492# initialisation and cleanup 3670# initialisation and cleanup
3493 3671
3494# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3495BEGIN { 3673BEGIN {
3496 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3500 }; 3678 };
3501 } 3679 }
3502} 3680}
3503 3681
3504sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3505 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3507 3687
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3689
3510 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3511 3691
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3693 or return;
3514 3694
3515 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3710 or return;
3531 3711
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3713 and return;
3534 3714
3535 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3716
3537 1 3717 1
3538} 3718}
3539 3719
3540our $uuid_lock; 3720our $uuid_lock;
… …
3552 or return; 3732 or return;
3553 3733
3554 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3555 3735
3556 unless ($value) { 3736 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3738 return;
3559 } 3739 }
3560 3740
3561 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3742 $uuid_skip = 0;
… …
3572 or return; 3752 or return;
3573 3753
3574 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3575 and return; 3755 and return;
3576 3756
3577 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3578 3758
3579 1 3759 1
3580 3760
3581} 3761}
3582 3762
… …
3588} 3768}
3589 3769
3590sub emergency_save() { 3770sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3592 3772
3593 warn "emergency_perl_save: enter\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3594 3779
3595 cf::sync_job { 3780 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3782
3601 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3789 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3791 $pl->save;
3610 } 3792 }
3611 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3612 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3613 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3800 $map->valid or next;
3617 $map->save; 3801 $map->save;
3618 } 3802 }
3619 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3620 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3624 3810
3625 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3812 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3833 };
3629 3834
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3636} 3836}
3637 3837
3638sub post_cleanup { 3838sub post_cleanup {
3639 my ($make_core) = @_; 3839 my ($make_core) = @_;
3640 3840
3841 IO::AIO::flush;
3842
3641 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3844 if $make_core;
3643 3845
3644 my $fh = pidfile; 3846 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3646} 3848}
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3872 }
3671 warn "cleared package $pkg\n";#d#
3672} 3873}
3673 3874
3674sub do_reload_perl() { 3875sub do_reload_perl() {
3675 # can/must only be called in main 3876 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3677 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3678 return; 3879 return;
3679 } 3880 }
3680 3881
3681 return if $RELOAD++; 3882 return if $RELOAD++;
3682 3883
3683 my $t1 = EV::time; 3884 my $t1 = AE::time;
3684 3885
3685 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3686 warn "reloading..."; 3888 info "reloading...";
3687 3889
3688 warn "entering sync_job"; 3890 trace "entering sync_job";
3689 3891
3690 cf::sync_job { 3892 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3893 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3894
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3897 %EXT_CORO = ();
3708 3898
3709 warn "removing commands"; 3899 trace "removing commands";
3710 %COMMAND = (); 3900 %COMMAND = ();
3711 3901
3712 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3713 %EXTCMD = (); 3903 %EXTCMD = ();
3714 %EXTICMD = (); 3904 %EXTICMD = ();
3715 3905
3716 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3719 3909
3720 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3911 eval {
3722 $cb->($pkg); 3912 $cb->($pkg);
3723 1 3913 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3725 } 3915 }
3726 3916
3727 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3728 clear_package $pkg; 3918 clear_package $pkg;
3729 } 3919 }
3730 3920
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3924
3735 warn "... unloading $k"; 3925 trace "... unloading $k";
3736 delete $INC{$k}; 3926 delete $INC{$k};
3737 3927
3738 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3740 3930
… …
3743 } 3933 }
3744 3934
3745 clear_package $k; 3935 clear_package $k;
3746 } 3936 }
3747 3937
3748 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 3939 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 3941
3752 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 3945
3756 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3757 # and global variables created in xs 3947 # and global variables created in xs
3758 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3759 3949
3760 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3761 3951
3762 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3763 require cf; 3953 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3765 3955
3766 warn "loading config and database again"; 3956 trace "loading config and database again";
3767 cf::reload_config; 3957 cf::reload_config;
3768 3958
3769 warn "loading extensions"; 3959 trace "loading extensions";
3770 cf::load_extensions; 3960 cf::load_extensions;
3771 3961
3772 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3776 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3779 } 3969 }
3780 3970
3781 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3783 3973
3784 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3785 3975
3786 1 3976 1
3787 } or do { 3977 } or do {
3788 warn $@; 3978 error $@;
3789 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3790 }; 3980 };
3791 3981
3792 warn "reloaded"; 3982 info "reloaded";
3793 --$RELOAD; 3983 --$RELOAD;
3794 } 3984 }
3795 3985
3796 $t1 = EV::time - $t1; 3986 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3798}; 3988};
3799 3989
3800our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3801 3991
3802sub reload_perl() { 3992sub reload_perl() {
… …
3804 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3805 3995
3806 $RELOAD_WATCHER ||= cf::async { 3996 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 3997 Coro::AIO::aio_wait cache_extensions;
3808 3998
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4000 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3812 }; 4002 };
3813 }; 4003 };
3814} 4004}
… …
3823 reload_perl; 4013 reload_perl;
3824 }; 4014 };
3825 } 4015 }
3826}; 4016};
3827 4017
3828unshift @INC, $LIBDIR; 4018#############################################################################
3829 4019
3830my $bug_warning = 0; 4020my $bug_warning = 0;
3831 4021
3832our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3834 4024
3835sub wait_for_tick { 4025sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 4027
3838 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 4030 $signal->wait;
3841} 4031}
3842 4032
3843sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 4035
3846 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4038 $signal->wait;
3849} 4039}
… …
3855 return; 4045 return;
3856 } 4046 }
3857 4047
3858 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3859 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4054 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4056 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3866 }; 4058 };
3867 } 4059 }
3868 4060
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4062 $sig->send;
… …
3878 4070
3879 if (0) { 4071 if (0) {
3880 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3884 } 4076 }
3885 } 4077 }
3886} 4078}
3887 4079
3888{ 4080{
3889 # configure BDB 4081 # configure BDB
3890 4082
3891 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3894 4086
3895 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
… …
3977 } 4169 }
3978} 4170}
3979 4171
3980# load additional modules 4172# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3982 4175
3983END { cf::emergency_save } 4176END { cf::emergency_save }
3984 4177
39851 41781
3986 4179

Diff Legend

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