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.477 by root, Wed Sep 2 22:52:36 2009 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 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
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %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;
109 118
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 121our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 127our $DB_ENV;
119 128
120our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
121 130
122our %CFG; 131our %CFG;
123 132
124our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 134our $RUNTIME;
159 168
160our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
161 170
162sub cf::map::normalise; 171sub cf::map::normalise;
163 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
164############################################################################# 188#############################################################################
165 189
166=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
167 191
168=over 4 192=over 4
214returns 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 process
215per 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.
216 240
217=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
218 242
219This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 245that call.
222 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
223=back 253=back
224 254
225=cut 255=cut
256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
226 262
227$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 264 my $msg = join "", @_;
229 265
230 $msg .= "\n" 266 $msg .= "\n"
231 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
232 268
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 270
235 LOG llevError, $msg; 271 LOG llevWarn, $msg;
236}; 272};
237 273
238$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
240 276
241 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
242 278
243 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 281 return;#d#
246 }#d# 282 }#d#
247 283
248 # kill coroutine otherwise 284 # kill coroutine otherwise
249 Coro::terminate 285 Coro::terminate
269)) { 305)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 307}
272 308
273$EV::DIED = sub { 309$EV::DIED = sub {
274 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
275}; 311};
276 312
277############################################################################# 313#############################################################################
278 314
279=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
376} 412}
377 413
378=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
379 415
380Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
381get spread over timer. 417get spread over time.
382 418
383=cut 419=cut
384 420
385sub periodic($$) { 421sub periodic($$) {
386 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
403 439
404=cut 440=cut
405 441
406our @SLOT_QUEUE; 442our @SLOT_QUEUE;
407our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
408 445
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
412 449
413 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
414 452
415 while () { 453 while () {
416 next_job: 454 next_job:
455
417 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 457
419 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 462 $job->[2]->send;
423 Coro::cede; 463 Coro::cede;
424 goto next_job; 464 goto next_job;
425 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 467 }
427 } 468 }
428 469
429 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
430 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
431 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 473 $signal->wait;
433 } else { 474 } else {
475 $busy = 0;
434 Coro::schedule; 476 Coro::schedule;
435 } 477 }
436 } 478 }
437}; 479};
438 480
439sub get_slot($;$$) { 481sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
441 483
442 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
443 485
444 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
445 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
446 489
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
475=cut 518=cut
476 519
477sub sync_job(&) { 520sub sync_job(&) {
478 my ($job) = @_; 521 my ($job) = @_;
479 522
480 if ($Coro::current == $Coro::main) { 523 if (in_main) {
481 my $time = EV::time; 524 my $time = AE::time;
482 525
483 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
485 528
486 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
487 530
488 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
489 532
490 my $busy = 1; 533 my $busy = 1;
491 my @res; 534 my @res;
492 535
493 (async { 536 (async {
494 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 538 @res = eval { $job->() };
496 warn $@ if $@; 539 error $@ if $@;
497 undef $busy; 540 undef $busy;
498 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
499 542
500 while ($busy) { 543 while ($busy) {
501 if (Coro::nready) { 544 if (Coro::nready) {
503 } else { 546 } else {
504 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
505 } 548 }
506 } 549 }
507 550
508 my $time = EV::time - $time; 551 my $time = AE::time - $time;
509 552
510 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
511 554
512 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
513 } else { 556 } else {
557 reset_signals; 600 reset_signals;
558 &$cb 601 &$cb
559 }, @args; 602 }, @args;
560 603
561 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
562} 616}
563 617
564=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
565 619
566=cut 620=cut
603within each server. 657within each server.
604 658
605=cut 659=cut
606 660
607sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
608 my ($name) = @_; 665 my ($name) = @_;
609 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
610 667
611 eval { 668 eval {
612 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
622} 679}
623 680
624our $DB; 681our $DB;
625 682
626sub db_init { 683sub db_init {
627 cf::sync_job {
628 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
629 };
630} 685}
631 686
632sub db_get($$) { 687sub db_get($$) {
633 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
634 689
635 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
636 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
637 694
638 $! ? () 695 $! ? ()
639 : $data 696 : $data
640 }
641} 697}
642 698
643sub db_put($$$) { 699sub db_put($$$) {
644 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
645 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
701 757
702 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
703 my $data = $process->(\@data); 759 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
705 761
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 763
708 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
711 767
721 777
722=cut 778=cut
723 779
724sub datalog($@) { 780sub datalog($@) {
725 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 783}
728 784
729=back 785=back
730 786
731=cut 787=cut
926 982
927 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 985
930 } elsif (ref $type) { 986 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
932 988
933 } else { 989 } else {
934 shift @arg; 990 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
936 } 992 }
937 } 993 }
938} 994}
939 995
940sub _object_attach { 996sub _object_attach {
950 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
951 } 1007 }
952 1008
953 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
954 } else { 1010 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1012 }
957 1013
958 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
959} 1015}
960 1016
1019 1075
1020 for (@$callbacks) { 1076 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1022 1078
1023 if ($@) { 1079 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1081 override;
1027 } 1082 }
1028 1083
1029 return 1 if $override; 1084 return 1 if $override;
1030 } 1085 }
1109 for (@$attach) { 1164 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1112 } 1167 }
1113 } else { 1168 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1170 }
1116 } 1171 }
1117} 1172}
1118 1173
1119cf::attachable->attach ( 1174cf::attachable->attach (
1146 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1147 1202
1148 sync_job { 1203 sync_job {
1149 if (length $$rdata) { 1204 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1153 1209
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
1179 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1180 1236
1181 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1239 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1185 } 1241 }
1186 } else { 1242 } else {
1187 aio_unlink $filename; 1243 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1189 } 1245 }
1213 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1270 $av = $st->{objs};
1215 } 1271 }
1216 1272
1217 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1220 1277
1221 ($data, $av) 1278 ($data, $av)
1222} 1279}
1223 1280
1224=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1283} 1340}
1284 1341
1285use File::Glob (); 1342use File::Glob ();
1286 1343
1287cf::player->attach ( 1344cf::player->attach (
1288 on_command => sub { 1345 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1290 1347
1291 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1292 or return; 1349 or return;
1293 1350
1316 1373
1317 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1318 if $reply; 1375 if $reply;
1319 1376
1320 } else { 1377 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1379 }
1323 1380
1324 cf::override; 1381 cf::override;
1325 }, 1382 },
1326); 1383);
1337 1394
1338 $grp 1395 $grp
1339} 1396}
1340 1397
1341sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1342 cf::sync_job { 1401 cf::sync_job {
1343 my %todo; 1402 my %todo;
1344 1403
1345 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1405 next unless -r $path;
1364 1423
1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367 1426
1368 $ext{source} = 1427 $ext{source} =
1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1370 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1371 . $source 1430 . $source
1372 . "\n};\n1"; 1431 . "\n};\n1";
1373 1432
1374 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1375 } 1434 }
1376 1435
1436 my $pass = 0;
1377 my %done; 1437 my %done;
1378 while (%todo) { 1438 while (%todo) {
1379 my $progress; 1439 my $progress;
1380 1440
1441 ++$pass;
1442
1443 ext:
1381 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1446 next ext
1384 unless exists $done{$_}; 1447 unless exists $done{$_};
1385 } 1448 }
1386 1449
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1451
1389 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1392 1457
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1459 if exists $v->{meta}{mandatory};
1397 1460
1398 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1399 } 1470 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1471 }
1405 1472
1406 skip: 1473 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1409 } 1481 }
1410 }; 1482 };
1411} 1483}
1412 1484
1413############################################################################# 1485#############################################################################
1497 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1498 } 1570 }
1499 } 1571 }
1500} 1572}
1501 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1502sub save($) { 1587sub save($) {
1503 my ($pl) = @_; 1588 my ($pl) = @_;
1504 1589
1505 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1506 1591
1511 1596
1512 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1514 1599
1515 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1516 1604
1517 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1606 cf::cede_to_tick;
1519} 1607}
1520 1608
1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1558 1646
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1560 $pl->deactivate; 1648 $pl->deactivate;
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1564 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1565 1652
1566 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1622 \@logins 1709 \@logins
1623} 1710}
1624 1711
1625=item $player->maps 1712=item $player->maps
1626 1713
1714=item cf::player::maps $login
1715
1627Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1628player. May block. 1717player. May block.
1629 1718
1630=cut 1719=cut
1631 1720
1693=cut 1782=cut
1694 1783
1695sub find_by_path($) { 1784sub find_by_path($) {
1696 my ($path) = @_; 1785 my ($path) = @_;
1697 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1698 my ($match, $specificity); 1789 my ($match, $specificity);
1699 1790
1700 for my $region (list) { 1791 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734 1825
1735 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1827 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1849
1759sub register { 1850sub register {
1760 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1852 my $pkg = caller;
1762 1853
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1855
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1857}
1768 1858
1769# also paths starting with '/' 1859# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1861
1772sub thawer_merge { 1862sub thawer_merge {
1773 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1774 1864
1775 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1989 2079
1990 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1991 } 2081 }
1992} 2082}
1993 2083
1994sub pre_load { } 2084sub pre_load { }
1995sub post_load { } 2085#sub post_load { } # XS
1996 2086
1997sub load { 2087sub load {
1998 my ($self) = @_; 2088 my ($self) = @_;
1999 2089
2000 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2057 } 2147 }
2058 2148
2059 $self->post_load; 2149 $self->post_load;
2060} 2150}
2061 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2062sub customise_for { 2155sub customise_for {
2063 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2064 2157
2065 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2159 if $self->per_player;
2082 or next; 2175 or next;
2083 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2084 or next; 2177 or next;
2085 $neigh->load; 2178 $neigh->load;
2086 2179
2180 # now find the diagonal neighbours
2087 push @neigh, 2181 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2184 }
2091 2185
2098} 2192}
2099 2193
2100sub find_sync { 2194sub find_sync {
2101 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2102 2196
2103 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2104} 2201}
2105 2202
2106sub do_load_sync { 2203sub do_load_sync {
2107 my ($map) = @_; 2204 my ($map) = @_;
2108 2205
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2111 2208
2112 cf::sync_job { $map->load }; 2209 $map->load;
2113} 2210}
2114 2211
2115our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2117 2214
2143 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2144 2241
2145 () 2242 ()
2146} 2243}
2147 2244
2245# common code, used by both ->save and ->swapout
2148sub save { 2246sub _save {
2149 my ($self) = @_; 2247 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2248
2153 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2154 2250
2155 return unless $self->dirty; 2251 return unless $self->dirty;
2156 2252
2176 } else { 2272 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2274 }
2179} 2275}
2180 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2181sub swap_out { 2285sub swap_out {
2182 my ($self) = @_; 2286 my ($self) = @_;
2183 2287
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2289
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2192 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2194 2344
2195 $self->deactivate; 2345 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2347 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2348
2243 $self->unlink_save; 2349 $self->unlink_save;
2244 $self->destroy; 2350 $self->destroy;
2245} 2351}
2246 2352
2254 2360
2255 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2256 2362
2257 $self->unlink_save; 2363 $self->unlink_save;
2258 2364
2259 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2370
2321 : normalise $_ 2427 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2429 ]
2324} 2430}
2325 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2326=back 2464=back
2327 2465
2328=head3 cf::object 2466=head3 cf::object
2329 2467
2330=cut 2468=cut
2462 2600
2463Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2464 2602
2465The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2468map. 2606map.
2469 2607
2470Will never block. 2608Will never block.
2471 2609
2472=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2494 my ($self) = @_; 2632 my ($self) = @_;
2495 2633
2496 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2497 2635
2636 ++$self->{_link_recursion};
2637
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2639
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2502 2642
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2644}
2505 2645
2506sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2508 2648
2525 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2527 2667
2528 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2531 2671
2532 $map->load; 2672 $map->load;
2533 $map->load_neighbours; 2673 $map->load_neighbours;
2534 2674
2535 return unless $self->contr->active; 2675 return unless $self->contr->active;
2536 2676
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2539 2679 # entering was successful
2680 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2682 $self->activate_recursive;
2542} 2683 }
2543 2684
2685}
2686
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2688
2546Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2556 2699
2557our $GOTOGEN; 2700our $GOTOGEN;
2558 2701
2559sub cf::object::player::goto { 2702sub cf::object::player::goto {
2560 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2561 2710
2562 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2713
2565 $self->enter_link; 2714 $self->enter_link;
2589 my $map = eval { 2738 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2591 2740
2592 if ($map) { 2741 if ($map) {
2593 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2744 } else {
2596 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2597 } 2746 }
2598 2747
2599 $map 2748 $map
2607 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2610 } 2759 }
2611 2760
2612 $done->() if $done; 2761 $done->($self) if $done;
2613 })->prio (1); 2762 })->prio (1);
2614} 2763}
2615 2764
2616=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2617 2766
2710 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2712 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2863
2715 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2865 $self->leave_link;
2717 } 2866 }
2718 })->prio (1); 2867 })->prio (1);
2719} 2868}
2720 2869
2732sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2734 2883
2735 utf8::encode $text; 2884 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2737} 2911}
2738 2912
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2914
2741Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2745 2919
2746=cut 2920=cut
2747 2921
2748# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2750 "c/identify" => { 2930 "c/identify" => {
2751 id => "infobox", 2931 id => "infobox",
2752 title => "Identify", 2932 title => "Identify",
2753 reply => undef, 2933 reply => undef,
2754 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2756 "c/examine" => { 2936 "c/examine" => {
2757 id => "infobox", 2937 id => "infobox",
2758 title => "Examine", 2938 title => "Examine",
2759 reply => undef, 2939 reply => undef,
2760 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 2947 },
2762 "c/book" => { 2948 "c/book" => {
2763 id => "infobox", 2949 id => "infobox",
2764 title => "Book", 2950 title => "Book",
2765 reply => undef, 2951 reply => undef,
2881 my $pkt = "msg " 3067 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3070 );
2885 3071
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2897} 3073}
2898 3074
2899=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2900 3076
2901Sends an ext event to the client. 3077Sends an ext event to the client.
2904 3080
2905sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2907 3083
2908 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3089 }
2914} 3090}
2915 3091
2916=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2917 3093
2921 3097
2922sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2924 3100
2925 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3104 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3107 }
2932} 3108}
2933 3109
2934=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2935 3111
3006 3182
3007 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3184 if $reply;
3009 3185
3010 } else { 3186 } else {
3011 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3012 } 3188 }
3013 3189
3014 cf::override; 3190 cf::override;
3015 }, 3191 },
3016); 3192);
3036 3212
3037 $coro 3213 $coro
3038} 3214}
3039 3215
3040cf::client->attach ( 3216cf::client->attach (
3041 on_destroy => sub { 3217 on_client_destroy => sub {
3042 my ($ns) = @_; 3218 my ($ns) = @_;
3043 3219
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3221 },
3046); 3222);
3062our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3063 3239
3064$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3065 3241
3066$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3069 sort time 3245 sort time
3070)); 3246));
3071 3247
3072# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3101) { 3277) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3280 for @funs;
3106} 3281}
3107 3282
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3126 3301
3127 %vars = (_dummy => 0) unless %vars; 3302 %vars = (_dummy => 0) unless %vars;
3128 3303
3304 my @res;
3129 local $_; 3305 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3306
3132 my $eval = 3307 my $eval =
3133 "do {\n" 3308 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3311 . $code
3137 . "\n}" 3312 . "\n}"
3138 ; 3313 ;
3139 3314
3315 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3143 3324
3144 if ($@) { 3325 if ($@) {
3145 warn "$@"; 3326 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3148 } 3329 }
3149 3330
3150 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3151} 3332}
3152 3333
3166=cut 3347=cut
3167 3348
3168sub register_script_function { 3349sub register_script_function {
3169 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3170 3351
3171 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3173} 3354}
3174 3355
3175=back 3356=back
3176 3357
3177=cut 3358=cut
3178 3359
3179############################################################################# 3360#############################################################################
3180# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3181 3405
3182sub load_facedata($) { 3406sub load_facedata($) {
3183 my ($path) = @_; 3407 my ($path) = @_;
3184 3408
3185 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?) 3410 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3412
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3414
3191 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3192 3416
3193 my $facedata; 3417 my $facedata;
3194 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3195 or die "$path: $!"; 3419 or die "$path: $!";
3196 3420
3198 3422
3199 $facedata->{version} == 2 3423 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3425
3202 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3429 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3432 };
3207 cf::cede_to_tick; 3433 cf::cede_to_tick;
3208 3434
3209 { 3435 {
3210 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3440
3215 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3445
3220 cf::cede_to_tick; 3446 cf::cede_to_tick;
3221 } 3447 }
3222 3448
3223 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3228 3454
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3458 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3460 }
3235 3461
3236 cf::cede_to_tick; 3462 cf::cede_to_tick;
3237 } 3463 }
3238 } 3464 }
3247 3473
3248 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3249 } 3475 }
3250 3476
3251 { 3477 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3255 3479
3256 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3483
3261 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3276 } else { 3486 } else {
3277 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3278 } 3488 }
3279 3489
3280 cf::cede_to_tick; 3490 cf::cede_to_tick;
3281 } 3491 }
3282 } 3492 }
3283 3493
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3495
3286 1 3496 1
3287} 3497}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3498
3309register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3311 3501
3312 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3541sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3354} 3544}
3355 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3356sub reload_resources { 3569sub reload_resources {
3357 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3358 3571
3359 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3360 reload_archetypes; 3574 reload_archetypes;
3361 reload_regions; 3575 reload_regions;
3362 reload_treasures; 3576 reload_treasures;
3363 3577
3364 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3365} 3579}
3366 3580
3367sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3585 or return;
3370 3586
3371 local $/; 3587 local $/;
3372 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3373 3589
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3591
3376 $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};
3377 $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};
3378 3594
3379 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3599 };
3384 warn $@ if $@; 3600 warn $@ if $@;
3385 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3386} 3604}
3387 3605
3388sub pidfile() { 3606sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
3403 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3404 print $fh $$; 3622 print $fh $$;
3405} 3623}
3406 3624
3407sub main_loop { 3625sub main_loop {
3408 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3409 if (1) { 3627 if (1) {
3410 EV::loop; 3628 EV::loop;
3411 } 3629 }
3412 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3414} 3632}
3415 3633
3416sub main { 3634sub main {
3417 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3418 3636
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3641
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3643
3431 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3438 }; 3651 };
3439 3652
3440 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3441 3654
3442 cf::sync_job { 3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3443 reload_resources; 3666 reload_resources;
3444 reload_config; 3667 reload_config;
3445 db_init; 3668 db_init;
3446 3669
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3670 cf::init_uuid;
3450 cf::init_signals; 3671 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3672 cf::init_skills;
3453 3673
3454 cf::init_beforeplay; 3674 cf::init_beforeplay;
3455 3675
3456 atomic; 3676 atomic;
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3685
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3467 }; 3687 };
3468 3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3469 main_loop; 3697 goto &main_loop;
3470} 3698}
3471 3699
3472############################################################################# 3700#############################################################################
3473# initialisation and cleanup 3701# initialisation and cleanup
3474 3702
3475# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3476BEGIN { 3704BEGIN {
3477 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3481 }; 3709 };
3482 } 3710 }
3483} 3711}
3484 3712
3485sub write_runtime_sync { 3713sub write_runtime_sync {
3714 my $t0 = AE::time;
3715
3486 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3488 3718
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3720
3491 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3492 3722
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3724 or return;
3495 3725
3496 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3511 or return; 3741 or return;
3512 3742
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3744 and return;
3515 3745
3516 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3747
3518 1 3748 1
3519} 3749}
3520 3750
3521our $uuid_lock; 3751our $uuid_lock;
3533 or return; 3763 or return;
3534 3764
3535 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3536 3766
3537 unless ($value) { 3767 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3769 return;
3540 } 3770 }
3541 3771
3542 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3773 $uuid_skip = 0;
3553 or return; 3783 or return;
3554 3784
3555 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3556 and return; 3786 and return;
3557 3787
3558 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3559 3789
3560 1 3790 1
3561 3791
3562} 3792}
3563 3793
3569} 3799}
3570 3800
3571sub emergency_save() { 3801sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3573 3803
3574 warn "emergency_perl_save: enter\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3575 3810
3576 cf::sync_job { 3811 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3812 cf::write_runtime_sync; # external watchdog should not bark
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581 3813
3582 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3820 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3822 $pl->save;
3591 } 3823 }
3592 warn "emergency_perl_save: end player save\n"; 3824 info "emergency_perl_save: end player save\n";
3593 3825
3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3594 warn "emergency_perl_save: begin map save\n"; 3828 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3831 $map->valid or next;
3598 $map->save; 3832 $map->save;
3599 } 3833 }
3600 warn "emergency_perl_save: end map save\n"; 3834 info "emergency_perl_save: end map save\n";
3601 3835
3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3838 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3605 3841
3606 warn "emergency_perl_save: begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3843 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3609 }; 3864 };
3610 3865
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3616 warn "emergency_perl_save: leave\n"; 3866 info "emergency_perl_save: leave\n";
3617} 3867}
3618 3868
3619sub post_cleanup { 3869sub post_cleanup {
3620 my ($make_core) = @_; 3870 my ($make_core) = @_;
3621 3871
3872 IO::AIO::flush;
3873
3622 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3875 if $make_core;
3624 3876
3625 my $fh = pidfile; 3877 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3627} 3879}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3900 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3901 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3903 }
3652 warn "cleared package $pkg\n";#d#
3653} 3904}
3654 3905
3655sub do_reload_perl() { 3906sub do_reload_perl() {
3656 # can/must only be called in main 3907 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3658 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3659 return; 3910 return;
3660 } 3911 }
3661 3912
3662 return if $RELOAD++; 3913 return if $RELOAD++;
3663 3914
3664 my $t1 = EV::time; 3915 my $t1 = AE::time;
3665 3916
3666 while ($RELOAD) { 3917 while ($RELOAD) {
3667 warn "reloading..."; 3918 info "reloading...";
3668 3919
3669 warn "entering sync_job"; 3920 trace "entering sync_job";
3670 3921
3671 cf::sync_job { 3922 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3923 cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 3924
3676 warn "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679 # if anything goes wrong in here, we should simply crash as we already saved
3680
3681 warn "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) {
3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684 }
3685
3686 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3927 %EXT_CORO = ();
3689 3928
3690 warn "removing commands"; 3929 trace "removing commands";
3691 %COMMAND = (); 3930 %COMMAND = ();
3692 3931
3693 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3694 %EXTCMD = (); 3933 %EXTCMD = ();
3695 %EXTICMD = (); 3934 %EXTICMD = ();
3696 3935
3697 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3700 3939
3701 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3941 eval {
3703 $cb->($pkg); 3942 $cb->($pkg);
3704 1 3943 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3706 } 3945 }
3707 3946
3708 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3709 clear_package $pkg; 3948 clear_package $pkg;
3710 } 3949 }
3711 3950
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3954
3716 warn "... unloading $k"; 3955 trace "... unloading $k";
3717 delete $INC{$k}; 3956 delete $INC{$k};
3718 3957
3719 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3721 3960
3724 } 3963 }
3725 3964
3726 clear_package $k; 3965 clear_package $k;
3727 } 3966 }
3728 3967
3729 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 3969 clear_package "safe::$_"
3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3732 3971
3733 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 3975
3737 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3738 # and global variables created in xs 3977 # and global variables created in xs
3739 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3740 3979
3741 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3742 3981
3743 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3744 require cf; 3983 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3746 3985
3747 warn "loading config and database again"; 3986 trace "loading config and database again";
3748 cf::reload_config; 3987 cf::reload_config;
3749 3988
3750 warn "loading extensions"; 3989 trace "loading extensions";
3751 cf::load_extensions; 3990 cf::load_extensions;
3752 3991
3753 if ($REATTACH_ON_RELOAD) { 3992 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3757 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3760 } 3999 }
3761 4000
3762 warn "running post_init jobs"; 4001 trace "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3764 4003
3765 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3766 4005
3767 1 4006 1
3768 } or do { 4007 } or do {
3769 warn $@; 4008 error $@;
3770 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3771 }; 4010 };
3772 4011
3773 warn "reloaded"; 4012 info "reloaded";
3774 --$RELOAD; 4013 --$RELOAD;
3775 } 4014 }
3776 4015
3777 $t1 = EV::time - $t1; 4016 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4017 info "reload completed in ${t1}s\n";
3779}; 4018};
3780 4019
3781our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3782 4021
3783sub reload_perl() { 4022sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3786 4025
3787 $RELOAD_WATCHER ||= cf::async { 4026 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4027 Coro::AIO::aio_wait cache_extensions;
3789 4028
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4030 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3793 }; 4032 };
3794 }; 4033 };
3795} 4034}
3804 reload_perl; 4043 reload_perl;
3805 }; 4044 };
3806 } 4045 }
3807}; 4046};
3808 4047
3809unshift @INC, $LIBDIR; 4048#############################################################################
3810 4049
3811my $bug_warning = 0; 4050my $bug_warning = 0;
3812 4051
3813our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3815 4054
3816sub wait_for_tick { 4055sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 4057
3819 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 4060 $signal->wait;
3822} 4061}
3823 4062
3824sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 4065
3827 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4068 $signal->wait;
3830} 4069}
3836 return; 4075 return;
3837 } 4076 }
3838 4077
3839 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3840 4079
4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4084 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4086 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3847 }; 4088 };
3848 } 4089 }
3849 4090
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4092 $sig->send;
3859 4100
3860 if (0) { 4101 if (0) {
3861 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3865 } 4106 }
3866 } 4107 }
3867} 4108}
3868 4109
3869{ 4110{
3870 # configure BDB 4111 # configure BDB
3871 4112
3872 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3875 4116
3876 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3958 } 4199 }
3959} 4200}
3960 4201
3961# load additional modules 4202# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3963 4205
3964END { cf::emergency_save } 4206END { cf::emergency_save }
3965 4207
39661 42081
3967 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines