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.472 by root, Sat Jun 6 21:43:13 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
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %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;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 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
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
210returns 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
211per 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.
212 240
213=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
214 242
215This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
216C<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
217that call. 245that call.
218 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
219=back 253=back
220 254
221=cut 255=cut
222 256
223BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 264 my $msg = join "", @_;
226 265
227 $msg .= "\n" 266 $msg .= "\n"
228 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
229 268
230 $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;
231 270
232 LOG llevError, $msg; 271 LOG llevWarn, $msg;
233 }; 272};
234}
235 273
236$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
238 276
239 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 281 return;#d#
242 }#d# 282 }#d#
243 283
244 # kill coroutine otherwise 284 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 285 Coro::terminate
247}; 286};
248
249$SIG{__DIE__} = sub { }; #d#?
250 287
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 305)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 307}
271 308
272$EV::DIED = sub { 309$EV::DIED = sub {
273 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
274}; 311};
275 312
276############################################################################# 313#############################################################################
277 314
278=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
375} 412}
376 413
377=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
378 415
379Like 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
380get spread over timer. 417get spread over time.
381 418
382=cut 419=cut
383 420
384sub periodic($$) { 421sub periodic($$) {
385 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
402 439
403=cut 440=cut
404 441
405our @SLOT_QUEUE; 442our @SLOT_QUEUE;
406our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
407 445
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
411 449
412 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
413 452
414 while () { 453 while () {
415 next_job: 454 next_job:
455
416 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 457
418 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 462 $job->[2]->send;
422 Coro::cede; 463 Coro::cede;
423 goto next_job; 464 goto next_job;
424 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 467 }
426 } 468 }
427 469
428 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 473 $signal->wait;
432 } else { 474 } else {
475 $busy = 0;
433 Coro::schedule; 476 Coro::schedule;
434 } 477 }
435 } 478 }
436}; 479};
437 480
438sub get_slot($;$$) { 481sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
440 483
441 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
442 485
443 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
444 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
445 489
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
474=cut 518=cut
475 519
476sub sync_job(&) { 520sub sync_job(&) {
477 my ($job) = @_; 521 my ($job) = @_;
478 522
479 if ($Coro::current == $Coro::main) { 523 if (in_main) {
480 my $time = EV::time; 524 my $time = AE::time;
481 525
482 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
484 528
485 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
486 530
487 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
488 532
489 my $busy = 1; 533 my $busy = 1;
490 my @res; 534 my @res;
491 535
492 (async { 536 (async {
493 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 538 @res = eval { $job->() };
495 warn $@ if $@; 539 error $@ if $@;
496 undef $busy; 540 undef $busy;
497 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
498 542
499 while ($busy) { 543 while ($busy) {
500 if (Coro::nready) { 544 if (Coro::nready) {
502 } else { 546 } else {
503 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
504 } 548 }
505 } 549 }
506 550
507 my $time = EV::time - $time; 551 my $time = AE::time - $time;
508 552
509 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
510 554
511 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
512 } else { 556 } else {
556 reset_signals; 600 reset_signals;
557 &$cb 601 &$cb
558 }, @args; 602 }, @args;
559 603
560 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 )
561} 616}
562 617
563=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
564 619
565=cut 620=cut
602within each server. 657within each server.
603 658
604=cut 659=cut
605 660
606sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
607 my ($name) = @_; 665 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
609 667
610 eval { 668 eval {
611 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
621} 679}
622 680
623our $DB; 681our $DB;
624 682
625sub db_init { 683sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
628 };
629} 685}
630 686
631sub db_get($$) { 687sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
633 689
634 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
635 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
636 694
637 $! ? () 695 $! ? ()
638 : $data 696 : $data
639 }
640} 697}
641 698
642sub db_put($$$) { 699sub db_put($$$) {
643 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 757
701 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 759 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
704 761
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 763
707 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
710 767
720 777
721=cut 778=cut
722 779
723sub datalog($@) { 780sub datalog($@) {
724 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 783}
727 784
728=back 785=back
729 786
730=cut 787=cut
925 982
926 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 985
929 } elsif (ref $type) { 986 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
931 988
932 } else { 989 } else {
933 shift @arg; 990 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
935 } 992 }
936 } 993 }
937} 994}
938 995
939sub _object_attach { 996sub _object_attach {
949 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
950 } 1007 }
951 1008
952 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
953 } else { 1010 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1012 }
956 1013
957 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
958} 1015}
959 1016
1018 1075
1019 for (@$callbacks) { 1076 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1021 1078
1022 if ($@) { 1079 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1081 override;
1026 } 1082 }
1027 1083
1028 return 1 if $override; 1084 return 1 if $override;
1029 } 1085 }
1108 for (@$attach) { 1164 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1111 } 1167 }
1112 } else { 1168 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1170 }
1115 } 1171 }
1116} 1172}
1117 1173
1118cf::attachable->attach ( 1174cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1146 1202
1147 sync_job { 1203 sync_job {
1148 if (length $$rdata) { 1204 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1152 1209
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1157 aio_close $fh; 1217 aio_close $fh;
1158 1218
1159 if (@$objs) { 1219 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1226 aio_fsync $fh;
1227 }
1165 aio_close $fh; 1228 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1230 }
1168 } else { 1231 } else {
1169 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1173 1236
1174 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1239 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1178 } 1241 }
1179 } else { 1242 } else {
1180 aio_unlink $filename; 1243 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1182 } 1245 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1270 $av = $st->{objs};
1208 } 1271 }
1209 1272
1210 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1213 1277
1214 ($data, $av) 1278 ($data, $av)
1215} 1279}
1216 1280
1217=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1276} 1340}
1277 1341
1278use File::Glob (); 1342use File::Glob ();
1279 1343
1280cf::player->attach ( 1344cf::player->attach (
1281 on_command => sub { 1345 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1283 1347
1284 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1285 or return; 1349 or return;
1286 1350
1309 1373
1310 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1375 if $reply;
1312 1376
1313 } else { 1377 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1379 }
1316 1380
1317 cf::override; 1381 cf::override;
1318 }, 1382 },
1319); 1383);
1330 1394
1331 $grp 1395 $grp
1332} 1396}
1333 1397
1334sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1335 cf::sync_job { 1401 cf::sync_job {
1336 my %todo; 1402 my %todo;
1337 1403
1338 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1405 next unless -r $path;
1357 1423
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1426
1361 $ext{source} = 1427 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1364 . $source 1430 . $source
1365 . "\n};\n1"; 1431 . "\n};\n1";
1366 1432
1367 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1368 } 1434 }
1369 1435
1436 my $pass = 0;
1370 my %done; 1437 my %done;
1371 while (%todo) { 1438 while (%todo) {
1372 my $progress; 1439 my $progress;
1373 1440
1441 ++$pass;
1442
1443 ext:
1374 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1446 next ext
1377 unless exists $done{$_}; 1447 unless exists $done{$_};
1378 } 1448 }
1379 1449
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1451
1382 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1385 1457
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1459 if exists $v->{meta}{mandatory};
1390 1460
1391 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;
1392 } 1470 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1471 }
1398 1472
1399 skip: 1473 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1481 }
1403 }; 1482 };
1404} 1483}
1405 1484
1406############################################################################# 1485#############################################################################
1490 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1491 } 1570 }
1492 } 1571 }
1493} 1572}
1494 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
1495sub save($) { 1587sub save($) {
1496 my ($pl) = @_; 1588 my ($pl) = @_;
1497 1589
1498 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1499 1591
1504 1596
1505 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1507 1599
1508 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];
1509 1604
1510 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1606 cf::cede_to_tick;
1512} 1607}
1513 1608
1550 $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
1551 1646
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1648 $pl->deactivate;
1554 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;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1558 1652
1559 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1615 \@logins 1709 \@logins
1616} 1710}
1617 1711
1618=item $player->maps 1712=item $player->maps
1619 1713
1714=item cf::player::maps $login
1715
1620Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1621player. May block. 1717player. May block.
1622 1718
1623=cut 1719=cut
1624 1720
1686=cut 1782=cut
1687 1783
1688sub find_by_path($) { 1784sub find_by_path($) {
1689 my ($path) = @_; 1785 my ($path) = @_;
1690 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1691 my ($match, $specificity); 1789 my ($match, $specificity);
1692 1790
1693 for my $region (list) { 1791 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
1726 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
1727 1825
1728 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1827 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1849
1752sub register { 1850sub register {
1753 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1852 my $pkg = caller;
1755 1853
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1855
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1857}
1761 1858
1762# also paths starting with '/' 1859# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1861
1765sub thawer_merge { 1862sub thawer_merge {
1766 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1767 1864
1768 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1982 2079
1983 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1984 } 2081 }
1985} 2082}
1986 2083
1987sub pre_load { } 2084sub pre_load { }
1988sub post_load { } 2085#sub post_load { } # XS
1989 2086
1990sub load { 2087sub load {
1991 my ($self) = @_; 2088 my ($self) = @_;
1992 2089
1993 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2050 } 2147 }
2051 2148
2052 $self->post_load; 2149 $self->post_load;
2053} 2150}
2054 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
2055sub customise_for { 2155sub customise_for {
2056 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2057 2157
2058 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2159 if $self->per_player;
2075 or next; 2175 or next;
2076 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2077 or next; 2177 or next;
2078 $neigh->load; 2178 $neigh->load;
2079 2179
2180 # now find the diagonal neighbours
2080 push @neigh, 2181 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2184 }
2084 2185
2091} 2192}
2092 2193
2093sub find_sync { 2194sub find_sync {
2094 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2095 2196
2096 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
2097} 2201}
2098 2202
2099sub do_load_sync { 2203sub do_load_sync {
2100 my ($map) = @_; 2204 my ($map) = @_;
2101 2205
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2104 2208
2105 cf::sync_job { $map->load }; 2209 $map->load;
2106} 2210}
2107 2211
2108our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2110 2214
2136 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2137 2241
2138 () 2242 ()
2139} 2243}
2140 2244
2245# common code, used by both ->save and ->swapout
2141sub save { 2246sub _save {
2142 my ($self) = @_; 2247 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2248
2146 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2147 2250
2148 return unless $self->dirty; 2251 return unless $self->dirty;
2149 2252
2169 } else { 2272 } else {
2170 $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);
2171 } 2274 }
2172} 2275}
2173 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2174sub swap_out { 2285sub swap_out {
2175 my ($self) = @_; 2286 my ($self) = @_;
2176 2287
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2289
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2185 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2186 $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};
2187 2344
2188 $self->deactivate; 2345 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2347 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2348
2236 $self->unlink_save; 2349 $self->unlink_save;
2237 $self->destroy; 2350 $self->destroy;
2238} 2351}
2239 2352
2247 2360
2248 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2249 2362
2250 $self->unlink_save; 2363 $self->unlink_save;
2251 2364
2252 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2370
2314 : normalise $_ 2427 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2429 ]
2317} 2430}
2318 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
2319=back 2464=back
2320 2465
2321=head3 cf::object 2466=head3 cf::object
2322 2467
2323=cut 2468=cut
2455 2600
2456Freezes 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}>).
2457 2602
2458The 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.
2459for 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,
2460though, 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
2461map. 2606map.
2462 2607
2463Will never block. 2608Will never block.
2464 2609
2465=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2487 my ($self) = @_; 2632 my ($self) = @_;
2488 2633
2489 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2490 2635
2636 ++$self->{_link_recursion};
2637
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2639
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2495 2642
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2644}
2498 2645
2499sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2501 2648
2518 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2520 2667
2521 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2524 2671
2525 $map->load; 2672 $map->load;
2526 $map->load_neighbours; 2673 $map->load_neighbours;
2527 2674
2528 return unless $self->contr->active; 2675 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2676
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2534} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2535 2684
2685}
2686
2536=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)]])
2537 2688
2538Moves 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
2539her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2540that 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
2541the 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
2548 2699
2549our $GOTOGEN; 2700our $GOTOGEN;
2550 2701
2551sub cf::object::player::goto { 2702sub cf::object::player::goto {
2552 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 }
2553 2710
2554 # 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
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2713
2557 $self->enter_link; 2714 $self->enter_link;
2581 my $map = eval { 2738 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2583 2740
2584 if ($map) { 2741 if ($map) {
2585 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2744 } else {
2588 $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);
2589 } 2746 }
2590 2747
2591 $map 2748 $map
2599 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2602 } 2759 }
2603 2760
2604 $done->() if $done; 2761 $done->($self) if $done;
2605 })->prio (1); 2762 })->prio (1);
2606} 2763}
2607 2764
2608=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2609 2766
2702 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2863
2707 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2865 $self->leave_link;
2709 } 2866 }
2710 })->prio (1); 2867 })->prio (1);
2711} 2868}
2712 2869
2724sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2726 2883
2727 utf8::encode $text; 2884 utf8::encode $text;
2728 $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);
2729} 2911}
2730 2912
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2914
2733Send 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
2737 2919
2738=cut 2920=cut
2739 2921
2740# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2742 "c/identify" => { 2930 "c/identify" => {
2743 id => "infobox", 2931 id => "infobox",
2744 title => "Identify", 2932 title => "Identify",
2745 reply => undef, 2933 reply => undef,
2746 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2748 "c/examine" => { 2936 "c/examine" => {
2749 id => "infobox", 2937 id => "infobox",
2750 title => "Examine", 2938 title => "Examine",
2751 reply => undef, 2939 reply => undef,
2752 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",
2753 }, 2947 },
2754 "c/book" => { 2948 "c/book" => {
2755 id => "infobox", 2949 id => "infobox",
2756 title => "Book", 2950 title => "Book",
2757 reply => undef, 2951 reply => undef,
2873 my $pkt = "msg " 3067 my $pkt = "msg "
2874 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2876 ); 3070 );
2877 3071
2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2881
2882 # split very large packets
2883 if (8192 < length $pkt and $self->{can_lzf}) {
2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2885 $pkt = "frag";
2886 }
2887
2888 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2889} 3073}
2890 3074
2891=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2892 3076
2893Sends an ext event to the client. 3077Sends an ext event to the client.
2896 3080
2897sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2899 3083
2900 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3089 }
2906} 3090}
2907 3091
2908=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2909 3093
2913 3097
2914sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2916 3100
2917 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3104 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3107 }
2924} 3108}
2925 3109
2926=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2927 3111
2998 3182
2999 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3184 if $reply;
3001 3185
3002 } else { 3186 } else {
3003 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";
3004 } 3188 }
3005 3189
3006 cf::override; 3190 cf::override;
3007 }, 3191 },
3008); 3192);
3028 3212
3029 $coro 3213 $coro
3030} 3214}
3031 3215
3032cf::client->attach ( 3216cf::client->attach (
3033 on_destroy => sub { 3217 on_client_destroy => sub {
3034 my ($ns) = @_; 3218 my ($ns) = @_;
3035 3219
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3221 },
3038); 3222);
3054our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3055 3239
3056$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3057 3241
3058$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3061 sort time 3245 sort time
3062)); 3246));
3063 3247
3064# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3089 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3090 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3091 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3092 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3093) { 3277) {
3094 no strict 'refs';
3095 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3097 for @funs; 3280 for @funs;
3098} 3281}
3099 3282
3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3117 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3118 3301
3119 %vars = (_dummy => 0) unless %vars; 3302 %vars = (_dummy => 0) unless %vars;
3120 3303
3304 my @res;
3121 local $_; 3305 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3306
3124 my $eval = 3307 my $eval =
3125 "do {\n" 3308 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3311 . $code
3129 . "\n}" 3312 . "\n}"
3130 ; 3313 ;
3131 3314
3315 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 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 }
3135 3324
3136 if ($@) { 3325 if ($@) {
3137 warn "$@"; 3326 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3140 } 3329 }
3141 3330
3142 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3143} 3332}
3144 3333
3158=cut 3347=cut
3159 3348
3160sub register_script_function { 3349sub register_script_function {
3161 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3162 3351
3163 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3165} 3354}
3166 3355
3167=back 3356=back
3168 3357
3169=cut 3358=cut
3170 3359
3171############################################################################# 3360#############################################################################
3172# 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}
3173 3405
3174sub load_facedata($) { 3406sub load_facedata($) {
3175 my ($path) = @_; 3407 my ($path) = @_;
3176 3408
3177 # 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
3178 # for this (global event?) 3410 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3412
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3414
3183 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3184 3416
3185 my $facedata; 3417 my $facedata;
3186 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3187 or die "$path: $!"; 3419 or die "$path: $!";
3188 3420
3190 3422
3191 $facedata->{version} == 2 3423 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3425
3194 # 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]);
3195 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3429 type => FT_RSRC,
3197 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),
3198 }; 3432 };
3199 cf::cede_to_tick; 3433 cf::cede_to_tick;
3200 3434
3201 { 3435 {
3202 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3440
3207 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3445
3212 cf::cede_to_tick; 3446 cf::cede_to_tick;
3213 } 3447 }
3214 3448
3215 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3220 3454
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3458 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3460 }
3227 3461
3228 cf::cede_to_tick; 3462 cf::cede_to_tick;
3229 } 3463 }
3230 } 3464 }
3239 3473
3240 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3241 } 3475 }
3242 3476
3243 { 3477 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3247 3479
3248 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3483
3253 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3268 } else { 3486 } else {
3269 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3270 } 3488 }
3271 3489
3272 cf::cede_to_tick; 3490 cf::cede_to_tick;
3273 } 3491 }
3274 } 3492 }
3275 3493
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3495
3278 1 3496 1
3279} 3497}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300 3498
3301register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3303 3501
3304 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3343sub reload_treasures { 3541sub reload_treasures {
3344 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3345 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3346} 3544}
3347 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
3348sub reload_resources { 3569sub reload_resources {
3349 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3350 3571
3351 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3352 reload_archetypes; 3574 reload_archetypes;
3353 reload_regions; 3575 reload_regions;
3354 reload_treasures; 3576 reload_treasures;
3355 3577
3356 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3357} 3579}
3358 3580
3359sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3585 or return;
3362 3586
3363 local $/; 3587 local $/;
3364 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3365 3589
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3591
3368 $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};
3369 $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};
3370 3594
3371 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3599 };
3376 warn $@ if $@; 3600 warn $@ if $@;
3377 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3378} 3604}
3379 3605
3380sub pidfile() { 3606sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
3394 3620
3395 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3396 print $fh $$; 3622 print $fh $$;
3397} 3623}
3398 3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3632}
3633
3399sub main { 3634sub main {
3400 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3401 3636
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 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.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411 3641
3412 $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
3413 3643
3414 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3415 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3421 }; 3651 };
3422 3652
3423 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3424 3654
3425 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
3426 reload_resources; 3666 reload_resources;
3427 reload_config; 3667 reload_config;
3428 db_init; 3668 db_init;
3429 3669
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid; 3670 cf::init_uuid;
3433 cf::init_signals; 3671 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills; 3672 cf::init_skills;
3436 3673
3437 cf::init_beforeplay; 3674 cf::init_beforeplay;
3438 3675
3439 atomic; 3676 atomic;
3441 load_extensions; 3678 load_extensions;
3442 3679
3443 utime time, time, $RUNTIMEFILE; 3680 utime time, time, $RUNTIMEFILE;
3444 3681
3445 # no (long-running) fork's whatsoever before this point(!) 3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3446 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};
3447 3685
3448 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3449 }; 3687 };
3450 3688
3451 EV::loop; 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
3697 goto &main_loop;
3452} 3698}
3453 3699
3454############################################################################# 3700#############################################################################
3455# initialisation and cleanup 3701# initialisation and cleanup
3456 3702
3457# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3458BEGIN { 3704BEGIN {
3459 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3460 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3461 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3462 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3463 }; 3709 };
3464 } 3710 }
3465} 3711}
3466 3712
3467sub write_runtime_sync { 3713sub write_runtime_sync {
3714 my $t0 = AE::time;
3715
3468 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3470 3718
3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3720
3473 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3474 3722
3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3724 or return;
3477 3725
3478 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3493 or return; 3741 or return;
3494 3742
3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3744 and return;
3497 3745
3498 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3747
3500 1 3748 1
3501} 3749}
3502 3750
3503our $uuid_lock; 3751our $uuid_lock;
3515 or return; 3763 or return;
3516 3764
3517 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3518 3766
3519 unless ($value) { 3767 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3521 return; 3769 return;
3522 } 3770 }
3523 3771
3524 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0; 3773 $uuid_skip = 0;
3535 or return; 3783 or return;
3536 3784
3537 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3538 and return; 3786 and return;
3539 3787
3540 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3541 3789
3542 1 3790 1
3543 3791
3544} 3792}
3545 3793
3551} 3799}
3552 3800
3553sub emergency_save() { 3801sub emergency_save() {
3554 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3555 3803
3556 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;
3557 3810
3558 cf::sync_job { 3811 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so 3812 cf::write_runtime_sync; # external watchdog should not bark
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563 3813
3564 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3565 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3566 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3567 warn "emergency_perl_save: begin player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3568 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3569 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3570 $pl->valid or next; 3820 $pl->valid or next;
3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3572 $pl->save; 3822 $pl->save;
3573 } 3823 }
3574 warn "emergency_perl_save: end player save\n"; 3824 info "emergency_perl_save: end player save\n";
3575 3825
3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3576 warn "emergency_perl_save: begin map save\n"; 3828 info "emergency_perl_save: begin map save\n";
3577 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3578 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3579 $map->valid or next; 3831 $map->valid or next;
3580 $map->save; 3832 $map->save;
3581 } 3833 }
3582 warn "emergency_perl_save: end map save\n"; 3834 info "emergency_perl_save: end map save\n";
3583 3835
3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3584 warn "emergency_perl_save: begin database checkpoint\n"; 3838 info "emergency_perl_save: begin database checkpoint\n";
3585 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3586 warn "emergency_perl_save: end database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3587 3841
3588 warn "emergency_perl_save: begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1; 3843 write_uuid_sync 1;
3590 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
3591 }; 3864 };
3592 3865
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3598 warn "emergency_perl_save: leave\n"; 3866 info "emergency_perl_save: leave\n";
3599} 3867}
3600 3868
3601sub post_cleanup { 3869sub post_cleanup {
3602 my ($make_core) = @_; 3870 my ($make_core) = @_;
3603 3871
3872 IO::AIO::flush;
3873
3604 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3605 if $make_core; 3875 if $make_core;
3606 3876
3607 my $fh = pidfile; 3877 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3609} 3879}
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) { 3900 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"}; 3901 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 } 3903 }
3634 warn "cleared package $pkg\n";#d#
3635} 3904}
3636 3905
3637sub do_reload_perl() { 3906sub do_reload_perl() {
3638 # can/must only be called in main 3907 # can/must only be called in main
3639 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3640 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3641 return; 3910 return;
3642 } 3911 }
3643 3912
3644 return if $RELOAD++; 3913 return if $RELOAD++;
3645 3914
3646 my $t1 = EV::time; 3915 my $t1 = AE::time;
3647 3916
3648 while ($RELOAD) { 3917 while ($RELOAD) {
3649 warn "reloading..."; 3918 info "reloading...";
3650 3919
3651 warn "entering sync_job"; 3920 trace "entering sync_job";
3652 3921
3653 cf::sync_job { 3922 cf::sync_job {
3654 cf::write_runtime_sync; # external watchdog should not bark
3655 cf::emergency_save; 3923 cf::emergency_save;
3656 cf::write_runtime_sync; # external watchdog should not bark
3657 3924
3658 warn "syncing database to disk";
3659 BDB::db_env_txn_checkpoint $DB_ENV;
3660
3661 # if anything goes wrong in here, we should simply crash as we already saved
3662
3663 warn "flushing outstanding aio requests";
3664 while (IO::AIO::nreqs || BDB::nreqs) {
3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3666 }
3667
3668 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3669 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3670 %EXT_CORO = (); 3927 %EXT_CORO = ();
3671 3928
3672 warn "removing commands"; 3929 trace "removing commands";
3673 %COMMAND = (); 3930 %COMMAND = ();
3674 3931
3675 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3676 %EXTCMD = (); 3933 %EXTCMD = ();
3677 %EXTICMD = (); 3934 %EXTICMD = ();
3678 3935
3679 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3681 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3682 3939
3683 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3684 eval { 3941 eval {
3685 $cb->($pkg); 3942 $cb->($pkg);
3686 1 3943 1
3687 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3688 } 3945 }
3689 3946
3690 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3691 clear_package $pkg; 3948 clear_package $pkg;
3692 } 3949 }
3693 3950
3694 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697 3954
3698 warn "... unloading $k"; 3955 trace "... unloading $k";
3699 delete $INC{$k}; 3956 delete $INC{$k};
3700 3957
3701 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3703 3960
3706 } 3963 }
3707 3964
3708 clear_package $k; 3965 clear_package $k;
3709 } 3966 }
3710 3967
3711 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3712 clear_package "safe::$_" 3969 clear_package "safe::$_"
3713 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);
3714 3971
3715 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3716 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3718 3975
3719 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3720 # and global variables created in xs 3977 # and global variables created in xs
3721 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3722 3979
3723 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3724 3981
3725 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3726 require cf; 3983 require cf;
3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3728 3985
3729 warn "loading config and database again"; 3986 trace "loading config and database again";
3730 cf::reload_config; 3987 cf::reload_config;
3731 3988
3732 warn "loading extensions"; 3989 trace "loading extensions";
3733 cf::load_extensions; 3990 cf::load_extensions;
3734 3991
3735 if ($REATTACH_ON_RELOAD) { 3992 if ($REATTACH_ON_RELOAD) {
3736 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3737 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3738 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3739 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3740 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3741 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3742 } 3999 }
3743 4000
3744 warn "running post_init jobs"; 4001 trace "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3746 4003
3747 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3748 4005
3749 1 4006 1
3750 } or do { 4007 } or do {
3751 warn $@; 4008 error $@;
3752 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3753 }; 4010 };
3754 4011
3755 warn "reloaded"; 4012 info "reloaded";
3756 --$RELOAD; 4013 --$RELOAD;
3757 } 4014 }
3758 4015
3759 $t1 = EV::time - $t1; 4016 $t1 = AE::time - $t1;
3760 warn "reload completed in ${t1}s\n"; 4017 info "reload completed in ${t1}s\n";
3761}; 4018};
3762 4019
3763our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3764 4021
3765sub reload_perl() { 4022sub reload_perl() {
3767 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3768 4025
3769 $RELOAD_WATCHER ||= cf::async { 4026 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions; 4027 Coro::AIO::aio_wait cache_extensions;
3771 4028
3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3773 do_reload_perl; 4030 do_reload_perl;
3774 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3775 }; 4032 };
3776 }; 4033 };
3777} 4034}
3786 reload_perl; 4043 reload_perl;
3787 }; 4044 };
3788 } 4045 }
3789}; 4046};
3790 4047
3791unshift @INC, $LIBDIR; 4048#############################################################################
3792 4049
3793my $bug_warning = 0; 4050my $bug_warning = 0;
3794 4051
3795our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3796our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3797 4054
3798sub wait_for_tick { 4055sub wait_for_tick {
3799 return if tick_inhibit || $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3800 4057
3801 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3802 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3803 $signal->wait; 4060 $signal->wait;
3804} 4061}
3805 4062
3806sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3807 return if tick_inhibit || $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3808 4065
3809 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3810 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3811 $signal->wait; 4068 $signal->wait;
3812} 4069}
3818 return; 4075 return;
3819 } 4076 }
3820 4077
3821 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3822 4079
4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081
3823 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3824 $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.;
3825 Coro::async_pool { 4084 Coro::async_pool {
3826 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3827 write_runtime_sync 4086 write_runtime_sync
3828 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3829 }; 4088 };
3830 } 4089 }
3831 4090
3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3833 $sig->send; 4092 $sig->send;
3841 4100
3842 if (0) { 4101 if (0) {
3843 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3844 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3847 } 4106 }
3848 } 4107 }
3849} 4108}
3850 4109
3851{ 4110{
3852 # configure BDB 4111 # configure BDB
3853 4112
3854 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3855 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3856 $AnyEvent::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3857 4116
3858 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3859 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3940 } 4199 }
3941} 4200}
3942 4201
3943# load additional modules 4202# load additional modules
3944require "cf/$_.pm" for @EXTRA_MODULES; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3945 4205
3946END { cf::emergency_save } 4206END { cf::emergency_save }
3947 4207
39481 42081
3949 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines