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.484 by root, Mon Oct 12 14:00:58 2009 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 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)
… …
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 1866 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1867 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1778 1889
1779sub register { 1890sub register {
1780 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1892 my $pkg = caller;
1782 1893
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1895
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1897}
1788 1898
1789# also paths starting with '/' 1899# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1901
1792sub thawer_merge { 1902sub thawer_merge {
1793 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1794 1904
1795 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1800} 1910}
1801 1911
1802sub normalise { 1912sub normalise {
1803 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1804 1914
1805 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1806 1916
1807 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1808 1918
1809 # map plan: 1919 # map plan:
1810 # 1920 #
… …
1825 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1936 $path = "$base/$path";
1827 } 1937 }
1828 1938
1829 for ($path) { 1939 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1833 } 1942 }
1834 1943
1835 $path 1944 $path
… …
1849 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1850 return $self; 1959 return $self;
1851 } 1960 }
1852 } 1961 }
1853 1962
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1964 ()
1856} 1965}
1857 1966
1858sub init { 1967sub init {
1859 my ($self) = @_; 1968 my ($self) = @_;
… …
1981} 2090}
1982 2091
1983sub find; 2092sub find;
1984sub find { 2093sub find {
1985 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2095
2096 cf::cede_to_tick;
1986 2097
1987 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1988 2099
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2120
2010 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
2011 } 2122 }
2012} 2123}
2013 2124
2014sub pre_load { } 2125sub pre_load { }
2015sub post_load { } 2126#sub post_load { } # XS
2016 2127
2017sub load { 2128sub load {
2018 my ($self) = @_; 2129 my ($self) = @_;
2019 2130
2020 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2188 }
2078 2189
2079 $self->post_load; 2190 $self->post_load;
2080} 2191}
2081 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2082sub customise_for { 2196sub customise_for {
2083 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2084 2198
2085 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2200 if $self->per_player;
… …
2102 or next; 2216 or next;
2103 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2104 or next; 2218 or next;
2105 $neigh->load; 2219 $neigh->load;
2106 2220
2221 # now find the diagonal neighbours
2107 push @neigh, 2222 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2225 }
2111 2226
… …
2118} 2233}
2119 2234
2120sub find_sync { 2235sub find_sync {
2121 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2122 2237
2123 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2124} 2242}
2125 2243
2126sub do_load_sync { 2244sub do_load_sync {
2127 my ($map) = @_; 2245 my ($map) = @_;
2128 2246
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2131 2249
2132 cf::sync_job { $map->load }; 2250 $map->load;
2133} 2251}
2134 2252
2135our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2137 2255
… …
2163 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2164 2282
2165 () 2283 ()
2166} 2284}
2167 2285
2286# common code, used by both ->save and ->swapout
2168sub save { 2287sub _save {
2169 my ($self) = @_; 2288 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2289
2173 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2174 2291
2175 return unless $self->dirty; 2292 return unless $self->dirty;
2176 2293
… …
2196 } else { 2313 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2315 }
2199} 2316}
2200 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2201sub swap_out { 2326sub swap_out {
2202 my ($self) = @_; 2327 my ($self) = @_;
2203 2328
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2330
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2212 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2214 2385
2215 $self->deactivate; 2386 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2388 $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 2389
2263 $self->unlink_save; 2390 $self->unlink_save;
2264 $self->destroy; 2391 $self->destroy;
2265} 2392}
2266 2393
… …
2274 2401
2275 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2276 2403
2277 $self->unlink_save; 2404 $self->unlink_save;
2278 2405
2279 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2411
… …
2341 : normalise $_ 2468 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2470 ]
2344} 2471}
2345 2472
2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2504
2346=back 2505=back
2347 2506
2348=head3 cf::object 2507=head3 cf::object
2349 2508
2350=cut 2509=cut
… …
2482 2641
2483Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2484 2643
2485The player should be reasonably safe there for short amounts of time (e.g. 2644The 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, 2645for 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 2646though, as the player cannot control the character while it is on the link
2488map. 2647map.
2489 2648
2490Will never block. 2649Will never block.
2491 2650
2492=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
… …
2513sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2514 my ($self) = @_; 2673 my ($self) = @_;
2515 2674
2516 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2517 2676
2677 ++$self->{_link_recursion};
2678
2518 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2519 2680
2520 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2522 2683
2523 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2524} 2685}
2525 2686
2526sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2527 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2528 2689
… …
2545 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2547 2708
2548 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2551 2712
2552 $map->load; 2713 $map->load;
2553 $map->load_neighbours; 2714 $map->load_neighbours;
2554 2715
2555 return unless $self->contr->active; 2716 return unless $self->contr->active;
2556 2717
2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2559 2720 # entering was successful
2721 delete $self->{_link_recursion};
2560 # only activate afterwards, to support waiting in hooks 2722 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive; 2723 $self->activate_recursive;
2562} 2724 }
2563 2725
2726}
2727
2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565 2729
2566Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2567her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2568that has to return the map if sucecssful, and then unfreezes the player on 2732that 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 2733the new (success) or old (failed) map position. In either case, $done will
… …
2576 2740
2577our $GOTOGEN; 2741our $GOTOGEN;
2578 2742
2579sub cf::object::player::goto { 2743sub cf::object::player::goto {
2580 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2581 2751
2582 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584 2754
2585 $self->enter_link; 2755 $self->enter_link;
… …
2609 my $map = eval { 2779 my $map = eval {
2610 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2611 2781
2612 if ($map) { 2782 if ($map) {
2613 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2614 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2615 } else { 2785 } else {
2616 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 } 2787 }
2618 2788
2619 $map 2789 $map
… …
2627 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2628 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2629 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2630 } 2800 }
2631 2801
2632 $done->() if $done; 2802 $done->($self) if $done;
2633 })->prio (1); 2803 })->prio (1);
2634} 2804}
2635 2805
2636=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2637 2807
… …
2730 $self->message ("Something went wrong deep within the deliantra server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2731 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2732 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2733 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2734 2904
2735 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2736 $self->leave_link; 2906 $self->leave_link;
2737 } 2907 }
2738 })->prio (1); 2908 })->prio (1);
2739} 2909}
2740 2910
… …
2752sub cf::client::send_drawinfo { 2922sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2923 my ($self, $text, $flags) = @_;
2754 2924
2755 utf8::encode $text; 2925 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2757} 2952}
2758 2953
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2955
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2765 2960
2766=cut 2961=cut
2767 2962
2768# non-persistent channels (usually the info channel) 2963# non-persistent channels (usually the info channel)
2769our %CHANNEL = ( 2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2770 "c/identify" => { 2971 "c/identify" => {
2771 id => "infobox", 2972 id => "infobox",
2772 title => "Identify", 2973 title => "Identify",
2773 reply => undef, 2974 reply => undef,
2774 tooltip => "Items recently identified", 2975 tooltip => "Items recently identified",
… …
2776 "c/examine" => { 2977 "c/examine" => {
2777 id => "infobox", 2978 id => "infobox",
2778 title => "Examine", 2979 title => "Examine",
2779 reply => undef, 2980 reply => undef,
2780 tooltip => "Signs and other items you examined", 2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2781 }, 2988 },
2782 "c/book" => { 2989 "c/book" => {
2783 id => "infobox", 2990 id => "infobox",
2784 title => "Book", 2991 title => "Book",
2785 reply => undef, 2992 reply => undef,
… …
2901 my $pkt = "msg " 3108 my $pkt = "msg "
2902 . $self->{json_coder}->encode ( 3109 . $self->{json_coder}->encode (
2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2904 ); 3111 );
2905 3112
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); 3113 $self->send_big_packet ($pkt);
2917} 3114}
2918 3115
2919=item $client->ext_msg ($type, @msg) 3116=item $client->ext_msg ($type, @msg)
2920 3117
2921Sends an ext event to the client. 3118Sends an ext event to the client.
… …
2924 3121
2925sub cf::client::ext_msg($$@) { 3122sub cf::client::ext_msg($$@) {
2926 my ($self, $type, @msg) = @_; 3123 my ($self, $type, @msg) = @_;
2927 3124
2928 if ($self->extcmd == 2) { 3125 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2930 } elsif ($self->extcmd == 1) { # TODO: remove 3127 } elsif ($self->extcmd == 1) { # TODO: remove
2931 push @msg, msgtype => "event_$type"; 3128 push @msg, msgtype => "event_$type";
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3130 }
2934} 3131}
2935 3132
2936=item $client->ext_reply ($msgid, @msg) 3133=item $client->ext_reply ($msgid, @msg)
2937 3134
… …
2941 3138
2942sub cf::client::ext_reply($$@) { 3139sub cf::client::ext_reply($$@) {
2943 my ($self, $id, @msg) = @_; 3140 my ($self, $id, @msg) = @_;
2944 3141
2945 if ($self->extcmd == 2) { 3142 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2947 } elsif ($self->extcmd == 1) { 3144 } elsif ($self->extcmd == 1) {
2948 #TODO: version 1, remove 3145 #TODO: version 1, remove
2949 unshift @msg, msgtype => "reply", msgid => $id; 3146 unshift @msg, msgtype => "reply", msgid => $id;
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3148 }
2952} 3149}
2953 3150
2954=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2955 3152
… …
3026 3223
3027 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3028 if $reply; 3225 if $reply;
3029 3226
3030 } else { 3227 } else {
3031 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3032 } 3229 }
3033 3230
3034 cf::override; 3231 cf::override;
3035 }, 3232 },
3036); 3233);
… …
3056 3253
3057 $coro 3254 $coro
3058} 3255}
3059 3256
3060cf::client->attach ( 3257cf::client->attach (
3061 on_destroy => sub { 3258 on_client_destroy => sub {
3062 my ($ns) = @_; 3259 my ($ns) = @_;
3063 3260
3064 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3065 }, 3262 },
3066); 3263);
… …
3082our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
3083 3280
3084$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
3085 3282
3086$safe->permit_only (Opcode::opset qw( 3283$safe->permit_only (Opcode::opset qw(
3087 :base_core :base_mem :base_orig :base_math 3284 :base_core :base_mem :base_orig :base_math :base_loop
3088 grepstart grepwhile mapstart mapwhile 3285 grepstart grepwhile mapstart mapwhile
3089 sort time 3286 sort time
3090)); 3287));
3091 3288
3092# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
… …
3117 decrease split destroy change_exp value msg lore send_msg)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3118 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3119 ["cf::player" => qw(peaceful send_msg)], 3316 ["cf::player" => qw(peaceful send_msg)],
3120 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3121) { 3318) {
3122 no strict 'refs';
3123 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3125 for @funs; 3321 for @funs;
3126} 3322}
3127 3323
… …
3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3145 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
3146 3342
3147 %vars = (_dummy => 0) unless %vars; 3343 %vars = (_dummy => 0) unless %vars;
3148 3344
3345 my @res;
3149 local $_; 3346 local $_;
3150 local @safe::cf::_safe_eval_args = values %vars;
3151 3347
3152 my $eval = 3348 my $eval =
3153 "do {\n" 3349 "do {\n"
3154 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3155 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
3156 . $code 3352 . $code
3157 . "\n}" 3353 . "\n}"
3158 ; 3354 ;
3159 3355
3356 if ($CFG{safe_eval}) {
3160 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
3161 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3162 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
3163 3365
3164 if ($@) { 3366 if ($@) {
3165 warn "$@"; 3367 warn "$@",
3166 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3167 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3168 } 3370 }
3169 3371
3170 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3171} 3373}
3172 3374
… …
3186=cut 3388=cut
3187 3389
3188sub register_script_function { 3390sub register_script_function {
3189 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
3190 3392
3191 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
3192 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
3193} 3395}
3194 3396
3195=back 3397=back
3196 3398
3197=cut 3399=cut
… …
3206 # for this (global event?) 3408 # for this (global event?)
3207 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3208 3410
3209 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3210 3412
3211 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3212 3414
3213 my $facedata;
3214 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3215 or die "$path: $!"; 3416 or die "$path: $!";
3216 3417
3217 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3218 3419
3219 $facedata->{version} == 2 3420 $facedata->{version} == 2
3220 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
3221 3422
3222 # patch in the exptable 3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3223 $facedata->{resource}{"res/exp_table"} = { 3425 $facedata->{resource}{"res/exp_table"} = {
3224 type => FT_RSRC, 3426 type => FT_RSRC,
3225 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3226 }; 3429 };
3227 cf::cede_to_tick; 3430 cf::cede_to_tick;
3228 3431
3229 { 3432 {
3230 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
… …
3232 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3233 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3234 3437
3235 cf::face::set_visibility $idx, $info->{visibility}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3236 cf::face::set_magicmap $idx, $info->{magicmap}; 3439 cf::face::set_magicmap $idx, $info->{magicmap};
3237 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3238 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3239 3442
3240 cf::cede_to_tick; 3443 cf::cede_to_tick;
3241 } 3444 }
3242 3445
3243 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
… …
3248 3451
3249 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3250 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3251 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3252 } else { 3455 } else {
3253 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3254 } 3457 }
3255 3458
3256 cf::cede_to_tick; 3459 cf::cede_to_tick;
3257 } 3460 }
3258 } 3461 }
… …
3267 3470
3268 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
3269 } 3472 }
3270 3473
3271 { 3474 {
3272 # TODO: for gcfclient pleasure, we should give resources
3273 # that gcfclient doesn't grok a >10000 face index.
3274 my $res = $facedata->{resource}; 3475 my $res = $facedata->{resource};
3275 3476
3276 while (my ($name, $info) = each %$res) { 3477 while (my ($name, $info) = each %$res) {
3277 if (defined $info->{type}) { 3478 if (defined $info->{type}) {
3278 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3279 my $data;
3280 3480
3281 if ($info->{type} & 1) { 3481 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}; 3482 cf::face::set_type $idx, $info->{type};
3296 } else { 3483 } else {
3297 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3298 } 3485 }
3299 3486
3300 cf::cede_to_tick; 3487 cf::cede_to_tick;
3301 } 3488 }
3302 } 3489 }
3303 3490
3304 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3305 3492
3306 1 3493 1
3307} 3494}
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 3495
3329register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3330 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3331 3498
3332 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
… …
3371sub reload_treasures { 3538sub reload_treasures {
3372 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3373 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3374} 3541}
3375 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3376sub reload_resources { 3566sub reload_resources {
3377 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3378 3568
3569 reload_exp_table;
3570 reload_materials;
3379 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3380 reload_archetypes; 3573 reload_archetypes;
3381 reload_regions; 3574 reload_regions;
3382 reload_treasures; 3575 reload_treasures;
3383 3576
3384 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3385} 3578}
3386 3579
3387sub reload_config { 3580sub reload_config {
3388 open my $fh, "<:utf8", "$CONFDIR/config" 3581 trace "reloading config file...\n";
3389 or return;
3390 3582
3391 local $/; 3583 0 < aio_load "$CONFDIR/config", my $config
3392 *CFG = YAML::XS::Load <$fh>; 3584 or die "$CONFDIR/config: $!";
3393 3585
3586 utf8::decode $config;
3587 *CFG = yaml_load $config;
3588
3394 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3395 3590
3396 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3397 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3398 3593
3399 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3423 seek $fh, 0, 0; 3618 seek $fh, 0, 0;
3424 print $fh $$; 3619 print $fh $$;
3425} 3620}
3426 3621
3427sub main_loop { 3622sub main_loop {
3428 warn "EV::loop starting\n"; 3623 trace "EV::loop starting\n";
3429 if (1) { 3624 if (1) {
3430 EV::loop; 3625 EV::loop;
3431 } 3626 }
3432 warn "EV::loop returned\n"; 3627 trace "EV::loop returned\n";
3433 goto &main_loop unless $REALLY_UNLOOP; 3628 goto &main_loop unless $REALLY_UNLOOP;
3434} 3629}
3435 3630
3436sub main { 3631sub main {
3437 cf::init_globals; # initialise logging 3632 cf::init_globals; # initialise logging
3438 3633
3439 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3440 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3441 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3442 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3443
3444 cf::init_experience;
3445 cf::init_anim;
3446 cf::init_attackmess;
3447 cf::init_dynamic;
3448 3638
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 3640
3451 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3452 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
… …
3458 }; 3648 };
3459 3649
3460 evthread_start IO::AIO::poll_fileno; 3650 evthread_start IO::AIO::poll_fileno;
3461 3651
3462 cf::sync_job { 3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3463 reload_resources; 3661 reload_resources;
3464 reload_config; 3662 reload_config;
3465 db_init; 3663 db_init;
3466 3664
3467 cf::load_settings;
3468 cf::load_materials;
3469 cf::init_uuid; 3665 cf::init_uuid;
3470 cf::init_signals; 3666 cf::init_signals;
3471 cf::init_commands;
3472 cf::init_skills; 3667 cf::init_skills;
3473 3668
3474 cf::init_beforeplay; 3669 cf::init_beforeplay;
3475 3670
3476 atomic; 3671 atomic;
… …
3481 3676
3482 # no (long-running) fork's whatsoever before this point(!) 3677 # no (long-running) fork's whatsoever before this point(!)
3483 use POSIX (); 3678 use POSIX ();
3484 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3485 3680
3486 (pop @POST_INIT)->(0) while @POST_INIT; 3681 cf::_post_init 0;
3487 }; 3682 };
3488 3683
3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3489 main_loop; 3692 goto &main_loop;
3490} 3693}
3491 3694
3492############################################################################# 3695#############################################################################
3493# initialisation and cleanup 3696# initialisation and cleanup
3494 3697
3495# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3496BEGIN { 3699BEGIN {
3497 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3498 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3499 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3500 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3501 }; 3704 };
3502 } 3705 }
3503} 3706}
3504 3707
3505sub write_runtime_sync { 3708sub write_runtime_sync {
3709 my $t0 = AE::time;
3710
3506 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3507 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3508 3713
3509 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3510 3715
3511 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3512 3717
3513 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3514 or return; 3719 or return;
3515 3720
3516 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3517 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3518 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
… …
3531 or return; 3736 or return;
3532 3737
3533 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3534 and return; 3739 and return;
3535 3740
3536 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3537 3742
3538 1 3743 1
3539} 3744}
3540 3745
3541our $uuid_lock; 3746our $uuid_lock;
… …
3553 or return; 3758 or return;
3554 3759
3555 my $value = uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3556 3761
3557 unless ($value) { 3762 unless ($value) {
3558 warn "cowardly refusing to write zero uuid value!\n"; 3763 info "cowardly refusing to write zero uuid value!\n";
3559 return; 3764 return;
3560 } 3765 }
3561 3766
3562 my $value = uuid_str $value + $uuid_skip; 3767 my $value = uuid_str $value + $uuid_skip;
3563 $uuid_skip = 0; 3768 $uuid_skip = 0;
… …
3573 or return; 3778 or return;
3574 3779
3575 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3576 and return; 3781 and return;
3577 3782
3578 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3579 3784
3580 1 3785 1
3581 3786
3582} 3787}
3583 3788
… …
3589} 3794}
3590 3795
3591sub emergency_save() { 3796sub emergency_save() {
3592 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3593 3798
3594 warn "emergency_perl_save: enter\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3595 3805
3596 cf::sync_job { 3806 cf::sync_job {
3597 # this is a trade-off: we want to be very quick here, so 3807 cf::write_runtime_sync; # external watchdog should not bark
3598 # save all maps without fsync, and later call a global sync
3599 # (which in turn might be very very slow)
3600 local $USE_FSYNC = 0;
3601 3808
3602 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3603 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3604 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3605 warn "emergency_perl_save: begin player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3606 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3607 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3608 $pl->valid or next; 3815 $pl->valid or next;
3609 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3610 $pl->save; 3817 $pl->save;
3611 } 3818 }
3612 warn "emergency_perl_save: end player save\n"; 3819 info "emergency_perl_save: end player save\n";
3613 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3614 warn "emergency_perl_save: begin map save\n"; 3823 info "emergency_perl_save: begin map save\n";
3615 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3616 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3617 $map->valid or next; 3826 $map->valid or next;
3618 $map->save; 3827 $map->save;
3619 } 3828 }
3620 warn "emergency_perl_save: end map save\n"; 3829 info "emergency_perl_save: end map save\n";
3621 3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3622 warn "emergency_perl_save: begin database checkpoint\n"; 3833 info "emergency_perl_save: begin database checkpoint\n";
3623 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3624 warn "emergency_perl_save: end database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3625 3836
3626 warn "emergency_perl_save: begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3627 write_uuid_sync 1; 3838 write_uuid_sync 1;
3628 warn "emergency_perl_save: end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3629 }; 3859 };
3630 3860
3631 warn "emergency_perl_save: starting sync()\n";
3632 IO::AIO::aio_sync sub {
3633 warn "emergency_perl_save: finished sync()\n";
3634 };
3635
3636 warn "emergency_perl_save: leave\n"; 3861 info "emergency_perl_save: leave\n";
3637} 3862}
3638 3863
3639sub post_cleanup { 3864sub post_cleanup {
3640 my ($make_core) = @_; 3865 my ($make_core) = @_;
3641 3866
3867 IO::AIO::flush;
3868
3642 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3643 if $make_core; 3870 if $make_core;
3644 3871
3645 my $fh = pidfile; 3872 my $fh = pidfile;
3646 unlink $PIDFILE if <$fh> == $$; 3873 unlink $PIDFILE if <$fh> == $$;
3647} 3874}
… …
3667 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3668 for my $name (keys %$leaf_symtab) { 3895 for my $name (keys %$leaf_symtab) {
3669 _gv_clear *{"$pkg$name"}; 3896 _gv_clear *{"$pkg$name"};
3670# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3671 } 3898 }
3672 warn "cleared package $pkg\n";#d#
3673} 3899}
3674 3900
3675sub do_reload_perl() { 3901sub do_reload_perl() {
3676 # can/must only be called in main 3902 # can/must only be called in main
3677 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3678 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3679 return; 3905 return;
3680 } 3906 }
3681 3907
3682 return if $RELOAD++; 3908 return if $RELOAD++;
3683 3909
3684 my $t1 = EV::time; 3910 my $t1 = AE::time;
3685 3911
3686 while ($RELOAD) { 3912 while ($RELOAD) {
3687 warn "reloading..."; 3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3688 3915
3689 warn "entering sync_job"; 3916 trace "perl_reload: entering sync_job";
3690 3917
3691 cf::sync_job { 3918 cf::sync_job {
3692 cf::write_runtime_sync; # external watchdog should not bark
3693 cf::emergency_save; 3919 #cf::emergency_save;
3694 cf::write_runtime_sync; # external watchdog should not bark
3695 3920
3696 warn "syncing database to disk";
3697 BDB::db_env_txn_checkpoint $DB_ENV;
3698
3699 # if anything goes wrong in here, we should simply crash as we already saved
3700
3701 warn "flushing outstanding aio requests";
3702 while (IO::AIO::nreqs || BDB::nreqs) {
3703 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3704 }
3705
3706 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3707 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3708 %EXT_CORO = (); 3923 %EXT_CORO = ();
3709 3924
3710 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3711 %COMMAND = (); 3926 %COMMAND = ();
3712 3927
3713 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3714 %EXTCMD = (); 3929 %EXTCMD = ();
3715 %EXTICMD = (); 3930 %EXTICMD = ();
3716 3931
3717 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3718 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3719 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3720 3935
3721 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3722 eval { 3937 eval {
3723 $cb->($pkg); 3938 $cb->($pkg);
3724 1 3939 1
3725 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3726 } 3941 }
3727 3942
3728 warn "... clearing $pkg"; 3943 trace "... clearing $pkg";
3729 clear_package $pkg; 3944 clear_package $pkg;
3730 } 3945 }
3731 3946
3732 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3733 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3734 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3735 3950
3736 warn "... unloading $k"; 3951 trace "... unloading $k";
3737 delete $INC{$k}; 3952 delete $INC{$k};
3738 3953
3739 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3740 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3741 3956
… …
3744 } 3959 }
3745 3960
3746 clear_package $k; 3961 clear_package $k;
3747 } 3962 }
3748 3963
3749 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3750 clear_package "safe::$_" 3965 clear_package "safe::$_"
3751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3752 3967
3753 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3754 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3755 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3756 3971
3757 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3758 # and global variables created in xs 3973 # and global variables created in xs
3759 #clear_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3760 3975
3761 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3762 3977
3763 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3764 require cf; 3979 require cf;
3765 cf::_connect_to_perl_1; 3980 cf::_connect_to_perl_1;
3766 3981
3767 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3768 cf::reload_config; 3983 cf::reload_config;
3769 3984
3770 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3771 cf::load_extensions; 3986 cf::load_extensions;
3772 3987
3773 if ($REATTACH_ON_RELOAD) { 3988 if ($REATTACH_ON_RELOAD) {
3774 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3775 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3776 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3777 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3778 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3779 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3780 } 3995 }
3781 3996
3782 warn "running post_init jobs"; 3997 cf::_post_init 1;
3783 (pop @POST_INIT)->(1) while @POST_INIT;
3784 3998
3785 warn "leaving sync_job"; 3999 trace "perl_reload: leaving sync_job";
3786 4000
3787 1 4001 1
3788 } or do { 4002 } or do {
3789 warn $@; 4003 error $@;
3790 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
3791 }; 4005 };
3792 4006
3793 warn "reloaded";
3794 --$RELOAD; 4007 --$RELOAD;
3795 } 4008 }
3796 4009
3797 $t1 = EV::time - $t1; 4010 $t1 = AE::time - $t1;
3798 warn "reload completed in ${t1}s\n"; 4011 info "perl_reload: completed in ${t1}s\n";
3799}; 4012};
3800 4013
3801our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3802 4015
3803sub reload_perl() { 4016sub reload_perl() {
… …
3805 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3806 4019
3807 $RELOAD_WATCHER ||= cf::async { 4020 $RELOAD_WATCHER ||= cf::async {
3808 Coro::AIO::aio_wait cache_extensions; 4021 Coro::AIO::aio_wait cache_extensions;
3809 4022
3810 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3811 do_reload_perl; 4024 do_reload_perl;
3812 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
3813 }; 4026 };
3814 }; 4027 };
3815} 4028}
… …
3824 reload_perl; 4037 reload_perl;
3825 }; 4038 };
3826 } 4039 }
3827}; 4040};
3828 4041
3829unshift @INC, $LIBDIR; 4042#############################################################################
3830 4043
3831my $bug_warning = 0; 4044my $bug_warning = 0;
3832 4045
3833our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3834our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3835 4048
3836sub wait_for_tick { 4049sub wait_for_tick() {
3837 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3838 4051
3839 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3840 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3841 $signal->wait; 4054 $signal->wait;
3842} 4055}
3843 4056
3844sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3845 return if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3846 4059
3847 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3848 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3849 $signal->wait; 4062 $signal->wait;
3850} 4063}
… …
3856 return; 4069 return;
3857 } 4070 }
3858 4071
3859 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3860 4073
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075
3861 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3862 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3863 Coro::async_pool { 4078 Coro::async_pool {
3864 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3865 write_runtime_sync 4080 write_runtime_sync
3866 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3867 }; 4082 };
3868 } 4083 }
3869 4084
3870 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3871 $sig->send; 4086 $sig->send;
… …
3879 4094
3880 if (0) { 4095 if (0) {
3881 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3882 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3883 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3884 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3885 } 4100 }
3886 } 4101 }
3887} 4102}
3888 4103
3889{ 4104{
3890 # configure BDB 4105 # configure BDB
3891 4106
3892 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3893 BDB::max_poll_reqs $TICK * 0.1; 4108 BDB::max_poll_reqs $TICK * 0.1;
3894 $AnyEvent::BDB::WATCHER->priority (1); 4109 $AnyEvent::BDB::WATCHER->priority (1);
3895 4110
3896 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3897 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;

Diff Legend

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