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.471 by root, Mon Apr 27 01:38:48 2009 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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 incloader);
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
… …
205from wherever your confdir points to. 233from wherever your confdir points to.
206 234
207=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
208 236
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
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 thread
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
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
213=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
214 247
215This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 250that call.
218 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
219=back 258=back
220 259
221=cut 260=cut
222 261
223BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 269 my $msg = join "", @_;
226 270
227 $msg .= "\n" 271 $msg .= "\n"
228 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
229 273
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 275
232 LOG llevError, $msg; 276 LOG llevWarn, $msg;
233 }; 277};
234}
235 278
236$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
238 281
239 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 286 return;#d#
242 }#d# 287 }#d#
243 288
244 # kill coroutine otherwise 289 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 290 Coro::terminate
247}; 291};
248
249$SIG{__DIE__} = sub { }; #d#?
250 292
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 310)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 312}
271 313
272$EV::DIED = sub { 314$EV::DIED = sub {
273 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
274}; 316};
275 317
276############################################################################# 318#############################################################################
277 319
278=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
375} 417}
376 418
377=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
378 420
379Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 422get spread over time.
381 423
382=cut 424=cut
383 425
384sub periodic($$) { 426sub periodic($$) {
385 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
402 444
403=cut 445=cut
404 446
405our @SLOT_QUEUE; 447our @SLOT_QUEUE;
406our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
407 450
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
411 454
412 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
413 457
414 while () { 458 while () {
415 next_job: 459 next_job:
460
416 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 462
418 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 467 $job->[2]->send;
422 Coro::cede; 468 Coro::cede;
423 goto next_job; 469 goto next_job;
424 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 472 }
426 } 473 }
427 474
428 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 478 $signal->wait;
432 } else { 479 } else {
480 $busy = 0;
433 Coro::schedule; 481 Coro::schedule;
434 } 482 }
435 } 483 }
436}; 484};
437 485
438sub get_slot($;$$) { 486sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
440 488
441 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
442 490
443 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
444 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
445 494
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
… …
474=cut 523=cut
475 524
476sub sync_job(&) { 525sub sync_job(&) {
477 my ($job) = @_; 526 my ($job) = @_;
478 527
479 if ($Coro::current == $Coro::main) { 528 if (in_main) {
480 my $time = EV::time; 529 my $time = AE::time;
481 530
482 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
484 533
485 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
486 535
487 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
488 537
489 my $busy = 1; 538 my $busy = 1;
490 my @res; 539 my @res;
491 540
492 (async { 541 (async {
493 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 543 @res = eval { $job->() };
495 warn $@ if $@; 544 error $@ if $@;
496 undef $busy; 545 undef $busy;
497 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
498 547
499 while ($busy) { 548 while ($busy) {
500 if (Coro::nready) { 549 if (Coro::nready) {
… …
502 } else { 551 } else {
503 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
504 } 553 }
505 } 554 }
506 555
507 my $time = EV::time - $time; 556 my $time = AE::time - $time;
508 557
509 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
510 559
511 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
512 } else { 561 } else {
… …
556 reset_signals; 605 reset_signals;
557 &$cb 606 &$cb
558 }, @args; 607 }, @args;
559 608
560 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
610}
611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
561} 621}
562 622
563=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
564 624
565=cut 625=cut
… …
602within each server. 662within each server.
603 663
604=cut 664=cut
605 665
606sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
607 my ($name) = @_; 670 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
609 672
610 eval { 673 eval {
611 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
621} 684}
622 685
623our $DB; 686our $DB;
624 687
625sub db_init { 688sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
628 };
629} 690}
630 691
631sub db_get($$) { 692sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
633 694
634 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
635 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
636 699
637 $! ? () 700 $! ? ()
638 : $data 701 : $data
639 }
640} 702}
641 703
642sub db_put($$$) { 704sub db_put($$$) {
643 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 762
701 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 764 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
704 766
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 768
707 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
710 772
… …
720 782
721=cut 783=cut
722 784
723sub datalog($@) { 785sub datalog($@) {
724 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 788}
727 789
728=back 790=back
729 791
730=cut 792=cut
… …
925 987
926 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 990
929 } elsif (ref $type) { 991 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
931 993
932 } else { 994 } else {
933 shift @arg; 995 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
935 } 997 }
936 } 998 }
937} 999}
938 1000
939sub _object_attach { 1001sub _object_attach {
… …
949 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
950 } 1012 }
951 1013
952 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
953 } else { 1015 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1017 }
956 1018
957 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
958} 1020}
959 1021
… …
1018 1080
1019 for (@$callbacks) { 1081 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1021 1083
1022 if ($@) { 1084 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1086 override;
1026 } 1087 }
1027 1088
1028 return 1 if $override; 1089 return 1 if $override;
1029 } 1090 }
… …
1108 for (@$attach) { 1169 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1111 } 1172 }
1112 } else { 1173 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1175 }
1115 } 1176 }
1116} 1177}
1117 1178
1118cf::attachable->attach ( 1179cf::attachable->attach (
… …
1145 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1146 1207
1147 sync_job { 1208 sync_job {
1148 if (length $$rdata) { 1209 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1152 1214
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1218 if ($cf::USE_FSYNC) {
1219 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;
1220 aio_fsync $fh;
1221 }
1157 aio_close $fh; 1222 aio_close $fh;
1158 1223
1159 if (@$objs) { 1224 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1225 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1226 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1227 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1228 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1229 if ($cf::USE_FSYNC) {
1230 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;
1231 aio_fsync $fh;
1232 }
1165 aio_close $fh; 1233 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1234 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1235 }
1168 } else { 1236 } else {
1169 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
… …
1172 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1173 1241
1174 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1244 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1178 } 1246 }
1179 } else { 1247 } else {
1180 aio_unlink $filename; 1248 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1182 } 1250 }
… …
1206 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1275 $av = $st->{objs};
1208 } 1276 }
1209 1277
1210 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1213 1282
1214 ($data, $av) 1283 ($data, $av)
1215} 1284}
1216 1285
1217=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
… …
1276} 1345}
1277 1346
1278use File::Glob (); 1347use File::Glob ();
1279 1348
1280cf::player->attach ( 1349cf::player->attach (
1281 on_command => sub { 1350 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1283 1352
1284 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1285 or return; 1354 or return;
1286 1355
… …
1309 1378
1310 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1380 if $reply;
1312 1381
1313 } else { 1382 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1384 }
1316 1385
1317 cf::override; 1386 cf::override;
1318 }, 1387 },
1319); 1388);
1320 1389
1321# "readahead" all extensions 1390# "readahead" all extensions
1322sub cache_extensions { 1391sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1392 my $grp = IO::AIO::aio_group;
1324 1393
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1394 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1395 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1396 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1397 }
1329 }; 1398 };
1330 1399
1331 $grp 1400 $grp
1332} 1401}
1333 1402
1334sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1335 cf::sync_job { 1406 cf::sync_job {
1336 my %todo; 1407 my %todo;
1337 1408
1338 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1410 next unless -r $path;
… …
1357 1428
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1431
1361 $ext{source} = 1432 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1364 . $source 1435 . $source
1365 . "\n};\n1"; 1436 . "\n};\n1";
1366 1437
1367 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1368 } 1439 }
1369 1440
1441 my $pass = 0;
1370 my %done; 1442 my %done;
1371 while (%todo) { 1443 while (%todo) {
1372 my $progress; 1444 my $progress;
1373 1445
1446 ++$pass;
1447
1448 ext:
1374 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1451 next ext
1377 unless exists $done{$_}; 1452 unless exists $done{$_};
1378 } 1453 }
1379 1454
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1456
1382 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1461
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1463 if exists $v->{meta}{mandatory};
1390 1464
1391 warn $msg; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1467 } else {
1468 $done{$k} = delete $todo{$k};
1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1392 } 1474 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1475 }
1398 1476
1399 skip: 1477 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1402 } 1485 }
1403 }; 1486 };
1404} 1487}
1405 1488
1406############################################################################# 1489#############################################################################
… …
1490 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1491 } 1574 }
1492 } 1575 }
1493} 1576}
1494 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1495sub save($) { 1591sub save($) {
1496 my ($pl) = @_; 1592 my ($pl) = @_;
1497 1593
1498 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1499 1595
… …
1504 1600
1505 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1507 1603
1508 cf::get_slot 0.01; 1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1608
1510 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1610 cf::cede_to_tick;
1512} 1611}
1513 1612
… …
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1650
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1652 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1558 1656
1559 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1615 \@logins 1713 \@logins
1616} 1714}
1617 1715
1618=item $player->maps 1716=item $player->maps
1619 1717
1718=item cf::player::maps $login
1719
1620Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1621player. May block. 1721player. May block.
1622 1722
1623=cut 1723=cut
1624 1724
… …
1686=cut 1786=cut
1687 1787
1688sub find_by_path($) { 1788sub find_by_path($) {
1689 my ($path) = @_; 1789 my ($path) = @_;
1690 1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1792
1691 my ($match, $specificity); 1793 my ($match, $specificity);
1692 1794
1693 for my $region (list) { 1795 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1797 ($match, $specificity) = ($region, $region->specificity)
… …
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1829
1728 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1831 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1751 1853
1752sub register { 1854sub register {
1753 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1856 my $pkg = caller;
1755 1857
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1859
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1861}
1761 1862
1762# also paths starting with '/' 1863# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1865
1765sub thawer_merge { 1866sub thawer_merge {
1766 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1767 1868
1768 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1773} 1874}
1774 1875
1775sub normalise { 1876sub normalise {
1776 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1777 1878
1778 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1779 1880
1780 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1781 1882
1782 # map plan: 1883 # map plan:
1783 # 1884 #
… …
1822 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1823 return $self; 1924 return $self;
1824 } 1925 }
1825 } 1926 }
1826 1927
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1929 ()
1829} 1930}
1830 1931
1831sub init { 1932sub init {
1832 my ($self) = @_; 1933 my ($self) = @_;
… …
1954} 2055}
1955 2056
1956sub find; 2057sub find;
1957sub find { 2058sub find {
1958 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
1959 2062
1960 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1961 2064
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
1982 2085
1983 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
1984 } 2087 }
1985} 2088}
1986 2089
1987sub pre_load { } 2090sub pre_load { }
1988sub post_load { } 2091#sub post_load { } # XS
1989 2092
1990sub load { 2093sub load {
1991 my ($self) = @_; 2094 my ($self) = @_;
1992 2095
1993 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2153 }
2051 2154
2052 $self->post_load; 2155 $self->post_load;
2053} 2156}
2054 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2055sub customise_for { 2161sub customise_for {
2056 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2057 2163
2058 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2165 if $self->per_player;
… …
2075 or next; 2181 or next;
2076 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2077 or next; 2183 or next;
2078 $neigh->load; 2184 $neigh->load;
2079 2185
2186 # now find the diagonal neighbours
2080 push @neigh, 2187 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2190 }
2084 2191
… …
2091} 2198}
2092 2199
2093sub find_sync { 2200sub find_sync {
2094 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2095 2202
2096 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2097} 2207}
2098 2208
2099sub do_load_sync { 2209sub do_load_sync {
2100 my ($map) = @_; 2210 my ($map) = @_;
2101 2211
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2104 2214
2105 cf::sync_job { $map->load }; 2215 $map->load;
2106} 2216}
2107 2217
2108our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2110 2220
… …
2136 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2137 2247
2138 () 2248 ()
2139} 2249}
2140 2250
2251# common code, used by both ->save and ->swapout
2141sub save { 2252sub _save {
2142 my ($self) = @_; 2253 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2254
2146 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2147 2256
2148 return unless $self->dirty; 2257 return unless $self->dirty;
2149 2258
… …
2169 } else { 2278 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2280 }
2172} 2281}
2173 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2174sub swap_out { 2291sub swap_out {
2175 my ($self) = @_; 2292 my ($self) = @_;
2176 2293
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2295
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2185 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2187 2350
2188 $self->deactivate; 2351 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2353 $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 2354
2236 $self->unlink_save; 2355 $self->unlink_save;
2237 $self->destroy; 2356 $self->destroy;
2238} 2357}
2239 2358
… …
2247 2366
2248 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2249 2368
2250 $self->unlink_save; 2369 $self->unlink_save;
2251 2370
2252 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2376
… …
2314 : normalise $_ 2433 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2435 ]
2317} 2436}
2318 2437
2438=item cf::map::static_maps
2439
2440Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2441file in the shared directory excluding F</styles> and F</editor>). May
2442block.
2443
2444=cut
2445
2446sub static_maps() {
2447 my @dirs = "";
2448 my @maps;
2449
2450 while (@dirs) {
2451 my $dir = shift @dirs;
2452
2453 next if $dir eq "/styles" || $dir eq "/editor";
2454
2455 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2456 or return;
2457
2458 for (@$files) {
2459 s/\.map$// or next;
2460 utf8::decode $_;
2461 push @maps, "$dir/$_";
2462 }
2463
2464 push @dirs, map "$dir/$_", @$dirs;
2465 }
2466
2467 \@maps
2468}
2469
2319=back 2470=back
2320 2471
2321=head3 cf::object 2472=head3 cf::object
2322 2473
2323=cut 2474=cut
… …
2455 2606
2456Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2457 2608
2458The player should be reasonably safe there for short amounts of time (e.g. 2609The 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, 2610for 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 2611though, as the player cannot control the character while it is on the link
2461map. 2612map.
2462 2613
2463Will never block. 2614Will never block.
2464 2615
2465=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
… …
2486sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2487 my ($self) = @_; 2638 my ($self) = @_;
2488 2639
2489 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2490 2641
2642 ++$self->{_link_recursion};
2643
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2645
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2495 2648
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2650}
2498 2651
2499sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2501 2654
… …
2518 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2520 2673
2521 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2524 2677
2525 $map->load; 2678 $map->load;
2526 $map->load_neighbours; 2679 $map->load_neighbours;
2527 2680
2528 return unless $self->contr->active; 2681 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2682
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2534} 2685 # entering was successful
2686 delete $self->{_link_recursion};
2687 # only activate afterwards, to support waiting in hooks
2688 $self->activate_recursive;
2689 }
2535 2690
2691}
2692
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2694
2538Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2697that 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 2698the new (success) or old (failed) map position. In either case, $done will
… …
2548 2705
2549our $GOTOGEN; 2706our $GOTOGEN;
2550 2707
2551sub cf::object::player::goto { 2708sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2553 2716
2554 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2719
2557 $self->enter_link; 2720 $self->enter_link;
… …
2581 my $map = eval { 2744 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2583 2746
2584 if ($map) { 2747 if ($map) {
2585 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2750 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2752 }
2590 2753
2591 $map 2754 $map
… …
2599 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2602 } 2765 }
2603 2766
2604 $done->() if $done; 2767 $done->($self) if $done;
2605 })->prio (1); 2768 })->prio (1);
2606} 2769}
2607 2770
2608=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2609 2772
… …
2702 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2869
2707 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2871 $self->leave_link;
2709 } 2872 }
2710 })->prio (1); 2873 })->prio (1);
2711} 2874}
2712 2875
… …
2724sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2726 2889
2727 utf8::encode $text; 2890 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt)
2895
2896Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required.
2898
2899=cut
2900
2901our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2902
2903sub cf::client::send_big_packet {
2904 my ($self, $pkt) = @_;
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2729} 2917}
2730 2918
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2920
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2921Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2737 2925
2738=cut 2926=cut
2739 2927
2740# non-persistent channels (usually the info channel) 2928# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2742 "c/identify" => { 2936 "c/identify" => {
2743 id => "infobox", 2937 id => "infobox",
2744 title => "Identify", 2938 title => "Identify",
2745 reply => undef, 2939 reply => undef,
2746 tooltip => "Items recently identified", 2940 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2942 "c/examine" => {
2749 id => "infobox", 2943 id => "infobox",
2750 title => "Examine", 2944 title => "Examine",
2751 reply => undef, 2945 reply => undef,
2752 tooltip => "Signs and other items you examined", 2946 tooltip => "Signs and other items you examined",
2947 },
2948 "c/shopinfo" => {
2949 id => "infobox",
2950 title => "Shop Info",
2951 reply => undef,
2952 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2953 },
2754 "c/book" => { 2954 "c/book" => {
2755 id => "infobox", 2955 id => "infobox",
2756 title => "Book", 2956 title => "Book",
2757 reply => undef, 2957 reply => undef,
… …
2873 my $pkt = "msg " 3073 my $pkt = "msg "
2874 . $self->{json_coder}->encode ( 3074 . $self->{json_coder}->encode (
2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2876 ); 3076 );
2877 3077
2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2881
2882 # split very large packets
2883 if (8192 < length $pkt and $self->{can_lzf}) {
2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2885 $pkt = "frag";
2886 }
2887
2888 $self->send_packet ($pkt); 3078 $self->send_big_packet ($pkt);
2889} 3079}
2890 3080
2891=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2892 3082
2893Sends an ext event to the client. 3083Sends an ext event to the client.
… …
2896 3086
2897sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2899 3089
2900 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3095 }
2906} 3096}
2907 3097
2908=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2909 3099
… …
2913 3103
2914sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2916 3106
2917 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3110 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3113 }
2924} 3114}
2925 3115
2926=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2927 3117
… …
2998 3188
2999 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3190 if $reply;
3001 3191
3002 } else { 3192 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 } 3194 }
3005 3195
3006 cf::override; 3196 cf::override;
3007 }, 3197 },
3008); 3198);
… …
3028 3218
3029 $coro 3219 $coro
3030} 3220}
3031 3221
3032cf::client->attach ( 3222cf::client->attach (
3033 on_destroy => sub { 3223 on_client_destroy => sub {
3034 my ($ns) = @_; 3224 my ($ns) = @_;
3035 3225
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3227 },
3038); 3228);
… …
3054our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
3055 3245
3056$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
3057 3247
3058$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
3061 sort time 3251 sort time
3062)); 3252));
3063 3253
3064# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
… …
3089 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3090 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3091 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3092 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3093) { 3283) {
3094 no strict 'refs';
3095 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3097 for @funs; 3286 for @funs;
3098} 3287}
3099 3288
… …
3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3117 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3118 3307
3119 %vars = (_dummy => 0) unless %vars; 3308 %vars = (_dummy => 0) unless %vars;
3120 3309
3310 my @res;
3121 local $_; 3311 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3312
3124 my $eval = 3313 my $eval =
3125 "do {\n" 3314 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3317 . $code
3129 . "\n}" 3318 . "\n}"
3130 ; 3319 ;
3131 3320
3321 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3135 3330
3136 if ($@) { 3331 if ($@) {
3137 warn "$@"; 3332 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3140 } 3335 }
3141 3336
3142 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3143} 3338}
3144 3339
… …
3158=cut 3353=cut
3159 3354
3160sub register_script_function { 3355sub register_script_function {
3161 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3162 3357
3163 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3165} 3360}
3166 3361
3167=back 3362=back
3168 3363
3169=cut 3364=cut
… …
3178 # for this (global event?) 3373 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3375
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3377
3183 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3184 3379
3185 my $facedata;
3186 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3187 or die "$path: $!"; 3381 or die "$path: $!";
3188 3382
3189 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3190 3384
3191 $facedata->{version} == 2 3385 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3387
3194 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3391 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3394 };
3199 cf::cede_to_tick; 3395 cf::cede_to_tick;
3200 3396
3201 { 3397 {
3202 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
… …
3204 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3402
3207 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3407
3212 cf::cede_to_tick; 3408 cf::cede_to_tick;
3213 } 3409 }
3214 3410
3215 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
… …
3220 3416
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3420 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3422 }
3227 3423
3228 cf::cede_to_tick; 3424 cf::cede_to_tick;
3229 } 3425 }
3230 } 3426 }
… …
3239 3435
3240 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
3241 } 3437 }
3242 3438
3243 { 3439 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
3247 3441
3248 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3443 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3445
3253 if ($info->{type} & 1) { 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3268 } else { 3448 } else {
3269 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3270 } 3450 }
3271 3451
3272 cf::cede_to_tick; 3452 cf::cede_to_tick;
3273 } 3453 }
3274 } 3454 }
3275 3455
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3457
3278 1 3458 1
3279} 3459}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300 3460
3301register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3303 3463
3304 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3343sub reload_treasures { 3503sub reload_treasures {
3344 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3345 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3346} 3506}
3347 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3348sub reload_resources { 3531sub reload_resources {
3349 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3350 3533
3534 reload_exp_table;
3535 reload_materials;
3351 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3352 reload_archetypes; 3538 reload_archetypes;
3353 reload_regions; 3539 reload_regions;
3354 reload_treasures; 3540 reload_treasures;
3355 3541
3356 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3357} 3543}
3358 3544
3359sub reload_config { 3545sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3361 or return;
3362 3547
3363 local $/; 3548 0 < aio_load "$CONFDIR/config", my $config
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3364 *CFG = YAML::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3365 3555
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3557
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3560
3371 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3394 3584
3395 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3396 print $fh $$; 3586 print $fh $$;
3397} 3587}
3398 3588
3589sub main_loop {
3590 trace "EV::loop starting\n";
3591 if (1) {
3592 EV::loop;
3593 }
3594 trace "EV::loop returned\n";
3595 goto &main_loop unless $REALLY_UNLOOP;
3596}
3597
3399sub main { 3598sub main {
3400 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3401 3600
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411 3605
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 3607
3414 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3415 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
… …
3421 }; 3615 };
3422 3616
3423 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3424 3618
3425 cf::sync_job { 3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3626 cf::load_settings;
3627
3426 reload_resources; 3628 reload_resources;
3427 reload_config; 3629 reload_config;
3428 db_init; 3630 db_init;
3429 3631
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid; 3632 cf::init_uuid;
3433 cf::init_signals; 3633 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills; 3634 cf::init_skills;
3436 3635
3437 cf::init_beforeplay; 3636 cf::init_beforeplay;
3438 3637
3439 atomic; 3638 atomic;
… …
3441 load_extensions; 3640 load_extensions;
3442 3641
3443 utime time, time, $RUNTIMEFILE; 3642 utime time, time, $RUNTIMEFILE;
3444 3643
3445 # no (long-running) fork's whatsoever before this point(!) 3644 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX ();
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447 3647
3448 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3449 }; 3649 };
3450 3650
3451 EV::loop; 3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3659 goto &main_loop;
3452} 3660}
3453 3661
3454############################################################################# 3662#############################################################################
3455# initialisation and cleanup 3663# initialisation and cleanup
3456 3664
3457# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3458BEGIN { 3666BEGIN {
3459 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3460 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3461 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3462 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3463 }; 3671 };
3464 } 3672 }
3465} 3673}
3466 3674
3467sub write_runtime_sync { 3675sub write_runtime_sync {
3676 my $t0 = AE::time;
3677
3468 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3470 3680
3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3682
3473 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3474 3684
3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3686 or return;
3477 3687
3478 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
… …
3493 or return; 3703 or return;
3494 3704
3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3706 and return;
3497 3707
3498 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3709
3500 1 3710 1
3501} 3711}
3502 3712
3503our $uuid_lock; 3713our $uuid_lock;
… …
3515 or return; 3725 or return;
3516 3726
3517 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3518 3728
3519 unless ($value) { 3729 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3521 return; 3731 return;
3522 } 3732 }
3523 3733
3524 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3535 or return; 3745 or return;
3536 3746
3537 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3538 and return; 3748 and return;
3539 3749
3540 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3541 3751
3542 1 3752 1
3543 3753
3544} 3754}
3545 3755
… …
3551} 3761}
3552 3762
3553sub emergency_save() { 3763sub emergency_save() {
3554 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3555 3765
3556 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3557 3772
3558 cf::sync_job { 3773 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563 3775
3564 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3565 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3566 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3567 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3568 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3569 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3570 $pl->valid or next; 3782 $pl->valid or next;
3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3572 $pl->save; 3784 $pl->save;
3573 } 3785 }
3574 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3575 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3576 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3577 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3578 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3579 $map->valid or next; 3793 $map->valid or next;
3580 $map->save; 3794 $map->save;
3581 } 3795 }
3582 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3583 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3584 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3585 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3586 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3587 3803
3588 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1; 3805 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3591 }; 3826 };
3592 3827
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3598 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3599} 3829}
3600 3830
3601sub post_cleanup { 3831sub post_cleanup {
3602 my ($make_core) = @_; 3832 my ($make_core) = @_;
3603 3833
3834 IO::AIO::flush;
3835
3604 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3605 if $make_core; 3837 if $make_core;
3606 3838
3607 my $fh = pidfile; 3839 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3609} 3841}
… …
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 } 3865 }
3634 warn "cleared package $pkg\n";#d#
3635} 3866}
3636 3867
3637sub do_reload_perl() { 3868sub do_reload_perl() {
3638 # can/must only be called in main 3869 # can/must only be called in main
3639 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3640 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3641 return; 3872 return;
3642 } 3873 }
3643 3874
3644 return if $RELOAD++; 3875 return if $RELOAD++;
3645 3876
3646 my $t1 = EV::time; 3877 my $t1 = AE::time;
3647 3878
3648 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3649 warn "reloading..."; 3881 info "reloading...";
3650 3882
3651 warn "entering sync_job"; 3883 trace "entering sync_job";
3652 3884
3653 cf::sync_job { 3885 cf::sync_job {
3654 cf::write_runtime_sync; # external watchdog should not bark
3655 cf::emergency_save; 3886 #cf::emergency_save;
3656 cf::write_runtime_sync; # external watchdog should not bark
3657 3887
3658 warn "syncing database to disk";
3659 BDB::db_env_txn_checkpoint $DB_ENV;
3660
3661 # if anything goes wrong in here, we should simply crash as we already saved
3662
3663 warn "flushing outstanding aio requests";
3664 while (IO::AIO::nreqs || BDB::nreqs) {
3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3666 }
3667
3668 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3669 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3670 %EXT_CORO = (); 3890 %EXT_CORO = ();
3671 3891
3672 warn "removing commands"; 3892 trace "removing commands";
3673 %COMMAND = (); 3893 %COMMAND = ();
3674 3894
3675 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3676 %EXTCMD = (); 3896 %EXTCMD = ();
3677 %EXTICMD = (); 3897 %EXTICMD = ();
3678 3898
3679 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3681 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3682 3902
3683 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3684 eval { 3904 eval {
3685 $cb->($pkg); 3905 $cb->($pkg);
3686 1 3906 1
3687 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3688 } 3908 }
3689 3909
3690 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3691 clear_package $pkg; 3911 clear_package $pkg;
3692 } 3912 }
3693 3913
3694 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697 3917
3698 warn "... unloading $k"; 3918 trace "... unloading $k";
3699 delete $INC{$k}; 3919 delete $INC{$k};
3700 3920
3701 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3703 3923
… …
3706 } 3926 }
3707 3927
3708 clear_package $k; 3928 clear_package $k;
3709 } 3929 }
3710 3930
3711 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3712 clear_package "safe::$_" 3932 clear_package "safe::$_"
3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3714 3934
3715 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3716 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3718 3938
3719 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3720 # and global variables created in xs 3940 # and global variables created in xs
3721 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3722 3942
3723 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3724 3944
3725 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3726 require cf; 3946 require cf;
3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3728 3948
3729 warn "loading config and database again"; 3949 trace "loading config and database again";
3730 cf::reload_config; 3950 cf::reload_config;
3731 3951
3732 warn "loading extensions"; 3952 trace "loading extensions";
3733 cf::load_extensions; 3953 cf::load_extensions;
3734 3954
3735 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3736 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3737 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3738 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3739 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3740 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3741 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3742 } 3962 }
3743 3963
3744 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3746 3966
3747 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3748 3968
3749 1 3969 1
3750 } or do { 3970 } or do {
3751 warn $@; 3971 error $@;
3752 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3753 }; 3973 };
3754 3974
3755 warn "reloaded"; 3975 info "reloaded";
3756 --$RELOAD; 3976 --$RELOAD;
3757 } 3977 }
3758 3978
3759 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3760 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3761}; 3981};
3762 3982
3763our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3764 3984
3765sub reload_perl() { 3985sub reload_perl() {
… …
3767 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3768 3988
3769 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3771 3991
3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3773 do_reload_perl; 3993 do_reload_perl;
3774 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3775 }; 3995 };
3776 }; 3996 };
3777} 3997}
… …
3786 reload_perl; 4006 reload_perl;
3787 }; 4007 };
3788 } 4008 }
3789}; 4009};
3790 4010
3791unshift @INC, $LIBDIR; 4011#############################################################################
3792 4012
3793my $bug_warning = 0; 4013my $bug_warning = 0;
3794 4014
3795our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3796our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3797 4017
3798sub wait_for_tick { 4018sub wait_for_tick() {
3799 return if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3800 4020
3801 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3802 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3803 $signal->wait; 4023 $signal->wait;
3804} 4024}
3805 4025
3806sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3807 return if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3808 4028
3809 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3810 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3811 $signal->wait; 4031 $signal->wait;
3812} 4032}
… …
3818 return; 4038 return;
3819 } 4039 }
3820 4040
3821 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3822 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3823 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3825 Coro::async_pool { 4047 Coro::async_pool {
3826 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3827 write_runtime_sync 4049 write_runtime_sync
3828 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3829 }; 4051 };
3830 } 4052 }
3831 4053
3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3833 $sig->send; 4055 $sig->send;
… …
3841 4063
3842 if (0) { 4064 if (0) {
3843 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3844 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3847 } 4069 }
3848 } 4070 }
3849} 4071}
3850 4072
3851{ 4073{
3852 # configure BDB 4074 # configure BDB
3853 4075
3854 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3855 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3856 $AnyEvent::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3857 4079
3858 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3859 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
… …
3940 } 4162 }
3941} 4163}
3942 4164
3943# load additional modules 4165# load additional modules
3944require "cf/$_.pm" for @EXTRA_MODULES; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3945 4168
3946END { cf::emergency_save } 4169END { cf::emergency_save }
3947 4170
39481 41711
3949 4172

Diff Legend

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