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.469 by root, Mon Mar 2 22:25:19 2009 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 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
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
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
75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 80
79our %COMMAND = (); 81our %COMMAND = ();
80our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
87 89
88our $RELOAD; # number of reloads so far, non-zero while in reload 90our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
90 94
91our $CONFDIR = confdir; 95our $CONFDIR = confdir;
92our $DATADIR = datadir; 96our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
… …
100our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 106our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 107our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 108
105our %RESOURCE; 109our %RESOURCE; # unused
110
111our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000;
113
114our $MAX_LINKS = 32; # how many chained exits to follow
115our $VERBOSE_IO = 1;
106 116
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 119our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 120our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
112our $BDB_DEADLOCK_WATCHER; 122our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 123our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 124our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 125our $DB_ENV;
116 126
117our @EXTRA_MODULES = qw(pod mapscript); 127our @EXTRA_MODULES = qw(pod match mapscript);
118 128
119our %CFG; 129our %CFG;
120 130
121our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 132our $RUNTIME;
… …
134our $JITTER; # average jitter 144our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
136 146
137our @POST_INIT; 147our @POST_INIT;
138 148
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 149our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
150our $REALLY_UNLOOP; # never set to true, please :)
140 151
141binmode STDOUT; 152binmode STDOUT;
142binmode STDERR; 153binmode STDERR;
143 154
144# read virtual server time, if available 155# read virtual server time, if available
… …
155 166
156our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
157 168
158sub cf::map::normalise; 169sub cf::map::normalise;
159 170
171sub in_main() {
172 $Coro::current == $Coro::main
173}
174
175#############################################################################
176
177%REFLECT = ();
178for (@REFLECT) {
179 my $reflect = JSON::XS::decode_json $_;
180 $REFLECT{$reflect->{class}} = $reflect;
181}
182
183# this is decidedly evil
184$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
185
160############################################################################# 186#############################################################################
161 187
162=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
163 189
164=over 4 190=over 4
… …
210returns directly I<after> the tick processing (and consequently, can only wake one process 236returns 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. 237per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 238
213=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
214 240
215This array contains the results of the last C<invoke ()> call. When 241This 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 242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 243that call.
218 244
245=item %cf::REFLECT
246
247Contains, for each (C++) class name, a hash reference with information
248about object members (methods, scalars, arrays and flags) and other
249metadata, which is useful for introspection.
250
219=back 251=back
220 252
221=cut 253=cut
222 254
223BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 256sub warn (@) { LOG llevWarn , join "", @_ }
257sub info (@) { LOG llevInfo , join "", @_ }
258sub debug(@) { LOG llevDebug, join "", @_ }
259sub trace(@) { LOG llevTrace, join "", @_ }
260
261$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 262 my $msg = join "", @_;
226 263
227 $msg .= "\n" 264 $msg .= "\n"
228 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
229 266
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 267 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 268
232 LOG llevError, $msg; 269 LOG llevWarn, $msg;
233 }; 270};
234}
235 271
236$Coro::State::DIEHOOK = sub { 272$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 273 return unless $^S eq 0; # "eq", not "=="
238 274
239 if ($Coro::current == $Coro::main) {#d# 275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 278 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 279 return;#d#
242 }#d# 280 }#d#
243 281
244 # kill coroutine otherwise 282 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 283 Coro::terminate
247}; 284};
248
249$SIG{__DIE__} = sub { }; #d#?
250 285
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 303)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 305}
271 306
272$EV::DIED = sub { 307$EV::DIED = sub {
273 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
274}; 309};
275 310
276############################################################################# 311#############################################################################
277 312
278=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
… …
375} 410}
376 411
377=item cf::periodic $interval, $cb 412=item cf::periodic $interval, $cb
378 413
379Like EV::periodic, but randomly selects a starting point so that the actions 414Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 415get spread over time.
381 416
382=cut 417=cut
383 418
384sub periodic($$) { 419sub periodic($$) {
385 my ($interval, $cb) = @_; 420 my ($interval, $cb) = @_;
… …
402 437
403=cut 438=cut
404 439
405our @SLOT_QUEUE; 440our @SLOT_QUEUE;
406our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
407 443
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 446 $Coro::current->desc ("timeslot manager");
411 447
412 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
413 450
414 while () { 451 while () {
415 next_job: 452 next_job:
453
416 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 455
418 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 460 $job->[2]->send;
422 Coro::cede; 461 Coro::cede;
423 goto next_job; 462 goto next_job;
424 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 465 }
426 } 466 }
427 467
428 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 469 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 471 $signal->wait;
432 } else { 472 } else {
473 $busy = 0;
433 Coro::schedule; 474 Coro::schedule;
434 } 475 }
435 } 476 }
436}; 477};
437 478
438sub get_slot($;$$) { 479sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 480 return if tick_inhibit || $Coro::current == $Coro::main;
440 481
441 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
442 483
443 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
444 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
445 487
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
… …
474=cut 516=cut
475 517
476sub sync_job(&) { 518sub sync_job(&) {
477 my ($job) = @_; 519 my ($job) = @_;
478 520
479 if ($Coro::current == $Coro::main) { 521 if (in_main) {
480 my $time = EV::time; 522 my $time = AE::time;
481 523
482 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
484 526
485 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
486 528
487 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
488 530
489 my $busy = 1; 531 my $busy = 1;
490 my @res; 532 my @res;
491 533
492 (async { 534 (async {
493 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 536 @res = eval { $job->() };
495 warn $@ if $@; 537 error $@ if $@;
496 undef $busy; 538 undef $busy;
497 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
498 540
499 while ($busy) { 541 while ($busy) {
500 if (Coro::nready) { 542 if (Coro::nready) {
… …
502 } else { 544 } else {
503 EV::loop EV::LOOP_ONESHOT; 545 EV::loop EV::LOOP_ONESHOT;
504 } 546 }
505 } 547 }
506 548
507 my $time = EV::time - $time; 549 my $time = AE::time - $time;
508 550
509 $TICK_START += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
510 552
511 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
512 } else { 554 } else {
… …
556 reset_signals; 598 reset_signals;
557 &$cb 599 &$cb
558 }, @args; 600 }, @args;
559 601
560 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
603}
604
605sub objinfo {
606 (
607 "counter value" => cf::object::object_count,
608 "objects created" => cf::object::create_count,
609 "objects destroyed" => cf::object::destroy_count,
610 "freelist size" => cf::object::free_count,
611 "allocated objects" => cf::object::objects_size,
612 "active objects" => cf::object::actives_size,
613 )
561} 614}
562 615
563=item $coin = coin_from_name $name 616=item $coin = coin_from_name $name
564 617
565=cut 618=cut
… …
602within each server. 655within each server.
603 656
604=cut 657=cut
605 658
606sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
607 my ($name) = @_; 663 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
609 665
610 eval { 666 eval {
611 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
… …
621} 677}
622 678
623our $DB; 679our $DB;
624 680
625sub db_init { 681sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
628 };
629} 683}
630 684
631sub db_get($$) { 685sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
633 687
634 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
635 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
636 692
637 $! ? () 693 $! ? ()
638 : $data 694 : $data
639 }
640} 695}
641 696
642sub db_put($$$) { 697sub db_put($$$) {
643 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 755
701 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 757 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
704 759
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 761
707 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
710 765
… …
720 775
721=cut 776=cut
722 777
723sub datalog($@) { 778sub datalog($@) {
724 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 781}
727 782
728=back 783=back
729 784
730=cut 785=cut
… …
925 980
926 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 983
929 } elsif (ref $type) { 984 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
931 986
932 } else { 987 } else {
933 shift @arg; 988 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
935 } 990 }
936 } 991 }
937} 992}
938 993
939sub _object_attach { 994sub _object_attach {
… …
949 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
950 } 1005 }
951 1006
952 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
953 } else { 1008 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1010 }
956 1011
957 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
958} 1013}
959 1014
… …
1018 1073
1019 for (@$callbacks) { 1074 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1021 1076
1022 if ($@) { 1077 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1079 override;
1026 } 1080 }
1027 1081
1028 return 1 if $override; 1082 return 1 if $override;
1029 } 1083 }
… …
1108 for (@$attach) { 1162 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1111 } 1165 }
1112 } else { 1166 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1168 }
1115 } 1169 }
1116} 1170}
1117 1171
1118cf::attachable->attach ( 1172cf::attachable->attach (
… …
1145 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1146 1200
1147 sync_job { 1201 sync_job {
1148 if (length $$rdata) { 1202 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1152 1207
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1157 aio_close $fh; 1215 aio_close $fh;
1158 1216
1159 if (@$objs) { 1217 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1165 aio_close $fh; 1226 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1228 }
1168 } else { 1229 } else {
1169 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
… …
1172 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1173 1234
1174 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1237 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1178 } 1239 }
1179 } else { 1240 } else {
1180 aio_unlink $filename; 1241 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1182 } 1243 }
… …
1206 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1268 $av = $st->{objs};
1208 } 1269 }
1209 1270
1210 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1213 1275
1214 ($data, $av) 1276 ($data, $av)
1215} 1277}
1216 1278
1217=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1276} 1338}
1277 1339
1278use File::Glob (); 1340use File::Glob ();
1279 1341
1280cf::player->attach ( 1342cf::player->attach (
1281 on_command => sub { 1343 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1283 1345
1284 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1285 or return; 1347 or return;
1286 1348
… …
1309 1371
1310 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1373 if $reply;
1312 1374
1313 } else { 1375 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1377 }
1316 1378
1317 cf::override; 1379 cf::override;
1318 }, 1380 },
1319); 1381);
1320 1382
1321# "readahead" all extensions 1383# "readahead" all extensions
1322sub cache_extensions { 1384sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1385 my $grp = IO::AIO::aio_group;
1324 1386
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1388 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1390 }
1329 }; 1391 };
1330 1392
1331 $grp 1393 $grp
1332} 1394}
1333 1395
1334sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1335 cf::sync_job { 1399 cf::sync_job {
1336 my %todo; 1400 my %todo;
1337 1401
1338 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1403 next unless -r $path;
… …
1357 1421
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1424
1361 $ext{source} = 1425 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1364 . $source 1428 . $source
1365 . "\n};\n1"; 1429 . "\n};\n1";
1366 1430
1367 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1368 } 1432 }
1369 1433
1434 my $pass = 0;
1370 my %done; 1435 my %done;
1371 while (%todo) { 1436 while (%todo) {
1372 my $progress; 1437 my $progress;
1373 1438
1439 ++$pass;
1440
1441 ext:
1374 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1444 next ext
1377 unless exists $done{$_}; 1445 unless exists $done{$_};
1378 } 1446 }
1379 1447
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1449
1382 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1385 1455
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1457 if exists $v->{meta}{mandatory};
1390 1458
1391 warn $msg; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1460 delete $todo{$k};
1461 } else {
1462 $done{$k} = delete $todo{$k};
1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1392 } 1468 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1469 }
1398 1470
1399 skip: 1471 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1473
1474 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory};
1477 }
1478 }
1402 } 1479 }
1403 }; 1480 };
1404} 1481}
1405 1482
1406############################################################################# 1483#############################################################################
… …
1490 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1491 } 1568 }
1492 } 1569 }
1493} 1570}
1494 1571
1572cf::player->attach (
1573 on_load => sub {
1574 my ($pl, $path) = @_;
1575
1576 # restore slots saved in save, below
1577 my $slots = delete $pl->{_slots};
1578
1579 $pl->ob->current_weapon ($slots->[0]);
1580 $pl->combat_ob ($slots->[1]);
1581 $pl->ranged_ob ($slots->[2]);
1582 },
1583);
1584
1495sub save($) { 1585sub save($) {
1496 my ($pl) = @_; 1586 my ($pl) = @_;
1497 1587
1498 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1499 1589
… …
1504 1594
1505 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1507 1597
1508 cf::get_slot 0.01; 1598 cf::get_slot 0.01;
1599
1600 # save slots, to be restored later
1601 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1602
1510 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1604 cf::cede_to_tick;
1512} 1605}
1513 1606
… …
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1644
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1646 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1558 1650
1559 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1615 \@logins 1707 \@logins
1616} 1708}
1617 1709
1618=item $player->maps 1710=item $player->maps
1619 1711
1712=item cf::player::maps $login
1713
1620Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1621player. May block. 1715player. May block.
1622 1716
1623=cut 1717=cut
1624 1718
… …
1686=cut 1780=cut
1687 1781
1688sub find_by_path($) { 1782sub find_by_path($) {
1689 my ($path) = @_; 1783 my ($path) = @_;
1690 1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1786
1691 my ($match, $specificity); 1787 my ($match, $specificity);
1692 1788
1693 for my $region (list) { 1789 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1791 ($match, $specificity) = ($region, $region->specificity)
… …
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1822 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1823
1728 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1825 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1751 1847
1752sub register { 1848sub register {
1753 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1850 my $pkg = caller;
1755 1851
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1853
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1855}
1761 1856
1762# also paths starting with '/' 1857# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1859
1765sub thawer_merge { 1860sub thawer_merge {
1766 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1767 1862
1768 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
1982 2077
1983 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1984 } 2079 }
1985} 2080}
1986 2081
1987sub pre_load { } 2082sub pre_load { }
1988sub post_load { } 2083#sub post_load { } # XS
1989 2084
1990sub load { 2085sub load {
1991 my ($self) = @_; 2086 my ($self) = @_;
1992 2087
1993 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2145 }
2051 2146
2052 $self->post_load; 2147 $self->post_load;
2053} 2148}
2054 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2055sub customise_for { 2153sub customise_for {
2056 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2057 2155
2058 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2157 if $self->per_player;
… …
2075 or next; 2173 or next;
2076 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2077 or next; 2175 or next;
2078 $neigh->load; 2176 $neigh->load;
2079 2177
2178 # now find the diagonal neighbours
2080 push @neigh, 2179 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2182 }
2084 2183
… …
2091} 2190}
2092 2191
2093sub find_sync { 2192sub find_sync {
2094 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2095 2194
2096 cf::sync_job { find $path, $origin } 2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main;
2197
2198 find $path, $origin
2097} 2199}
2098 2200
2099sub do_load_sync { 2201sub do_load_sync {
2100 my ($map) = @_; 2202 my ($map) = @_;
2101 2203
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2104 2206
2105 cf::sync_job { $map->load }; 2207 $map->load;
2106} 2208}
2107 2209
2108our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2110 2212
… …
2136 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2137 2239
2138 () 2240 ()
2139} 2241}
2140 2242
2243# common code, used by both ->save and ->swapout
2141sub save { 2244sub _save {
2142 my ($self) = @_; 2245 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2246
2146 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2147 2248
2148 return unless $self->dirty; 2249 return unless $self->dirty;
2149 2250
… …
2169 } else { 2270 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2272 }
2172} 2273}
2173 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2174sub swap_out { 2283sub swap_out {
2175 my ($self) = @_; 2284 my ($self) = @_;
2176 2285
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2287
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2288 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2289 return if $self->{deny_save};
2290 return if $self->players;
2185 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # then atomically save
2298 $self->_save;
2299
2300 # then free the map
2301 $self->clear;
2302}
2303
2304sub reset_at {
2305 my ($self) = @_;
2306
2307 # TODO: safety, remove and allow resettable per-player maps
2308 return 1e99 if $self->{deny_reset};
2309
2310 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2311 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2312
2313 $time + $to
2314}
2315
2316sub should_reset {
2317 my ($self) = @_;
2318
2319 $self->reset_at <= $cf::RUNTIME
2320}
2321
2322sub reset {
2323 my ($self) = @_;
2324
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
2327 return if $self->players;
2328
2329 cf::trace "resetting map ", $self->path, "\n";
2330
2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # need to save uniques path
2334 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336
2337 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2338 if $uniq;
2339 }
2340
2341 delete $cf::MAP{$self->path};
2187 2342
2188 $self->deactivate; 2343 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2345 $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 2346
2236 $self->unlink_save; 2347 $self->unlink_save;
2237 $self->destroy; 2348 $self->destroy;
2238} 2349}
2239 2350
… …
2247 2358
2248 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2249 2360
2250 $self->unlink_save; 2361 $self->unlink_save;
2251 2362
2252 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2368
… …
2314 : normalise $_ 2425 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2427 ]
2317} 2428}
2318 2429
2430=item cf::map::static_maps
2431
2432Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2433file in the shared directory excluding F</styles> and F</editor>). May
2434block.
2435
2436=cut
2437
2438sub static_maps() {
2439 my @dirs = "";
2440 my @maps;
2441
2442 while (@dirs) {
2443 my $dir = shift @dirs;
2444
2445 next if $dir eq "/styles" || $dir eq "/editor";
2446
2447 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2448 or return;
2449
2450 for (@$files) {
2451 s/\.map$// or next;
2452 utf8::decode $_;
2453 push @maps, "$dir/$_";
2454 }
2455
2456 push @dirs, map "$dir/$_", @$dirs;
2457 }
2458
2459 \@maps
2460}
2461
2319=back 2462=back
2320 2463
2321=head3 cf::object 2464=head3 cf::object
2322 2465
2323=cut 2466=cut
… …
2455 2598
2456Freezes the player and moves him/her to a special map (C<{link}>). 2599Freezes the player and moves him/her to a special map (C<{link}>).
2457 2600
2458The player should be reasonably safe there for short amounts of time (e.g. 2601The 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, 2602for 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 2603though, as the player cannot control the character while it is on the link
2461map. 2604map.
2462 2605
2463Will never block. 2606Will never block.
2464 2607
2465=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
… …
2486sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2487 my ($self) = @_; 2630 my ($self) = @_;
2488 2631
2489 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2490 2633
2634 ++$self->{_link_recursion};
2635
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2637
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2495 2640
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2642}
2498 2643
2499sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2501 2646
… …
2518 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2520 2665
2521 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2524 2669
2525 $map->load; 2670 $map->load;
2526 $map->load_neighbours; 2671 $map->load_neighbours;
2527 2672
2528 return unless $self->contr->active; 2673 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2674
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2534} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2535 2682
2683}
2684
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2686
2538Moves the player to the given map-path and coordinates by first freezing 2687Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2689that 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 2690the new (success) or old (failed) map position. In either case, $done will
… …
2548 2697
2549our $GOTOGEN; 2698our $GOTOGEN;
2550 2699
2551sub cf::object::player::goto { 2700sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2702
2703 if ($self->{_link_recursion} >= $MAX_LINKS) {
2704 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2705 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2706 ($path, $x, $y) = @$EMERGENCY_POSITION;
2707 }
2553 2708
2554 # do generation counting so two concurrent goto's will be executed in-order 2709 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2711
2557 $self->enter_link; 2712 $self->enter_link;
… …
2581 my $map = eval { 2736 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2583 2738
2584 if ($map) { 2739 if ($map) {
2585 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2742 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2743 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2744 }
2590 2745
2591 $map 2746 $map
… …
2599 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2602 } 2757 }
2603 2758
2604 $done->() if $done; 2759 $done->($self) if $done;
2605 })->prio (1); 2760 })->prio (1);
2606} 2761}
2607 2762
2608=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2609 2764
… …
2702 $self->message ("Something went wrong deep within the deliantra server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2858 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2861
2707 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2863 $self->leave_link;
2709 } 2864 }
2710 })->prio (1); 2865 })->prio (1);
2711} 2866}
2712 2867
… …
2724sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2726 2881
2727 utf8::encode $text; 2882 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2883 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2884}
2885
2886=item $client->send_big_packet ($pkt)
2887
2888Like C<send_packet>, but tries to compress large packets, and fragments
2889them as required.
2890
2891=cut
2892
2893our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2894
2895sub cf::client::send_big_packet {
2896 my ($self, $pkt) = @_;
2897
2898 # try lzf for large packets
2899 $pkt = "lzf " . Compress::LZF::compress $pkt
2900 if 1024 <= length $pkt and $self->{can_lzf};
2901
2902 # split very large packets
2903 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2904 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2905 $pkt = "frag";
2906 }
2907
2908 $self->send_packet ($pkt);
2729} 2909}
2730 2910
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2912
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2913Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2737 2917
2738=cut 2918=cut
2739 2919
2740# non-persistent channels (usually the info channel) 2920# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2742 "c/identify" => { 2928 "c/identify" => {
2743 id => "infobox", 2929 id => "infobox",
2744 title => "Identify", 2930 title => "Identify",
2745 reply => undef, 2931 reply => undef,
2746 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2934 "c/examine" => {
2749 id => "infobox", 2935 id => "infobox",
2750 title => "Examine", 2936 title => "Examine",
2751 reply => undef, 2937 reply => undef,
2752 tooltip => "Signs and other items you examined", 2938 tooltip => "Signs and other items you examined",
2939 },
2940 "c/shopinfo" => {
2941 id => "infobox",
2942 title => "Shop Info",
2943 reply => undef,
2944 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2945 },
2754 "c/book" => { 2946 "c/book" => {
2755 id => "infobox", 2947 id => "infobox",
2756 title => "Book", 2948 title => "Book",
2757 reply => undef, 2949 reply => undef,
… …
2785 id => "infobox", 2977 id => "infobox",
2786 title => "Skills", 2978 title => "Skills",
2787 reply => undef, 2979 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2980 tooltip => "Shows your experience per skill and item power",
2789 }, 2981 },
2982 "c/shopitems" => {
2983 id => "infobox",
2984 title => "Shop Items",
2985 reply => undef,
2986 tooltip => "Shows the items currently for sale in this shop",
2987 },
2790 "c/resistances" => { 2988 "c/resistances" => {
2791 id => "infobox", 2989 id => "infobox",
2792 title => "Resistances", 2990 title => "Resistances",
2793 reply => undef, 2991 reply => undef,
2794 tooltip => "Shows your resistances", 2992 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2994 "c/pets" => {
2797 id => "infobox", 2995 id => "infobox",
2798 title => "Pets", 2996 title => "Pets",
2799 reply => undef, 2997 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2998 tooltip => "Shows information abotu your pets/a specific pet",
2999 },
3000 "c/perceiveself" => {
3001 id => "infobox",
3002 title => "Perceive Self",
3003 reply => undef,
3004 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3005 },
2802 "c/uptime" => { 3006 "c/uptime" => {
2803 id => "infobox", 3007 id => "infobox",
2804 title => "Uptime", 3008 title => "Uptime",
2805 reply => undef, 3009 reply => undef,
… …
2861 my $pkt = "msg " 3065 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3066 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3068 );
2865 3069
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3070 $self->send_big_packet ($pkt);
2877} 3071}
2878 3072
2879=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2880 3074
2881Sends an ext event to the client. 3075Sends an ext event to the client.
… …
2884 3078
2885sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2887 3081
2888 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3087 }
2894} 3088}
2895 3089
2896=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2897 3091
… …
2901 3095
2902sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2904 3098
2905 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3102 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3105 }
2912} 3106}
2913 3107
2914=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2915 3109
… …
2986 3180
2987 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3182 if $reply;
2989 3183
2990 } else { 3184 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 } 3186 }
2993 3187
2994 cf::override; 3188 cf::override;
2995 }, 3189 },
2996); 3190);
… …
3016 3210
3017 $coro 3211 $coro
3018} 3212}
3019 3213
3020cf::client->attach ( 3214cf::client->attach (
3021 on_destroy => sub { 3215 on_client_destroy => sub {
3022 my ($ns) = @_; 3216 my ($ns) = @_;
3023 3217
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3219 },
3026); 3220);
… …
3042our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
3043 3237
3044$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
3045 3239
3046$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
3049 sort time 3243 sort time
3050)); 3244));
3051 3245
3052# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
… …
3077 decrease split destroy change_exp value msg lore send_msg)], 3271 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful send_msg)], 3273 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
3081) { 3275) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3278 for @funs;
3086} 3279}
3087 3280
… …
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
3106 3299
3107 %vars = (_dummy => 0) unless %vars; 3300 %vars = (_dummy => 0) unless %vars;
3108 3301
3302 my @res;
3109 local $_; 3303 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3304
3112 my $eval = 3305 my $eval =
3113 "do {\n" 3306 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3309 . $code
3117 . "\n}" 3310 . "\n}"
3118 ; 3311 ;
3119 3312
3313 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3317 sub_generation_inc;
3318 } else {
3319 local @cf::_safe_eval_args = values %vars;
3320 @res = wantarray ? eval eval : scalar eval $eval;
3321 }
3123 3322
3124 if ($@) { 3323 if ($@) {
3125 warn "$@"; 3324 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3128 } 3327 }
3129 3328
3130 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3131} 3330}
3132 3331
… …
3146=cut 3345=cut
3147 3346
3148sub register_script_function { 3347sub register_script_function {
3149 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3150 3349
3151 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3153} 3352}
3154 3353
3155=back 3354=back
3156 3355
3157=cut 3356=cut
… …
3166 # for this (global event?) 3365 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3367
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3369
3171 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3172 3371
3173 my $facedata; 3372 my $facedata;
3174 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3175 or die "$path: $!"; 3374 or die "$path: $!";
3176 3375
… …
3178 3377
3179 $facedata->{version} == 2 3378 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3380
3182 # patch in the exptable 3381 # patch in the exptable
3382 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3384 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3385 data => $exp_table,
3386 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3387 };
3187 cf::cede_to_tick; 3388 cf::cede_to_tick;
3188 3389
3189 { 3390 {
3190 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
… …
3192 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3395
3195 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3400
3200 cf::cede_to_tick; 3401 cf::cede_to_tick;
3201 } 3402 }
3202 3403
3203 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
… …
3208 3409
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3413 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3415 }
3215 3416
3216 cf::cede_to_tick; 3417 cf::cede_to_tick;
3217 } 3418 }
3218 } 3419 }
… …
3227 3428
3228 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3229 } 3430 }
3230 3431
3231 { 3432 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3235 3434
3236 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3436 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3438
3241 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3440 cf::face::set_type $idx, $info->{type};
3256 } else { 3441 } else {
3257 $RESOURCE{$name} = $info; 3442 $RESOURCE{$name} = $info; # unused
3258 } 3443 }
3259 3444
3260 cf::cede_to_tick; 3445 cf::cede_to_tick;
3261 } 3446 }
3262 } 3447 }
3263 3448
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3450
3266 1 3451 1
3267} 3452}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3453
3289register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3455 my ($ns, $want) = @_;
3291 3456
3292 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
… …
3331sub reload_treasures { 3496sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3334} 3499}
3335 3500
3501sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n";
3503
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3508
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_]
3511 or next;
3512
3513 my $face = cf::face::find "sound/$sound->[1]";
3514 cf::sound::set $sound->[0] => $face;
3515 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3516 }
3517
3518 while (my ($k, $v) = each %{$soundconf->{event}}) {
3519 my $face = cf::face::find "sound/$v";
3520 cf::sound::set $k => $face;
3521 }
3522}
3523
3336sub reload_resources { 3524sub reload_resources {
3337 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3338 3526
3339 reload_facedata; 3527 reload_facedata;
3528 reload_sound;
3340 reload_archetypes; 3529 reload_archetypes;
3341 reload_regions; 3530 reload_regions;
3342 reload_treasures; 3531 reload_treasures;
3343 3532
3344 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3345} 3534}
3346 3535
3347sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3540 or return;
3350 3541
3351 local $/; 3542 local $/;
3352 *CFG = YAML::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3353 3544
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3546
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3549
3359 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
… …
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3554 };
3364 warn $@ if $@; 3555 warn $@ if $@;
3365 } 3556 }
3557
3558 trace "finished reloading resource files\n";
3366} 3559}
3367 3560
3368sub pidfile() { 3561sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3563 or die "$PIDFILE: $!";
… …
3382 3575
3383 seek $fh, 0, 0; 3576 seek $fh, 0, 0;
3384 print $fh $$; 3577 print $fh $$;
3385} 3578}
3386 3579
3580sub main_loop {
3581 trace "EV::loop starting\n";
3582 if (1) {
3583 EV::loop;
3584 }
3585 trace "EV::loop returned\n";
3586 goto &main_loop unless $REALLY_UNLOOP;
3587}
3588
3387sub main { 3589sub main {
3388 cf::init_globals; # initialise logging 3590 cf::init_globals; # initialise logging
3389 3591
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3596
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3598
3402 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
… …
3409 }; 3606 };
3410 3607
3411 evthread_start IO::AIO::poll_fileno; 3608 evthread_start IO::AIO::poll_fileno;
3412 3609
3413 cf::sync_job { 3610 cf::sync_job {
3611 cf::init_experience;
3612 cf::init_anim;
3613 cf::init_attackmess;
3614 cf::init_dynamic;
3615
3616 cf::load_settings;
3617 cf::load_materials;
3618
3414 reload_resources; 3619 reload_resources;
3415 reload_config; 3620 reload_config;
3416 db_init; 3621 db_init;
3417 3622
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3623 cf::init_uuid;
3421 cf::init_signals; 3624 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3625 cf::init_skills;
3424 3626
3425 cf::init_beforeplay; 3627 cf::init_beforeplay;
3426 3628
3427 atomic; 3629 atomic;
… …
3429 load_extensions; 3631 load_extensions;
3430 3632
3431 utime time, time, $RUNTIMEFILE; 3633 utime time, time, $RUNTIMEFILE;
3432 3634
3433 # no (long-running) fork's whatsoever before this point(!) 3635 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3638
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3639 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3640 };
3438 3641
3439 EV::loop; 3642 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n";
3644
3645 main_loop;
3440} 3646}
3441 3647
3442############################################################################# 3648#############################################################################
3443# initialisation and cleanup 3649# initialisation and cleanup
3444 3650
3445# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3446BEGIN { 3652BEGIN {
3447 our %SIGWATCHER = (); 3653 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3451 }; 3657 };
3452 } 3658 }
3453} 3659}
3454 3660
3455sub write_runtime_sync { 3661sub write_runtime_sync {
3662 my $t0 = AE::time;
3663
3456 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3458 3666
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3668
3461 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3462 3670
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3672 or return;
3465 3673
3466 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
… …
3481 or return; 3689 or return;
3482 3690
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3692 and return;
3485 3693
3486 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3695
3488 1 3696 1
3489} 3697}
3490 3698
3491our $uuid_lock; 3699our $uuid_lock;
… …
3503 or return; 3711 or return;
3504 3712
3505 my $value = uuid_seq uuid_cur; 3713 my $value = uuid_seq uuid_cur;
3506 3714
3507 unless ($value) { 3715 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3716 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3717 return;
3510 } 3718 }
3511 3719
3512 my $value = uuid_str $value + $uuid_skip; 3720 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3721 $uuid_skip = 0;
… …
3523 or return; 3731 or return;
3524 3732
3525 aio_rename "$uuid~", $uuid 3733 aio_rename "$uuid~", $uuid
3526 and return; 3734 and return;
3527 3735
3528 warn "uuid file written ($value).\n"; 3736 trace "uuid file written ($value).\n";
3529 3737
3530 1 3738 1
3531 3739
3532} 3740}
3533 3741
… …
3539} 3747}
3540 3748
3541sub emergency_save() { 3749sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3543 3751
3544 warn "emergency_perl_save: enter\n"; 3752 info "emergency_perl_save: enter\n";
3753
3754 # this is a trade-off: we want to be very quick here, so
3755 # save all maps without fsync, and later call a global sync
3756 # (which in turn might be very very slow)
3757 local $USE_FSYNC = 0;
3545 3758
3546 cf::sync_job { 3759 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3760 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 3761
3552 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3768 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3770 $pl->save;
3561 } 3771 }
3562 warn "emergency_perl_save: end player save\n"; 3772 info "emergency_perl_save: end player save\n";
3563 3773
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3564 warn "emergency_perl_save: begin map save\n"; 3776 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3779 $map->valid or next;
3568 $map->save; 3780 $map->save;
3569 } 3781 }
3570 warn "emergency_perl_save: end map save\n"; 3782 info "emergency_perl_save: end map save\n";
3571 3783
3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3786 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3575 3789
3576 warn "emergency_perl_save: begin write uuid\n"; 3790 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3791 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n"; 3792 info "emergency_perl_save: end write uuid\n";
3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 trace "emergency_perl_save: syncing database to disk";
3797 BDB::db_env_txn_checkpoint $DB_ENV;
3798
3799 info "emergency_perl_save: starting sync\n";
3800 IO::AIO::aio_sync sub {
3801 info "emergency_perl_save: finished sync\n";
3802 };
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3809 }
3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3812 };
3580 3813
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 3814 info "emergency_perl_save: leave\n";
3587} 3815}
3588 3816
3589sub post_cleanup { 3817sub post_cleanup {
3590 my ($make_core) = @_; 3818 my ($make_core) = @_;
3591 3819
3820 IO::AIO::flush;
3821
3592 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3823 if $make_core;
3594 3824
3595 my $fh = pidfile; 3825 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3826 unlink $PIDFILE if <$fh> == $$;
3597} 3827}
… …
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3848 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3849 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3851 }
3622 warn "cleared package $pkg\n";#d#
3623} 3852}
3624 3853
3625sub do_reload_perl() { 3854sub do_reload_perl() {
3626 # can/must only be called in main 3855 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3628 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3629 return; 3858 return;
3630 } 3859 }
3631 3860
3632 return if $RELOAD++; 3861 return if $RELOAD++;
3633 3862
3634 my $t1 = EV::time; 3863 my $t1 = AE::time;
3635 3864
3636 while ($RELOAD) { 3865 while ($RELOAD) {
3637 warn "reloading..."; 3866 info "reloading...";
3638 3867
3639 warn "entering sync_job"; 3868 trace "entering sync_job";
3640 3869
3641 cf::sync_job { 3870 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3871 cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3872
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3875 %EXT_CORO = ();
3659 3876
3660 warn "removing commands"; 3877 trace "removing commands";
3661 %COMMAND = (); 3878 %COMMAND = ();
3662 3879
3663 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3664 %EXTCMD = (); 3881 %EXTCMD = ();
3665 %EXTICMD = (); 3882 %EXTICMD = ();
3666 3883
3667 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3670 3887
3671 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3889 eval {
3673 $cb->($pkg); 3890 $cb->($pkg);
3674 1 3891 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3676 } 3893 }
3677 3894
3678 warn "... clearing $pkg"; 3895 trace "... clearing $pkg";
3679 clear_package $pkg; 3896 clear_package $pkg;
3680 } 3897 }
3681 3898
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3902
3686 warn "... unloading $k"; 3903 trace "... unloading $k";
3687 delete $INC{$k}; 3904 delete $INC{$k};
3688 3905
3689 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3691 3908
… …
3694 } 3911 }
3695 3912
3696 clear_package $k; 3913 clear_package $k;
3697 } 3914 }
3698 3915
3699 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 3917 clear_package "safe::$_"
3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3702 3919
3703 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 3923
3707 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3708 # and global variables created in xs 3925 # and global variables created in xs
3709 #clear_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3710 3927
3711 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3712 3929
3713 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3714 require cf; 3931 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3716 3933
3717 warn "loading config and database again"; 3934 trace "loading config and database again";
3718 cf::reload_config; 3935 cf::reload_config;
3719 3936
3720 warn "loading extensions"; 3937 trace "loading extensions";
3721 cf::load_extensions; 3938 cf::load_extensions;
3722 3939
3723 if ($REATTACH_ON_RELOAD) { 3940 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3727 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3730 } 3947 }
3731 3948
3732 warn "running post_init jobs"; 3949 trace "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT; 3950 (pop @POST_INIT)->(1) while @POST_INIT;
3734 3951
3735 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3736 3953
3737 1 3954 1
3738 } or do { 3955 } or do {
3739 warn $@; 3956 error $@;
3740 cf::cleanup "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3741 }; 3958 };
3742 3959
3743 warn "reloaded"; 3960 info "reloaded";
3744 --$RELOAD; 3961 --$RELOAD;
3745 } 3962 }
3746 3963
3747 $t1 = EV::time - $t1; 3964 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3965 info "reload completed in ${t1}s\n";
3749}; 3966};
3750 3967
3751our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3752 3969
3753sub reload_perl() { 3970sub reload_perl() {
… …
3755 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3756 3973
3757 $RELOAD_WATCHER ||= cf::async { 3974 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3975 Coro::AIO::aio_wait cache_extensions;
3759 3976
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3978 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3763 }; 3980 };
3764 }; 3981 };
3765} 3982}
… …
3782 3999
3783our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3785 4002
3786sub wait_for_tick { 4003sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 4005
3789 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 4008 $signal->wait;
3792} 4009}
3793 4010
3794sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4013
3797 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4016 $signal->wait;
3800} 4017}
… …
3806 return; 4023 return;
3807 } 4024 }
3808 4025
3809 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3810 4027
4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4032 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4034 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3817 }; 4036 };
3818 } 4037 }
3819 4038
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4040 $sig->send;
… …
3829 4048
3830 if (0) { 4049 if (0) {
3831 if ($NEXT_TICK) { 4050 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4051 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4053 debug "jitter $JITTER\n";#d#
3835 } 4054 }
3836 } 4055 }
3837} 4056}
3838 4057
3839{ 4058{
3840 # configure BDB 4059 # configure BDB
3841 4060
3842 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4063 $AnyEvent::BDB::WATCHER->priority (1);
3845 4064
3846 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
… …
3928 } 4147 }
3929} 4148}
3930 4149
3931# load additional modules 4150# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3933 4153
3934END { cf::emergency_save } 4154END { cf::emergency_save }
3935 4155
39361 41561
3937 4157

Diff Legend

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