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.470 by root, Sun Apr 26 19:42:45 2009 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 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);
1320 1384
1321# "readahead" all extensions 1385# "readahead" all extensions
1322sub cache_extensions { 1386sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1387 my $grp = IO::AIO::aio_group;
1324 1388
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1390 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1392 }
1329 }; 1393 };
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";
1385 1456
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1458 if exists $v->{meta}{mandatory};
1390 1459
1391 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1392 } 1469 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1470 }
1398 1471
1399 skip: 1472 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1402 } 1480 }
1403 }; 1481 };
1404} 1482}
1405 1483
1406############################################################################# 1484#############################################################################
1490 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1491 } 1569 }
1492 } 1570 }
1493} 1571}
1494 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1495sub save($) { 1586sub save($) {
1496 my ($pl) = @_; 1587 my ($pl) = @_;
1497 1588
1498 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1499 1590
1504 1595
1505 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1507 1598
1508 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1603
1510 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1605 cf::cede_to_tick;
1512} 1606}
1513 1607
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1645
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1647 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1558 1651
1559 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1615 \@logins 1708 \@logins
1616} 1709}
1617 1710
1618=item $player->maps 1711=item $player->maps
1619 1712
1713=item cf::player::maps $login
1714
1620Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1621player. May block. 1716player. May block.
1622 1717
1623=cut 1718=cut
1624 1719
1686=cut 1781=cut
1687 1782
1688sub find_by_path($) { 1783sub find_by_path($) {
1689 my ($path) = @_; 1784 my ($path) = @_;
1690 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1691 my ($match, $specificity); 1788 my ($match, $specificity);
1692 1789
1693 for my $region (list) { 1790 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1824
1728 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1826 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1848
1752sub register { 1849sub register {
1753 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1851 my $pkg = caller;
1755 1852
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1854
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1856}
1761 1857
1762# also paths starting with '/' 1858# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1860
1765sub thawer_merge { 1861sub thawer_merge {
1766 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1767 1863
1768 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1982 2078
1983 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1984 } 2080 }
1985} 2081}
1986 2082
1987sub pre_load { } 2083sub pre_load { }
1988sub post_load { } 2084#sub post_load { } # XS
1989 2085
1990sub load { 2086sub load {
1991 my ($self) = @_; 2087 my ($self) = @_;
1992 2088
1993 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
2050 } 2146 }
2051 2147
2052 $self->post_load; 2148 $self->post_load;
2053} 2149}
2054 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
2055sub customise_for { 2154sub customise_for {
2056 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2057 2156
2058 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2158 if $self->per_player;
2075 or next; 2174 or next;
2076 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2077 or next; 2176 or next;
2078 $neigh->load; 2177 $neigh->load;
2079 2178
2179 # now find the diagonal neighbours
2080 push @neigh, 2180 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2183 }
2084 2184
2091} 2191}
2092 2192
2093sub find_sync { 2193sub find_sync {
2094 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2095 2195
2096 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2097} 2200}
2098 2201
2099sub do_load_sync { 2202sub do_load_sync {
2100 my ($map) = @_; 2203 my ($map) = @_;
2101 2204
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2104 2207
2105 cf::sync_job { $map->load }; 2208 $map->load;
2106} 2209}
2107 2210
2108our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2110 2213
2136 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2137 2240
2138 () 2241 ()
2139} 2242}
2140 2243
2244# common code, used by both ->save and ->swapout
2141sub save { 2245sub _save {
2142 my ($self) = @_; 2246 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2247
2146 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2147 2249
2148 return unless $self->dirty; 2250 return unless $self->dirty;
2149 2251
2169 } else { 2271 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2273 }
2172} 2274}
2173 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2174sub swap_out { 2284sub swap_out {
2175 my ($self) = @_; 2285 my ($self) = @_;
2176 2286
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2288
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2289 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2290 return if $self->{deny_save};
2291 return if $self->players;
2185 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2187 2343
2188 $self->deactivate; 2344 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2346 $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 2347
2236 $self->unlink_save; 2348 $self->unlink_save;
2237 $self->destroy; 2349 $self->destroy;
2238} 2350}
2239 2351
2247 2359
2248 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2249 2361
2250 $self->unlink_save; 2362 $self->unlink_save;
2251 2363
2252 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2369
2314 : normalise $_ 2426 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2428 ]
2317} 2429}
2318 2430
2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
2462
2319=back 2463=back
2320 2464
2321=head3 cf::object 2465=head3 cf::object
2322 2466
2323=cut 2467=cut
2455 2599
2456Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2457 2601
2458The player should be reasonably safe there for short amounts of time (e.g. 2602The 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, 2603for 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 2604though, as the player cannot control the character while it is on the link
2461map. 2605map.
2462 2606
2463Will never block. 2607Will never block.
2464 2608
2465=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2487 my ($self) = @_; 2631 my ($self) = @_;
2488 2632
2489 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2490 2634
2635 ++$self->{_link_recursion};
2636
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2638
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2495 2641
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2643}
2498 2644
2499sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2501 2647
2518 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2520 2666
2521 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2524 2670
2525 $map->load; 2671 $map->load;
2526 $map->load_neighbours; 2672 $map->load_neighbours;
2527 2673
2528 return unless $self->contr->active; 2674 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2675
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2534} 2678 # entering was successful
2679 delete $self->{_link_recursion};
2680 # only activate afterwards, to support waiting in hooks
2681 $self->activate_recursive;
2682 }
2535 2683
2684}
2685
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2687
2538Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2690that 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 2691the new (success) or old (failed) map position. In either case, $done will
2548 2698
2549our $GOTOGEN; 2699our $GOTOGEN;
2550 2700
2551sub cf::object::player::goto { 2701sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2553 2709
2554 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2712
2557 $self->enter_link; 2713 $self->enter_link;
2581 my $map = eval { 2737 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2583 2739
2584 if ($map) { 2740 if ($map) {
2585 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2743 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2745 }
2590 2746
2591 $map 2747 $map
2599 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2602 } 2758 }
2603 2759
2604 $done->() if $done; 2760 $done->($self) if $done;
2605 })->prio (1); 2761 })->prio (1);
2606} 2762}
2607 2763
2608=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2609 2765
2702 $self->message ("Something went wrong deep within the deliantra server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2862
2707 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2864 $self->leave_link;
2709 } 2865 }
2710 })->prio (1); 2866 })->prio (1);
2711} 2867}
2712 2868
2724sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2726 2882
2727 utf8::encode $text; 2883 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2729} 2910}
2730 2911
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2913
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2914Send a drawinfo or msg packet to the client, formatting the msg for the
2737 2918
2738=cut 2919=cut
2739 2920
2740# non-persistent channels (usually the info channel) 2921# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2742 "c/identify" => { 2929 "c/identify" => {
2743 id => "infobox", 2930 id => "infobox",
2744 title => "Identify", 2931 title => "Identify",
2745 reply => undef, 2932 reply => undef,
2746 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
2748 "c/examine" => { 2935 "c/examine" => {
2749 id => "infobox", 2936 id => "infobox",
2750 title => "Examine", 2937 title => "Examine",
2751 reply => undef, 2938 reply => undef,
2752 tooltip => "Signs and other items you examined", 2939 tooltip => "Signs and other items you examined",
2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2946 },
2754 "c/book" => { 2947 "c/book" => {
2755 id => "infobox", 2948 id => "infobox",
2756 title => "Book", 2949 title => "Book",
2757 reply => undef, 2950 reply => undef,
2803 id => "infobox", 2996 id => "infobox",
2804 title => "Pets", 2997 title => "Pets",
2805 reply => undef, 2998 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet", 2999 tooltip => "Shows information abotu your pets/a specific pet",
2807 }, 3000 },
3001 "c/perceiveself" => {
3002 id => "infobox",
3003 title => "Perceive Self",
3004 reply => undef,
3005 tooltip => "You gained detailed knowledge about yourself",
3006 },
2808 "c/uptime" => { 3007 "c/uptime" => {
2809 id => "infobox", 3008 id => "infobox",
2810 title => "Uptime", 3009 title => "Uptime",
2811 reply => undef, 3010 reply => undef,
2812 tooltip => "How long the server has been running since last restart", 3011 tooltip => "How long the server has been running since last restart",
2867 my $pkt = "msg " 3066 my $pkt = "msg "
2868 . $self->{json_coder}->encode ( 3067 . $self->{json_coder}->encode (
2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870 ); 3069 );
2871 3070
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if (8192 < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt); 3071 $self->send_big_packet ($pkt);
2883} 3072}
2884 3073
2885=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2886 3075
2887Sends an ext event to the client. 3076Sends an ext event to the client.
2890 3079
2891sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2892 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2893 3082
2894 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2897 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3088 }
2900} 3089}
2901 3090
2902=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2903 3092
2907 3096
2908sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2909 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2910 3099
2911 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2914 #TODO: version 1, remove 3103 #TODO: version 1, remove
2915 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2916 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917 } 3106 }
2918} 3107}
2919 3108
2920=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2921 3110
2992 3181
2993 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
2994 if $reply; 3183 if $reply;
2995 3184
2996 } else { 3185 } else {
2997 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2998 } 3187 }
2999 3188
3000 cf::override; 3189 cf::override;
3001 }, 3190 },
3002); 3191);
3022 3211
3023 $coro 3212 $coro
3024} 3213}
3025 3214
3026cf::client->attach ( 3215cf::client->attach (
3027 on_destroy => sub { 3216 on_client_destroy => sub {
3028 my ($ns) = @_; 3217 my ($ns) = @_;
3029 3218
3030 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031 }, 3220 },
3032); 3221);
3048our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
3049 3238
3050$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
3051 3240
3052$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
3053 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
3054 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
3055 sort time 3244 sort time
3056)); 3245));
3057 3246
3058# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
3083 decrease split destroy change_exp value msg lore send_msg)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3084 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3085 ["cf::player" => qw(peaceful send_msg)], 3274 ["cf::player" => qw(peaceful send_msg)],
3086 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3087) { 3276) {
3088 no strict 'refs';
3089 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3091 for @funs; 3279 for @funs;
3092} 3280}
3093 3281
3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3111 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
3112 3300
3113 %vars = (_dummy => 0) unless %vars; 3301 %vars = (_dummy => 0) unless %vars;
3114 3302
3303 my @res;
3115 local $_; 3304 local $_;
3116 local @safe::cf::_safe_eval_args = values %vars;
3117 3305
3118 my $eval = 3306 my $eval =
3119 "do {\n" 3307 "do {\n"
3120 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
3122 . $code 3310 . $code
3123 . "\n}" 3311 . "\n}"
3124 ; 3312 ;
3125 3313
3314 if ($CFG{safe_eval}) {
3126 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3127 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
3129 3323
3130 if ($@) { 3324 if ($@) {
3131 warn "$@"; 3325 warn "$@",
3132 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3133 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3134 } 3328 }
3135 3329
3136 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3137} 3331}
3138 3332
3152=cut 3346=cut
3153 3347
3154sub register_script_function { 3348sub register_script_function {
3155 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3156 3350
3157 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3158 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3159} 3353}
3160 3354
3161=back 3355=back
3162 3356
3163=cut 3357=cut
3164 3358
3165############################################################################# 3359#############################################################################
3166# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3167 3403
3168sub load_facedata($) { 3404sub load_facedata($) {
3169 my ($path) = @_; 3405 my ($path) = @_;
3170 3406
3171 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3172 # for this (global event?) 3408 # for this (global event?)
3173 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3174 3410
3175 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3176 3412
3177 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3178 3414
3179 my $facedata; 3415 my $facedata;
3180 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3181 or die "$path: $!"; 3417 or die "$path: $!";
3182 3418
3184 3420
3185 $facedata->{version} == 2 3421 $facedata->{version} == 2
3186 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3187 3423
3188 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3189 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3190 type => FT_RSRC, 3427 type => FT_RSRC,
3191 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3192 }; 3430 };
3193 cf::cede_to_tick; 3431 cf::cede_to_tick;
3194 3432
3195 { 3433 {
3196 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3198 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3199 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200 3438
3201 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3202 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3203 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3205 3443
3206 cf::cede_to_tick; 3444 cf::cede_to_tick;
3207 } 3445 }
3208 3446
3209 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3214 3452
3215 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3216 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3217 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3218 } else { 3456 } else {
3219 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3220 } 3458 }
3221 3459
3222 cf::cede_to_tick; 3460 cf::cede_to_tick;
3223 } 3461 }
3224 } 3462 }
3233 3471
3234 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3235 } 3473 }
3236 3474
3237 { 3475 {
3238 # TODO: for gcfclient pleasure, we should give resources
3239 # that gcfclient doesn't grok a >10000 face index.
3240 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3241 3477
3242 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3244 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245 my $data;
3246 3481
3247 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3248 # prepend meta info
3249
3250 my $meta = $enc->encode ({
3251 name => $name,
3252 %{ $info->{meta} || {} },
3253 });
3254
3255 $data = pack "(w/a*)*", $meta, $info->{data};
3256 } else {
3257 $data = $info->{data};
3258 }
3259
3260 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3262 } else { 3484 } else {
3263 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3264 } 3486 }
3265 3487
3266 cf::cede_to_tick; 3488 cf::cede_to_tick;
3267 } 3489 }
3268 } 3490 }
3269 3491
3270 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3271 3493
3272 1 3494 1
3273} 3495}
3274
3275cf::global->attach (on_resource_update => sub {
3276 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280 my $sound = $soundconf->{compat}[$_]
3281 or next;
3282
3283 my $face = cf::face::find "sound/$sound->[1]";
3284 cf::sound::set $sound->[0] => $face;
3285 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286 }
3287
3288 while (my ($k, $v) = each %{$soundconf->{event}}) {
3289 my $face = cf::face::find "sound/$v";
3290 cf::sound::set $k => $face;
3291 }
3292 }
3293});
3294 3496
3295register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3296 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3297 3499
3298 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3337sub reload_treasures { 3539sub reload_treasures {
3338 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3339 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3340} 3542}
3341 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3342sub reload_resources { 3567sub reload_resources {
3343 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3344 3569
3345 reload_facedata; 3570 reload_facedata;
3571 reload_sound;
3346 reload_archetypes; 3572 reload_archetypes;
3347 reload_regions; 3573 reload_regions;
3348 reload_treasures; 3574 reload_treasures;
3349 3575
3350 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3351} 3577}
3352 3578
3353sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3583 or return;
3356 3584
3357 local $/; 3585 local $/;
3358 *CFG = YAML::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3359 3587
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3589
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364 3592
3365 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3597 };
3370 warn $@ if $@; 3598 warn $@ if $@;
3371 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3372} 3602}
3373 3603
3374sub pidfile() { 3604sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
3388 3618
3389 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3390 print $fh $$; 3620 print $fh $$;
3391} 3621}
3392 3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3630}
3631
3393sub main { 3632sub main {
3394 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3395 3634
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401 cf::init_experience;
3402 cf::init_anim;
3403 cf::init_attackmess;
3404 cf::init_dynamic;
3405 3639
3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407 3641
3408 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3409 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3415 }; 3649 };
3416 3650
3417 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3418 3652
3419 cf::sync_job { 3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3420 reload_resources; 3664 reload_resources;
3421 reload_config; 3665 reload_config;
3422 db_init; 3666 db_init;
3423 3667
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid; 3668 cf::init_uuid;
3427 cf::init_signals; 3669 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills; 3670 cf::init_skills;
3430 3671
3431 cf::init_beforeplay; 3672 cf::init_beforeplay;
3432 3673
3433 atomic; 3674 atomic;
3435 load_extensions; 3676 load_extensions;
3436 3677
3437 utime time, time, $RUNTIMEFILE; 3678 utime time, time, $RUNTIMEFILE;
3438 3679
3439 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441 3683
3442 (pop @POST_INIT)->(0) while @POST_INIT; 3684 (pop @POST_INIT)->(0) while @POST_INIT;
3443 }; 3685 };
3444 3686
3445 EV::loop; 3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3695 goto &main_loop;
3446} 3696}
3447 3697
3448############################################################################# 3698#############################################################################
3449# initialisation and cleanup 3699# initialisation and cleanup
3450 3700
3451# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3452BEGIN { 3702BEGIN {
3453 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3454 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3455 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3456 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3457 }; 3707 };
3458 } 3708 }
3459} 3709}
3460 3710
3461sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3462 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3463 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3464 3716
3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466 3718
3467 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3468 3720
3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470 or return; 3722 or return;
3471 3723
3472 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3473 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3474 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3487 or return; 3739 or return;
3488 3740
3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490 and return; 3742 and return;
3491 3743
3492 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493 3745
3494 1 3746 1
3495} 3747}
3496 3748
3497our $uuid_lock; 3749our $uuid_lock;
3509 or return; 3761 or return;
3510 3762
3511 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3512 3764
3513 unless ($value) { 3765 unless ($value) {
3514 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3515 return; 3767 return;
3516 } 3768 }
3517 3769
3518 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3771 $uuid_skip = 0;
3529 or return; 3781 or return;
3530 3782
3531 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3532 and return; 3784 and return;
3533 3785
3534 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3535 3787
3536 1 3788 1
3537 3789
3538} 3790}
3539 3791
3545} 3797}
3546 3798
3547sub emergency_save() { 3799sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3549 3801
3550 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3551 3808
3552 cf::sync_job { 3809 cf::sync_job {
3553 # this is a trade-off: we want to be very quick here, so 3810 cf::write_runtime_sync; # external watchdog should not bark
3554 # save all maps without fsync, and later call a global sync
3555 # (which in turn might be very very slow)
3556 local $USE_FSYNC = 0;
3557 3811
3558 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3559 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3560 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3561 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3562 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3563 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3564 $pl->valid or next; 3818 $pl->valid or next;
3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3566 $pl->save; 3820 $pl->save;
3567 } 3821 }
3568 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3569 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3570 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3571 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3572 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3573 $map->valid or next; 3829 $map->valid or next;
3574 $map->save; 3830 $map->save;
3575 } 3831 }
3576 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3577 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3578 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3579 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3580 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3581 3839
3582 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3583 write_uuid_sync 1; 3841 write_uuid_sync 1;
3584 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3585 }; 3862 };
3586 3863
3587 warn "emergency_perl_save: starting sync()\n";
3588 IO::AIO::aio_sync sub {
3589 warn "emergency_perl_save: finished sync()\n";
3590 };
3591
3592 warn "emergency_perl_save: leave\n"; 3864 info "emergency_perl_save: leave\n";
3593} 3865}
3594 3866
3595sub post_cleanup { 3867sub post_cleanup {
3596 my ($make_core) = @_; 3868 my ($make_core) = @_;
3597 3869
3870 IO::AIO::flush;
3871
3598 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3873 if $make_core;
3600 3874
3601 my $fh = pidfile; 3875 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3603} 3877}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3901 }
3628 warn "cleared package $pkg\n";#d#
3629} 3902}
3630 3903
3631sub do_reload_perl() { 3904sub do_reload_perl() {
3632 # can/must only be called in main 3905 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3634 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3635 return; 3908 return;
3636 } 3909 }
3637 3910
3638 return if $RELOAD++; 3911 return if $RELOAD++;
3639 3912
3640 my $t1 = EV::time; 3913 my $t1 = AE::time;
3641 3914
3642 while ($RELOAD) { 3915 while ($RELOAD) {
3643 warn "reloading..."; 3916 info "reloading...";
3644 3917
3645 warn "entering sync_job"; 3918 trace "entering sync_job";
3646 3919
3647 cf::sync_job { 3920 cf::sync_job {
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 cf::emergency_save; 3921 cf::emergency_save;
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 3922
3652 warn "syncing database to disk";
3653 BDB::db_env_txn_checkpoint $DB_ENV;
3654
3655 # if anything goes wrong in here, we should simply crash as we already saved
3656
3657 warn "flushing outstanding aio requests";
3658 while (IO::AIO::nreqs || BDB::nreqs) {
3659 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3660 }
3661
3662 warn "cancelling all extension coros"; 3923 trace "cancelling all extension coros";
3663 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3664 %EXT_CORO = (); 3925 %EXT_CORO = ();
3665 3926
3666 warn "removing commands"; 3927 trace "removing commands";
3667 %COMMAND = (); 3928 %COMMAND = ();
3668 3929
3669 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3670 %EXTCMD = (); 3931 %EXTCMD = ();
3671 %EXTICMD = (); 3932 %EXTICMD = ();
3672 3933
3673 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3674 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3675 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3676 3937
3677 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3678 eval { 3939 eval {
3679 $cb->($pkg); 3940 $cb->($pkg);
3680 1 3941 1
3681 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3682 } 3943 }
3683 3944
3684 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3685 clear_package $pkg; 3946 clear_package $pkg;
3686 } 3947 }
3687 3948
3688 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3689 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3690 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691 3952
3692 warn "... unloading $k"; 3953 trace "... unloading $k";
3693 delete $INC{$k}; 3954 delete $INC{$k};
3694 3955
3695 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3696 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3697 3958
3700 } 3961 }
3701 3962
3702 clear_package $k; 3963 clear_package $k;
3703 } 3964 }
3704 3965
3705 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3706 clear_package "safe::$_" 3967 clear_package "safe::$_"
3707 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3708 3969
3709 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3710 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3712 3973
3713 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3714 # and global variables created in xs 3975 # and global variables created in xs
3715 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3716 3977
3717 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3718 3979
3719 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3720 require cf; 3981 require cf;
3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3722 3983
3723 warn "loading config and database again"; 3984 trace "loading config and database again";
3724 cf::reload_config; 3985 cf::reload_config;
3725 3986
3726 warn "loading extensions"; 3987 trace "loading extensions";
3727 cf::load_extensions; 3988 cf::load_extensions;
3728 3989
3729 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3736 } 3997 }
3737 3998
3738 warn "running post_init jobs"; 3999 trace "running post_init jobs";
3739 (pop @POST_INIT)->(1) while @POST_INIT; 4000 (pop @POST_INIT)->(1) while @POST_INIT;
3740 4001
3741 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3742 4003
3743 1 4004 1
3744 } or do { 4005 } or do {
3745 warn $@; 4006 error $@;
3746 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3747 }; 4008 };
3748 4009
3749 warn "reloaded"; 4010 info "reloaded";
3750 --$RELOAD; 4011 --$RELOAD;
3751 } 4012 }
3752 4013
3753 $t1 = EV::time - $t1; 4014 $t1 = AE::time - $t1;
3754 warn "reload completed in ${t1}s\n"; 4015 info "reload completed in ${t1}s\n";
3755}; 4016};
3756 4017
3757our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3758 4019
3759sub reload_perl() { 4020sub reload_perl() {
3761 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3762 4023
3763 $RELOAD_WATCHER ||= cf::async { 4024 $RELOAD_WATCHER ||= cf::async {
3764 Coro::AIO::aio_wait cache_extensions; 4025 Coro::AIO::aio_wait cache_extensions;
3765 4026
3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767 do_reload_perl; 4028 do_reload_perl;
3768 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3769 }; 4030 };
3770 }; 4031 };
3771} 4032}
3780 reload_perl; 4041 reload_perl;
3781 }; 4042 };
3782 } 4043 }
3783}; 4044};
3784 4045
3785unshift @INC, $LIBDIR; 4046#############################################################################
3786 4047
3787my $bug_warning = 0; 4048my $bug_warning = 0;
3788 4049
3789our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3790our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3791 4052
3792sub wait_for_tick { 4053sub wait_for_tick {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4055
3795 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3797 $signal->wait; 4058 $signal->wait;
3798} 4059}
3799 4060
3800sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3801 return if tick_inhibit || $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3802 4063
3803 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3804 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3805 $signal->wait; 4066 $signal->wait;
3806} 4067}
3812 return; 4073 return;
3813 } 4074 }
3814 4075
3815 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3816 4077
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079
3817 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3819 Coro::async_pool { 4082 Coro::async_pool {
3820 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3821 write_runtime_sync 4084 write_runtime_sync
3822 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3823 }; 4086 };
3824 } 4087 }
3825 4088
3826 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3827 $sig->send; 4090 $sig->send;
3835 4098
3836 if (0) { 4099 if (0) {
3837 if ($NEXT_TICK) { 4100 if ($NEXT_TICK) {
3838 my $jitter = $TICK_START - $NEXT_TICK; 4101 my $jitter = $TICK_START - $NEXT_TICK;
3839 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840 warn "jitter $JITTER\n";#d# 4103 debug "jitter $JITTER\n";#d#
3841 } 4104 }
3842 } 4105 }
3843} 4106}
3844 4107
3845{ 4108{
3846 # configure BDB 4109 # configure BDB
3847 4110
3848 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3849 BDB::max_poll_reqs $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3850 $AnyEvent::BDB::WATCHER->priority (1); 4113 $AnyEvent::BDB::WATCHER->priority (1);
3851 4114
3852 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3853 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
3934 } 4197 }
3935} 4198}
3936 4199
3937# load additional modules 4200# load additional modules
3938require "cf/$_.pm" for @EXTRA_MODULES; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3939 4203
3940END { cf::emergency_save } 4204END { cf::emergency_save }
3941 4205
39421 42061
3943 4207

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines