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.486 by root, Thu Oct 15 21:56:50 2009 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 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(&) {
… …
396} 429}
397 430
398=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
399 432
400Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 434get spread over time.
402 435
403=cut 436=cut
404 437
405sub periodic($$) { 438sub periodic($$) {
406 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
… …
423 456
424=cut 457=cut
425 458
426our @SLOT_QUEUE; 459our @SLOT_QUEUE;
427our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
428 462
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
432 466
433 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
434 469
435 while () { 470 while () {
436 next_job: 471 next_job:
472
437 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 474
439 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 479 $job->[2]->send;
443 Coro::cede; 480 Coro::cede;
444 goto next_job; 481 goto next_job;
445 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 484 }
447 } 485 }
448 486
449 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 490 $signal->wait;
453 } else { 491 } else {
492 $busy = 0;
454 Coro::schedule; 493 Coro::schedule;
455 } 494 }
456 } 495 }
457}; 496};
458 497
459sub get_slot($;$$) { 498sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
461 500
462 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
463 502
464 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
465 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
466 506
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
… …
495=cut 535=cut
496 536
497sub sync_job(&) { 537sub sync_job(&) {
498 my ($job) = @_; 538 my ($job) = @_;
499 539
500 if ($Coro::current == $Coro::main) { 540 if (in_main) {
501 my $time = EV::time; 541 my $time = AE::time;
502 542
503 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
505 545
506 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
507 547
508 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
509 549
510 my $busy = 1; 550 my $busy = 1;
511 my @res; 551 my @res;
512 552
513 (async { 553 (async {
514 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 555 @res = eval { $job->() };
516 warn $@ if $@; 556 error $@ if $@;
517 undef $busy; 557 undef $busy;
518 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
519 559
520 while ($busy) { 560 while ($busy) {
521 if (Coro::nready) { 561 if (Coro::nready) {
… …
523 } else { 563 } else {
524 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
525 } 565 }
526 } 566 }
527 567
528 my $time = EV::time - $time; 568 my $time = AE::time - $time;
529 569
530 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
531 571
532 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
533 } else { 573 } else {
… …
555 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
556 596
557 $coro 597 $coro
558} 598}
559 599
560=item fork_call { }, $args 600=item fork_call { }, @args
561 601
562Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 605never block itself or use any form of event handling.
566 606
567=cut 607=cut
568 608
609sub post_fork {
610 reset_signals;
611}
612
569sub fork_call(&@) { 613sub fork_call(&@) {
570 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
571 615
572 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
575 619
576 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
577 reset_signals; 621 cf::post_fork;
578 &$cb 622 &$cb
579 }, @args; 623 } @args;
580 624
581 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
582} 637}
583 638
584=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
585 640
586=cut 641=cut
… …
623within each server. 678within each server.
624 679
625=cut 680=cut
626 681
627sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
628 my ($name) = @_; 686 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
630 688
631 eval { 689 eval {
632 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
… …
642} 700}
643 701
644our $DB; 702our $DB;
645 703
646sub db_init { 704sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
649 };
650} 706}
651 707
652sub db_get($$) { 708sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
654 710
655 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
656 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
657 715
658 $! ? () 716 $! ? ()
659 : $data 717 : $data
660 }
661} 718}
662 719
663sub db_put($$$) { 720sub db_put($$$) {
664 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 778
722 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 780 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
725 782
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 784
728 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
731 788
… …
741 798
742=cut 799=cut
743 800
744sub datalog($@) { 801sub datalog($@) {
745 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 804}
748 805
749=back 806=back
750 807
751=cut 808=cut
… …
946 1003
947 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1006
950 } elsif (ref $type) { 1007 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
952 1009
953 } else { 1010 } else {
954 shift @arg; 1011 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
956 } 1013 }
957 } 1014 }
958} 1015}
959 1016
960sub _object_attach { 1017sub _object_attach {
… …
970 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
971 } 1028 }
972 1029
973 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
974 } else { 1031 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1033 }
977 1034
978 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
979} 1036}
980 1037
… …
1039 1096
1040 for (@$callbacks) { 1097 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1042 1099
1043 if ($@) { 1100 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1102 override;
1047 } 1103 }
1048 1104
1049 return 1 if $override; 1105 return 1 if $override;
1050 } 1106 }
… …
1129 for (@$attach) { 1185 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1132 } 1188 }
1133 } else { 1189 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1191 }
1136 } 1192 }
1137} 1193}
1138 1194
1139cf::attachable->attach ( 1195cf::attachable->attach (
… …
1166 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1167 1223
1168 sync_job { 1224 sync_job {
1169 if (length $$rdata) { 1225 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1173 1230
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1234 if ($cf::USE_FSYNC) {
… …
1199 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1200 1257
1201 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1260 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1205 } 1262 }
1206 } else { 1263 } else {
1207 aio_unlink $filename; 1264 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1209 } 1266 }
… …
1233 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1291 $av = $st->{objs};
1235 } 1292 }
1236 1293
1237 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1240 1298
1241 ($data, $av) 1299 ($data, $av)
1242} 1300}
1243 1301
1244=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
… …
1303} 1361}
1304 1362
1305use File::Glob (); 1363use File::Glob ();
1306 1364
1307cf::player->attach ( 1365cf::player->attach (
1308 on_command => sub { 1366 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1310 1368
1311 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1312 or return; 1370 or return;
1313 1371
… …
1336 1394
1337 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1396 if $reply;
1339 1397
1340 } else { 1398 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1400 }
1343 1401
1344 cf::override; 1402 cf::override;
1345 }, 1403 },
1346); 1404);
… …
1357 1415
1358 $grp 1416 $grp
1359} 1417}
1360 1418
1361sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1362 cf::sync_job { 1422 cf::sync_job {
1363 my %todo; 1423 my %todo;
1364 1424
1365 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1426 next unless -r $path;
… …
1384 1444
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1447
1388 $ext{source} = 1448 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1391 . $source 1451 . $source
1392 . "\n};\n1"; 1452 . "\n};\n1";
1393 1453
1394 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1395 } 1455 }
1396 1456
1457 my $pass = 0;
1397 my %done; 1458 my %done;
1398 while (%todo) { 1459 while (%todo) {
1399 my $progress; 1460 my $progress;
1400 1461
1462 ++$pass;
1463
1464 ext:
1401 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1467 next ext
1404 unless exists $done{$_}; 1468 unless exists $done{$_};
1405 } 1469 }
1406 1470
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1472
1409 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1477
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1479 if exists $v->{meta}{mandatory};
1417 1480
1418 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1419 } 1490 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1491 }
1425 1492
1426 skip: 1493 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1429 } 1501 }
1430 }; 1502 };
1431} 1503}
1432 1504
1433############################################################################# 1505#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1518 } 1590 }
1519 } 1591 }
1520} 1592}
1521 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1522sub save($) { 1607sub save($) {
1523 my ($pl) = @_; 1608 my ($pl) = @_;
1524 1609
1525 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1526 1611
… …
1531 1616
1532 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1534 1619
1535 cf::get_slot 0.01; 1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1624
1537 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1626 cf::cede_to_tick;
1539} 1627}
1540 1628
… …
1574 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1575 1663
1576 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1666
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1668 $pl->deactivate;
1669
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1584 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1585 1675
1586 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
… …
1642 \@logins 1732 \@logins
1643} 1733}
1644 1734
1645=item $player->maps 1735=item $player->maps
1646 1736
1737=item cf::player::maps $login
1738
1647Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1648player. May block. 1740player. May block.
1649 1741
1650=cut 1742=cut
1651 1743
… …
1713=cut 1805=cut
1714 1806
1715sub find_by_path($) { 1807sub find_by_path($) {
1716 my ($path) = @_; 1808 my ($path) = @_;
1717 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1718 my ($match, $specificity); 1812 my ($match, $specificity);
1719 1813
1720 for my $region (list) { 1814 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1848
1755 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1850 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1778 1872
1779sub register { 1873sub register {
1780 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1875 my $pkg = caller;
1782 1876
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1878
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1880}
1788 1881
1789# also paths starting with '/' 1882# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1884
1792sub thawer_merge { 1885sub thawer_merge {
1793 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1794 1887
1795 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
… …
1800} 1893}
1801 1894
1802sub normalise { 1895sub normalise {
1803 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1804 1897
1805 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1806 1899
1807 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1808 1901
1809 # map plan: 1902 # map plan:
1810 # 1903 #
… …
1849 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1850 return $self; 1943 return $self;
1851 } 1944 }
1852 } 1945 }
1853 1946
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1948 ()
1856} 1949}
1857 1950
1858sub init { 1951sub init {
1859 my ($self) = @_; 1952 my ($self) = @_;
… …
1981} 2074}
1982 2075
1983sub find; 2076sub find;
1984sub find { 2077sub find {
1985 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
1986 2081
1987 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1988 2083
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2104
2010 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2011 } 2106 }
2012} 2107}
2013 2108
2014sub pre_load { } 2109sub pre_load { }
2015sub post_load { } 2110#sub post_load { } # XS
2016 2111
2017sub load { 2112sub load {
2018 my ($self) = @_; 2113 my ($self) = @_;
2019 2114
2020 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2172 }
2078 2173
2079 $self->post_load; 2174 $self->post_load;
2080} 2175}
2081 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2082sub customise_for { 2180sub customise_for {
2083 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2084 2182
2085 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2184 if $self->per_player;
… …
2102 or next; 2200 or next;
2103 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2104 or next; 2202 or next;
2105 $neigh->load; 2203 $neigh->load;
2106 2204
2205 # now find the diagonal neighbours
2107 push @neigh, 2206 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2209 }
2111 2210
… …
2118} 2217}
2119 2218
2120sub find_sync { 2219sub find_sync {
2121 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2122 2221
2123 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2124} 2226}
2125 2227
2126sub do_load_sync { 2228sub do_load_sync {
2127 my ($map) = @_; 2229 my ($map) = @_;
2128 2230
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2131 2233
2132 cf::sync_job { $map->load }; 2234 $map->load;
2133} 2235}
2134 2236
2135our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2137 2239
… …
2163 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2164 2266
2165 () 2267 ()
2166} 2268}
2167 2269
2270# common code, used by both ->save and ->swapout
2168sub save { 2271sub _save {
2169 my ($self) = @_; 2272 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2273
2173 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2174 2275
2175 return unless $self->dirty; 2276 return unless $self->dirty;
2176 2277
… …
2196 } else { 2297 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2299 }
2199} 2300}
2200 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2201sub swap_out { 2310sub swap_out {
2202 my ($self) = @_; 2311 my ($self) = @_;
2203 2312
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2314
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2212 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2214 2369
2215 $self->deactivate; 2370 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2372 $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 2373
2263 $self->unlink_save; 2374 $self->unlink_save;
2264 $self->destroy; 2375 $self->destroy;
2265} 2376}
2266 2377
… …
2274 2385
2275 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2276 2387
2277 $self->unlink_save; 2388 $self->unlink_save;
2278 2389
2279 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2395
… …
2341 : normalise $_ 2452 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2454 ]
2344} 2455}
2345 2456
2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2488
2346=back 2489=back
2347 2490
2348=head3 cf::object 2491=head3 cf::object
2349 2492
2350=cut 2493=cut
… …
2482 2625
2483Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2484 2627
2485The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2486for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2488map. 2631map.
2489 2632
2490Will never block. 2633Will never block.
2491 2634
2492=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
… …
2513sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2514 my ($self) = @_; 2657 my ($self) = @_;
2515 2658
2516 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2517 2660
2661 ++$self->{_link_recursion};
2662
2518 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2519 2664
2520 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2522 2667
2523 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2524} 2669}
2525 2670
2526sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2527 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2528 2673
… …
2545 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2547 2692
2548 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2551 2696
2552 $map->load; 2697 $map->load;
2553 $map->load_neighbours; 2698 $map->load_neighbours;
2554 2699
2555 return unless $self->contr->active; 2700 return unless $self->contr->active;
2556 2701
2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2559 2704 # entering was successful
2705 delete $self->{_link_recursion};
2560 # only activate afterwards, to support waiting in hooks 2706 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive; 2707 $self->activate_recursive;
2562} 2708 }
2563 2709
2710}
2711
2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565 2713
2566Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2567her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2568that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2569the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
… …
2576 2724
2577our $GOTOGEN; 2725our $GOTOGEN;
2578 2726
2579sub cf::object::player::goto { 2727sub cf::object::player::goto {
2580 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2581 2735
2582 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584 2738
2585 $self->enter_link; 2739 $self->enter_link;
… …
2609 my $map = eval { 2763 my $map = eval {
2610 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2611 2765
2612 if ($map) { 2766 if ($map) {
2613 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2614 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2615 } else { 2769 } else {
2616 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 } 2771 }
2618 2772
2619 $map 2773 $map
… …
2627 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2628 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2629 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2630 } 2784 }
2631 2785
2632 $done->() if $done; 2786 $done->($self) if $done;
2633 })->prio (1); 2787 })->prio (1);
2634} 2788}
2635 2789
2636=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2637 2791
… …
2730 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2731 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2732 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2733 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2734 2888
2735 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2736 $self->leave_link; 2890 $self->leave_link;
2737 } 2891 }
2738 })->prio (1); 2892 })->prio (1);
2739} 2893}
2740 2894
… …
2752sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2754 2908
2755 utf8::encode $text; 2909 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2757} 2936}
2758 2937
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2939
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2782 "c/examine" => { 2961 "c/examine" => {
2783 id => "infobox", 2962 id => "infobox",
2784 title => "Examine", 2963 title => "Examine",
2785 reply => undef, 2964 reply => undef,
2786 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2787 }, 2972 },
2788 "c/book" => { 2973 "c/book" => {
2789 id => "infobox", 2974 id => "infobox",
2790 title => "Book", 2975 title => "Book",
2791 reply => undef, 2976 reply => undef,
… …
2907 my $pkt = "msg " 3092 my $pkt = "msg "
2908 . $self->{json_coder}->encode ( 3093 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 ); 3095 );
2911 3096
2912 # try lzf for large packets
2913 $pkt = "lzf " . Compress::LZF::compress $pkt
2914 if 1024 <= length $pkt and $self->{can_lzf};
2915
2916 # split very large packets
2917 if (8192 < length $pkt and $self->{can_lzf}) {
2918 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2919 $pkt = "frag";
2920 }
2921
2922 $self->send_packet ($pkt); 3097 $self->send_big_packet ($pkt);
2923} 3098}
2924 3099
2925=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2926 3101
2927Sends an ext event to the client. 3102Sends an ext event to the client.
… …
2930 3105
2931sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2932 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2933 3108
2934 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2935 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2936 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2937 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2938 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2939 } 3114 }
2940} 3115}
2941 3116
2942=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2943 3118
… …
2947 3122
2948sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2949 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2950 3125
2951 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2952 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2953 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2954 #TODO: version 1, remove 3129 #TODO: version 1, remove
2955 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2956 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2957 } 3132 }
2958} 3133}
2959 3134
2960=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2961 3136
… …
3032 3207
3033 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3034 if $reply; 3209 if $reply;
3035 3210
3036 } else { 3211 } else {
3037 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3038 } 3213 }
3039 3214
3040 cf::override; 3215 cf::override;
3041 }, 3216 },
3042); 3217);
… …
3062 3237
3063 $coro 3238 $coro
3064} 3239}
3065 3240
3066cf::client->attach ( 3241cf::client->attach (
3067 on_destroy => sub { 3242 on_client_destroy => sub {
3068 my ($ns) = @_; 3243 my ($ns) = @_;
3069 3244
3070 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3071 }, 3246 },
3072); 3247);
… …
3088our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3089 3264
3090$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3091 3266
3092$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3093 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3094 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3095 sort time 3270 sort time
3096)); 3271));
3097 3272
3098# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
… …
3123 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3124 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3125 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3126 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3127) { 3302) {
3128 no strict 'refs';
3129 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3130 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3131 for @funs; 3305 for @funs;
3132} 3306}
3133 3307
… …
3150 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3151 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3152 3326
3153 %vars = (_dummy => 0) unless %vars; 3327 %vars = (_dummy => 0) unless %vars;
3154 3328
3329 my @res;
3155 local $_; 3330 local $_;
3156 local @safe::cf::_safe_eval_args = values %vars;
3157 3331
3158 my $eval = 3332 my $eval =
3159 "do {\n" 3333 "do {\n"
3160 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3161 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3162 . $code 3336 . $code
3163 . "\n}" 3337 . "\n}"
3164 ; 3338 ;
3165 3339
3340 if ($CFG{safe_eval}) {
3166 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3167 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3168 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3169 3349
3170 if ($@) { 3350 if ($@) {
3171 warn "$@"; 3351 warn "$@",
3172 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3173 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3174 } 3354 }
3175 3355
3176 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3177} 3357}
3178 3358
… …
3192=cut 3372=cut
3193 3373
3194sub register_script_function { 3374sub register_script_function {
3195 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3196 3376
3197 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3198 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3199} 3379}
3200 3380
3201=back 3381=back
3202 3382
3203=cut 3383=cut
… …
3212 # for this (global event?) 3392 # for this (global event?)
3213 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3214 3394
3215 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3216 3396
3217 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3218 3398
3219 my $facedata;
3220 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3221 or die "$path: $!"; 3400 or die "$path: $!";
3222 3401
3223 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3224 3403
3225 $facedata->{version} == 2 3404 $facedata->{version} == 2
3226 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3227 3406
3228 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3229 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3230 type => FT_RSRC, 3410 type => FT_RSRC,
3231 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3232 }; 3413 };
3233 cf::cede_to_tick; 3414 cf::cede_to_tick;
3234 3415
3235 { 3416 {
3236 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
… …
3238 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3239 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3240 3421
3241 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3242 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3243 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3244 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3245 3426
3246 cf::cede_to_tick; 3427 cf::cede_to_tick;
3247 } 3428 }
3248 3429
3249 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
… …
3254 3435
3255 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3256 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3257 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3258 } else { 3439 } else {
3259 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3260 } 3441 }
3261 3442
3262 cf::cede_to_tick; 3443 cf::cede_to_tick;
3263 } 3444 }
3264 } 3445 }
… …
3273 3454
3274 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3275 } 3456 }
3276 3457
3277 { 3458 {
3278 # TODO: for gcfclient pleasure, we should give resources
3279 # that gcfclient doesn't grok a >10000 face index.
3280 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3281 3460
3282 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3283 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3284 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3285 my $data;
3286 3464
3287 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3288 # prepend meta info
3289
3290 my $meta = $enc->encode ({
3291 name => $name,
3292 %{ $info->{meta} || {} },
3293 });
3294
3295 $data = pack "(w/a*)*", $meta, $info->{data};
3296 } else {
3297 $data = $info->{data};
3298 }
3299
3300 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3301 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3302 } else { 3467 } else {
3303 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3304 } 3469 }
3305 3470
3306 cf::cede_to_tick; 3471 cf::cede_to_tick;
3307 } 3472 }
3308 } 3473 }
3309 3474
3310 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3311 3476
3312 1 3477 1
3313} 3478}
3314
3315cf::global->attach (on_resource_update => sub {
3316 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3317 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3318
3319 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3320 my $sound = $soundconf->{compat}[$_]
3321 or next;
3322
3323 my $face = cf::face::find "sound/$sound->[1]";
3324 cf::sound::set $sound->[0] => $face;
3325 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3326 }
3327
3328 while (my ($k, $v) = each %{$soundconf->{event}}) {
3329 my $face = cf::face::find "sound/$v";
3330 cf::sound::set $k => $face;
3331 }
3332 }
3333});
3334 3479
3335register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3336 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3337 3482
3338 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
… …
3377sub reload_treasures { 3522sub reload_treasures {
3378 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3379 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3380} 3525}
3381 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3382sub reload_resources { 3550sub reload_resources {
3383 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3384 3552
3553 reload_exp_table;
3554 reload_materials;
3385 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3386 reload_archetypes; 3557 reload_archetypes;
3387 reload_regions; 3558 reload_regions;
3388 reload_treasures; 3559 reload_treasures;
3389 3560
3390 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3391} 3562}
3392 3563
3393sub reload_config { 3564sub reload_config {
3394 warn "reloading config file...\n"; 3565 trace "reloading config file...\n";
3395 3566
3396 open my $fh, "<:utf8", "$CONFDIR/config" 3567 0 < aio_load "$CONFDIR/config", my $config
3397 or return; 3568 or die "$CONFDIR/config: $!";
3398 3569
3399 local $/; 3570 utf8::decode $config;
3400 *CFG = YAML::XS::Load scalar <$fh>; 3571 *CFG = yaml_load $config;
3401 3572
3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3403 3574
3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3406 3577
3407 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
… …
3409 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3580 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3410 and die "WARNING: m(un)lockall failed: $!\n"; 3581 and die "WARNING: m(un)lockall failed: $!\n";
3411 }; 3582 };
3412 warn $@ if $@; 3583 warn $@ if $@;
3413 } 3584 }
3414
3415 warn "finished reloading resource files\n";
3416} 3585}
3417 3586
3418sub pidfile() { 3587sub pidfile() {
3419 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3420 or die "$PIDFILE: $!"; 3589 or die "$PIDFILE: $!";
… …
3433 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3434 print $fh $$; 3603 print $fh $$;
3435} 3604}
3436 3605
3437sub main_loop { 3606sub main_loop {
3438 warn "EV::loop starting\n"; 3607 trace "EV::loop starting\n";
3439 if (1) { 3608 if (1) {
3440 EV::loop; 3609 EV::loop;
3441 } 3610 }
3442 warn "EV::loop returned\n"; 3611 trace "EV::loop returned\n";
3443 goto &main_loop unless $REALLY_UNLOOP; 3612 goto &main_loop unless $REALLY_UNLOOP;
3444} 3613}
3445 3614
3446sub main { 3615sub main {
3447 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3448 3617
3449 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3450 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3451 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3452 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3453
3454 cf::init_experience;
3455 cf::init_anim;
3456 cf::init_attackmess;
3457 cf::init_dynamic;
3458 3622
3459 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3460 3624
3461 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3462 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
… …
3468 }; 3632 };
3469 3633
3470 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3471 3635
3472 cf::sync_job { 3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3473 reload_resources; 3645 reload_resources;
3474 reload_config; 3646 reload_config;
3475 db_init; 3647 db_init;
3476 3648
3477 cf::load_settings;
3478 cf::load_materials;
3479 cf::init_uuid; 3649 cf::init_uuid;
3480 cf::init_signals; 3650 cf::init_signals;
3481 cf::init_commands;
3482 cf::init_skills; 3651 cf::init_skills;
3483 3652
3484 cf::init_beforeplay; 3653 cf::init_beforeplay;
3485 3654
3486 atomic; 3655 atomic;
… …
3494 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3495 3664
3496 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3497 }; 3666 };
3498 3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3499 main_loop; 3676 goto &main_loop;
3500} 3677}
3501 3678
3502############################################################################# 3679#############################################################################
3503# initialisation and cleanup 3680# initialisation and cleanup
3504 3681
3505# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3506BEGIN { 3683BEGIN {
3507 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3508 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3509 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3510 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3511 }; 3688 };
3512 } 3689 }
3513} 3690}
3514 3691
3515sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3516 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3517 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3518 3697
3519 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3520 3699
3521 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3522 3701
3523 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3524 or return; 3703 or return;
3525 3704
3526 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3527 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3528 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
… …
3541 or return; 3720 or return;
3542 3721
3543 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3544 and return; 3723 and return;
3545 3724
3546 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3547 3726
3548 1 3727 1
3549} 3728}
3550 3729
3551our $uuid_lock; 3730our $uuid_lock;
… …
3563 or return; 3742 or return;
3564 3743
3565 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3566 3745
3567 unless ($value) { 3746 unless ($value) {
3568 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3569 return; 3748 return;
3570 } 3749 }
3571 3750
3572 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3573 $uuid_skip = 0; 3752 $uuid_skip = 0;
… …
3583 or return; 3762 or return;
3584 3763
3585 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3586 and return; 3765 and return;
3587 3766
3588 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3589 3768
3590 1 3769 1
3591 3770
3592} 3771}
3593 3772
… …
3599} 3778}
3600 3779
3601sub emergency_save() { 3780sub emergency_save() {
3602 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3603 3782
3604 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3605 3789
3606 cf::sync_job { 3790 cf::sync_job {
3607 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3608 # save all maps without fsync, and later call a global sync
3609 # (which in turn might be very very slow)
3610 local $USE_FSYNC = 0;
3611 3792
3612 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3613 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3614 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3615 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3616 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3617 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3618 $pl->valid or next; 3799 $pl->valid or next;
3619 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3620 $pl->save; 3801 $pl->save;
3621 } 3802 }
3622 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3623 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3624 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3625 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3626 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3627 $map->valid or next; 3810 $map->valid or next;
3628 $map->save; 3811 $map->save;
3629 } 3812 }
3630 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3631 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3632 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3633 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3634 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3635 3820
3636 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3637 write_uuid_sync 1; 3822 write_uuid_sync 1;
3638 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3639 }; 3843 };
3640 3844
3641 warn "emergency_perl_save: starting sync()\n";
3642 IO::AIO::aio_sync sub {
3643 warn "emergency_perl_save: finished sync()\n";
3644 };
3645
3646 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3647} 3846}
3648 3847
3649sub post_cleanup { 3848sub post_cleanup {
3650 my ($make_core) = @_; 3849 my ($make_core) = @_;
3651 3850
3851 IO::AIO::flush;
3852
3652 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3653 if $make_core; 3854 if $make_core;
3654 3855
3655 my $fh = pidfile; 3856 my $fh = pidfile;
3656 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3657} 3858}
… …
3677 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3678 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3679 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3680# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3681 } 3882 }
3682 warn "cleared package $pkg\n";#d#
3683} 3883}
3684 3884
3685sub do_reload_perl() { 3885sub do_reload_perl() {
3686 # can/must only be called in main 3886 # can/must only be called in main
3687 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3688 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3689 return; 3889 return;
3690 } 3890 }
3691 3891
3692 return if $RELOAD++; 3892 return if $RELOAD++;
3693 3893
3694 my $t1 = EV::time; 3894 my $t1 = AE::time;
3695 3895
3696 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3697 warn "reloading..."; 3898 info "reloading...";
3698 3899
3699 warn "entering sync_job"; 3900 trace "entering sync_job";
3700 3901
3701 cf::sync_job { 3902 cf::sync_job {
3702 cf::write_runtime_sync; # external watchdog should not bark
3703 cf::emergency_save; 3903 #cf::emergency_save;
3704 cf::write_runtime_sync; # external watchdog should not bark
3705 3904
3706 warn "syncing database to disk";
3707 BDB::db_env_txn_checkpoint $DB_ENV;
3708
3709 # if anything goes wrong in here, we should simply crash as we already saved
3710
3711 warn "flushing outstanding aio requests";
3712 while (IO::AIO::nreqs || BDB::nreqs) {
3713 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3714 }
3715
3716 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3717 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3718 %EXT_CORO = (); 3907 %EXT_CORO = ();
3719 3908
3720 warn "removing commands"; 3909 trace "removing commands";
3721 %COMMAND = (); 3910 %COMMAND = ();
3722 3911
3723 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3724 %EXTCMD = (); 3913 %EXTCMD = ();
3725 %EXTICMD = (); 3914 %EXTICMD = ();
3726 3915
3727 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3728 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3729 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3730 3919
3731 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3732 eval { 3921 eval {
3733 $cb->($pkg); 3922 $cb->($pkg);
3734 1 3923 1
3735 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3736 } 3925 }
3737 3926
3738 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3739 clear_package $pkg; 3928 clear_package $pkg;
3740 } 3929 }
3741 3930
3742 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3743 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3744 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3745 3934
3746 warn "... unloading $k"; 3935 trace "... unloading $k";
3747 delete $INC{$k}; 3936 delete $INC{$k};
3748 3937
3749 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3750 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3751 3940
… …
3754 } 3943 }
3755 3944
3756 clear_package $k; 3945 clear_package $k;
3757 } 3946 }
3758 3947
3759 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3760 clear_package "safe::$_" 3949 clear_package "safe::$_"
3761 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3762 3951
3763 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3764 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3765 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3766 3955
3767 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3768 # and global variables created in xs 3957 # and global variables created in xs
3769 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3770 3959
3771 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3772 3961
3773 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3774 require cf; 3963 require cf;
3775 cf::_connect_to_perl_1; 3964 cf::_connect_to_perl_1;
3776 3965
3777 warn "loading config and database again"; 3966 trace "loading config and database again";
3778 cf::reload_config; 3967 cf::reload_config;
3779 3968
3780 warn "loading extensions"; 3969 trace "loading extensions";
3781 cf::load_extensions; 3970 cf::load_extensions;
3782 3971
3783 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3784 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3785 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3786 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3787 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3788 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3789 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3790 } 3979 }
3791 3980
3792 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3793 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3794 3983
3795 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3796 3985
3797 1 3986 1
3798 } or do { 3987 } or do {
3799 warn $@; 3988 error $@;
3800 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3801 }; 3990 };
3802 3991
3803 warn "reloaded"; 3992 info "reloaded";
3804 --$RELOAD; 3993 --$RELOAD;
3805 } 3994 }
3806 3995
3807 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3808 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3809}; 3998};
3810 3999
3811our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3812 4001
3813sub reload_perl() { 4002sub reload_perl() {
… …
3815 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3816 4005
3817 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3818 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3819 4008
3820 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3821 do_reload_perl; 4010 do_reload_perl;
3822 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3823 }; 4012 };
3824 }; 4013 };
3825} 4014}
… …
3834 reload_perl; 4023 reload_perl;
3835 }; 4024 };
3836 } 4025 }
3837}; 4026};
3838 4027
3839unshift @INC, $LIBDIR; 4028#############################################################################
3840 4029
3841my $bug_warning = 0; 4030my $bug_warning = 0;
3842 4031
3843our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3844our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3845 4034
3846sub wait_for_tick { 4035sub wait_for_tick() {
3847 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3848 4037
3849 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3850 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3851 $signal->wait; 4040 $signal->wait;
3852} 4041}
3853 4042
3854sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3855 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3856 4045
3857 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3858 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3859 $signal->wait; 4048 $signal->wait;
3860} 4049}
… …
3866 return; 4055 return;
3867 } 4056 }
3868 4057
3869 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3870 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3872 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3873 Coro::async_pool { 4064 Coro::async_pool {
3874 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3875 write_runtime_sync 4066 write_runtime_sync
3876 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3877 }; 4068 };
3878 } 4069 }
3879 4070
3880 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3881 $sig->send; 4072 $sig->send;
… …
3889 4080
3890 if (0) { 4081 if (0) {
3891 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3892 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3893 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3894 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3895 } 4086 }
3896 } 4087 }
3897} 4088}
3898 4089
3899{ 4090{
3900 # configure BDB 4091 # configure BDB
3901 4092
3902 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3903 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3904 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3905 4096
3906 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3907 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;

Diff Legend

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