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.485 by root, Mon Oct 12 14:12:54 2009 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
33use Opcode; 31use Opcode;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
35use Carp ();
37 36
38use Guard (); 37use Guard ();
39use Coro (); 38use Coro ();
40use Coro::State; 39use Coro::State;
41use Coro::Handle; 40use Coro::Handle;
… …
52use Coro::Util (); 51use Coro::Util ();
53 52
54use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
55use BDB (); 54use BDB ();
56use Data::Dumper; 55use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 56use Fcntl;
59use YAML::XS (); 57use YAML::XS ();
60use IO::AIO (); 58use IO::AIO ();
61use Time::HiRes; 59use Time::HiRes;
62use Compress::LZF; 60use Compress::LZF;
… …
77 75
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
82 82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
230 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235that call. 250that call.
236 251
237=item %cf::REFLECT 252=item %cf::REFLECT
238 253
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
289)) { 310)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 312}
292 313
293$EV::DIED = sub { 314$EV::DIED = sub {
294 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
295}; 316};
296 317
297############################################################################# 318#############################################################################
298 319
299=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 358
338sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
340 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
341=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
342 375
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
345 378
346The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 380is a reload or not.
348 381
349=cut 382=cut
350 383
351sub post_init(&) { 384sub post_init(&) {
352 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
353} 403}
354 404
355=item cf::lock_wait $string 405=item cf::lock_wait $string
356 406
357Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
396} 446}
397 447
398=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
399 449
400Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 451get spread over time.
402 452
403=cut 453=cut
404 454
405sub periodic($$) { 455sub periodic($$) {
406 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
423 473
424=cut 474=cut
425 475
426our @SLOT_QUEUE; 476our @SLOT_QUEUE;
427our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
428 479
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
432 483
433 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
434 486
435 while () { 487 while () {
436 next_job: 488 next_job:
489
437 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 491
439 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 496 $job->[2]->send;
443 Coro::cede; 497 Coro::cede;
444 goto next_job; 498 goto next_job;
445 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 501 }
447 } 502 }
448 503
449 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 507 $signal->wait;
453 } else { 508 } else {
509 $busy = 0;
454 Coro::schedule; 510 Coro::schedule;
455 } 511 }
456 } 512 }
457}; 513};
458 514
459sub get_slot($;$$) { 515sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
461 517
462 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
463 519
464 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
465 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
466 523
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
… …
495=cut 552=cut
496 553
497sub sync_job(&) { 554sub sync_job(&) {
498 my ($job) = @_; 555 my ($job) = @_;
499 556
500 if ($Coro::current == $Coro::main) { 557 if (in_main) {
501 my $time = EV::time; 558 my $time = AE::time;
502 559
503 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
505 562
506 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
507 564
508 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
509 566
510 my $busy = 1; 567 my $busy = 1;
511 my @res; 568 my @res;
512 569
513 (async { 570 (async {
514 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 572 @res = eval { $job->() };
516 warn $@ if $@; 573 error $@ if $@;
517 undef $busy; 574 undef $busy;
518 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
519 576
520 while ($busy) { 577 while ($busy) {
521 if (Coro::nready) { 578 if (Coro::nready) {
… …
523 } else { 580 } else {
524 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
525 } 582 }
526 } 583 }
527 584
528 my $time = EV::time - $time; 585 my $time = AE::time - $time;
529 586
530 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
531 588
532 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
533 } else { 590 } else {
… …
555 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
556 613
557 $coro 614 $coro
558} 615}
559 616
560=item fork_call { }, $args 617=item fork_call { }, @args
561 618
562Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 622never block itself or use any form of event handling.
566 623
567=cut 624=cut
568 625
626sub post_fork {
627 reset_signals;
628}
629
569sub fork_call(&@) { 630sub fork_call(&@) {
570 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
571 632
572 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
575 636
576 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
577 reset_signals; 638 cf::post_fork;
578 &$cb 639 &$cb
579 }, @args; 640 } @args;
580 641
581 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
582} 654}
583 655
584=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
585 657
586=cut 658=cut
… …
623within each server. 695within each server.
624 696
625=cut 697=cut
626 698
627sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
628 my ($name) = @_; 703 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
630 705
631 eval { 706 eval {
632 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
642} 717}
643 718
644our $DB; 719our $DB;
645 720
646sub db_init { 721sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
649 };
650} 723}
651 724
652sub db_get($$) { 725sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
654 727
655 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
656 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
657 732
658 $! ? () 733 $! ? ()
659 : $data 734 : $data
660 }
661} 735}
662 736
663sub db_put($$$) { 737sub db_put($$$) {
664 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 795
722 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 797 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
725 799
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 801
728 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
731 805
… …
741 815
742=cut 816=cut
743 817
744sub datalog($@) { 818sub datalog($@) {
745 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 821}
748 822
749=back 823=back
750 824
751=cut 825=cut
… …
946 1020
947 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1023
950 } elsif (ref $type) { 1024 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
952 1026
953 } else { 1027 } else {
954 shift @arg; 1028 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
956 } 1030 }
957 } 1031 }
958} 1032}
959 1033
960sub _object_attach { 1034sub _object_attach {
… …
970 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
971 } 1045 }
972 1046
973 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
974 } else { 1048 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1050 }
977 1051
978 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
979} 1053}
980 1054
… …
1039 1113
1040 for (@$callbacks) { 1114 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1042 1116
1043 if ($@) { 1117 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1119 override;
1047 } 1120 }
1048 1121
1049 return 1 if $override; 1122 return 1 if $override;
1050 } 1123 }
… …
1129 for (@$attach) { 1202 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1132 } 1205 }
1133 } else { 1206 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1208 }
1136 } 1209 }
1137} 1210}
1138 1211
1139cf::attachable->attach ( 1212cf::attachable->attach (
… …
1166 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1167 1240
1168 sync_job { 1241 sync_job {
1169 if (length $$rdata) { 1242 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1173 1247
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1199 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1200 1274
1201 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1277 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1205 } 1279 }
1206 } else { 1280 } else {
1207 aio_unlink $filename; 1281 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1209 } 1283 }
… …
1233 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1308 $av = $st->{objs};
1235 } 1309 }
1236 1310
1237 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1240 1315
1241 ($data, $av) 1316 ($data, $av)
1242} 1317}
1243 1318
1244=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1303} 1378}
1304 1379
1305use File::Glob (); 1380use File::Glob ();
1306 1381
1307cf::player->attach ( 1382cf::player->attach (
1308 on_command => sub { 1383 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1310 1385
1311 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1312 or return; 1387 or return;
1313 1388
… …
1336 1411
1337 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1413 if $reply;
1339 1414
1340 } else { 1415 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1417 }
1343 1418
1344 cf::override; 1419 cf::override;
1345 }, 1420 },
1346); 1421);
… …
1357 1432
1358 $grp 1433 $grp
1359} 1434}
1360 1435
1361sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1362 cf::sync_job { 1439 cf::sync_job {
1363 my %todo; 1440 my %todo;
1364 1441
1365 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1443 next unless -r $path;
… …
1384 1461
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1464
1388 $ext{source} = 1465 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1391 . $source 1468 . $source
1392 . "\n};\n1"; 1469 . "\n};\n1";
1393 1470
1394 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1395 } 1472 }
1396 1473
1474 my $pass = 0;
1397 my %done; 1475 my %done;
1398 while (%todo) { 1476 while (%todo) {
1399 my $progress; 1477 my $progress;
1400 1478
1479 ++$pass;
1480
1481 ext:
1401 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1484 next ext
1404 unless exists $done{$_}; 1485 unless exists $done{$_};
1405 } 1486 }
1406 1487
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1489
1409 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1494
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1496 if exists $v->{meta}{mandatory};
1417 1497
1418 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1419 } 1507 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1508 }
1425 1509
1426 skip: 1510 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1429 } 1518 }
1430 }; 1519 };
1431} 1520}
1432 1521
1433############################################################################# 1522#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1518 } 1607 }
1519 } 1608 }
1520} 1609}
1521 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1522sub save($) { 1624sub save($) {
1523 my ($pl) = @_; 1625 my ($pl) = @_;
1524 1626
1525 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1526 1628
… …
1531 1633
1532 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1534 1636
1535 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1641
1537 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1643 cf::cede_to_tick;
1539} 1644}
1540 1645
… …
1574 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1575 1680
1576 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1683
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1685 $pl->deactivate;
1686
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1584 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1585 1692
1586 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1642 \@logins 1749 \@logins
1643} 1750}
1644 1751
1645=item $player->maps 1752=item $player->maps
1646 1753
1754=item cf::player::maps $login
1755
1647Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1648player. May block. 1757player. May block.
1649 1758
1650=cut 1759=cut
1651 1760
… …
1713=cut 1822=cut
1714 1823
1715sub find_by_path($) { 1824sub find_by_path($) {
1716 my ($path) = @_; 1825 my ($path) = @_;
1717 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1718 my ($match, $specificity); 1829 my ($match, $specificity);
1719 1830
1720 for my $region (list) { 1831 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1750sub generate_random_map { 1861sub generate_random_map {
1751 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1752 1863
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1865
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom}
1768 )
1769} 1867}
1770 1868
1771=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1772 1870
1773Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1778 1876
1779sub register { 1877sub register {
1780 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1879 my $pkg = caller;
1782 1880
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1882
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1884}
1788 1885
1789# also paths starting with '/' 1886# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1888
1792sub thawer_merge { 1889sub thawer_merge {
1793 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1794 1891
1795 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
… …
1800} 1897}
1801 1898
1802sub normalise { 1899sub normalise {
1803 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1804 1901
1805 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1806 1903
1807 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1808 1905
1809 # map plan: 1906 # map plan:
1810 # 1907 #
… …
1825 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1923 $path = "$base/$path";
1827 } 1924 }
1828 1925
1829 for ($path) { 1926 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1833 } 1929 }
1834 1930
1835 $path 1931 $path
… …
1849 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1850 return $self; 1946 return $self;
1851 } 1947 }
1852 } 1948 }
1853 1949
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1951 ()
1856} 1952}
1857 1953
1858sub init { 1954sub init {
1859 my ($self) = @_; 1955 my ($self) = @_;
… …
1981} 2077}
1982 2078
1983sub find; 2079sub find;
1984sub find { 2080sub find {
1985 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
1986 2084
1987 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1988 2086
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2107
2010 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
2011 } 2109 }
2012} 2110}
2013 2111
2014sub pre_load { } 2112sub pre_load { }
2015sub post_load { } 2113#sub post_load { } # XS
2016 2114
2017sub load { 2115sub load {
2018 my ($self) = @_; 2116 my ($self) = @_;
2019 2117
2020 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
… …
2075 2173
2076 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2175 }
2078 2176
2079 $self->post_load; 2177 $self->post_load;
2080}
2081 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2082sub customise_for { 2185sub customise_for {
2083 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2084 2187
2085 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2189 if $self->per_player;
… …
2102 or next; 2205 or next;
2103 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2104 or next; 2207 or next;
2105 $neigh->load; 2208 $neigh->load;
2106 2209
2210 # now find the diagonal neighbours
2107 push @neigh, 2211 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2214 }
2111 2215
… …
2118} 2222}
2119 2223
2120sub find_sync { 2224sub find_sync {
2121 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2122 2226
2123 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2124} 2231}
2125 2232
2126sub do_load_sync { 2233sub do_load_sync {
2127 my ($map) = @_; 2234 my ($map) = @_;
2128 2235
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2131 2238
2132 cf::sync_job { $map->load }; 2239 $map->load;
2133} 2240}
2134 2241
2135our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2137 2244
… …
2163 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2164 2271
2165 () 2272 ()
2166} 2273}
2167 2274
2275# common code, used by both ->save and ->swapout
2168sub save { 2276sub _save {
2169 my ($self) = @_; 2277 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2278
2173 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2174 2280
2175 return unless $self->dirty; 2281 return unless $self->dirty;
2176 2282
… …
2196 } else { 2302 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2304 }
2199} 2305}
2200 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2201sub swap_out { 2315sub swap_out {
2202 my ($self) = @_; 2316 my ($self) = @_;
2203 2317
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2319
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2212 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2214 2374
2215 $self->deactivate; 2375 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2377 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2378
2263 $self->unlink_save; 2379 $self->unlink_save;
2264 $self->destroy; 2380 $self->destroy;
2265} 2381}
2266 2382
… …
2274 2390
2275 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2276 2392
2277 $self->unlink_save; 2393 $self->unlink_save;
2278 2394
2279 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2400
… …
2341 : normalise $_ 2457 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2459 ]
2344} 2460}
2345 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2346=back 2494=back
2347 2495
2348=head3 cf::object 2496=head3 cf::object
2349 2497
2350=cut 2498=cut
… …
2482 2630
2483Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2484 2632
2485The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2486for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2488map. 2636map.
2489 2637
2490Will never block. 2638Will never block.
2491 2639
2492=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2513sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2514 my ($self) = @_; 2662 my ($self) = @_;
2515 2663
2516 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2517 2665
2666 ++$self->{_link_recursion};
2667
2518 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2519 2669
2520 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2522 2672
2523 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2524} 2674}
2525 2675
2526sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2527 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2528 2678
… …
2545 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2547 2697
2548 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2551 2701
2552 $map->load; 2702 $map->load;
2553 $map->load_neighbours; 2703 $map->load_neighbours;
2554 2704
2555 return unless $self->contr->active; 2705 return unless $self->contr->active;
2556 2706
2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2559 2709 # entering was successful
2710 delete $self->{_link_recursion};
2560 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive; 2712 $self->activate_recursive;
2562} 2713 }
2563 2714
2715}
2716
2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565 2718
2566Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2567her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2568that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2569the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
… …
2576 2729
2577our $GOTOGEN; 2730our $GOTOGEN;
2578 2731
2579sub cf::object::player::goto { 2732sub cf::object::player::goto {
2580 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2581 2740
2582 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584 2743
2585 $self->enter_link; 2744 $self->enter_link;
… …
2609 my $map = eval { 2768 my $map = eval {
2610 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2611 2770
2612 if ($map) { 2771 if ($map) {
2613 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2614 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2615 } else { 2774 } else {
2616 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 } 2776 }
2618 2777
2619 $map 2778 $map
… …
2627 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2628 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2629 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2630 } 2789 }
2631 2790
2632 $done->() if $done; 2791 $done->($self) if $done;
2633 })->prio (1); 2792 })->prio (1);
2634} 2793}
2635 2794
2636=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2637 2796
… …
2730 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2731 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2732 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2733 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2734 2893
2735 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2736 $self->leave_link; 2895 $self->leave_link;
2737 } 2896 }
2738 })->prio (1); 2897 })->prio (1);
2739} 2898}
2740 2899
… …
2752sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2754 2913
2755 utf8::encode $text; 2914 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2757} 2941}
2758 2942
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2944
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2765 2949
2766=cut 2950=cut
2767 2951
2768# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2769our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2770 "c/identify" => { 2960 "c/identify" => {
2771 id => "infobox", 2961 id => "infobox",
2772 title => "Identify", 2962 title => "Identify",
2773 reply => undef, 2963 reply => undef,
2774 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
… …
2776 "c/examine" => { 2966 "c/examine" => {
2777 id => "infobox", 2967 id => "infobox",
2778 title => "Examine", 2968 title => "Examine",
2779 reply => undef, 2969 reply => undef,
2780 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2781 }, 2977 },
2782 "c/book" => { 2978 "c/book" => {
2783 id => "infobox", 2979 id => "infobox",
2784 title => "Book", 2980 title => "Book",
2785 reply => undef, 2981 reply => undef,
… …
2901 my $pkt = "msg " 3097 my $pkt = "msg "
2902 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2904 ); 3100 );
2905 3101
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if (8192 < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2917} 3103}
2918 3104
2919=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2920 3106
2921Sends an ext event to the client. 3107Sends an ext event to the client.
… …
2924 3110
2925sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2926 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2927 3113
2928 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2930 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2931 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3119 }
2934} 3120}
2935 3121
2936=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2937 3123
… …
2941 3127
2942sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2943 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2944 3130
2945 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2947 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2948 #TODO: version 1, remove 3134 #TODO: version 1, remove
2949 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3137 }
2952} 3138}
2953 3139
2954=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2955 3141
… …
3026 3212
3027 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3028 if $reply; 3214 if $reply;
3029 3215
3030 } else { 3216 } else {
3031 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3032 } 3218 }
3033 3219
3034 cf::override; 3220 cf::override;
3035 }, 3221 },
3036); 3222);
… …
3056 3242
3057 $coro 3243 $coro
3058} 3244}
3059 3245
3060cf::client->attach ( 3246cf::client->attach (
3061 on_destroy => sub { 3247 on_client_destroy => sub {
3062 my ($ns) = @_; 3248 my ($ns) = @_;
3063 3249
3064 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3065 }, 3251 },
3066); 3252);
… …
3082our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3083 3269
3084$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3085 3271
3086$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3087 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3088 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3089 sort time 3275 sort time
3090)); 3276));
3091 3277
3092# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
… …
3117 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3118 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3119 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3120 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3121) { 3307) {
3122 no strict 'refs';
3123 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3125 for @funs; 3310 for @funs;
3126} 3311}
3127 3312
… …
3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3145 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3146 3331
3147 %vars = (_dummy => 0) unless %vars; 3332 %vars = (_dummy => 0) unless %vars;
3148 3333
3334 my @res;
3149 local $_; 3335 local $_;
3150 local @safe::cf::_safe_eval_args = values %vars;
3151 3336
3152 my $eval = 3337 my $eval =
3153 "do {\n" 3338 "do {\n"
3154 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3155 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3156 . $code 3341 . $code
3157 . "\n}" 3342 . "\n}"
3158 ; 3343 ;
3159 3344
3345 if ($CFG{safe_eval}) {
3160 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3161 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3162 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3163 3354
3164 if ($@) { 3355 if ($@) {
3165 warn "$@"; 3356 warn "$@",
3166 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3167 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3168 } 3359 }
3169 3360
3170 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3171} 3362}
3172 3363
… …
3186=cut 3377=cut
3187 3378
3188sub register_script_function { 3379sub register_script_function {
3189 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3190 3381
3191 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3192 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3193} 3384}
3194 3385
3195=back 3386=back
3196 3387
3197=cut 3388=cut
… …
3206 # for this (global event?) 3397 # for this (global event?)
3207 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3208 3399
3209 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3210 3401
3211 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3212 3403
3213 my $facedata;
3214 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3215 or die "$path: $!"; 3405 or die "$path: $!";
3216 3406
3217 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3218 3408
3219 $facedata->{version} == 2 3409 $facedata->{version} == 2
3220 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3221 3411
3222 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3223 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3224 type => FT_RSRC, 3415 type => FT_RSRC,
3225 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3226 }; 3418 };
3227 cf::cede_to_tick; 3419 cf::cede_to_tick;
3228 3420
3229 { 3421 {
3230 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
… …
3232 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3233 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3234 3426
3235 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3236 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3237 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3238 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3239 3431
3240 cf::cede_to_tick; 3432 cf::cede_to_tick;
3241 } 3433 }
3242 3434
3243 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
… …
3248 3440
3249 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
3250 cf::face::set_smooth $idx, $smooth; 3442 cf::face::set_smooth $idx, $smooth;
3251 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3252 } else { 3444 } else {
3253 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
3254 } 3446 }
3255 3447
3256 cf::cede_to_tick; 3448 cf::cede_to_tick;
3257 } 3449 }
3258 } 3450 }
… …
3267 3459
3268 cf::anim::invalidate_all; # d'oh 3460 cf::anim::invalidate_all; # d'oh
3269 } 3461 }
3270 3462
3271 { 3463 {
3272 # TODO: for gcfclient pleasure, we should give resources
3273 # that gcfclient doesn't grok a >10000 face index.
3274 my $res = $facedata->{resource}; 3464 my $res = $facedata->{resource};
3275 3465
3276 while (my ($name, $info) = each %$res) { 3466 while (my ($name, $info) = each %$res) {
3277 if (defined $info->{type}) { 3467 if (defined $info->{type}) {
3278 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3279 my $data;
3280 3469
3281 if ($info->{type} & 1) { 3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3282 # prepend meta info
3283
3284 my $meta = $enc->encode ({
3285 name => $name,
3286 %{ $info->{meta} || {} },
3287 });
3288
3289 $data = pack "(w/a*)*", $meta, $info->{data};
3290 } else {
3291 $data = $info->{data};
3292 }
3293
3294 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3295 cf::face::set_type $idx, $info->{type}; 3471 cf::face::set_type $idx, $info->{type};
3296 } else { 3472 } else {
3297 $RESOURCE{$name} = $info; 3473 $RESOURCE{$name} = $info; # unused
3298 } 3474 }
3299 3475
3300 cf::cede_to_tick; 3476 cf::cede_to_tick;
3301 } 3477 }
3302 } 3478 }
3303 3479
3304 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3305 3481
3306 1 3482 1
3307} 3483}
3308
3309cf::global->attach (on_resource_update => sub {
3310 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3311 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3312
3313 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3314 my $sound = $soundconf->{compat}[$_]
3315 or next;
3316
3317 my $face = cf::face::find "sound/$sound->[1]";
3318 cf::sound::set $sound->[0] => $face;
3319 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3320 }
3321
3322 while (my ($k, $v) = each %{$soundconf->{event}}) {
3323 my $face = cf::face::find "sound/$v";
3324 cf::sound::set $k => $face;
3325 }
3326 }
3327});
3328 3484
3329register_exticmd fx_want => sub { 3485register_exticmd fx_want => sub {
3330 my ($ns, $want) = @_; 3486 my ($ns, $want) = @_;
3331 3487
3332 while (my ($k, $v) = each %$want) { 3488 while (my ($k, $v) = each %$want) {
… …
3371sub reload_treasures { 3527sub reload_treasures {
3372 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
3373 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
3374} 3530}
3375 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
3376sub reload_resources { 3555sub reload_resources {
3377 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
3378 3557
3558 reload_exp_table;
3559 reload_materials;
3379 reload_facedata; 3560 reload_facedata;
3561 reload_sound;
3380 reload_archetypes; 3562 reload_archetypes;
3381 reload_regions; 3563 reload_regions;
3382 reload_treasures; 3564 reload_treasures;
3383 3565
3384 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3385} 3567}
3386 3568
3387sub reload_config { 3569sub reload_config {
3388 warn "reloading config file...\n"; 3570 trace "reloading config file...\n";
3389 3571
3390 open my $fh, "<:utf8", "$CONFDIR/config" 3572 0 < aio_load "$CONFDIR/config", my $config
3391 or return; 3573 or die "$CONFDIR/config: $!";
3392 3574
3393 local $/; 3575 utf8::decode $config;
3394 *CFG = YAML::XS::Load scalar <$fh>; 3576 *CFG = yaml_load $config;
3395 3577
3396 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3397 3579
3398 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3399 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3400 3582
3401 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
… …
3403 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3585 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3404 and die "WARNING: m(un)lockall failed: $!\n"; 3586 and die "WARNING: m(un)lockall failed: $!\n";
3405 }; 3587 };
3406 warn $@ if $@; 3588 warn $@ if $@;
3407 } 3589 }
3408
3409 warn "finished reloading resource files\n";
3410} 3590}
3411 3591
3412sub pidfile() { 3592sub pidfile() {
3413 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3414 or die "$PIDFILE: $!"; 3594 or die "$PIDFILE: $!";
… …
3427 seek $fh, 0, 0; 3607 seek $fh, 0, 0;
3428 print $fh $$; 3608 print $fh $$;
3429} 3609}
3430 3610
3431sub main_loop { 3611sub main_loop {
3432 warn "EV::loop starting\n"; 3612 trace "EV::loop starting\n";
3433 if (1) { 3613 if (1) {
3434 EV::loop; 3614 EV::loop;
3435 } 3615 }
3436 warn "EV::loop returned\n"; 3616 trace "EV::loop returned\n";
3437 goto &main_loop unless $REALLY_UNLOOP; 3617 goto &main_loop unless $REALLY_UNLOOP;
3438} 3618}
3439 3619
3440sub main { 3620sub main {
3441 cf::init_globals; # initialise logging 3621 cf::init_globals; # initialise logging
3442 3622
3443 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3444 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3445 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3446 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3447
3448 cf::init_experience;
3449 cf::init_anim;
3450 cf::init_attackmess;
3451 cf::init_dynamic;
3452 3627
3453 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3454 3629
3455 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
3456 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
… …
3462 }; 3637 };
3463 3638
3464 evthread_start IO::AIO::poll_fileno; 3639 evthread_start IO::AIO::poll_fileno;
3465 3640
3466 cf::sync_job { 3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3648 cf::load_settings;
3649
3467 reload_resources; 3650 reload_resources;
3468 reload_config; 3651 reload_config;
3469 db_init; 3652 db_init;
3470 3653
3471 cf::load_settings;
3472 cf::load_materials;
3473 cf::init_uuid; 3654 cf::init_uuid;
3474 cf::init_signals; 3655 cf::init_signals;
3475 cf::init_commands;
3476 cf::init_skills; 3656 cf::init_skills;
3477 3657
3478 cf::init_beforeplay; 3658 cf::init_beforeplay;
3479 3659
3480 atomic; 3660 atomic;
… …
3485 3665
3486 # no (long-running) fork's whatsoever before this point(!) 3666 # no (long-running) fork's whatsoever before this point(!)
3487 use POSIX (); 3667 use POSIX ();
3488 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3489 3669
3490 (pop @POST_INIT)->(0) while @POST_INIT; 3670 cf::_post_init 0;
3491 }; 3671 };
3492 3672
3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3493 main_loop; 3681 goto &main_loop;
3494} 3682}
3495 3683
3496############################################################################# 3684#############################################################################
3497# initialisation and cleanup 3685# initialisation and cleanup
3498 3686
3499# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
3500BEGIN { 3688BEGIN {
3501 our %SIGWATCHER = (); 3689 our %SIGWATCHER = ();
3502 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
3503 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3504 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
3505 }; 3693 };
3506 } 3694 }
3507} 3695}
3508 3696
3509sub write_runtime_sync { 3697sub write_runtime_sync {
3698 my $t0 = AE::time;
3699
3510 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
3511 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
3512 3702
3513 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3514 3704
3515 my $guard = cf::lock_acquire "write_runtime"; 3705 my $guard = cf::lock_acquire "write_runtime";
3516 3706
3517 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3707 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3518 or return; 3708 or return;
3519 3709
3520 my $value = $cf::RUNTIME + 90 + 10; 3710 my $value = $cf::RUNTIME + 90 + 10;
3521 # 10 is the runtime save interval, for a monotonic clock 3711 # 10 is the runtime save interval, for a monotonic clock
3522 # 60 allows for the watchdog to kill the server. 3712 # 60 allows for the watchdog to kill the server.
… …
3535 or return; 3725 or return;
3536 3726
3537 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3538 and return; 3728 and return;
3539 3729
3540 warn "runtime file written.\n"; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3541 3731
3542 1 3732 1
3543} 3733}
3544 3734
3545our $uuid_lock; 3735our $uuid_lock;
… …
3557 or return; 3747 or return;
3558 3748
3559 my $value = uuid_seq uuid_cur; 3749 my $value = uuid_seq uuid_cur;
3560 3750
3561 unless ($value) { 3751 unless ($value) {
3562 warn "cowardly refusing to write zero uuid value!\n"; 3752 info "cowardly refusing to write zero uuid value!\n";
3563 return; 3753 return;
3564 } 3754 }
3565 3755
3566 my $value = uuid_str $value + $uuid_skip; 3756 my $value = uuid_str $value + $uuid_skip;
3567 $uuid_skip = 0; 3757 $uuid_skip = 0;
… …
3577 or return; 3767 or return;
3578 3768
3579 aio_rename "$uuid~", $uuid 3769 aio_rename "$uuid~", $uuid
3580 and return; 3770 and return;
3581 3771
3582 warn "uuid file written ($value).\n"; 3772 trace "uuid file written ($value).\n";
3583 3773
3584 1 3774 1
3585 3775
3586} 3776}
3587 3777
… …
3593} 3783}
3594 3784
3595sub emergency_save() { 3785sub emergency_save() {
3596 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3597 3787
3598 warn "emergency_perl_save: enter\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3599 3794
3600 cf::sync_job { 3795 cf::sync_job {
3601 # this is a trade-off: we want to be very quick here, so 3796 cf::write_runtime_sync; # external watchdog should not bark
3602 # save all maps without fsync, and later call a global sync
3603 # (which in turn might be very very slow)
3604 local $USE_FSYNC = 0;
3605 3797
3606 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3607 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3608 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3609 warn "emergency_perl_save: begin player save\n"; 3801 info "emergency_perl_save: begin player save\n";
3610 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
3611 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
3612 $pl->valid or next; 3804 $pl->valid or next;
3613 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3614 $pl->save; 3806 $pl->save;
3615 } 3807 }
3616 warn "emergency_perl_save: end player save\n"; 3808 info "emergency_perl_save: end player save\n";
3617 3809
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3618 warn "emergency_perl_save: begin map save\n"; 3812 info "emergency_perl_save: begin map save\n";
3619 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3620 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3621 $map->valid or next; 3815 $map->valid or next;
3622 $map->save; 3816 $map->save;
3623 } 3817 }
3624 warn "emergency_perl_save: end map save\n"; 3818 info "emergency_perl_save: end map save\n";
3625 3819
3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3626 warn "emergency_perl_save: begin database checkpoint\n"; 3822 info "emergency_perl_save: begin database checkpoint\n";
3627 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3628 warn "emergency_perl_save: end database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3629 3825
3630 warn "emergency_perl_save: begin write uuid\n"; 3826 info "emergency_perl_save: begin write uuid\n";
3631 write_uuid_sync 1; 3827 write_uuid_sync 1;
3632 warn "emergency_perl_save: end write uuid\n"; 3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3633 }; 3848 };
3634 3849
3635 warn "emergency_perl_save: starting sync()\n";
3636 IO::AIO::aio_sync sub {
3637 warn "emergency_perl_save: finished sync()\n";
3638 };
3639
3640 warn "emergency_perl_save: leave\n"; 3850 info "emergency_perl_save: leave\n";
3641} 3851}
3642 3852
3643sub post_cleanup { 3853sub post_cleanup {
3644 my ($make_core) = @_; 3854 my ($make_core) = @_;
3645 3855
3856 IO::AIO::flush;
3857
3646 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3647 if $make_core; 3859 if $make_core;
3648 3860
3649 my $fh = pidfile; 3861 my $fh = pidfile;
3650 unlink $PIDFILE if <$fh> == $$; 3862 unlink $PIDFILE if <$fh> == $$;
3651} 3863}
… …
3671 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3672 for my $name (keys %$leaf_symtab) { 3884 for my $name (keys %$leaf_symtab) {
3673 _gv_clear *{"$pkg$name"}; 3885 _gv_clear *{"$pkg$name"};
3674# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3675 } 3887 }
3676 warn "cleared package $pkg\n";#d#
3677} 3888}
3678 3889
3679sub do_reload_perl() { 3890sub do_reload_perl() {
3680 # can/must only be called in main 3891 # can/must only be called in main
3681 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
3682 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3683 return; 3894 return;
3684 } 3895 }
3685 3896
3686 return if $RELOAD++; 3897 return if $RELOAD++;
3687 3898
3688 my $t1 = EV::time; 3899 my $t1 = AE::time;
3689 3900
3690 while ($RELOAD) { 3901 while ($RELOAD) {
3691 warn "reloading..."; 3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3692 3904
3693 warn "entering sync_job"; 3905 trace "perl_reload: entering sync_job";
3694 3906
3695 cf::sync_job { 3907 cf::sync_job {
3696 cf::write_runtime_sync; # external watchdog should not bark
3697 cf::emergency_save; 3908 #cf::emergency_save;
3698 cf::write_runtime_sync; # external watchdog should not bark
3699 3909
3700 warn "syncing database to disk";
3701 BDB::db_env_txn_checkpoint $DB_ENV;
3702
3703 # if anything goes wrong in here, we should simply crash as we already saved
3704
3705 warn "flushing outstanding aio requests";
3706 while (IO::AIO::nreqs || BDB::nreqs) {
3707 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3708 }
3709
3710 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3711 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3712 %EXT_CORO = (); 3912 %EXT_CORO = ();
3713 3913
3714 warn "removing commands"; 3914 trace "perl_reload: removing commands";
3715 %COMMAND = (); 3915 %COMMAND = ();
3716 3916
3717 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3718 %EXTCMD = (); 3918 %EXTCMD = ();
3719 %EXTICMD = (); 3919 %EXTICMD = ();
3720 3920
3721 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3722 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3723 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
3724 3924
3725 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3726 eval { 3926 eval {
3727 $cb->($pkg); 3927 $cb->($pkg);
3728 1 3928 1
3729 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3730 } 3930 }
3731 3931
3732 warn "... clearing $pkg"; 3932 trace "... clearing $pkg";
3733 clear_package $pkg; 3933 clear_package $pkg;
3734 } 3934 }
3735 3935
3736 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3737 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3738 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3739 3939
3740 warn "... unloading $k"; 3940 trace "... unloading $k";
3741 delete $INC{$k}; 3941 delete $INC{$k};
3742 3942
3743 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
3744 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
3745 3945
… …
3748 } 3948 }
3749 3949
3750 clear_package $k; 3950 clear_package $k;
3751 } 3951 }
3752 3952
3753 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3754 clear_package "safe::$_" 3954 clear_package "safe::$_"
3755 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3756 3956
3757 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3758 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3759 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3760 3960
3761 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3762 # and global variables created in xs 3962 # and global variables created in xs
3763 #clear_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3764 3964
3765 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3766 3966
3767 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3768 require cf; 3968 require cf;
3769 cf::_connect_to_perl_1; 3969 cf::_connect_to_perl_1;
3770 3970
3771 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3772 cf::reload_config; 3972 cf::reload_config;
3773 3973
3774 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
3775 cf::load_extensions; 3975 cf::load_extensions;
3776 3976
3777 if ($REATTACH_ON_RELOAD) { 3977 if ($REATTACH_ON_RELOAD) {
3778 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3779 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3780 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3781 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3782 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3783 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3784 } 3984 }
3785 3985
3786 warn "running post_init jobs"; 3986 cf::_post_init 1;
3787 (pop @POST_INIT)->(1) while @POST_INIT;
3788 3987
3789 warn "leaving sync_job"; 3988 trace "perl_reload: leaving sync_job";
3790 3989
3791 1 3990 1
3792 } or do { 3991 } or do {
3793 warn $@; 3992 error $@;
3794 cf::cleanup "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3795 }; 3994 };
3796 3995
3797 warn "reloaded";
3798 --$RELOAD; 3996 --$RELOAD;
3799 } 3997 }
3800 3998
3801 $t1 = EV::time - $t1; 3999 $t1 = AE::time - $t1;
3802 warn "reload completed in ${t1}s\n"; 4000 info "perl_reload: completed in ${t1}s\n";
3803}; 4001};
3804 4002
3805our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3806 4004
3807sub reload_perl() { 4005sub reload_perl() {
… …
3809 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3810 4008
3811 $RELOAD_WATCHER ||= cf::async { 4009 $RELOAD_WATCHER ||= cf::async {
3812 Coro::AIO::aio_wait cache_extensions; 4010 Coro::AIO::aio_wait cache_extensions;
3813 4011
3814 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3815 do_reload_perl; 4013 do_reload_perl;
3816 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
3817 }; 4015 };
3818 }; 4016 };
3819} 4017}
… …
3828 reload_perl; 4026 reload_perl;
3829 }; 4027 };
3830 } 4028 }
3831}; 4029};
3832 4030
3833unshift @INC, $LIBDIR; 4031#############################################################################
3834 4032
3835my $bug_warning = 0; 4033my $bug_warning = 0;
3836 4034
3837our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3838our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3839 4037
3840sub wait_for_tick { 4038sub wait_for_tick() {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3842 4040
3843 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3845 $signal->wait; 4043 $signal->wait;
3846} 4044}
3847 4045
3848sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3849 return if tick_inhibit || $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3850 4048
3851 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3852 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3853 $signal->wait; 4051 $signal->wait;
3854} 4052}
… …
3860 return; 4058 return;
3861 } 4059 }
3862 4060
3863 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3864 4062
4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4064
3865 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3866 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3867 Coro::async_pool { 4067 Coro::async_pool {
3868 $Coro::current->{desc} = "runtime saver"; 4068 $Coro::current->{desc} = "runtime saver";
3869 write_runtime_sync 4069 write_runtime_sync
3870 or warn "ERROR: unable to write runtime file: $!"; 4070 or error "ERROR: unable to write runtime file: $!";
3871 }; 4071 };
3872 } 4072 }
3873 4073
3874 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3875 $sig->send; 4075 $sig->send;
… …
3883 4083
3884 if (0) { 4084 if (0) {
3885 if ($NEXT_TICK) { 4085 if ($NEXT_TICK) {
3886 my $jitter = $TICK_START - $NEXT_TICK; 4086 my $jitter = $TICK_START - $NEXT_TICK;
3887 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3888 warn "jitter $JITTER\n";#d# 4088 debug "jitter $JITTER\n";#d#
3889 } 4089 }
3890 } 4090 }
3891} 4091}
3892 4092
3893{ 4093{
3894 # configure BDB 4094 # configure BDB
3895 4095
3896 BDB::min_parallel 8; 4096 BDB::min_parallel 16;
3897 BDB::max_poll_reqs $TICK * 0.1; 4097 BDB::max_poll_reqs $TICK * 0.1;
3898 $AnyEvent::BDB::WATCHER->priority (1); 4098 $AnyEvent::BDB::WATCHER->priority (1);
3899 4099
3900 unless ($DB_ENV) { 4100 unless ($DB_ENV) {
3901 $DB_ENV = BDB::db_env_create; 4101 $DB_ENV = BDB::db_env_create;
… …
3938 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
3939 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
3940 undef $AnyEvent::AIO::WATCHER; 4140 undef $AnyEvent::AIO::WATCHER;
3941} 4141}
3942 4142
3943my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
3944 4145
3945sub _log_backtrace { 4146sub _log_backtrace {
3946 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
3947 4148
3948 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
3949 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3950 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
3951 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
3952 ++$_log_backtrace; 4157 ++$_log_backtrace;
3953 my $perl_bt = Carp::longmess $msg; 4158 my $perl_bt = Carp::longmess $msg;
3954 async { 4159 async {
3955 $Coro::current->{desc} = "abt $msg"; 4160 $Coro::current->{desc} = "abt $msg";
3956 4161
… …
3976 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
3977 --$_log_backtrace; 4182 --$_log_backtrace;
3978 }; 4183 };
3979 } else { 4184 } else {
3980 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
3981 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3982 } 4187 }
3983} 4188}
3984 4189
3985# load additional modules 4190# load additional modules
3986require "cf/$_.pm" for @EXTRA_MODULES; 4191require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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