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.477 by root, Wed Sep 2 22:52:36 2009 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
95our $DATADIR = datadir; 99our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
99our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 112
108our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
109 120
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 123our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 129our $DB_ENV;
119 130
120our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 132
122our %CFG; 133our %CFG;
123 134
124our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 136our $RUNTIME;
159 170
160our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
161 172
162sub cf::map::normalise; 173sub cf::map::normalise;
163 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
189
164############################################################################# 190#############################################################################
165 191
166=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
167 193
168=over 4 194=over 4
209from wherever your confdir points to. 235from wherever your confdir points to.
210 236
211=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
212 238
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
217=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
218 249
219This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 252that call.
222 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
223=back 260=back
224 261
225=cut 262=cut
263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
226 269
227$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 271 my $msg = join "", @_;
229 272
230 $msg .= "\n" 273 $msg .= "\n"
231 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
232 275
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 277
235 LOG llevError, $msg; 278 LOG llevWarn, $msg;
236}; 279};
237 280
238$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
240 283
241 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
242 285
243 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 288 return;#d#
246 }#d# 289 }#d#
247 290
248 # kill coroutine otherwise 291 # kill coroutine otherwise
249 Coro::terminate 292 Coro::terminate
269)) { 312)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 314}
272 315
273$EV::DIED = sub { 316$EV::DIED = sub {
274 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
275}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
276 324
277############################################################################# 325#############################################################################
278 326
279=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
280 328
301 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
302 $d 350 $d
303 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
304} 352}
305 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
306=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
307 369
308Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
309 371
310=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
316our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
317 379
318sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
319sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
320 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
321=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
322 415
323Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
325 418
326The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
327is a reload or not. 420is a reload or not.
328 421
329=cut 422=cut
330 423
331sub post_init(&) { 424sub post_init(&) {
332 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
333} 443}
334 444
335=item cf::lock_wait $string 445=item cf::lock_wait $string
336 446
337Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
376} 486}
377 487
378=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
379 489
380Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
381get spread over timer. 491get spread over time.
382 492
383=cut 493=cut
384 494
385sub periodic($$) { 495sub periodic($$) {
386 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
390 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
391} 501}
392 502
393=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
394 504
395Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
396This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
397of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
398 512
399The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
400used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
401 515
402Useful for short background jobs. 516Useful for short background jobs.
403 517
404=cut 518=cut
405 519
406our @SLOT_QUEUE; 520our @SLOT_QUEUE;
407our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
408 523
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
412 527
413 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
414 530
415 while () { 531 while () {
416 next_job: 532 next_job:
533
417 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 535
419 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 540 $job->[2]->send;
423 Coro::cede; 541 Coro::cede;
424 goto next_job; 542 goto next_job;
425 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 545 }
427 } 546 }
428 547
429 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
430 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
431 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 551 $signal->wait;
433 } else { 552 } else {
553 $busy = 0;
434 Coro::schedule; 554 Coro::schedule;
435 } 555 }
436 } 556 }
437}; 557};
438 558
439sub get_slot($;$$) { 559sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
441 561
442 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
443 563
444 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
445 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
446 567
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
475=cut 596=cut
476 597
477sub sync_job(&) { 598sub sync_job(&) {
478 my ($job) = @_; 599 my ($job) = @_;
479 600
480 if ($Coro::current == $Coro::main) { 601 if (in_main) {
481 my $time = EV::time; 602 my $time = AE::time;
482 603
483 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
485 606
486 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
487 608
488 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
489 610
490 my $busy = 1; 611 my $busy = 1;
491 my @res; 612 my @res;
492 613
493 (async { 614 (async {
494 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 616 @res = eval { $job->() };
496 warn $@ if $@; 617 error $@ if $@;
497 undef $busy; 618 undef $busy;
498 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
499 620
500 while ($busy) { 621 while ($busy) {
501 if (Coro::nready) { 622 if (Coro::nready) {
503 } else { 624 } else {
504 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
505 } 626 }
506 } 627 }
507 628
508 my $time = EV::time - $time; 629 my $time = AE::time - $time;
509 630
510 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
511 632
512 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
513 } else { 634 } else {
535 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
536 657
537 $coro 658 $coro
538} 659}
539 660
540=item fork_call { }, $args 661=item fork_call { }, @args
541 662
542Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
543process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
544Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
545never block itself or use any form of event handling. 666never block itself or use any form of event handling.
546 667
547=cut 668=cut
548 669
670sub post_fork {
671 reset_signals;
672}
673
549sub fork_call(&@) { 674sub fork_call(&@) {
550 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
551 676
552 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
553 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
554 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
555 680
556 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
557 reset_signals; 682 cf::post_fork;
558 &$cb 683 &$cb
559 }, @args; 684 } @args;
560 685
561 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
562} 698}
563 699
564=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
565 701
566=cut 702=cut
603within each server. 739within each server.
604 740
605=cut 741=cut
606 742
607sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
608 my ($name) = @_; 747 my ($name) = @_;
609 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
610 749
611 eval { 750 eval {
612 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
622} 761}
623 762
624our $DB; 763our $DB;
625 764
626sub db_init { 765sub db_init {
627 cf::sync_job {
628 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
629 };
630} 767}
631 768
632sub db_get($$) { 769sub db_get($$) {
633 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
634 771
635 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
636 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
637 776
638 $! ? () 777 $! ? ()
639 : $data 778 : $data
640 }
641} 779}
642 780
643sub db_put($$$) { 781sub db_put($$$) {
644 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
645 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
673 811
674 my @data; 812 my @data;
675 my $md5; 813 my $md5;
676 814
677 for (0 .. $#$src) { 815 for (0 .. $#$src) {
678 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
679 or Carp::croak "$src->[$_]: $!";
680 } 817 }
681 818
682 # if processing is expensive, check 819 # if processing is expensive, check
683 # checksum first 820 # checksum first
684 if (1) { 821 if (1) {
701 838
702 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
703 my $data = $process->(\@data); 840 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
705 842
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 844
708 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
711 848
721 858
722=cut 859=cut
723 860
724sub datalog($@) { 861sub datalog($@) {
725 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 864}
728 865
729=back 866=back
730 867
731=cut 868=cut
926 1063
927 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 1066
930 } elsif (ref $type) { 1067 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
932 1069
933 } else { 1070 } else {
934 shift @arg; 1071 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
936 } 1073 }
937 } 1074 }
938} 1075}
939 1076
940sub _object_attach { 1077sub _object_attach {
950 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
951 } 1088 }
952 1089
953 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
954 } else { 1091 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1093 }
957 1094
958 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
959} 1096}
960 1097
1019 1156
1020 for (@$callbacks) { 1157 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1022 1159
1023 if ($@) { 1160 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1162 override;
1027 } 1163 }
1028 1164
1029 return 1 if $override; 1165 return 1 if $override;
1030 } 1166 }
1109 for (@$attach) { 1245 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1112 } 1248 }
1113 } else { 1249 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1251 }
1116 } 1252 }
1117} 1253}
1118 1254
1119cf::attachable->attach ( 1255cf::attachable->attach (
1146 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1147 1283
1148 sync_job { 1284 sync_job {
1149 if (length $$rdata) { 1285 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1153 1290
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
1179 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1180 1317
1181 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1320 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1185 } 1322 }
1186 } else { 1323 } else {
1187 aio_unlink $filename; 1324 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1189 } 1326 }
1213 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1351 $av = $st->{objs};
1215 } 1352 }
1216 1353
1217 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1220 1358
1221 ($data, $av) 1359 ($data, $av)
1222} 1360}
1223 1361
1224=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1283} 1421}
1284 1422
1285use File::Glob (); 1423use File::Glob ();
1286 1424
1287cf::player->attach ( 1425cf::player->attach (
1288 on_command => sub { 1426 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1290 1428
1291 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1292 or return; 1430 or return;
1293 1431
1316 1454
1317 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1318 if $reply; 1456 if $reply;
1319 1457
1320 } else { 1458 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1460 }
1323 1461
1324 cf::override; 1462 cf::override;
1325 }, 1463 },
1326); 1464);
1337 1475
1338 $grp 1476 $grp
1339} 1477}
1340 1478
1341sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1342 cf::sync_job { 1482 cf::sync_job {
1343 my %todo; 1483 my %todo;
1344 1484
1345 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1486 next unless -r $path;
1364 1504
1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367 1507
1368 $ext{source} = 1508 $ext{source} =
1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1370 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1371 . $source 1511 . $source
1372 . "\n};\n1"; 1512 . "\n};\n1";
1373 1513
1374 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1375 } 1515 }
1376 1516
1517 my $pass = 0;
1377 my %done; 1518 my %done;
1378 while (%todo) { 1519 while (%todo) {
1379 my $progress; 1520 my $progress;
1380 1521
1522 ++$pass;
1523
1524 ext:
1381 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1527 next ext
1384 unless exists $done{$_}; 1528 unless exists $done{$_};
1385 } 1529 }
1386 1530
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1532
1389 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1537
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1539 if exists $v->{meta}{mandatory};
1397 1540
1398 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1399 } 1550 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1551 }
1405 1552
1406 skip: 1553 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560 }
1409 } 1561 }
1410 }; 1562 };
1411} 1563}
1412 1564
1413############################################################################# 1565#############################################################################
1497 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1498 } 1650 }
1499 } 1651 }
1500} 1652}
1501 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1502sub save($) { 1667sub save($) {
1503 my ($pl) = @_; 1668 my ($pl) = @_;
1504 1669
1505 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1506 1671
1511 1676
1512 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1514 1679
1515 cf::get_slot 0.01; 1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1516 1684
1517 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1686 cf::cede_to_tick;
1519} 1687}
1520 1688
1554 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1555 1723
1556 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1558 1726
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1560 $pl->deactivate; 1728 $pl->deactivate;
1729
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1564 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1565 1735
1566 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1568 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1622 \@logins 1792 \@logins
1623} 1793}
1624 1794
1625=item $player->maps 1795=item $player->maps
1626 1796
1797=item cf::player::maps $login
1798
1627Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1628player. May block. 1800player. May block.
1629 1801
1630=cut 1802=cut
1631 1803
1693=cut 1865=cut
1694 1866
1695sub find_by_path($) { 1867sub find_by_path($) {
1696 my ($path) = @_; 1868 my ($path) = @_;
1697 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1698 my ($match, $specificity); 1872 my ($match, $specificity);
1699 1873
1700 for my $region (list) { 1874 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
1730sub generate_random_map { 1904sub generate_random_map {
1731 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1732 1906
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734 1908
1735 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747 (cf::region::find $rmp->{region}), $rmp->{custom}
1748 )
1749} 1910}
1750 1911
1751=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1752 1913
1753Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
1758 1919
1759sub register { 1920sub register {
1760 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1922 my $pkg = caller;
1762 1923
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1925
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1927}
1768 1928
1769# also paths starting with '/' 1929# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1931
1772sub thawer_merge { 1932sub thawer_merge {
1773 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1774 1934
1775 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1780} 1940}
1781 1941
1782sub normalise { 1942sub normalise {
1783 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1784 1944
1785 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1786 1946
1787 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1788 1948
1789 # map plan: 1949 # map plan:
1790 # 1950 #
1805 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 1966 $path = "$base/$path";
1807 } 1967 }
1808 1968
1809 for ($path) { 1969 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1813 } 1972 }
1814 1973
1815 $path 1974 $path
1829 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1830 return $self; 1989 return $self;
1831 } 1990 }
1832 } 1991 }
1833 1992
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 1994 ()
1836} 1995}
1837 1996
1838sub init { 1997sub init {
1839 my ($self) = @_; 1998 my ($self) = @_;
1961} 2120}
1962 2121
1963sub find; 2122sub find;
1964sub find { 2123sub find {
1965 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
1966 2127
1967 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1968 2129
1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1989 2150
1990 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1991 } 2152 }
1992} 2153}
1993 2154
1994sub pre_load { } 2155sub pre_load { }
1995sub post_load { } 2156#sub post_load { } # XS
1996 2157
1997sub load { 2158sub load {
1998 my ($self) = @_; 2159 my ($self) = @_;
1999 2160
2000 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
2055 2216
2056 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2218 }
2058 2219
2059 $self->post_load; 2220 $self->post_load;
2060}
2061 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2062sub customise_for { 2228sub customise_for {
2063 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2064 2230
2065 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2232 if $self->per_player;
2082 or next; 2248 or next;
2083 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2084 or next; 2250 or next;
2085 $neigh->load; 2251 $neigh->load;
2086 2252
2253 # now find the diagonal neighbours
2087 push @neigh, 2254 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2257 }
2091 2258
2098} 2265}
2099 2266
2100sub find_sync { 2267sub find_sync {
2101 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2102 2269
2103 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2104} 2274}
2105 2275
2106sub do_load_sync { 2276sub do_load_sync {
2107 my ($map) = @_; 2277 my ($map) = @_;
2108 2278
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2111 2281
2112 cf::sync_job { $map->load }; 2282 $map->load;
2113} 2283}
2114 2284
2115our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2117 2287
2143 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2144 2314
2145 () 2315 ()
2146} 2316}
2147 2317
2318# common code, used by both ->save and ->swapout
2148sub save { 2319sub _save {
2149 my ($self) = @_; 2320 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2321
2153 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2154 2323
2155 return unless $self->dirty; 2324 return unless $self->dirty;
2156 2325
2176 } else { 2345 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2347 }
2179} 2348}
2180 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2181sub swap_out { 2358sub swap_out {
2182 my ($self) = @_; 2359 my ($self) = @_;
2183 2360
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2362
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2192 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2194 2417
2195 $self->deactivate; 2418 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2420 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2421
2243 $self->unlink_save; 2422 $self->unlink_save;
2244 $self->destroy; 2423 $self->destroy;
2245} 2424}
2246 2425
2254 2433
2255 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2256 2435
2257 $self->unlink_save; 2436 $self->unlink_save;
2258 2437
2259 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2443
2321 : normalise $_ 2500 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2502 ]
2324} 2503}
2325 2504
2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2536
2326=back 2537=back
2327 2538
2328=head3 cf::object 2539=head3 cf::object
2329 2540
2330=cut 2541=cut
2462 2673
2463Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2464 2675
2465The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2468map. 2679map.
2469 2680
2470Will never block. 2681Will never block.
2471 2682
2472=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2494 my ($self) = @_; 2705 my ($self) = @_;
2495 2706
2496 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2497 2708
2709 ++$self->{_link_recursion};
2710
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2712
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2502 2715
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2717}
2505 2718
2506sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2508 2721
2525 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2527 2740
2528 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2531 2744
2532 $map->load; 2745 $map->load;
2533 $map->load_neighbours; 2746 $map->load_neighbours;
2534 2747
2535 return unless $self->contr->active; 2748 return unless $self->contr->active;
2536 2749
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2539 2752 # entering was successful
2753 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2754 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2755 $self->activate_recursive;
2542} 2756 }
2543 2757
2758}
2759
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2761
2546Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
2556 2772
2557our $GOTOGEN; 2773our $GOTOGEN;
2558 2774
2559sub cf::object::player::goto { 2775sub cf::object::player::goto {
2560 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2561 2783
2562 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2786
2565 $self->enter_link; 2787 $self->enter_link;
2589 my $map = eval { 2811 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2591 2813
2592 if ($map) { 2814 if ($map) {
2593 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2817 } else {
2596 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2597 } 2819 }
2598 2820
2599 $map 2821 $map
2607 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2610 } 2832 }
2611 2833
2612 $done->() if $done; 2834 $done->($self) if $done;
2613 })->prio (1); 2835 })->prio (1);
2614} 2836}
2615 2837
2616=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2617 2839
2710 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2712 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2936
2715 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2938 $self->leave_link;
2717 } 2939 }
2718 })->prio (1); 2940 })->prio (1);
2719} 2941}
2720 2942
2732sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2734 2956
2735 utf8::encode $text; 2957 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2737} 2984}
2738 2985
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2987
2741Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send a drawinfo or msg packet to the client, formatting the msg for the
2745 2992
2746=cut 2993=cut
2747 2994
2748# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2750 "c/identify" => { 3003 "c/identify" => {
2751 id => "infobox", 3004 id => "infobox",
2752 title => "Identify", 3005 title => "Identify",
2753 reply => undef, 3006 reply => undef,
2754 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2756 "c/examine" => { 3009 "c/examine" => {
2757 id => "infobox", 3010 id => "infobox",
2758 title => "Examine", 3011 title => "Examine",
2759 reply => undef, 3012 reply => undef,
2760 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 3020 },
2762 "c/book" => { 3021 "c/book" => {
2763 id => "infobox", 3022 id => "infobox",
2764 title => "Book", 3023 title => "Book",
2765 reply => undef, 3024 reply => undef,
2881 my $pkt = "msg " 3140 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3141 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3143 );
2885 3144
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3145 $self->send_big_packet ($pkt);
2897} 3146}
2898 3147
2899=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2900 3149
2901Sends an ext event to the client. 3150Sends an ext event to the client.
2904 3153
2905sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2907 3156
2908 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3162 }
2914} 3163}
2915 3164
2916=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2917 3166
2921 3170
2922sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2924 3173
2925 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3177 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3180 }
2932} 3181}
2933 3182
2934=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2935 3184
3006 3255
3007 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3257 if $reply;
3009 3258
3010 } else { 3259 } else {
3011 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3012 } 3261 }
3013 3262
3014 cf::override; 3263 cf::override;
3015 }, 3264 },
3016); 3265);
3036 3285
3037 $coro 3286 $coro
3038} 3287}
3039 3288
3040cf::client->attach ( 3289cf::client->attach (
3041 on_destroy => sub { 3290 on_client_destroy => sub {
3042 my ($ns) = @_; 3291 my ($ns) = @_;
3043 3292
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3294 },
3046); 3295);
3062our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3063 3312
3064$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3065 3314
3066$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3069 sort time 3318 sort time
3070)); 3319));
3071 3320
3072# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3101) { 3350) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3353 for @funs;
3106} 3354}
3107 3355
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3126 3374
3127 %vars = (_dummy => 0) unless %vars; 3375 %vars = (_dummy => 0) unless %vars;
3128 3376
3377 my @res;
3129 local $_; 3378 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3379
3132 my $eval = 3380 my $eval =
3133 "do {\n" 3381 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3384 . $code
3137 . "\n}" 3385 . "\n}"
3138 ; 3386 ;
3139 3387
3388 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3143 3397
3144 if ($@) { 3398 if ($@) {
3145 warn "$@"; 3399 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3148 } 3402 }
3149 3403
3150 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3151} 3405}
3152 3406
3166=cut 3420=cut
3167 3421
3168sub register_script_function { 3422sub register_script_function {
3169 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3170 3424
3171 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3173} 3427}
3174 3428
3175=back 3429=back
3176 3430
3177=cut 3431=cut
3186 # for this (global event?) 3440 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3442
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3444
3191 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3192 3446
3193 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3448
3199 $facedata->{version} == 2 3449 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3451
3202 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3455 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3458 };
3207 cf::cede_to_tick; 3459 cf::cede_to_tick;
3208 3460
3209 { 3461 {
3210 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3466
3215 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3219 3472
3220 cf::cede_to_tick; 3473 cf::cede_to_tick;
3221 } 3474 }
3222 3475
3223 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3228 3481
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3485 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3487 }
3235 3488
3236 cf::cede_to_tick; 3489 cf::cede_to_tick;
3237 } 3490 }
3238 } 3491 }
3247 3500
3248 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3249 } 3502 }
3250 3503
3251 { 3504 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3255 3506
3256 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3510
3261 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3276 } else { 3513 } else {
3277 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3278 } 3515 }
3279 3516
3280 cf::cede_to_tick; 3517 cf::cede_to_tick;
3281 } 3518 }
3282 } 3519 }
3283 3520
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3522
3286 1 3523 1
3287} 3524}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3525
3309register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3311 3528
3312 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3568sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3354} 3571}
3355 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3356sub reload_resources { 3593sub reload_resources {
3357 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3358 3595
3596 reload_exp_table;
3597 reload_materials;
3359 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3360 reload_archetypes; 3600 reload_archetypes;
3361 reload_regions; 3601 reload_regions;
3362 reload_treasures; 3602 reload_treasures;
3363 3603
3364 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3365} 3605}
3366 3606
3367sub reload_config { 3607sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3369 or return;
3370 3609
3371 local $/; 3610 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3373 3613
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3615
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3618
3379 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3403 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3404 print $fh $$; 3644 print $fh $$;
3405} 3645}
3406 3646
3407sub main_loop { 3647sub main_loop {
3408 warn "EV::loop starting\n"; 3648 trace "EV::loop starting\n";
3409 if (1) { 3649 if (1) {
3410 EV::loop; 3650 EV::loop;
3411 } 3651 }
3412 warn "EV::loop returned\n"; 3652 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3653 goto &main_loop unless $REALLY_UNLOOP;
3414} 3654}
3415 3655
3416sub main { 3656sub main {
3417 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3418 3658
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3663
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3665
3431 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3438 }; 3673 };
3439 3674
3440 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3441 3676
3442 cf::sync_job { 3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3443 reload_resources; 3686 reload_resources;
3444 reload_config; 3687 reload_config;
3445 db_init; 3688 db_init;
3446 3689
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3690 cf::init_uuid;
3450 cf::init_signals; 3691 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3692 cf::init_skills;
3453 3693
3454 cf::init_beforeplay; 3694 cf::init_beforeplay;
3455 3695
3456 atomic; 3696 atomic;
3461 3701
3462 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX (); 3703 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3705
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3467 }; 3707 };
3468 3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3469 main_loop; 3717 goto &main_loop;
3470} 3718}
3471 3719
3472############################################################################# 3720#############################################################################
3473# initialisation and cleanup 3721# initialisation and cleanup
3474 3722
3475# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3476BEGIN { 3724BEGIN {
3477 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3481 }; 3729 };
3482 } 3730 }
3483} 3731}
3484 3732
3485sub write_runtime_sync { 3733sub write_runtime_sync {
3734 my $t0 = AE::time;
3735
3486 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3488 3738
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3740
3491 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3492 3742
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3744 or return;
3495 3745
3496 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3511 or return; 3761 or return;
3512 3762
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3764 and return;
3515 3765
3516 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3767
3518 1 3768 1
3519} 3769}
3520 3770
3521our $uuid_lock; 3771our $uuid_lock;
3533 or return; 3783 or return;
3534 3784
3535 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3536 3786
3537 unless ($value) { 3787 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3789 return;
3540 } 3790 }
3541 3791
3542 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3793 $uuid_skip = 0;
3553 or return; 3803 or return;
3554 3804
3555 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3556 and return; 3806 and return;
3557 3807
3558 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3559 3809
3560 1 3810 1
3561 3811
3562} 3812}
3563 3813
3569} 3819}
3570 3820
3571sub emergency_save() { 3821sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3573 3823
3574 warn "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3575 3830
3576 cf::sync_job { 3831 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581 3833
3582 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3840 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3842 $pl->save;
3591 } 3843 }
3592 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3593 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3594 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3851 $map->valid or next;
3598 $map->save; 3852 $map->save;
3599 } 3853 }
3600 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3601 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3605 3861
3606 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3863 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3609 }; 3884 };
3610 3885
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3616 warn "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3617} 3887}
3618 3888
3619sub post_cleanup { 3889sub post_cleanup {
3620 my ($make_core) = @_; 3890 my ($make_core) = @_;
3621 3891
3892 IO::AIO::flush;
3893
3622 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3895 if $make_core;
3624 3896
3625 my $fh = pidfile; 3897 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3627} 3899}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3923 }
3652 warn "cleared package $pkg\n";#d#
3653} 3924}
3654 3925
3655sub do_reload_perl() { 3926sub do_reload_perl() {
3656 # can/must only be called in main 3927 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3658 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3659 return; 3930 return;
3660 } 3931 }
3661 3932
3662 return if $RELOAD++; 3933 return if $RELOAD++;
3663 3934
3664 my $t1 = EV::time; 3935 my $t1 = AE::time;
3665 3936
3666 while ($RELOAD) { 3937 while ($RELOAD) {
3667 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3668 3940
3669 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3670 3942
3671 cf::sync_job { 3943 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3944 #cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 3945
3676 warn "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679 # if anything goes wrong in here, we should simply crash as we already saved
3680
3681 warn "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) {
3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684 }
3685
3686 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3948 %EXT_CORO = ();
3689 3949
3690 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3691 %COMMAND = (); 3951 %COMMAND = ();
3692 3952
3693 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3694 %EXTCMD = (); 3954 %EXTCMD = ();
3695 %EXTICMD = (); 3955 %EXTICMD = ();
3696 3956
3697 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3700 3960
3701 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3962 eval {
3703 $cb->($pkg); 3963 $cb->($pkg);
3704 1 3964 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3706 } 3966 }
3707 3967
3708 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3709 clear_package $pkg; 3969 clear_package $pkg;
3710 } 3970 }
3711 3971
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3975
3716 warn "... unloading $k"; 3976 trace "... unloading $k";
3717 delete $INC{$k}; 3977 delete $INC{$k};
3718 3978
3719 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3721 3981
3724 } 3984 }
3725 3985
3726 clear_package $k; 3986 clear_package $k;
3727 } 3987 }
3728 3988
3729 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 3990 clear_package "safe::$_"
3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3732 3992
3733 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 3996
3737 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3738 # and global variables created in xs 3998 # and global variables created in xs
3739 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3740 4000
3741 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3742 4002
3743 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3744 require cf; 4004 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3746 4006
3747 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3748 cf::reload_config; 4008 cf::reload_config;
3749 4009
3750 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3751 cf::load_extensions; 4011 cf::load_extensions;
3752 4012
3753 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3757 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3760 } 4020 }
3761 4021
3762 warn "running post_init jobs"; 4022 cf::_post_init 1;
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764 4023
3765 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3766 4025
3767 1 4026 1
3768 } or do { 4027 } or do {
3769 warn $@; 4028 error $@;
3770 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3771 }; 4030 };
3772 4031
3773 warn "reloaded";
3774 --$RELOAD; 4032 --$RELOAD;
3775 } 4033 }
3776 4034
3777 $t1 = EV::time - $t1; 4035 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3779}; 4037};
3780 4038
3781our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3782 4040
3783sub reload_perl() { 4041sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3786 4044
3787 $RELOAD_WATCHER ||= cf::async { 4045 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4046 Coro::AIO::aio_wait cache_extensions;
3789 4047
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4049 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3793 }; 4051 };
3794 }; 4052 };
3795} 4053}
3804 reload_perl; 4062 reload_perl;
3805 }; 4063 };
3806 } 4064 }
3807}; 4065};
3808 4066
3809unshift @INC, $LIBDIR; 4067#############################################################################
3810 4068
3811my $bug_warning = 0; 4069my $bug_warning = 0;
3812 4070
3813our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3815 4073
3816sub wait_for_tick { 4074sub wait_for_tick() {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 4076
3819 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 4079 $signal->wait;
3822} 4080}
3823 4081
3824sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 4084
3827 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4087 $signal->wait;
3830} 4088}
3836 return; 4094 return;
3837 } 4095 }
3838 4096
3839 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3840 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4103 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4105 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3847 }; 4107 };
3848 } 4108 }
3849 4109
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4111 $sig->send;
3859 4119
3860 if (0) { 4120 if (0) {
3861 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3865 } 4125 }
3866 } 4126 }
3867} 4127}
3868 4128
3869{ 4129{
3870 # configure BDB 4130 # configure BDB
3871 4131
3872 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3875 4135
3876 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3914 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3915 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3916 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
3917} 4177}
3918 4178
3919my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3920 4181
3921sub _log_backtrace { 4182sub _log_backtrace {
3922 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3923 4184
3924 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3925 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3927 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3928 ++$_log_backtrace; 4193 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
3930 async { 4195 async {
3931 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3932 4197
3952 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3953 --$_log_backtrace; 4218 --$_log_backtrace;
3954 }; 4219 };
3955 } else { 4220 } else {
3956 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3957 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958 } 4223 }
3959} 4224}
3960 4225
3961# load additional modules 4226# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3963 4229
3964END { cf::emergency_save } 4230END { cf::emergency_save }
3965 4231
39661 42321
3967 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines