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.465 by root, Thu Jan 8 00:54:55 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 "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 off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
111 121
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
127our @EXTRA_MODULES = qw(pod match mapscript);
128
117our %CFG; 129our %CFG;
118 130
119our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 132our $RUNTIME;
121our $NOW; 133our $NOW;
… …
132our $JITTER; # average jitter 144our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
134 146
135our @POST_INIT; 147our @POST_INIT;
136 148
137our $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 :)
138 151
139binmode STDOUT; 152binmode STDOUT;
140binmode STDERR; 153binmode STDERR;
141 154
142# read virtual server time, if available 155# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 157 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
147} 160}
148 161
162eval "sub TICK() { $TICK } 1" or die;
163
149mkdir $_ 164mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 166
152our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
153 168
154sub cf::map::normalise; 169sub cf::map::normalise;
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::"} };
155 185
156############################################################################# 186#############################################################################
157 187
158=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
159 189
… …
206returns 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
207per 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.
208 238
209=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
210 240
211This array contains the results of the last C<invoke ()> call. When 241This array contains the results of the last C<invoke ()> call. When
212C<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
213that call. 243that call.
214 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
215=back 251=back
216 252
217=cut 253=cut
218 254
219BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
220 *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 {
221 my $msg = join "", @_; 262 my $msg = join "", @_;
222 263
223 $msg .= "\n" 264 $msg .= "\n"
224 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
225 266
226 $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;
227 268
228 LOG llevError, $msg; 269 LOG llevWarn, $msg;
229 }; 270};
230}
231 271
232$Coro::State::DIEHOOK = sub { 272$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 273 return unless $^S eq 0; # "eq", not "=="
234 274
235 if ($Coro::current == $Coro::main) {#d# 275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 278 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 279 return;#d#
238 }#d# 280 }#d#
239 281
240 # kill coroutine otherwise 282 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 283 Coro::terminate
243}; 284};
244
245$SIG{__DIE__} = sub { }; #d#?
246 285
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 303)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 305}
267 306
268$EV::DIED = sub { 307$EV::DIED = sub {
269 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
270}; 309};
271 310
272############################################################################# 311#############################################################################
273 312
274=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
… …
371} 410}
372 411
373=item cf::periodic $interval, $cb 412=item cf::periodic $interval, $cb
374 413
375Like 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
376get spread over timer. 415get spread over time.
377 416
378=cut 417=cut
379 418
380sub periodic($$) { 419sub periodic($$) {
381 my ($interval, $cb) = @_; 420 my ($interval, $cb) = @_;
… …
398 437
399=cut 438=cut
400 439
401our @SLOT_QUEUE; 440our @SLOT_QUEUE;
402our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
403 443
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 446 $Coro::current->desc ("timeslot manager");
407 447
408 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
409 450
410 while () { 451 while () {
411 next_job: 452 next_job:
453
412 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 455
414 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 460 $job->[2]->send;
418 Coro::cede; 461 Coro::cede;
419 goto next_job; 462 goto next_job;
420 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 465 }
422 } 466 }
423 467
424 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 471 $signal->wait;
428 } else { 472 } else {
473 $busy = 0;
429 Coro::schedule; 474 Coro::schedule;
430 } 475 }
431 } 476 }
432}; 477};
433 478
434sub get_slot($;$$) { 479sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 480 return if tick_inhibit || $Coro::current == $Coro::main;
436 481
437 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
438 483
439 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
440 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
441 487
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
… …
470=cut 516=cut
471 517
472sub sync_job(&) { 518sub sync_job(&) {
473 my ($job) = @_; 519 my ($job) = @_;
474 520
475 if ($Coro::current == $Coro::main) { 521 if (in_main) {
476 my $time = EV::time; 522 my $time = AE::time;
477 523
478 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
480 526
481 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
482 528
483 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
484 530
485 my $busy = 1; 531 my $busy = 1;
486 my @res; 532 my @res;
487 533
488 (async { 534 (async {
489 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 536 @res = eval { $job->() };
491 warn $@ if $@; 537 error $@ if $@;
492 undef $busy; 538 undef $busy;
493 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
494 540
495 while ($busy) { 541 while ($busy) {
496 if (Coro::nready) { 542 if (Coro::nready) {
… …
498 } else { 544 } else {
499 EV::loop EV::LOOP_ONESHOT; 545 EV::loop EV::LOOP_ONESHOT;
500 } 546 }
501 } 547 }
502 548
503 my $time = EV::time - $time; 549 my $time = AE::time - $time;
504 550
505 $TICK_START += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
506 552
507 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
508 } else { 554 } else {
… …
552 reset_signals; 598 reset_signals;
553 &$cb 599 &$cb
554 }, @args; 600 }, @args;
555 601
556 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 )
557} 614}
558 615
559=item $coin = coin_from_name $name 616=item $coin = coin_from_name $name
560 617
561=cut 618=cut
… …
598within each server. 655within each server.
599 656
600=cut 657=cut
601 658
602sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
603 my ($name) = @_; 663 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
605 665
606 eval { 666 eval {
607 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
… …
617} 677}
618 678
619our $DB; 679our $DB;
620 680
621sub db_init { 681sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
624 };
625} 683}
626 684
627sub db_get($$) { 685sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
629 687
630 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
631 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
632 692
633 $! ? () 693 $! ? ()
634 : $data 694 : $data
635 }
636} 695}
637 696
638sub db_put($$$) { 697sub db_put($$$) {
639 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
696 755
697 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 757 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
700 759
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 761
703 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
706 765
… …
716 775
717=cut 776=cut
718 777
719sub datalog($@) { 778sub datalog($@) {
720 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 781}
723 782
724=back 783=back
725 784
726=cut 785=cut
… …
921 980
922 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 983
925 } elsif (ref $type) { 984 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
927 986
928 } else { 987 } else {
929 shift @arg; 988 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
931 } 990 }
932 } 991 }
933} 992}
934 993
935sub _object_attach { 994sub _object_attach {
… …
945 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
946 } 1005 }
947 1006
948 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
949 } else { 1008 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1010 }
952 1011
953 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
954} 1013}
955 1014
… …
1014 1073
1015 for (@$callbacks) { 1074 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1017 1076
1018 if ($@) { 1077 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1079 override;
1022 } 1080 }
1023 1081
1024 return 1 if $override; 1082 return 1 if $override;
1025 } 1083 }
… …
1104 for (@$attach) { 1162 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1107 } 1165 }
1108 } else { 1166 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1168 }
1111 } 1169 }
1112} 1170}
1113 1171
1114cf::attachable->attach ( 1172cf::attachable->attach (
… …
1141 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1142 1200
1143 sync_job { 1201 sync_job {
1144 if (length $$rdata) { 1202 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1148 1207
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1215 aio_close $fh;
1154 1216
1155 if (@$objs) { 1217 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1226 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1228 }
1164 } else { 1229 } else {
1165 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
… …
1168 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1169 1234
1170 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1237 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1174 } 1239 }
1175 } else { 1240 } else {
1176 aio_unlink $filename; 1241 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1178 } 1243 }
… …
1202 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1268 $av = $st->{objs};
1204 } 1269 }
1205 1270
1206 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1209 1275
1210 ($data, $av) 1276 ($data, $av)
1211} 1277}
1212 1278
1213=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1272} 1338}
1273 1339
1274use File::Glob (); 1340use File::Glob ();
1275 1341
1276cf::player->attach ( 1342cf::player->attach (
1277 on_command => sub { 1343 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1279 1345
1280 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1281 or return; 1347 or return;
1282 1348
… …
1305 1371
1306 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1373 if $reply;
1308 1374
1309 } else { 1375 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1377 }
1312 1378
1313 cf::override; 1379 cf::override;
1314 }, 1380 },
1315); 1381);
1316 1382
1317# "readahead" all extensions 1383# "readahead" all extensions
1318sub cache_extensions { 1384sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1385 my $grp = IO::AIO::aio_group;
1320 1386
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1388 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1390 }
1325 }; 1391 };
1326 1392
1327 $grp 1393 $grp
1328} 1394}
1329 1395
1330sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1331 cf::sync_job { 1399 cf::sync_job {
1332 my %todo; 1400 my %todo;
1333 1401
1334 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1403 next unless -r $path;
… …
1353 1421
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1424
1357 $ext{source} = 1425 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1360 . $source 1428 . $source
1361 . "\n};\n1"; 1429 . "\n};\n1";
1362 1430
1363 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1364 } 1432 }
1365 1433
1434 my $pass = 0;
1366 my %done; 1435 my %done;
1367 while (%todo) { 1436 while (%todo) {
1368 my $progress; 1437 my $progress;
1369 1438
1439 ++$pass;
1440
1441 ext:
1370 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1444 next ext
1373 unless exists $done{$_}; 1445 unless exists $done{$_};
1374 } 1446 }
1375 1447
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1449
1378 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1381 1455
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1457 if exists $v->{meta}{mandatory};
1386 1458
1387 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;
1388 } 1468 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1469 }
1394 1470
1395 skip: 1471 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 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 }
1398 } 1479 }
1399 }; 1480 };
1400} 1481}
1401 1482
1402############################################################################# 1483#############################################################################
… …
1486 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1487 } 1568 }
1488 } 1569 }
1489} 1570}
1490 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
1491sub save($) { 1585sub save($) {
1492 my ($pl) = @_; 1586 my ($pl) = @_;
1493 1587
1494 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1495 1589
… …
1500 1594
1501 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1503 1597
1504 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];
1505 1602
1506 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1604 cf::cede_to_tick;
1508} 1605}
1509 1606
… …
1546 $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
1547 1644
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1549 $pl->deactivate; 1646 $pl->deactivate;
1550 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;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1553 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1554 1650
1555 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1611 \@logins 1707 \@logins
1612} 1708}
1613 1709
1614=item $player->maps 1710=item $player->maps
1615 1711
1712=item cf::player::maps $login
1713
1616Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1617player. May block. 1715player. May block.
1618 1716
1619=cut 1717=cut
1620 1718
… …
1682=cut 1780=cut
1683 1781
1684sub find_by_path($) { 1782sub find_by_path($) {
1685 my ($path) = @_; 1783 my ($path) = @_;
1686 1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1786
1687 my ($match, $specificity); 1787 my ($match, $specificity);
1688 1788
1689 for my $region (list) { 1789 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1791 ($match, $specificity) = ($region, $region->specificity)
… …
1722 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
1723 1823
1724 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1825 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1747 1847
1748sub register { 1848sub register {
1749 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1850 my $pkg = caller;
1751 1851
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1853
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1855}
1757 1856
1758# also paths starting with '/' 1857# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1859
1761sub thawer_merge { 1860sub thawer_merge {
1762 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1763 1862
1764 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
1978 2077
1979 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1980 } 2079 }
1981} 2080}
1982 2081
1983sub pre_load { } 2082sub pre_load { }
1984sub post_load { } 2083#sub post_load { } # XS
1985 2084
1986sub load { 2085sub load {
1987 my ($self) = @_; 2086 my ($self) = @_;
1988 2087
1989 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
… …
2046 } 2145 }
2047 2146
2048 $self->post_load; 2147 $self->post_load;
2049} 2148}
2050 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
2051sub customise_for { 2153sub customise_for {
2052 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2053 2155
2054 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2157 if $self->per_player;
… …
2071 or next; 2173 or next;
2072 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2073 or next; 2175 or next;
2074 $neigh->load; 2176 $neigh->load;
2075 2177
2178 # now find the diagonal neighbours
2076 push @neigh, 2179 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2182 }
2080 2183
… …
2087} 2190}
2088 2191
2089sub find_sync { 2192sub find_sync {
2090 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2091 2194
2092 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
2093} 2199}
2094 2200
2095sub do_load_sync { 2201sub do_load_sync {
2096 my ($map) = @_; 2202 my ($map) = @_;
2097 2203
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2100 2206
2101 cf::sync_job { $map->load }; 2207 $map->load;
2102} 2208}
2103 2209
2104our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2106 2212
… …
2132 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2133 2239
2134 () 2240 ()
2135} 2241}
2136 2242
2243# common code, used by both ->save and ->swapout
2137sub save { 2244sub _save {
2138 my ($self) = @_; 2245 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2246
2142 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2143 2248
2144 return unless $self->dirty; 2249 return unless $self->dirty;
2145 2250
… …
2165 } else { 2270 } else {
2166 $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);
2167 } 2272 }
2168} 2273}
2169 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2170sub swap_out { 2283sub swap_out {
2171 my ($self) = @_; 2284 my ($self) = @_;
2172 2285
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2287
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2288 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2289 return if $self->{deny_save};
2290 return if $self->players;
2181 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2182 $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};
2183 2342
2184 $self->deactivate; 2343 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2345 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2346
2232 $self->unlink_save; 2347 $self->unlink_save;
2233 $self->destroy; 2348 $self->destroy;
2234} 2349}
2235 2350
… …
2243 2358
2244 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2245 2360
2246 $self->unlink_save; 2361 $self->unlink_save;
2247 2362
2248 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2368
… …
2310 : normalise $_ 2425 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2427 ]
2313} 2428}
2314 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
2315=back 2462=back
2316 2463
2317=head3 cf::object 2464=head3 cf::object
2318 2465
2319=cut 2466=cut
… …
2384 2531
2385our $SAY_CHANNEL = { 2532our $SAY_CHANNEL = {
2386 id => "say", 2533 id => "say",
2387 title => "Map", 2534 title => "Map",
2388 reply => "say ", 2535 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2536 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2537};
2391 2538
2392our $CHAT_CHANNEL = { 2539our $CHAT_CHANNEL = {
2393 id => "chat", 2540 id => "chat",
2394 title => "Chat", 2541 title => "Chat",
… …
2451 2598
2452Freezes 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}>).
2453 2600
2454The 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.
2455for 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,
2456though, 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
2457map. 2604map.
2458 2605
2459Will never block. 2606Will never block.
2460 2607
2461=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
… …
2482sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2483 my ($self) = @_; 2630 my ($self) = @_;
2484 2631
2485 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2486 2633
2634 ++$self->{_link_recursion};
2635
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2637
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2491 2640
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2642}
2494 2643
2495sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2497 2646
… …
2514 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2516 2665
2517 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2520 2669
2521 $map->load; 2670 $map->load;
2522 $map->load_neighbours; 2671 $map->load_neighbours;
2523 2672
2524 return unless $self->contr->active; 2673 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2674
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2530} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2531 2682
2683}
2684
2532=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)]])
2533 2686
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
… …
2544 2697
2545our $GOTOGEN; 2698our $GOTOGEN;
2546 2699
2547sub cf::object::player::goto { 2700sub cf::object::player::goto {
2548 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 }
2549 2708
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2711
2553 $self->enter_link; 2712 $self->enter_link;
… …
2577 my $map = eval { 2736 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2579 2738
2580 if ($map) { 2739 if ($map) {
2581 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2742 } else {
2584 $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);
2585 } 2744 }
2586 2745
2587 $map 2746 $map
… …
2595 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2598 } 2757 }
2599 2758
2600 $done->() if $done; 2759 $done->($self) if $done;
2601 })->prio (1); 2760 })->prio (1);
2602} 2761}
2603 2762
2604=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2605 2764
… …
2698 $self->message ("Something went wrong deep within the deliantra server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "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. "
2700 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2861
2703 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2863 $self->leave_link;
2705 } 2864 }
2706 })->prio (1); 2865 })->prio (1);
2707} 2866}
2708 2867
… …
2720sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2722 2881
2723 utf8::encode $text; 2882 utf8::encode $text;
2724 $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);
2725} 2909}
2726 2910
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2912
2729Send 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
… …
2733 2917
2734=cut 2918=cut
2735 2919
2736# non-persistent channels (usually the info channel) 2920# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2738 "c/identify" => { 2928 "c/identify" => {
2739 id => "infobox", 2929 id => "infobox",
2740 title => "Identify", 2930 title => "Identify",
2741 reply => undef, 2931 reply => undef,
2742 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2934 "c/examine" => {
2745 id => "infobox", 2935 id => "infobox",
2746 title => "Examine", 2936 title => "Examine",
2747 reply => undef, 2937 reply => undef,
2748 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",
2749 }, 2945 },
2750 "c/book" => { 2946 "c/book" => {
2751 id => "infobox", 2947 id => "infobox",
2752 title => "Book", 2948 title => "Book",
2753 reply => undef, 2949 reply => undef,
… …
2781 id => "infobox", 2977 id => "infobox",
2782 title => "Skills", 2978 title => "Skills",
2783 reply => undef, 2979 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 2980 tooltip => "Shows your experience per skill and item power",
2785 }, 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 },
2786 "c/resistances" => { 2988 "c/resistances" => {
2787 id => "infobox", 2989 id => "infobox",
2788 title => "Resistances", 2990 title => "Resistances",
2789 reply => undef, 2991 reply => undef,
2790 tooltip => "Shows your resistances", 2992 tooltip => "Shows your resistances",
… …
2792 "c/pets" => { 2994 "c/pets" => {
2793 id => "infobox", 2995 id => "infobox",
2794 title => "Pets", 2996 title => "Pets",
2795 reply => undef, 2997 reply => undef,
2796 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",
2797 }, 3005 },
2798 "c/uptime" => { 3006 "c/uptime" => {
2799 id => "infobox", 3007 id => "infobox",
2800 title => "Uptime", 3008 title => "Uptime",
2801 reply => undef, 3009 reply => undef,
… …
2857 my $pkt = "msg " 3065 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3066 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3068 );
2861 3069
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3070 $self->send_big_packet ($pkt);
2873} 3071}
2874 3072
2875=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2876 3074
2877Sends an ext event to the client. 3075Sends an ext event to the client.
… …
2880 3078
2881sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2882 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2883 3081
2884 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2887 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3087 }
2890} 3088}
2891 3089
2892=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2893 3091
… …
2897 3095
2898sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2900 3098
2901 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove 3102 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 } 3105 }
2908} 3106}
2909 3107
2910=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2911 3109
… …
2982 3180
2983 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2984 if $reply; 3182 if $reply;
2985 3183
2986 } else { 3184 } else {
2987 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";
2988 } 3186 }
2989 3187
2990 cf::override; 3188 cf::override;
2991 }, 3189 },
2992); 3190);
… …
3012 3210
3013 $coro 3211 $coro
3014} 3212}
3015 3213
3016cf::client->attach ( 3214cf::client->attach (
3017 on_destroy => sub { 3215 on_client_destroy => sub {
3018 my ($ns) = @_; 3216 my ($ns) = @_;
3019 3217
3020 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3021 }, 3219 },
3022); 3220);
… …
3038our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
3039 3237
3040$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
3041 3239
3042$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
3044 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
3045 sort time 3243 sort time
3046)); 3244));
3047 3245
3048# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
… …
3052The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
3053 3251
3054 cf::object 3252 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3253 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3254 insert remove name archname title slaying race decrease split
3255 value
3057 3256
3058 cf::object::player 3257 cf::object::player
3059 player 3258 player
3060 3259
3061 cf::player 3260 cf::player
… …
3067=cut 3266=cut
3068 3267
3069for ( 3268for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3269 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3271 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
3076) { 3275) {
3077 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3080 for @funs; 3278 for @funs;
3081} 3279}
3082 3280
… …
3097 3295
3098 my $qcode = $code; 3296 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
3101 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
3102 local $_; 3303 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars;
3104 3304
3105 my $eval = 3305 my $eval =
3106 "do {\n" 3306 "do {\n"
3107 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3108 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
3109 . $code 3309 . $code
3110 . "\n}" 3310 . "\n}"
3111 ; 3311 ;
3112 3312
3313 if ($CFG{safe_eval}) {
3113 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
3114 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3115 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 }
3116 3322
3117 if ($@) { 3323 if ($@) {
3118 warn "$@"; 3324 warn "$@",
3119 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3120 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3121 } 3327 }
3122 3328
3123 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3124} 3330}
3125 3331
… …
3139=cut 3345=cut
3140 3346
3141sub register_script_function { 3347sub register_script_function {
3142 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3143 3349
3144 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3145 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3146} 3352}
3147 3353
3148=back 3354=back
3149 3355
3150=cut 3356=cut
… …
3159 # for this (global event?) 3365 # for this (global event?)
3160 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3161 3367
3162 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3163 3369
3164 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3165 3371
3166 my $facedata; 3372 my $facedata;
3167 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3168 or die "$path: $!"; 3374 or die "$path: $!";
3169 3375
… …
3171 3377
3172 $facedata->{version} == 2 3378 $facedata->{version} == 2
3173 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3174 3380
3175 # 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]);
3176 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC, 3384 type => FT_RSRC,
3178 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),
3179 }; 3387 };
3180 cf::cede_to_tick; 3388 cf::cede_to_tick;
3181 3389
3182 { 3390 {
3183 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
… …
3185 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3186 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187 3395
3188 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3192 3400
3193 cf::cede_to_tick; 3401 cf::cede_to_tick;
3194 } 3402 }
3195 3403
3196 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
… …
3201 3409
3202 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3203 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3204 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3205 } else { 3413 } else {
3206 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3207 } 3415 }
3208 3416
3209 cf::cede_to_tick; 3417 cf::cede_to_tick;
3210 } 3418 }
3211 } 3419 }
… …
3220 3428
3221 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3222 } 3430 }
3223 3431
3224 { 3432 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3228 3434
3229 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) { 3436 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233 3438
3234 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3235 # prepend meta info
3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type}; 3440 cf::face::set_type $idx, $info->{type};
3249 } else { 3441 } else {
3250 $RESOURCE{$name} = $info; 3442 $RESOURCE{$name} = $info; # unused
3251 } 3443 }
3252 3444
3253 cf::cede_to_tick; 3445 cf::cede_to_tick;
3254 } 3446 }
3255 } 3447 }
3256 3448
3257 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3258 3450
3259 1 3451 1
3260} 3452}
3261
3262cf::global->attach (on_resource_update => sub {
3263 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3264 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3265
3266 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3267 my $sound = $soundconf->{compat}[$_]
3268 or next;
3269
3270 my $face = cf::face::find "sound/$sound->[1]";
3271 cf::sound::set $sound->[0] => $face;
3272 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3273 }
3274
3275 while (my ($k, $v) = each %{$soundconf->{event}}) {
3276 my $face = cf::face::find "sound/$v";
3277 cf::sound::set $k => $face;
3278 }
3279 }
3280});
3281 3453
3282register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3283 my ($ns, $want) = @_; 3455 my ($ns, $want) = @_;
3284 3456
3285 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
… …
3324sub reload_treasures { 3496sub reload_treasures {
3325 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3326 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3327} 3499}
3328 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
3329sub reload_resources { 3524sub reload_resources {
3330 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3331 3526
3332 reload_facedata; 3527 reload_facedata;
3528 reload_sound;
3333 reload_archetypes; 3529 reload_archetypes;
3334 reload_regions; 3530 reload_regions;
3335 reload_treasures; 3531 reload_treasures;
3336 3532
3337 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3338} 3534}
3339 3535
3340sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3540 or return;
3343 3541
3344 local $/; 3542 local $/;
3345 *CFG = YAML::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3346 3544
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3546
3349 $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};
3350 $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};
3351 3549
3352 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
… …
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3554 };
3357 warn $@ if $@; 3555 warn $@ if $@;
3358 } 3556 }
3557
3558 trace "finished reloading resource files\n";
3359} 3559}
3360 3560
3361sub pidfile() { 3561sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3563 or die "$PIDFILE: $!";
… …
3375 3575
3376 seek $fh, 0, 0; 3576 seek $fh, 0, 0;
3377 print $fh $$; 3577 print $fh $$;
3378} 3578}
3379 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
3380sub main { 3589sub main {
3381 cf::init_globals; # initialise logging 3590 cf::init_globals; # initialise logging
3382 3591
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 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.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392 3596
3393 $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
3394 3598
3395 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
… …
3402 }; 3606 };
3403 3607
3404 evthread_start IO::AIO::poll_fileno; 3608 evthread_start IO::AIO::poll_fileno;
3405 3609
3406 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
3407 reload_resources; 3619 reload_resources;
3408 reload_config; 3620 reload_config;
3409 db_init; 3621 db_init;
3410 3622
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid; 3623 cf::init_uuid;
3414 cf::init_signals; 3624 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills; 3625 cf::init_skills;
3417 3626
3418 cf::init_beforeplay; 3627 cf::init_beforeplay;
3419 3628
3420 atomic; 3629 atomic;
… …
3422 load_extensions; 3631 load_extensions;
3423 3632
3424 utime time, time, $RUNTIMEFILE; 3633 utime time, time, $RUNTIMEFILE;
3425 3634
3426 # no (long-running) fork's whatsoever before this point(!) 3635 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX ();
3427 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};
3428 3638
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3639 (pop @POST_INIT)->(0) while @POST_INIT;
3430 }; 3640 };
3431 3641
3432 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;
3433} 3646}
3434 3647
3435############################################################################# 3648#############################################################################
3436# initialisation and cleanup 3649# initialisation and cleanup
3437 3650
3438# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3439BEGIN { 3652BEGIN {
3440 our %SIGWATCHER = (); 3653 our %SIGWATCHER = ();
3441 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3442 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3443 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3444 }; 3657 };
3445 } 3658 }
3446} 3659}
3447 3660
3448sub write_runtime_sync { 3661sub write_runtime_sync {
3662 my $t0 = AE::time;
3663
3449 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3450 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3451 3666
3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3453 3668
3454 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3455 3670
3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3457 or return; 3672 or return;
3458 3673
3459 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3460 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3461 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
… …
3474 or return; 3689 or return;
3475 3690
3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3477 and return; 3692 and return;
3478 3693
3479 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3480 3695
3481 1 3696 1
3482} 3697}
3483 3698
3484our $uuid_lock; 3699our $uuid_lock;
… …
3496 or return; 3711 or return;
3497 3712
3498 my $value = uuid_seq uuid_cur; 3713 my $value = uuid_seq uuid_cur;
3499 3714
3500 unless ($value) { 3715 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n"; 3716 info "cowardly refusing to write zero uuid value!\n";
3502 return; 3717 return;
3503 } 3718 }
3504 3719
3505 my $value = uuid_str $value + $uuid_skip; 3720 my $value = uuid_str $value + $uuid_skip;
3506 $uuid_skip = 0; 3721 $uuid_skip = 0;
… …
3516 or return; 3731 or return;
3517 3732
3518 aio_rename "$uuid~", $uuid 3733 aio_rename "$uuid~", $uuid
3519 and return; 3734 and return;
3520 3735
3521 warn "uuid file written ($value).\n"; 3736 trace "uuid file written ($value).\n";
3522 3737
3523 1 3738 1
3524 3739
3525} 3740}
3526 3741
… …
3532} 3747}
3533 3748
3534sub emergency_save() { 3749sub emergency_save() {
3535 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3536 3751
3537 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;
3538 3758
3539 cf::sync_job { 3759 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so 3760 cf::write_runtime_sync; # external watchdog should not bark
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544 3761
3545 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3548 warn "emergency_perl_save: begin player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3768 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3770 $pl->save;
3554 } 3771 }
3555 warn "emergency_perl_save: end player save\n"; 3772 info "emergency_perl_save: end player save\n";
3556 3773
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3557 warn "emergency_perl_save: begin map save\n"; 3776 info "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3779 $map->valid or next;
3561 $map->save; 3780 $map->save;
3562 } 3781 }
3563 warn "emergency_perl_save: end map save\n"; 3782 info "emergency_perl_save: end map save\n";
3564 3783
3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3565 warn "emergency_perl_save: begin database checkpoint\n"; 3786 info "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "emergency_perl_save: end database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3568 3789
3569 warn "emergency_perl_save: begin write uuid\n"; 3790 info "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3791 write_uuid_sync 1;
3571 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
3572 }; 3812 };
3573 3813
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3579 warn "emergency_perl_save: leave\n"; 3814 info "emergency_perl_save: leave\n";
3580} 3815}
3581 3816
3582sub post_cleanup { 3817sub post_cleanup {
3583 my ($make_core) = @_; 3818 my ($make_core) = @_;
3584 3819
3820 IO::AIO::flush;
3821
3585 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3586 if $make_core; 3823 if $make_core;
3587 3824
3588 my $fh = pidfile; 3825 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$; 3826 unlink $PIDFILE if <$fh> == $$;
3590} 3827}
… …
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) { 3848 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"}; 3849 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 } 3851 }
3615 warn "cleared package $pkg\n";#d#
3616} 3852}
3617 3853
3618sub do_reload_perl() { 3854sub do_reload_perl() {
3619 # can/must only be called in main 3855 # can/must only be called in main
3620 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3621 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3622 return; 3858 return;
3623 } 3859 }
3624 3860
3625 return if $RELOAD++; 3861 return if $RELOAD++;
3626 3862
3627 my $t1 = EV::time; 3863 my $t1 = AE::time;
3628 3864
3629 while ($RELOAD) { 3865 while ($RELOAD) {
3630 warn "reloading..."; 3866 info "reloading...";
3631 3867
3632 warn "entering sync_job"; 3868 trace "entering sync_job";
3633 3869
3634 cf::sync_job { 3870 cf::sync_job {
3635 cf::write_runtime_sync; # external watchdog should not bark
3636 cf::emergency_save; 3871 cf::emergency_save;
3637 cf::write_runtime_sync; # external watchdog should not bark
3638 3872
3639 warn "syncing database to disk";
3640 BDB::db_env_txn_checkpoint $DB_ENV;
3641
3642 # if anything goes wrong in here, we should simply crash as we already saved
3643
3644 warn "flushing outstanding aio requests";
3645 while (IO::AIO::nreqs || BDB::nreqs) {
3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3647 }
3648
3649 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3650 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3651 %EXT_CORO = (); 3875 %EXT_CORO = ();
3652 3876
3653 warn "removing commands"; 3877 trace "removing commands";
3654 %COMMAND = (); 3878 %COMMAND = ();
3655 3879
3656 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3657 %EXTCMD = (); 3881 %EXTCMD = ();
3658 %EXTICMD = (); 3882 %EXTICMD = ();
3659 3883
3660 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3662 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3663 3887
3664 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3665 eval { 3889 eval {
3666 $cb->($pkg); 3890 $cb->($pkg);
3667 1 3891 1
3668 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3669 } 3893 }
3670 3894
3671 warn "... clearing $pkg"; 3895 trace "... clearing $pkg";
3672 clear_package $pkg; 3896 clear_package $pkg;
3673 } 3897 }
3674 3898
3675 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678 3902
3679 warn "... unloading $k"; 3903 trace "... unloading $k";
3680 delete $INC{$k}; 3904 delete $INC{$k};
3681 3905
3682 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3684 3908
… …
3687 } 3911 }
3688 3912
3689 clear_package $k; 3913 clear_package $k;
3690 } 3914 }
3691 3915
3692 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3693 clear_package "safe::$_" 3917 clear_package "safe::$_"
3694 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);
3695 3919
3696 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3923
3700 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3925 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3703 3927
3704 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3705 3929
3706 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3707 require cf; 3931 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3709 3933
3710 warn "loading config and database again"; 3934 trace "loading config and database again";
3711 cf::reload_config; 3935 cf::reload_config;
3712 3936
3713 warn "loading extensions"; 3937 trace "loading extensions";
3714 cf::load_extensions; 3938 cf::load_extensions;
3715 3939
3716 if ($REATTACH_ON_RELOAD) { 3940 if ($REATTACH_ON_RELOAD) {
3717 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3718 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3719 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3720 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3721 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3722 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3723 } 3947 }
3724 3948
3725 warn "running post_init jobs"; 3949 trace "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT; 3950 (pop @POST_INIT)->(1) while @POST_INIT;
3727 3951
3728 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3729 3953
3730 1 3954 1
3731 } or do { 3955 } or do {
3732 warn $@; 3956 error $@;
3733 cf::cleanup "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3734 }; 3958 };
3735 3959
3736 warn "reloaded"; 3960 info "reloaded";
3737 --$RELOAD; 3961 --$RELOAD;
3738 } 3962 }
3739 3963
3740 $t1 = EV::time - $t1; 3964 $t1 = AE::time - $t1;
3741 warn "reload completed in ${t1}s\n"; 3965 info "reload completed in ${t1}s\n";
3742}; 3966};
3743 3967
3744our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3745 3969
3746sub reload_perl() { 3970sub reload_perl() {
… …
3748 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3749 3973
3750 $RELOAD_WATCHER ||= cf::async { 3974 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions; 3975 Coro::AIO::aio_wait cache_extensions;
3752 3976
3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3754 do_reload_perl; 3978 do_reload_perl;
3755 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3756 }; 3980 };
3757 }; 3981 };
3758} 3982}
… …
3775 3999
3776our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3777our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3778 4002
3779sub wait_for_tick { 4003sub wait_for_tick {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 4005
3782 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3784 $signal->wait; 4008 $signal->wait;
3785} 4009}
3786 4010
3787sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3788 return if tick_inhibit || $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3789 4013
3790 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3791 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3792 $signal->wait; 4016 $signal->wait;
3793} 4017}
… …
3799 return; 4023 return;
3800 } 4024 }
3801 4025
3802 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3803 4027
4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029
3804 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3805 $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.;
3806 Coro::async_pool { 4032 Coro::async_pool {
3807 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3808 write_runtime_sync 4034 write_runtime_sync
3809 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3810 }; 4036 };
3811 } 4037 }
3812 4038
3813 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3814 $sig->send; 4040 $sig->send;
… …
3822 4048
3823 if (0) { 4049 if (0) {
3824 if ($NEXT_TICK) { 4050 if ($NEXT_TICK) {
3825 my $jitter = $TICK_START - $NEXT_TICK; 4051 my $jitter = $TICK_START - $NEXT_TICK;
3826 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3827 warn "jitter $JITTER\n";#d# 4053 debug "jitter $JITTER\n";#d#
3828 } 4054 }
3829 } 4055 }
3830} 4056}
3831 4057
3832{ 4058{
3833 # configure BDB 4059 # configure BDB
3834 4060
3835 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3836 BDB::max_poll_reqs $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1); 4063 $AnyEvent::BDB::WATCHER->priority (1);
3838 4064
3839 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3840 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
… …
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 4147 }
3922} 4148}
3923 4149
3924# load additional modules 4150# load additional modules
3925use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3926 4153
3927END { cf::emergency_save } 4154END { cf::emergency_save }
3928 4155
39291 41561
3930 4157

Diff Legend

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