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.562 by root, Sat Apr 23 04:46:26 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
1561 last;
1562 }
1409 } 1563 }
1410 }; 1564 };
1411} 1565}
1412 1566
1413############################################################################# 1567#############################################################################
1497 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1498 } 1652 }
1499 } 1653 }
1500} 1654}
1501 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1502sub save($) { 1669sub save($) {
1503 my ($pl) = @_; 1670 my ($pl) = @_;
1504 1671
1505 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1506 1673
1511 1678
1512 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1514 1681
1515 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1516 1686
1517 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1688 cf::cede_to_tick;
1519} 1689}
1520 1690
1554 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1555 1725
1556 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1558 1728
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1560 $pl->deactivate; 1730 $pl->deactivate;
1731
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1564 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1565 1737
1566 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1568 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1622 \@logins 1794 \@logins
1623} 1795}
1624 1796
1625=item $player->maps 1797=item $player->maps
1626 1798
1799=item cf::player::maps $login
1800
1627Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1628player. May block. 1802player. May block.
1629 1803
1630=cut 1804=cut
1631 1805
1693=cut 1867=cut
1694 1868
1695sub find_by_path($) { 1869sub find_by_path($) {
1696 my ($path) = @_; 1870 my ($path) = @_;
1697 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1698 my ($match, $specificity); 1874 my ($match, $specificity);
1699 1875
1700 for my $region (list) { 1876 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1730sub generate_random_map { 1906sub generate_random_map {
1731 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1732 1908
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734 1910
1735 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1911 $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} 1912}
1750 1913
1751=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1752 1915
1753Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1758 1921
1759sub register { 1922sub register {
1760 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1924 my $pkg = caller;
1762 1925
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1927
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1929}
1768 1930
1769# also paths starting with '/' 1931# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1933
1772sub thawer_merge { 1934sub thawer_merge {
1773 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1774 1936
1775 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1780} 1942}
1781 1943
1782sub normalise { 1944sub normalise {
1783 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1784 1946
1785 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1786 1948
1787 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1788 1950
1789 # map plan: 1951 # map plan:
1790 # 1952 #
1805 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 1968 $path = "$base/$path";
1807 } 1969 }
1808 1970
1809 for ($path) { 1971 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1813 } 1974 }
1814 1975
1815 $path 1976 $path
1829 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1830 return $self; 1991 return $self;
1831 } 1992 }
1832 } 1993 }
1833 1994
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 1996 ()
1836} 1997}
1837 1998
1999# may re-bless or do other evil things
1838sub init { 2000sub init {
1839 my ($self) = @_; 2001 my ($self) = @_;
1840 2002
1841 $self 2003 $self
1842} 2004}
1961} 2123}
1962 2124
1963sub find; 2125sub find;
1964sub find { 2126sub find {
1965 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
1966 2130
1967 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1968 2132
1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1989 2153
1990 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1991 } 2155 }
1992} 2156}
1993 2157
1994sub pre_load { } 2158sub pre_load { }
1995sub post_load { } 2159#sub post_load { } # XS
1996 2160
1997sub load { 2161sub load {
1998 my ($self) = @_; 2162 my ($self) = @_;
1999 2163
2000 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2012 $self->alloc; 2176 $self->alloc;
2013 2177
2014 $self->pre_load; 2178 $self->pre_load;
2015 cf::cede_to_tick; 2179 cf::cede_to_tick;
2016 2180
2181 if (exists $self->{load_path}) {
2017 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2018 $f->skip_block; 2183 $f->skip_block;
2019 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2020 or return; 2185 or return;
2021 2186
2022 $self->post_load_original 2187 $self->post_load_original
2023 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2024 2189
2025 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2026 utf8::encode $uniq; 2191 utf8::encode $uniq;
2027 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2028 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2029 $self->clear_unique_items; 2194 $self->clear_unique_items;
2030 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2031 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2032 } 2198 }
2033 } 2199 }
2034 }
2035 2200
2036 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2037 2203
2038 cf::cede_to_tick; 2204 cf::cede_to_tick;
2039 # now do the right thing for maps 2205 # now do the right thing for maps
2040 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2041 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
2055 2221
2056 $self->in_memory (cf::MAP_ACTIVE); 2222 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2223 }
2058 2224
2059 $self->post_load; 2225 $self->post_load;
2060}
2061 2226
2227 1
2228}
2229
2230# customize the map for a given player, i.e.
2231# return the _real_ map. used by e.g. per-player
2232# maps to change the path to ~playername/mappath
2062sub customise_for { 2233sub customise_for {
2063 my ($self, $ob) = @_; 2234 my ($self, $ob) = @_;
2064 2235
2065 return find "~" . $ob->name . "/" . $self->{path} 2236 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2237 if $self->per_player;
2082 or next; 2253 or next;
2083 $neigh = find $neigh, $map 2254 $neigh = find $neigh, $map
2084 or next; 2255 or next;
2085 $neigh->load; 2256 $neigh->load;
2086 2257
2258 # now find the diagonal neighbours
2087 push @neigh, 2259 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2262 }
2091 2263
2098} 2270}
2099 2271
2100sub find_sync { 2272sub find_sync {
2101 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2102 2274
2103 cf::sync_job { find $path, $origin } 2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main;
2277
2278 find $path, $origin
2104} 2279}
2105 2280
2106sub do_load_sync { 2281sub do_load_sync {
2107 my ($map) = @_; 2282 my ($map) = @_;
2108 2283
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2285 if $Coro::current == $Coro::main;
2111 2286
2112 cf::sync_job { $map->load }; 2287 $map->load;
2113} 2288}
2114 2289
2115our %MAP_PREFETCH; 2290our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2291our $MAP_PREFETCHER = undef;
2117 2292
2143 $MAP_PREFETCHER->prio (6); 2318 $MAP_PREFETCHER->prio (6);
2144 2319
2145 () 2320 ()
2146} 2321}
2147 2322
2323# common code, used by both ->save and ->swapout
2148sub save { 2324sub _save {
2149 my ($self) = @_; 2325 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2326
2153 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2154 2328
2155 return unless $self->dirty; 2329 return unless $self->dirty;
2156 2330
2176 } else { 2350 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2351 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2352 }
2179} 2353}
2180 2354
2355sub save {
2356 my ($self) = @_;
2357
2358 my $lock = cf::lock_acquire "map_data:$self->{path}";
2359
2360 $self->_save;
2361}
2362
2181sub swap_out { 2363sub swap_out {
2182 my ($self) = @_; 2364 my ($self) = @_;
2183 2365
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2366 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2367
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2368 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2369 return if $self->{deny_save};
2370 return if $self->players;
2192 2371
2372 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # then atomically save
2378 $self->_save;
2379
2380 # then free the map
2381 $self->clear;
2382}
2383
2384sub reset_at {
2385 my ($self) = @_;
2386
2387 # TODO: safety, remove and allow resettable per-player maps
2388 return 1e99 if $self->{deny_reset};
2389
2390 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2391 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2392
2393 $time + $to
2394}
2395
2396sub should_reset {
2397 my ($self) = @_;
2398
2399 $self->reset_at <= $cf::RUNTIME
2400}
2401
2402sub reset {
2403 my ($self) = @_;
2404
2405 my $lock = cf::lock_acquire "map_data:$self->{path}";
2406
2407 return if $self->players;
2408
2409 cf::trace "resetting map ", $self->path, "\n";
2410
2411 $self->in_memory (cf::MAP_SWAPPED);
2412
2413 # need to save uniques path
2414 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416
2417 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2418 if $uniq;
2419 }
2420
2421 delete $cf::MAP{$self->path};
2194 2422
2195 $self->deactivate; 2423 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2424 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2425 $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 2426
2243 $self->unlink_save; 2427 $self->unlink_save;
2244 $self->destroy; 2428 $self->destroy;
2245} 2429}
2246 2430
2254 2438
2255 delete $cf::MAP{$self->path}; 2439 delete $cf::MAP{$self->path};
2256 2440
2257 $self->unlink_save; 2441 $self->unlink_save;
2258 2442
2259 bless $self, "cf::map"; 2443 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2444 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2445 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2446 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2447 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2448
2321 : normalise $_ 2505 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2506 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2507 ]
2324} 2508}
2325 2509
2510=item cf::map::static_maps
2511
2512Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2513file in the shared directory excluding F</styles> and F</editor>). May
2514block.
2515
2516=cut
2517
2518sub static_maps() {
2519 my @dirs = "";
2520 my @maps;
2521
2522 while (@dirs) {
2523 my $dir = shift @dirs;
2524
2525 next if $dir eq "/styles" || $dir eq "/editor";
2526
2527 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2528 or return;
2529
2530 for (@$files) {
2531 s/\.map$// or next;
2532 utf8::decode $_;
2533 push @maps, "$dir/$_";
2534 }
2535
2536 push @dirs, map "$dir/$_", @$dirs;
2537 }
2538
2539 \@maps
2540}
2541
2326=back 2542=back
2327 2543
2328=head3 cf::object 2544=head3 cf::object
2329 2545
2330=cut 2546=cut
2462 2678
2463Freezes the player and moves him/her to a special map (C<{link}>). 2679Freezes the player and moves him/her to a special map (C<{link}>).
2464 2680
2465The player should be reasonably safe there for short amounts of time (e.g. 2681The 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, 2682for 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 2683though, as the player cannot control the character while it is on the link
2468map. 2684map.
2469 2685
2470Will never block. 2686Will never block.
2471 2687
2472=item $player_object->leave_link ($map, $x, $y) 2688=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2709sub cf::object::player::enter_link {
2494 my ($self) = @_; 2710 my ($self) = @_;
2495 2711
2496 $self->deactivate_recursive; 2712 $self->deactivate_recursive;
2497 2713
2714 ++$self->{_link_recursion};
2715
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2716 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2717
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2719 if $self->map && $self->map->{path} ne "{link}";
2502 2720
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2721 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2722}
2505 2723
2506sub cf::object::player::leave_link { 2724sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2725 my ($self, $map, $x, $y) = @_;
2508 2726
2525 ($x, $y) = (-1, -1) 2743 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2744 unless (defined $x) && (defined $y);
2527 2745
2528 # use -1 or undef as default coordinates, not 0, 0 2746 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2747 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2748 if $x <= 0 && $y <= 0;
2531 2749
2532 $map->load; 2750 $map->load;
2533 $map->load_neighbours; 2751 $map->load_neighbours;
2534 2752
2535 return unless $self->contr->active; 2753 return unless $self->contr->active;
2536 2754
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2756 if ($self->enter_map ($map, $x, $y)) {
2539 2757 # entering was successful
2758 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2759 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2760 $self->activate_recursive;
2542} 2761 }
2543 2762
2763}
2764
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2765=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2766
2546Moves the player to the given map-path and coordinates by first freezing 2767Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2768her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2769that 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 2770the new (success) or old (failed) map position. In either case, $done will
2556 2777
2557our $GOTOGEN; 2778our $GOTOGEN;
2558 2779
2559sub cf::object::player::goto { 2780sub cf::object::player::goto {
2560 my ($self, $path, $x, $y, $check, $done) = @_; 2781 my ($self, $path, $x, $y, $check, $done) = @_;
2782
2783 if ($self->{_link_recursion} >= $MAX_LINKS) {
2784 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2785 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2786 ($path, $x, $y) = @$EMERGENCY_POSITION;
2787 }
2561 2788
2562 # do generation counting so two concurrent goto's will be executed in-order 2789 # do generation counting so two concurrent goto's will be executed in-order
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2790 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2791
2565 $self->enter_link; 2792 $self->enter_link;
2589 my $map = eval { 2816 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2817 my $map = defined $path ? cf::map::find $path : undef;
2591 2818
2592 if ($map) { 2819 if ($map) {
2593 $map = $map->customise_for ($self); 2820 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2821 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2822 } else {
2596 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2823 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2597 } 2824 }
2598 2825
2599 $map 2826 $map
2607 if ($gen == $self->{_goto_generation}) { 2834 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2835 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2836 $self->leave_link ($map, $x, $y);
2610 } 2837 }
2611 2838
2612 $done->() if $done; 2839 $done->($self) if $done;
2613 })->prio (1); 2840 })->prio (1);
2614} 2841}
2615 2842
2616=item $player_object->enter_exit ($exit_object) 2843=item $player_object->enter_exit ($exit_object)
2617 2844
2710 $self->message ("Something went wrong deep within the deliantra server. " 2937 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "I'll try to bring you back to the map you were before. " 2938 . "I'll try to bring you back to the map you were before. "
2712 . "Please report this to the dungeon master!", 2939 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2940 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2941
2715 warn "ERROR in enter_exit: $@"; 2942 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2943 $self->leave_link;
2717 } 2944 }
2718 })->prio (1); 2945 })->prio (1);
2719} 2946}
2720 2947
2732sub cf::client::send_drawinfo { 2959sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2960 my ($self, $text, $flags) = @_;
2734 2961
2735 utf8::encode $text; 2962 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2963 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2964}
2965
2966=item $client->send_big_packet ($pkt)
2967
2968Like C<send_packet>, but tries to compress large packets, and fragments
2969them as required.
2970
2971=cut
2972
2973our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2974
2975sub cf::client::send_big_packet {
2976 my ($self, $pkt) = @_;
2977
2978 # try lzf for large packets
2979 $pkt = "lzf " . Compress::LZF::compress $pkt
2980 if 1024 <= length $pkt and $self->{can_lzf};
2981
2982 # split very large packets
2983 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2984 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2985 $pkt = "frag";
2986 }
2987
2988 $self->send_packet ($pkt);
2737} 2989}
2738 2990
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2991=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2992
2741Send a drawinfo or msg packet to the client, formatting the msg for the 2993Send a drawinfo or msg packet to the client, formatting the msg for the
2745 2997
2746=cut 2998=cut
2747 2999
2748# non-persistent channels (usually the info channel) 3000# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 3001our %CHANNEL = (
3002 "c/motd" => {
3003 id => "infobox",
3004 title => "MOTD",
3005 reply => undef,
3006 tooltip => "The message of the day",
3007 },
2750 "c/identify" => { 3008 "c/identify" => {
2751 id => "infobox", 3009 id => "infobox",
2752 title => "Identify", 3010 title => "Identify",
2753 reply => undef, 3011 reply => undef,
2754 tooltip => "Items recently identified", 3012 tooltip => "Items recently identified",
2756 "c/examine" => { 3014 "c/examine" => {
2757 id => "infobox", 3015 id => "infobox",
2758 title => "Examine", 3016 title => "Examine",
2759 reply => undef, 3017 reply => undef,
2760 tooltip => "Signs and other items you examined", 3018 tooltip => "Signs and other items you examined",
3019 },
3020 "c/shopinfo" => {
3021 id => "infobox",
3022 title => "Shop Info",
3023 reply => undef,
3024 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 3025 },
2762 "c/book" => { 3026 "c/book" => {
2763 id => "infobox", 3027 id => "infobox",
2764 title => "Book", 3028 title => "Book",
2765 reply => undef, 3029 reply => undef,
2881 my $pkt = "msg " 3145 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3146 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3147 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3148 );
2885 3149
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); 3150 $self->send_big_packet ($pkt);
2897} 3151}
2898 3152
2899=item $client->ext_msg ($type, @msg) 3153=item $client->ext_msg ($type, @msg)
2900 3154
2901Sends an ext event to the client. 3155Sends an ext event to the client.
2904 3158
2905sub cf::client::ext_msg($$@) { 3159sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3160 my ($self, $type, @msg) = @_;
2907 3161
2908 if ($self->extcmd == 2) { 3162 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3163 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3164 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3165 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3166 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3167 }
2914} 3168}
2915 3169
2916=item $client->ext_reply ($msgid, @msg) 3170=item $client->ext_reply ($msgid, @msg)
2917 3171
2921 3175
2922sub cf::client::ext_reply($$@) { 3176sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3177 my ($self, $id, @msg) = @_;
2924 3178
2925 if ($self->extcmd == 2) { 3179 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3181 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3182 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3183 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3185 }
2932} 3186}
2933 3187
2934=item $success = $client->query ($flags, "text", \&cb) 3188=item $success = $client->query ($flags, "text", \&cb)
2935 3189
3006 3260
3007 $ns->ext_reply ($reply, @reply) 3261 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3262 if $reply;
3009 3263
3010 } else { 3264 } else {
3011 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3265 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3012 } 3266 }
3013 3267
3014 cf::override; 3268 cf::override;
3015 }, 3269 },
3016); 3270);
3036 3290
3037 $coro 3291 $coro
3038} 3292}
3039 3293
3040cf::client->attach ( 3294cf::client->attach (
3041 on_destroy => sub { 3295 on_client_destroy => sub {
3042 my ($ns) = @_; 3296 my ($ns) = @_;
3043 3297
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3298 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3299 },
3046); 3300);
3062our $safe_hole = new Safe::Hole; 3316our $safe_hole = new Safe::Hole;
3063 3317
3064$SIG{FPE} = 'IGNORE'; 3318$SIG{FPE} = 'IGNORE';
3065 3319
3066$safe->permit_only (Opcode::opset qw( 3320$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3321 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3322 grepstart grepwhile mapstart mapwhile
3069 sort time 3323 sort time
3070)); 3324));
3071 3325
3072# here we export the classes and methods available to script code 3326# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3351 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3352 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3353 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3354 ["cf::map" => qw(trigger)],
3101) { 3355) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3356 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3357 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3358 for @funs;
3106} 3359}
3107 3360
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3377 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3378 $qcode =~ s/\n/\\n/g;
3126 3379
3127 %vars = (_dummy => 0) unless %vars; 3380 %vars = (_dummy => 0) unless %vars;
3128 3381
3382 my @res;
3129 local $_; 3383 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3384
3132 my $eval = 3385 my $eval =
3133 "do {\n" 3386 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3387 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3388 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3389 . $code
3137 . "\n}" 3390 . "\n}"
3138 ; 3391 ;
3139 3392
3393 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3394 sub_generation_inc;
3395 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3396 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3397 sub_generation_inc;
3398 } else {
3399 local @cf::_safe_eval_args = values %vars;
3400 @res = wantarray ? eval eval : scalar eval $eval;
3401 }
3143 3402
3144 if ($@) { 3403 if ($@) {
3145 warn "$@"; 3404 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3405 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3406 "with arguments " . (join " ", %vars) . "\n";
3148 } 3407 }
3149 3408
3150 wantarray ? @res : $res[0] 3409 wantarray ? @res : $res[0]
3151} 3410}
3152 3411
3166=cut 3425=cut
3167 3426
3168sub register_script_function { 3427sub register_script_function {
3169 my ($fun, $cb) = @_; 3428 my ($fun, $cb) = @_;
3170 3429
3171 no strict 'refs'; 3430 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3431 *$fun = $safe_hole->wrap ($cb);
3173} 3432}
3174 3433
3175=back 3434=back
3176 3435
3177=cut 3436=cut
3186 # for this (global event?) 3445 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3446 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3447
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3449
3191 warn "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
3192 3451
3193 my $facedata; 3452 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 3453
3199 $facedata->{version} == 2 3454 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3456
3202 # patch in the exptable 3457 # patch in the exptable
3458 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3459 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3460 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3461 data => $exp_table,
3462 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3463 };
3207 cf::cede_to_tick; 3464 cf::cede_to_tick;
3208 3465
3209 { 3466 {
3210 my $faces = $facedata->{faceinfo}; 3467 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3469 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3470 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3471
3215 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3219 3477
3220 cf::cede_to_tick; 3478 cf::cede_to_tick;
3221 } 3479 }
3222 3480
3223 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
3228 3486
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3487 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3488 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3489 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3490 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3491 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3492 }
3235 3493
3236 cf::cede_to_tick; 3494 cf::cede_to_tick;
3237 } 3495 }
3238 } 3496 }
3247 3505
3248 cf::anim::invalidate_all; # d'oh 3506 cf::anim::invalidate_all; # d'oh
3249 } 3507 }
3250 3508
3251 { 3509 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3510 my $res = $facedata->{resource};
3255 3511
3256 while (my ($name, $info) = each %$res) { 3512 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3513 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3514 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3515
3261 if ($info->{type} & 1) { 3516 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}; 3517 cf::face::set_type $idx, $info->{type};
3276 } else { 3518 } else {
3277 $RESOURCE{$name} = $info; 3519 $RESOURCE{$name} = $info; # unused
3278 } 3520 }
3279 3521
3280 cf::cede_to_tick; 3522 cf::cede_to_tick;
3281 } 3523 }
3282 } 3524 }
3283 3525
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3526 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3527
3286 1 3528 1
3287} 3529}
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 3530
3309register_exticmd fx_want => sub { 3531register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3532 my ($ns, $want) = @_;
3311 3533
3312 while (my ($k, $v) = each %$want) { 3534 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3573sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
3354} 3576}
3355 3577
3578sub reload_sound {
3579 trace "loading sound config from $DATADIR/sound\n";
3580
3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3582
3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3584 my $sound = $soundconf->{compat}[$_]
3585 or next;
3586
3587 my $face = cf::face::find "sound/$sound->[1]";
3588 cf::sound::set $sound->[0] => $face;
3589 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3590 }
3591
3592 while (my ($k, $v) = each %{$soundconf->{event}}) {
3593 my $face = cf::face::find "sound/$v";
3594 cf::sound::set $k => $face;
3595 }
3596}
3597
3356sub reload_resources { 3598sub reload_resources {
3357 warn "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3358 3600
3601 reload_exp_table;
3602 reload_materials;
3359 reload_facedata; 3603 reload_facedata;
3604 reload_sound;
3360 reload_archetypes; 3605 reload_archetypes;
3361 reload_regions; 3606 reload_regions;
3362 reload_treasures; 3607 reload_treasures;
3363 3608
3364 warn "finished reloading resource files\n"; 3609 trace "finished reloading resource files\n";
3365} 3610}
3366 3611
3367sub reload_config { 3612sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3613 trace "reloading config file...\n";
3369 or return;
3370 3614
3371 local $/; 3615 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3616 utf8::decode $config;
3617 *CFG = decode_yaml $config;
3373 3618
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3620
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $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}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3623
3379 if (exists $CFG{mlockall}) { 3624 if (exists $CFG{mlockall}) {
3403 seek $fh, 0, 0; 3648 seek $fh, 0, 0;
3404 print $fh $$; 3649 print $fh $$;
3405} 3650}
3406 3651
3407sub main_loop { 3652sub main_loop {
3408 warn "EV::loop starting\n"; 3653 trace "EV::loop starting\n";
3409 if (1) { 3654 if (1) {
3410 EV::loop; 3655 EV::loop;
3411 } 3656 }
3412 warn "EV::loop returned\n"; 3657 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3658 goto &main_loop unless $REALLY_UNLOOP;
3414} 3659}
3415 3660
3416sub main { 3661sub main {
3417 cf::init_globals; # initialise logging 3662 cf::init_globals; # initialise logging
3418 3663
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3667 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 3668
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3670
3431 # we must not ever block the main coroutine 3671 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3672 local $Coro::idle = sub {
3438 }; 3678 };
3439 3679
3440 evthread_start IO::AIO::poll_fileno; 3680 evthread_start IO::AIO::poll_fileno;
3441 3681
3442 cf::sync_job { 3682 cf::sync_job {
3683 cf::incloader::init ();
3684
3685 cf::init_anim;
3686 cf::init_attackmess;
3687 cf::init_dynamic;
3688
3689 cf::load_settings;
3690
3443 reload_resources; 3691 reload_resources;
3444 reload_config; 3692 reload_config;
3445 db_init; 3693 db_init;
3446 3694
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3695 cf::init_uuid;
3450 cf::init_signals; 3696 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3697 cf::init_skills;
3453 3698
3454 cf::init_beforeplay; 3699 cf::init_beforeplay;
3455 3700
3456 atomic; 3701 atomic;
3461 3706
3462 # no (long-running) fork's whatsoever before this point(!) 3707 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX (); 3708 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3710
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3711 cf::_post_init 0;
3467 }; 3712 };
3468 3713
3714 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n";
3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3469 main_loop; 3722 goto &main_loop;
3470} 3723}
3471 3724
3472############################################################################# 3725#############################################################################
3473# initialisation and cleanup 3726# initialisation and cleanup
3474 3727
3475# install some emergency cleanup handlers 3728# install some emergency cleanup handlers
3476BEGIN { 3729BEGIN {
3477 our %SIGWATCHER = (); 3730 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3731 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3732 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3733 cf::cleanup "SIG$signal";
3481 }; 3734 };
3482 } 3735 }
3483} 3736}
3484 3737
3485sub write_runtime_sync { 3738sub write_runtime_sync {
3739 my $t0 = AE::time;
3740
3486 # first touch the runtime file to show we are still running: 3741 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3742 # the fsync below can take a very very long time.
3488 3743
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3744 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3745
3491 my $guard = cf::lock_acquire "write_runtime"; 3746 my $guard = cf::lock_acquire "write_runtime";
3492 3747
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3748 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3749 or return;
3495 3750
3496 my $value = $cf::RUNTIME + 90 + 10; 3751 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3752 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3753 # 60 allows for the watchdog to kill the server.
3511 or return; 3766 or return;
3512 3767
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3768 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3769 and return;
3515 3770
3516 warn "runtime file written.\n"; 3771 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3772
3518 1 3773 1
3519} 3774}
3520 3775
3521our $uuid_lock; 3776our $uuid_lock;
3533 or return; 3788 or return;
3534 3789
3535 my $value = uuid_seq uuid_cur; 3790 my $value = uuid_seq uuid_cur;
3536 3791
3537 unless ($value) { 3792 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3793 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3794 return;
3540 } 3795 }
3541 3796
3542 my $value = uuid_str $value + $uuid_skip; 3797 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3798 $uuid_skip = 0;
3553 or return; 3808 or return;
3554 3809
3555 aio_rename "$uuid~", $uuid 3810 aio_rename "$uuid~", $uuid
3556 and return; 3811 and return;
3557 3812
3558 warn "uuid file written ($value).\n"; 3813 trace "uuid file written ($value).\n";
3559 3814
3560 1 3815 1
3561 3816
3562} 3817}
3563 3818
3569} 3824}
3570 3825
3571sub emergency_save() { 3826sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3827 my $freeze_guard = cf::freeze_mainloop;
3573 3828
3574 warn "emergency_perl_save: enter\n"; 3829 info "emergency_perl_save: enter\n";
3830
3831 # this is a trade-off: we want to be very quick here, so
3832 # save all maps without fsync, and later call a global sync
3833 # (which in turn might be very very slow)
3834 local $USE_FSYNC = 0;
3575 3835
3576 cf::sync_job { 3836 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3837 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 3838
3582 # use a peculiar iteration method to avoid tripping on perl 3839 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3840 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3841 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3842 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3843 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3844 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3845 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3846 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3847 $pl->save;
3591 } 3848 }
3592 warn "emergency_perl_save: end player save\n"; 3849 info "emergency_perl_save: end player save\n";
3593 3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3594 warn "emergency_perl_save: begin map save\n"; 3853 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3854 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3855 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3856 $map->valid or next;
3598 $map->save; 3857 $map->save;
3599 } 3858 }
3600 warn "emergency_perl_save: end map save\n"; 3859 info "emergency_perl_save: end map save\n";
3601 3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3862
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3863 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3864 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3865 info "emergency_perl_save: end database checkpoint\n";
3605 3866
3606 warn "emergency_perl_save: begin write uuid\n"; 3867 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3868 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 3869 info "emergency_perl_save: end write uuid\n";
3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 trace "emergency_perl_save: syncing database to disk";
3874 BDB::db_env_txn_checkpoint $DB_ENV;
3875
3876 info "emergency_perl_save: starting sync\n";
3877 IO::AIO::aio_sync sub {
3878 info "emergency_perl_save: finished sync\n";
3879 };
3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3886 }
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3609 }; 3889 };
3610 3890
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"; 3891 info "emergency_perl_save: leave\n";
3617} 3892}
3618 3893
3619sub post_cleanup { 3894sub post_cleanup {
3620 my ($make_core) = @_; 3895 my ($make_core) = @_;
3621 3896
3897 IO::AIO::flush;
3898
3622 warn Carp::longmess "post_cleanup backtrace" 3899 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3900 if $make_core;
3624 3901
3625 my $fh = pidfile; 3902 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3903 unlink $PIDFILE if <$fh> == $$;
3627} 3904}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3924 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3925 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3926 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3927# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3928 }
3652 warn "cleared package $pkg\n";#d#
3653} 3929}
3654 3930
3655sub do_reload_perl() { 3931sub do_reload_perl() {
3656 # can/must only be called in main 3932 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3933 unless (in_main) {
3658 warn "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3659 return; 3935 return;
3660 } 3936 }
3661 3937
3662 return if $RELOAD++; 3938 return if $RELOAD++;
3663 3939
3664 my $t1 = EV::time; 3940 my $t1 = AE::time;
3665 3941
3666 while ($RELOAD) { 3942 while ($RELOAD) {
3667 warn "reloading..."; 3943 cf::get_slot 0.1, -1, "reload_perl";
3944 info "perl_reload: reloading...";
3668 3945
3669 warn "entering sync_job"; 3946 trace "perl_reload: entering sync_job";
3670 3947
3671 cf::sync_job { 3948 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3949 #cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 3950
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"; 3951 trace "perl_reload: cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3953 %EXT_CORO = ();
3689 3954
3690 warn "removing commands"; 3955 trace "perl_reload: removing commands";
3691 %COMMAND = (); 3956 %COMMAND = ();
3692 3957
3693 warn "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3694 %EXTCMD = (); 3959 %EXTCMD = ();
3695 %EXTICMD = (); 3960 %EXTICMD = ();
3696 3961
3697 warn "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3964 trace "... unloading $pkg";
3700 3965
3701 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3967 eval {
3703 $cb->($pkg); 3968 $cb->($pkg);
3704 1 3969 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3970 } or error "$pkg unloaded, but with errors: $@";
3706 } 3971 }
3707 3972
3708 warn "... clearing $pkg"; 3973 trace "... clearing $pkg";
3709 clear_package $pkg; 3974 clear_package $pkg;
3710 } 3975 }
3711 3976
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3980
3716 warn "... unloading $k"; 3981 trace "... unloading $k";
3717 delete $INC{$k}; 3982 delete $INC{$k};
3718 3983
3719 $k =~ s/\.pm$//; 3984 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3985 $k =~ s/\//::/g;
3721 3986
3724 } 3989 }
3725 3990
3726 clear_package $k; 3991 clear_package $k;
3727 } 3992 }
3728 3993
3729 warn "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 3995 clear_package "safe::$_"
3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3732 3997
3733 warn "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 4001
3737 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3738 # and global variables created in xs 4003 # and global variables created in xs
3739 #clear_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3740 4005
3741 warn "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3742 4007
3743 warn "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3744 require cf; 4009 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4010 cf::_connect_to_perl_1;
3746 4011
3747 warn "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3748 cf::reload_config; 4013 cf::reload_config;
3749 4014
3750 warn "loading extensions"; 4015 trace "perl_reload: loading extensions";
3751 cf::load_extensions; 4016 cf::load_extensions;
3752 4017
3753 if ($REATTACH_ON_RELOAD) { 4018 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3757 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
3760 } 4025 }
3761 4026
3762 warn "running post_init jobs"; 4027 cf::_post_init 1;
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764 4028
3765 warn "leaving sync_job"; 4029 trace "perl_reload: leaving sync_job";
3766 4030
3767 1 4031 1
3768 } or do { 4032 } or do {
3769 warn $@; 4033 error $@;
3770 cf::cleanup "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3771 }; 4035 };
3772 4036
3773 warn "reloaded";
3774 --$RELOAD; 4037 --$RELOAD;
3775 } 4038 }
3776 4039
3777 $t1 = EV::time - $t1; 4040 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4041 info "perl_reload: completed in ${t1}s\n";
3779}; 4042};
3780 4043
3781our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3782 4045
3783sub reload_perl() { 4046sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4048 # coro crashes during coro_state_free->destroy here.
3786 4049
3787 $RELOAD_WATCHER ||= cf::async { 4050 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4051 Coro::AIO::aio_wait cache_extensions;
3789 4052
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4053 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4054 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4055 undef $RELOAD_WATCHER;
3793 }; 4056 };
3794 }; 4057 };
3795} 4058}
3804 reload_perl; 4067 reload_perl;
3805 }; 4068 };
3806 } 4069 }
3807}; 4070};
3808 4071
3809unshift @INC, $LIBDIR; 4072#############################################################################
3810 4073
3811my $bug_warning = 0; 4074my $bug_warning = 0;
3812 4075
3813our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
3815 4078
3816sub wait_for_tick { 4079sub wait_for_tick() {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 4081
3819 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 4084 $signal->wait;
3822} 4085}
3823 4086
3824sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 4089
3827 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4092 $signal->wait;
3830} 4093}
3836 return; 4099 return;
3837 } 4100 }
3838 4101
3839 cf::server_tick; # one server iteration 4102 cf::server_tick; # one server iteration
3840 4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4108 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4110 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3847 }; 4112 };
3848 } 4113 }
3849 4114
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4116 $sig->send;
3859 4124
3860 if (0) { 4125 if (0) {
3861 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3865 } 4130 }
3866 } 4131 }
3867} 4132}
3868 4133
3869{ 4134{
3870 # configure BDB 4135 # configure BDB
3871 4136
3872 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4139 $AnyEvent::BDB::WATCHER->priority (1);
3875 4140
3876 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3914 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3915 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3916 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3917} 4182}
3918 4183
3919my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3920 4186
3921sub _log_backtrace { 4187sub _log_backtrace {
3922 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3923 4189
3924 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3925 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3927 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3928 ++$_log_backtrace; 4198 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3930 async { 4200 async {
3931 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3932 4202
3952 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3953 --$_log_backtrace; 4223 --$_log_backtrace;
3954 }; 4224 };
3955 } else { 4225 } else {
3956 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3957 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958 } 4228 }
3959} 4229}
3960 4230
3961# load additional modules 4231# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3963 4234
3964END { cf::emergency_save } 4235END { cf::emergency_save }
3965 4236
39661 42371
3967 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines