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.463 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 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
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 off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
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
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
117our %CFG; 131our %CFG;
118 132
119our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 134our $RUNTIME;
121our $NOW; 135our $NOW;
132our $JITTER; # average jitter 146our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
134 148
135our @POST_INIT; 149our @POST_INIT;
136 150
137our $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 :)
138 153
139binmode STDOUT; 154binmode STDOUT;
140binmode STDERR; 155binmode STDERR;
141 156
142# read virtual server time, if available 157# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
147} 162}
148 163
164eval "sub TICK() { $TICK } 1" or die;
165
149mkdir $_ 166mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 168
152our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
153 170
154sub cf::map::normalise; 171sub cf::map::normalise;
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::"} };
155 187
156############################################################################# 188#############################################################################
157 189
158=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
159 191
201from wherever your confdir points to. 233from wherever your confdir points to.
202 234
203=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
204 236
205These 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
206returns 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
207per 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.
208 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
209=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
210 247
211This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 250that call.
214 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
215=back 258=back
216 259
217=cut 260=cut
218 261
219BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
220 *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 {
221 my $msg = join "", @_; 269 my $msg = join "", @_;
222 270
223 $msg .= "\n" 271 $msg .= "\n"
224 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
225 273
226 $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;
227 275
228 LOG llevError, $msg; 276 LOG llevWarn, $msg;
229 }; 277};
230}
231 278
232$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
234 281
235 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 286 return;#d#
238 }#d# 287 }#d#
239 288
240 # kill coroutine otherwise 289 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 290 Coro::terminate
243}; 291};
244
245$SIG{__DIE__} = sub { }; #d#?
246 292
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 310)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 312}
267 313
268$EV::DIED = sub { 314$EV::DIED = sub {
269 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
270}; 316};
271 317
272############################################################################# 318#############################################################################
273 319
274=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312 358
313sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
315 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
316=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
317 375
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
320 378
321The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 380is a reload or not.
323 381
324=cut 382=cut
325 383
326sub post_init(&) { 384sub post_init(&) {
371} 429}
372 430
373=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
374 432
375Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 434get spread over time.
377 435
378=cut 436=cut
379 437
380sub periodic($$) { 438sub periodic($$) {
381 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
398 456
399=cut 457=cut
400 458
401our @SLOT_QUEUE; 459our @SLOT_QUEUE;
402our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
403 462
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
407 466
408 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
409 469
410 while () { 470 while () {
411 next_job: 471 next_job:
472
412 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 474
414 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 479 $job->[2]->send;
418 Coro::cede; 480 Coro::cede;
419 goto next_job; 481 goto next_job;
420 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 484 }
422 } 485 }
423 486
424 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 490 $signal->wait;
428 } else { 491 } else {
492 $busy = 0;
429 Coro::schedule; 493 Coro::schedule;
430 } 494 }
431 } 495 }
432}; 496};
433 497
434sub get_slot($;$$) { 498sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
436 500
437 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
438 502
439 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
440 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
441 506
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
470=cut 535=cut
471 536
472sub sync_job(&) { 537sub sync_job(&) {
473 my ($job) = @_; 538 my ($job) = @_;
474 539
475 if ($Coro::current == $Coro::main) { 540 if (in_main) {
476 my $time = EV::time; 541 my $time = AE::time;
477 542
478 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
480 545
481 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
482 547
483 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
484 549
485 my $busy = 1; 550 my $busy = 1;
486 my @res; 551 my @res;
487 552
488 (async { 553 (async {
489 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 555 @res = eval { $job->() };
491 warn $@ if $@; 556 error $@ if $@;
492 undef $busy; 557 undef $busy;
493 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
494 559
495 while ($busy) { 560 while ($busy) {
496 if (Coro::nready) { 561 if (Coro::nready) {
498 } else { 563 } else {
499 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
500 } 565 }
501 } 566 }
502 567
503 my $time = EV::time - $time; 568 my $time = AE::time - $time;
504 569
505 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
506 571
507 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
508 } else { 573 } else {
530 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
531 596
532 $coro 597 $coro
533} 598}
534 599
535=item fork_call { }, $args 600=item fork_call { }, @args
536 601
537Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 605never block itself or use any form of event handling.
541 606
542=cut 607=cut
543 608
609sub post_fork {
610 reset_signals;
611}
612
544sub fork_call(&@) { 613sub fork_call(&@) {
545 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
546 615
547 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
550 619
551 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
552 reset_signals; 621 cf::post_fork;
553 &$cb 622 &$cb
554 }, @args; 623 } @args;
555 624
556 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
557} 637}
558 638
559=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
560 640
561=cut 641=cut
598within each server. 678within each server.
599 679
600=cut 680=cut
601 681
602sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
603 my ($name) = @_; 686 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
605 688
606 eval { 689 eval {
607 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
617} 700}
618 701
619our $DB; 702our $DB;
620 703
621sub db_init { 704sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
624 };
625} 706}
626 707
627sub db_get($$) { 708sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
629 710
630 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
631 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
632 715
633 $! ? () 716 $! ? ()
634 : $data 717 : $data
635 }
636} 718}
637 719
638sub db_put($$$) { 720sub db_put($$$) {
639 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 778
697 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 780 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
700 782
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 784
703 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
706 788
716 798
717=cut 799=cut
718 800
719sub datalog($@) { 801sub datalog($@) {
720 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 804}
723 805
724=back 806=back
725 807
726=cut 808=cut
921 1003
922 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1006
925 } elsif (ref $type) { 1007 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
927 1009
928 } else { 1010 } else {
929 shift @arg; 1011 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
931 } 1013 }
932 } 1014 }
933} 1015}
934 1016
935sub _object_attach { 1017sub _object_attach {
945 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
946 } 1028 }
947 1029
948 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
949 } else { 1031 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1033 }
952 1034
953 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
954} 1036}
955 1037
1014 1096
1015 for (@$callbacks) { 1097 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1017 1099
1018 if ($@) { 1100 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1102 override;
1022 } 1103 }
1023 1104
1024 return 1 if $override; 1105 return 1 if $override;
1025 } 1106 }
1104 for (@$attach) { 1185 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1107 } 1188 }
1108 } else { 1189 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1191 }
1111 } 1192 }
1112} 1193}
1113 1194
1114cf::attachable->attach ( 1195cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1142 1223
1143 sync_job { 1224 sync_job {
1144 if (length $$rdata) { 1225 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1148 1230
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1153 aio_close $fh; 1238 aio_close $fh;
1154 1239
1155 if (@$objs) { 1240 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1161 aio_close $fh; 1249 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1251 }
1164 } else { 1252 } else {
1165 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1169 1257
1170 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1260 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1174 } 1262 }
1175 } else { 1263 } else {
1176 aio_unlink $filename; 1264 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1178 } 1266 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1291 $av = $st->{objs};
1204 } 1292 }
1205 1293
1206 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1209 1298
1210 ($data, $av) 1299 ($data, $av)
1211} 1300}
1212 1301
1213=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1272} 1361}
1273 1362
1274use File::Glob (); 1363use File::Glob ();
1275 1364
1276cf::player->attach ( 1365cf::player->attach (
1277 on_command => sub { 1366 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1279 1368
1280 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1281 or return; 1370 or return;
1282 1371
1305 1394
1306 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1396 if $reply;
1308 1397
1309 } else { 1398 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1400 }
1312 1401
1313 cf::override; 1402 cf::override;
1314 }, 1403 },
1315); 1404);
1316 1405
1317# "readahead" all extensions 1406# "readahead" all extensions
1318sub cache_extensions { 1407sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1408 my $grp = IO::AIO::aio_group;
1320 1409
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1411 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1413 }
1325 }; 1414 };
1326 1415
1327 $grp 1416 $grp
1328} 1417}
1329 1418
1330sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1331 cf::sync_job { 1422 cf::sync_job {
1332 my %todo; 1423 my %todo;
1333 1424
1334 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1426 next unless -r $path;
1353 1444
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1447
1357 $ext{source} = 1448 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1360 . $source 1451 . $source
1361 . "\n};\n1"; 1452 . "\n};\n1";
1362 1453
1363 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1364 } 1455 }
1365 1456
1457 my $pass = 0;
1366 my %done; 1458 my %done;
1367 while (%todo) { 1459 while (%todo) {
1368 my $progress; 1460 my $progress;
1369 1461
1462 ++$pass;
1463
1464 ext:
1370 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1467 next ext
1373 unless exists $done{$_}; 1468 unless exists $done{$_};
1374 } 1469 }
1375 1470
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1472
1378 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1477
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1479 if exists $v->{meta}{mandatory};
1386 1480
1387 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1388 } 1490 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1491 }
1394 1492
1395 skip: 1493 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1398 } 1501 }
1399 }; 1502 };
1400} 1503}
1401 1504
1402############################################################################# 1505#############################################################################
1486 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1487 } 1590 }
1488 } 1591 }
1489} 1592}
1490 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1491sub save($) { 1607sub save($) {
1492 my ($pl) = @_; 1608 my ($pl) = @_;
1493 1609
1494 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1495 1611
1500 1616
1501 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1503 1619
1504 cf::get_slot 0.01; 1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1624
1506 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1626 cf::cede_to_tick;
1508} 1627}
1509 1628
1543 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1544 1663
1545 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1666
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1668 $pl->deactivate;
1669
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1553 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1554 1675
1555 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1611 \@logins 1732 \@logins
1612} 1733}
1613 1734
1614=item $player->maps 1735=item $player->maps
1615 1736
1737=item cf::player::maps $login
1738
1616Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1617player. May block. 1740player. May block.
1618 1741
1619=cut 1742=cut
1620 1743
1682=cut 1805=cut
1683 1806
1684sub find_by_path($) { 1807sub find_by_path($) {
1685 my ($path) = @_; 1808 my ($path) = @_;
1686 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1687 my ($match, $specificity); 1812 my ($match, $specificity);
1688 1813
1689 for my $region (list) { 1814 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1848
1724 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1850 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 1872
1748sub register { 1873sub register {
1749 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1875 my $pkg = caller;
1751 1876
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1878
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1880}
1757 1881
1758# also paths starting with '/' 1882# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1884
1761sub thawer_merge { 1885sub thawer_merge {
1762 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1763 1887
1764 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1769} 1893}
1770 1894
1771sub normalise { 1895sub normalise {
1772 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1773 1897
1774 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1775 1899
1776 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1777 1901
1778 # map plan: 1902 # map plan:
1779 # 1903 #
1818 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1819 return $self; 1943 return $self;
1820 } 1944 }
1821 } 1945 }
1822 1946
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 1948 ()
1825} 1949}
1826 1950
1827sub init { 1951sub init {
1828 my ($self) = @_; 1952 my ($self) = @_;
1950} 2074}
1951 2075
1952sub find; 2076sub find;
1953sub find { 2077sub find {
1954 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
1955 2081
1956 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1957 2083
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1978 2104
1979 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1980 } 2106 }
1981} 2107}
1982 2108
1983sub pre_load { } 2109sub pre_load { }
1984sub post_load { } 2110#sub post_load { } # XS
1985 2111
1986sub load { 2112sub load {
1987 my ($self) = @_; 2113 my ($self) = @_;
1988 2114
1989 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2046 } 2172 }
2047 2173
2048 $self->post_load; 2174 $self->post_load;
2049} 2175}
2050 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2051sub customise_for { 2180sub customise_for {
2052 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2053 2182
2054 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2184 if $self->per_player;
2071 or next; 2200 or next;
2072 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2073 or next; 2202 or next;
2074 $neigh->load; 2203 $neigh->load;
2075 2204
2205 # now find the diagonal neighbours
2076 push @neigh, 2206 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2209 }
2080 2210
2087} 2217}
2088 2218
2089sub find_sync { 2219sub find_sync {
2090 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2091 2221
2092 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2093} 2226}
2094 2227
2095sub do_load_sync { 2228sub do_load_sync {
2096 my ($map) = @_; 2229 my ($map) = @_;
2097 2230
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2100 2233
2101 cf::sync_job { $map->load }; 2234 $map->load;
2102} 2235}
2103 2236
2104our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2106 2239
2132 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2133 2266
2134 () 2267 ()
2135} 2268}
2136 2269
2270# common code, used by both ->save and ->swapout
2137sub save { 2271sub _save {
2138 my ($self) = @_; 2272 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2273
2142 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2143 2275
2144 return unless $self->dirty; 2276 return unless $self->dirty;
2145 2277
2165 } else { 2297 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2299 }
2168} 2300}
2169 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2170sub swap_out { 2310sub swap_out {
2171 my ($self) = @_; 2311 my ($self) = @_;
2172 2312
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2314
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2181 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2183 2369
2184 $self->deactivate; 2370 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2372 $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 2373
2232 $self->unlink_save; 2374 $self->unlink_save;
2233 $self->destroy; 2375 $self->destroy;
2234} 2376}
2235 2377
2243 2385
2244 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2245 2387
2246 $self->unlink_save; 2388 $self->unlink_save;
2247 2389
2248 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2395
2310 : normalise $_ 2452 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2454 ]
2313} 2455}
2314 2456
2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2488
2315=back 2489=back
2316 2490
2317=head3 cf::object 2491=head3 cf::object
2318 2492
2319=cut 2493=cut
2384 2558
2385our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2386 id => "say", 2560 id => "say",
2387 title => "Map", 2561 title => "Map",
2388 reply => "say ", 2562 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2564};
2391 2565
2392our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2393 id => "chat", 2567 id => "chat",
2394 title => "Chat", 2568 title => "Chat",
2451 2625
2452Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2453 2627
2454The player should be reasonably safe there for short amounts of time (e.g. 2628The 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, 2629for 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 2630though, as the player cannot control the character while it is on the link
2457map. 2631map.
2458 2632
2459Will never block. 2633Will never block.
2460 2634
2461=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2483 my ($self) = @_; 2657 my ($self) = @_;
2484 2658
2485 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2486 2660
2661 ++$self->{_link_recursion};
2662
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2664
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2491 2667
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2669}
2494 2670
2495sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2497 2673
2514 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2516 2692
2517 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2520 2696
2521 $map->load; 2697 $map->load;
2522 $map->load_neighbours; 2698 $map->load_neighbours;
2523 2699
2524 return unless $self->contr->active; 2700 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2701
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2530} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2531 2709
2710}
2711
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2713
2534Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2716that 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 2717the new (success) or old (failed) map position. In either case, $done will
2544 2724
2545our $GOTOGEN; 2725our $GOTOGEN;
2546 2726
2547sub cf::object::player::goto { 2727sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2549 2735
2550 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2738
2553 $self->enter_link; 2739 $self->enter_link;
2577 my $map = eval { 2763 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2579 2765
2580 if ($map) { 2766 if ($map) {
2581 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2769 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2771 }
2586 2772
2587 $map 2773 $map
2595 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2598 } 2784 }
2599 2785
2600 $done->() if $done; 2786 $done->($self) if $done;
2601 })->prio (1); 2787 })->prio (1);
2602} 2788}
2603 2789
2604=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2605 2791
2698 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2700 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2888
2703 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2890 $self->leave_link;
2705 } 2891 }
2706 })->prio (1); 2892 })->prio (1);
2707} 2893}
2708 2894
2720sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2722 2908
2723 utf8::encode $text; 2909 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2725} 2936}
2726 2937
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2939
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2733 2944
2734=cut 2945=cut
2735 2946
2736# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2738 "c/identify" => { 2955 "c/identify" => {
2739 id => "infobox", 2956 id => "infobox",
2740 title => "Identify", 2957 title => "Identify",
2741 reply => undef, 2958 reply => undef,
2742 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2744 "c/examine" => { 2961 "c/examine" => {
2745 id => "infobox", 2962 id => "infobox",
2746 title => "Examine", 2963 title => "Examine",
2747 reply => undef, 2964 reply => undef,
2748 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2972 },
2750 "c/book" => { 2973 "c/book" => {
2751 id => "infobox", 2974 id => "infobox",
2752 title => "Book", 2975 title => "Book",
2753 reply => undef, 2976 reply => undef,
2769 id => "infobox", 2992 id => "infobox",
2770 title => "Body Parts", 2993 title => "Body Parts",
2771 reply => undef, 2994 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2773 }, 2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
2774 "c/skills" => { 3003 "c/skills" => {
2775 id => "infobox", 3004 id => "infobox",
2776 title => "Skills", 3005 title => "Skills",
2777 reply => undef, 3006 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3032 },
2780 "c/uptime" => { 3033 "c/uptime" => {
2781 id => "infobox", 3034 id => "infobox",
2782 title => "Uptime", 3035 title => "Uptime",
2783 reply => undef, 3036 reply => undef,
2793 id => "party", 3046 id => "party",
2794 title => "Party", 3047 title => "Party",
2795 reply => "gsay ", 3048 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 3049 tooltip => "Messages and chat related to your party",
2797 }, 3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
2798 "c/say" => $SAY_CHANNEL, 3057 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 3058 "c/chat" => $CHAT_CHANNEL,
2800); 3059);
2801 3060
2802sub cf::client::send_msg { 3061sub cf::client::send_msg {
2833 my $pkt = "msg " 3092 my $pkt = "msg "
2834 . $self->{json_coder}->encode ( 3093 . $self->{json_coder}->encode (
2835 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2836 ); 3095 );
2837 3096
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if (8192 < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt); 3097 $self->send_big_packet ($pkt);
2849} 3098}
2850 3099
2851=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2852 3101
2853Sends an ext event to the client. 3102Sends an ext event to the client.
2856 3105
2857sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2858 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2859 3108
2860 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2862 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2863 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2865 } 3114 }
2866} 3115}
2867 3116
2868=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2869 3118
2873 3122
2874sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2875 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2876 3125
2877 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2878 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2879 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2880 #TODO: version 1, remove 3129 #TODO: version 1, remove
2881 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2882 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2883 } 3132 }
2884} 3133}
2885 3134
2886=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2887 3136
2958 3207
2959 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2960 if $reply; 3209 if $reply;
2961 3210
2962 } else { 3211 } else {
2963 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2964 } 3213 }
2965 3214
2966 cf::override; 3215 cf::override;
2967 }, 3216 },
2968); 3217);
2988 3237
2989 $coro 3238 $coro
2990} 3239}
2991 3240
2992cf::client->attach ( 3241cf::client->attach (
2993 on_destroy => sub { 3242 on_client_destroy => sub {
2994 my ($ns) = @_; 3243 my ($ns) = @_;
2995 3244
2996 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2997 }, 3246 },
2998); 3247);
3014our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3015 3264
3016$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3017 3266
3018$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3019 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3020 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3021 sort time 3270 sort time
3022)); 3271));
3023 3272
3024# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3028The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3029 3278
3030 cf::object 3279 cf::object
3031 contr pay_amount pay_player map x y force_find force_add destroy 3280 contr pay_amount pay_player map x y force_find force_add destroy
3032 insert remove name archname title slaying race decrease split 3281 insert remove name archname title slaying race decrease split
3282 value
3033 3283
3034 cf::object::player 3284 cf::object::player
3035 player 3285 player
3036 3286
3037 cf::player 3287 cf::player
3043=cut 3293=cut
3044 3294
3045for ( 3295for (
3046 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3047 insert remove inv nrof name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3048 decrease split destroy change_exp)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3049 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3050 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3051 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3052) { 3302) {
3053 no strict 'refs';
3054 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3055 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3056 for @funs; 3305 for @funs;
3057} 3306}
3058 3307
3073 3322
3074 my $qcode = $code; 3323 my $qcode = $code;
3075 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3076 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3077 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3078 local $_; 3330 local $_;
3079 local @safe::cf::_safe_eval_args = values %vars;
3080 3331
3081 my $eval = 3332 my $eval =
3082 "do {\n" 3333 "do {\n"
3083 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3084 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3085 . $code 3336 . $code
3086 . "\n}" 3337 . "\n}"
3087 ; 3338 ;
3088 3339
3340 if ($CFG{safe_eval}) {
3089 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3090 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3091 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3092 3349
3093 if ($@) { 3350 if ($@) {
3094 warn "$@"; 3351 warn "$@",
3095 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3096 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3097 } 3354 }
3098 3355
3099 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3100} 3357}
3101 3358
3115=cut 3372=cut
3116 3373
3117sub register_script_function { 3374sub register_script_function {
3118 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3119 3376
3120 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3121 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3122} 3379}
3123 3380
3124=back 3381=back
3125 3382
3126=cut 3383=cut
3135 # for this (global event?) 3392 # for this (global event?)
3136 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3137 3394
3138 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3139 3396
3140 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3141 3398
3142 my $facedata;
3143 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3144 or die "$path: $!"; 3400 or die "$path: $!";
3145 3401
3146 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3147 3403
3148 $facedata->{version} == 2 3404 $facedata->{version} == 2
3149 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3150 3406
3151 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3152 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3153 type => FT_RSRC, 3410 type => FT_RSRC,
3154 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3155 }; 3413 };
3156 cf::cede_to_tick; 3414 cf::cede_to_tick;
3157 3415
3158 { 3416 {
3159 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3161 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3162 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3163 3421
3164 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3165 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3166 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3167 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3168 3426
3169 cf::cede_to_tick; 3427 cf::cede_to_tick;
3170 } 3428 }
3171 3429
3172 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3177 3435
3178 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3179 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3180 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3181 } else { 3439 } else {
3182 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3183 } 3441 }
3184 3442
3185 cf::cede_to_tick; 3443 cf::cede_to_tick;
3186 } 3444 }
3187 } 3445 }
3196 3454
3197 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3198 } 3456 }
3199 3457
3200 { 3458 {
3201 # TODO: for gcfclient pleasure, we should give resources
3202 # that gcfclient doesn't grok a >10000 face index.
3203 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3204 3460
3205 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3206 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3207 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3208 my $data;
3209 3464
3210 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3211 # prepend meta info
3212
3213 my $meta = $enc->encode ({
3214 name => $name,
3215 %{ $info->{meta} || {} },
3216 });
3217
3218 $data = pack "(w/a*)*", $meta, $info->{data};
3219 } else {
3220 $data = $info->{data};
3221 }
3222
3223 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3224 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3225 } else { 3467 } else {
3226 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3227 } 3469 }
3228 3470
3229 cf::cede_to_tick; 3471 cf::cede_to_tick;
3230 } 3472 }
3231 } 3473 }
3232 3474
3233 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3234 3476
3235 1 3477 1
3236} 3478}
3237
3238cf::global->attach (on_resource_update => sub {
3239 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3240 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3241
3242 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3243 my $sound = $soundconf->{compat}[$_]
3244 or next;
3245
3246 my $face = cf::face::find "sound/$sound->[1]";
3247 cf::sound::set $sound->[0] => $face;
3248 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3249 }
3250
3251 while (my ($k, $v) = each %{$soundconf->{event}}) {
3252 my $face = cf::face::find "sound/$v";
3253 cf::sound::set $k => $face;
3254 }
3255 }
3256});
3257 3479
3258register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3259 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3260 3482
3261 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3300sub reload_treasures { 3522sub reload_treasures {
3301 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3302 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3303} 3525}
3304 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3305sub reload_resources { 3550sub reload_resources {
3306 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3307 3552
3553 reload_exp_table;
3554 reload_materials;
3308 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3309 reload_archetypes; 3557 reload_archetypes;
3310 reload_regions; 3558 reload_regions;
3311 reload_treasures; 3559 reload_treasures;
3312 3560
3313 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3314} 3562}
3315 3563
3316sub reload_config { 3564sub reload_config {
3317 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3318 or return;
3319 3566
3320 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3321 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3322 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3323 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3324 3574
3325 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3326 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3327 3577
3328 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3351 3601
3352 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3353 print $fh $$; 3603 print $fh $$;
3354} 3604}
3355 3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3356sub main { 3615sub main {
3357 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3358 3617
3359 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3360 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3361 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3362 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3363
3364 cf::init_experience;
3365 cf::init_anim;
3366 cf::init_attackmess;
3367 cf::init_dynamic;
3368 3622
3369 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3370 3624
3371 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3372 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3378 }; 3632 };
3379 3633
3380 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3381 3635
3382 cf::sync_job { 3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3383 reload_resources; 3645 reload_resources;
3384 reload_config; 3646 reload_config;
3385 db_init; 3647 db_init;
3386 3648
3387 cf::load_settings;
3388 cf::load_materials;
3389 cf::init_uuid; 3649 cf::init_uuid;
3390 cf::init_signals; 3650 cf::init_signals;
3391 cf::init_commands;
3392 cf::init_skills; 3651 cf::init_skills;
3393 3652
3394 cf::init_beforeplay; 3653 cf::init_beforeplay;
3395 3654
3396 atomic; 3655 atomic;
3398 load_extensions; 3657 load_extensions;
3399 3658
3400 utime time, time, $RUNTIMEFILE; 3659 utime time, time, $RUNTIMEFILE;
3401 3660
3402 # no (long-running) fork's whatsoever before this point(!) 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404 3664
3405 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3406 }; 3666 };
3407 3667
3408 EV::loop; 3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3409} 3677}
3410 3678
3411############################################################################# 3679#############################################################################
3412# initialisation and cleanup 3680# initialisation and cleanup
3413 3681
3414# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3415BEGIN { 3683BEGIN {
3416 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3417 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3418 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3419 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3420 }; 3688 };
3421 } 3689 }
3422} 3690}
3423 3691
3424sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3425 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3426 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3427 3697
3428 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3429 3699
3430 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3431 3701
3432 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3433 or return; 3703 or return;
3434 3704
3435 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3436 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3437 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3450 or return; 3720 or return;
3451 3721
3452 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3453 and return; 3723 and return;
3454 3724
3455 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3456 3726
3457 1 3727 1
3458} 3728}
3459 3729
3460our $uuid_lock; 3730our $uuid_lock;
3472 or return; 3742 or return;
3473 3743
3474 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3475 3745
3476 unless ($value) { 3746 unless ($value) {
3477 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3478 return; 3748 return;
3479 } 3749 }
3480 3750
3481 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3482 $uuid_skip = 0; 3752 $uuid_skip = 0;
3492 or return; 3762 or return;
3493 3763
3494 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3495 and return; 3765 and return;
3496 3766
3497 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3498 3768
3499 1 3769 1
3500 3770
3501} 3771}
3502 3772
3508} 3778}
3509 3779
3510sub emergency_save() { 3780sub emergency_save() {
3511 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3512 3782
3513 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3514 3789
3515 cf::sync_job { 3790 cf::sync_job {
3516 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3517 # save all maps without fsync, and later call a global sync
3518 # (which in turn might be very very slow)
3519 local $USE_FSYNC = 0;
3520 3792
3521 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3524 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3799 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3801 $pl->save;
3530 } 3802 }
3531 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3532 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3533 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3810 $map->valid or next;
3537 $map->save; 3811 $map->save;
3538 } 3812 }
3539 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3540 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3541 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3544 3820
3545 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3822 write_uuid_sync 1;
3547 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3548 }; 3843 };
3549 3844
3550 warn "emergency_perl_save: starting sync()\n";
3551 IO::AIO::aio_sync sub {
3552 warn "emergency_perl_save: finished sync()\n";
3553 };
3554
3555 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3556} 3846}
3557 3847
3558sub post_cleanup { 3848sub post_cleanup {
3559 my ($make_core) = @_; 3849 my ($make_core) = @_;
3560 3850
3851 IO::AIO::flush;
3852
3561 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3562 if $make_core; 3854 if $make_core;
3563 3855
3564 my $fh = pidfile; 3856 my $fh = pidfile;
3565 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3566} 3858}
3586 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3587 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3588 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3589# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3590 } 3882 }
3591 warn "cleared package $pkg\n";#d#
3592} 3883}
3593 3884
3594sub do_reload_perl() { 3885sub do_reload_perl() {
3595 # can/must only be called in main 3886 # can/must only be called in main
3596 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3597 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3598 return; 3889 return;
3599 } 3890 }
3600 3891
3601 return if $RELOAD++; 3892 return if $RELOAD++;
3602 3893
3603 my $t1 = EV::time; 3894 my $t1 = AE::time;
3604 3895
3605 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3606 warn "reloading..."; 3898 info "reloading...";
3607 3899
3608 warn "entering sync_job"; 3900 trace "entering sync_job";
3609 3901
3610 cf::sync_job { 3902 cf::sync_job {
3611 cf::write_runtime_sync; # external watchdog should not bark
3612 cf::emergency_save; 3903 #cf::emergency_save;
3613 cf::write_runtime_sync; # external watchdog should not bark
3614 3904
3615 warn "syncing database to disk";
3616 BDB::db_env_txn_checkpoint $DB_ENV;
3617
3618 # if anything goes wrong in here, we should simply crash as we already saved
3619
3620 warn "flushing outstanding aio requests";
3621 while (IO::AIO::nreqs || BDB::nreqs) {
3622 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3623 }
3624
3625 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3626 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3627 %EXT_CORO = (); 3907 %EXT_CORO = ();
3628 3908
3629 warn "removing commands"; 3909 trace "removing commands";
3630 %COMMAND = (); 3910 %COMMAND = ();
3631 3911
3632 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3633 %EXTCMD = (); 3913 %EXTCMD = ();
3634 %EXTICMD = (); 3914 %EXTICMD = ();
3635 3915
3636 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3637 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3638 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3639 3919
3640 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3641 eval { 3921 eval {
3642 $cb->($pkg); 3922 $cb->($pkg);
3643 1 3923 1
3644 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3645 } 3925 }
3646 3926
3647 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3648 clear_package $pkg; 3928 clear_package $pkg;
3649 } 3929 }
3650 3930
3651 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3652 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3653 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3654 3934
3655 warn "... unloading $k"; 3935 trace "... unloading $k";
3656 delete $INC{$k}; 3936 delete $INC{$k};
3657 3937
3658 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3659 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3660 3940
3663 } 3943 }
3664 3944
3665 clear_package $k; 3945 clear_package $k;
3666 } 3946 }
3667 3947
3668 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3669 clear_package "safe::$_" 3949 clear_package "safe::$_"
3670 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3671 3951
3672 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3673 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3674 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3675 3955
3676 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3677 # and global variables created in xs 3957 # and global variables created in xs
3678 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3679 3959
3680 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3681 3961
3682 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3683 require cf; 3963 require cf;
3684 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3685 3965
3686 warn "loading config and database again"; 3966 trace "loading config and database again";
3687 cf::reload_config; 3967 cf::reload_config;
3688 3968
3689 warn "loading extensions"; 3969 trace "loading extensions";
3690 cf::load_extensions; 3970 cf::load_extensions;
3691 3971
3692 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3699 } 3979 }
3700 3980
3701 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3702 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3703 3983
3704 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3705 3985
3706 1 3986 1
3707 } or do { 3987 } or do {
3708 warn $@; 3988 error $@;
3709 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3710 }; 3990 };
3711 3991
3712 warn "reloaded"; 3992 info "reloaded";
3713 --$RELOAD; 3993 --$RELOAD;
3714 } 3994 }
3715 3995
3716 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3717 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3718}; 3998};
3719 3999
3720our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3721 4001
3722sub reload_perl() { 4002sub reload_perl() {
3724 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3725 4005
3726 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3727 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3728 4008
3729 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3730 do_reload_perl; 4010 do_reload_perl;
3731 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3732 }; 4012 };
3733 }; 4013 };
3734} 4014}
3743 reload_perl; 4023 reload_perl;
3744 }; 4024 };
3745 } 4025 }
3746}; 4026};
3747 4027
3748unshift @INC, $LIBDIR; 4028#############################################################################
3749 4029
3750my $bug_warning = 0; 4030my $bug_warning = 0;
3751 4031
3752our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3753our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3754 4034
3755sub wait_for_tick { 4035sub wait_for_tick() {
3756 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3757 4037
3758 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3759 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3760 $signal->wait; 4040 $signal->wait;
3761} 4041}
3762 4042
3763sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3764 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3765 4045
3766 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3767 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3768 $signal->wait; 4048 $signal->wait;
3769} 4049}
3775 return; 4055 return;
3776 } 4056 }
3777 4057
3778 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3779 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3780 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3781 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3782 Coro::async_pool { 4064 Coro::async_pool {
3783 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3784 write_runtime_sync 4066 write_runtime_sync
3785 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3786 }; 4068 };
3787 } 4069 }
3788 4070
3789 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3790 $sig->send; 4072 $sig->send;
3798 4080
3799 if (0) { 4081 if (0) {
3800 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3801 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3802 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3803 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3804 } 4086 }
3805 } 4087 }
3806} 4088}
3807 4089
3808{ 4090{
3809 # configure BDB 4091 # configure BDB
3810 4092
3811 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3812 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3813 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3814 4096
3815 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3816 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3896 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3897 } 4179 }
3898} 4180}
3899 4181
3900# load additional modules 4182# load additional modules
3901use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3902 4185
3903END { cf::emergency_save } 4186END { cf::emergency_save }
3904 4187
39051 41881
3906 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines