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.498 by elmex, Tue Jan 5 16:16:37 2010 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
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
82 80
81our @ORIG_INC;
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
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
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.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
230 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
… …
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
… …
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)
… …
1752 1863
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1865
1755 # mit "rum" bekleckern, nicht 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,
1869 $rmp->{wall_name}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1870 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1871 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1872 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1873 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1874 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1875 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1876 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1877 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1878 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom} 1879 (cf::region::find $rmp->{region})
1768 ) 1880 )
1769} 1881}
1770 1882
1771=item cf::map->register ($regex, $prio) 1883=item cf::map->register ($regex, $prio)
1772 1884
… …
1778 1890
1779sub register { 1891sub register {
1780 my (undef, $regex, $prio) = @_; 1892 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1893 my $pkg = caller;
1782 1894
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1895 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1896
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1897 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1898}
1788 1899
1789# also paths starting with '/' 1900# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1901$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1902
1792sub thawer_merge { 1903sub thawer_merge {
1793 my ($self, $merge) = @_; 1904 my ($self, $merge) = @_;
1794 1905
1795 # we have to keep some variables in memory intact 1906 # we have to keep some variables in memory intact
… …
1800} 1911}
1801 1912
1802sub normalise { 1913sub normalise {
1803 my ($path, $base) = @_; 1914 my ($path, $base) = @_;
1804 1915
1805 $path = "$path"; # make sure its a string 1916 $path = "$path"; # make sure it's a string
1806 1917
1807 $path =~ s/\.map$//; 1918 $path =~ s/\.map$//;
1808 1919
1809 # map plan: 1920 # map plan:
1810 # 1921 #
… …
1825 $base =~ s{[^/]+/?$}{}; 1936 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1937 $path = "$base/$path";
1827 } 1938 }
1828 1939
1829 for ($path) { 1940 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1941 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1942 redo if s{/[^/]+/\.\./}{/};
1833 } 1943 }
1834 1944
1835 $path 1945 $path
… …
1849 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1850 return $self; 1960 return $self;
1851 } 1961 }
1852 } 1962 }
1853 1963
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1965 ()
1856} 1966}
1857 1967
1858sub init { 1968sub init {
1859 my ($self) = @_; 1969 my ($self) = @_;
… …
1981} 2091}
1982 2092
1983sub find; 2093sub find;
1984sub find { 2094sub find {
1985 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
1986 2098
1987 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
1988 2100
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2121
2010 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
2011 } 2123 }
2012} 2124}
2013 2125
2014sub pre_load { } 2126sub pre_load { }
2015sub post_load { } 2127#sub post_load { } # XS
2016 2128
2017sub load { 2129sub load {
2018 my ($self) = @_; 2130 my ($self) = @_;
2019 2131
2020 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
… …
2075 2187
2076 $self->in_memory (cf::MAP_ACTIVE); 2188 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2189 }
2078 2190
2079 $self->post_load; 2191 $self->post_load;
2080}
2081 2192
2193 1
2194}
2195
2196# customize the map for a given player, i.e.
2197# return the _real_ map. used by e.g. per-player
2198# maps to change the path to ~playername/mappath
2082sub customise_for { 2199sub customise_for {
2083 my ($self, $ob) = @_; 2200 my ($self, $ob) = @_;
2084 2201
2085 return find "~" . $ob->name . "/" . $self->{path} 2202 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2203 if $self->per_player;
… …
2102 or next; 2219 or next;
2103 $neigh = find $neigh, $map 2220 $neigh = find $neigh, $map
2104 or next; 2221 or next;
2105 $neigh->load; 2222 $neigh->load;
2106 2223
2224 # now find the diagonal neighbours
2107 push @neigh, 2225 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2226 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2227 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2228 }
2111 2229
… …
2118} 2236}
2119 2237
2120sub find_sync { 2238sub find_sync {
2121 my ($path, $origin) = @_; 2239 my ($path, $origin) = @_;
2122 2240
2123 cf::sync_job { find $path, $origin } 2241 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2242 if $Coro::current == $Coro::main;
2243
2244 find $path, $origin
2124} 2245}
2125 2246
2126sub do_load_sync { 2247sub do_load_sync {
2127 my ($map) = @_; 2248 my ($map) = @_;
2128 2249
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2250 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2251 if $Coro::current == $Coro::main;
2131 2252
2132 cf::sync_job { $map->load }; 2253 $map->load;
2133} 2254}
2134 2255
2135our %MAP_PREFETCH; 2256our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2257our $MAP_PREFETCHER = undef;
2137 2258
… …
2163 $MAP_PREFETCHER->prio (6); 2284 $MAP_PREFETCHER->prio (6);
2164 2285
2165 () 2286 ()
2166} 2287}
2167 2288
2289# common code, used by both ->save and ->swapout
2168sub save { 2290sub _save {
2169 my ($self) = @_; 2291 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2292
2173 $self->{last_save} = $cf::RUNTIME; 2293 $self->{last_save} = $cf::RUNTIME;
2174 2294
2175 return unless $self->dirty; 2295 return unless $self->dirty;
2176 2296
… …
2196 } else { 2316 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2317 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2318 }
2199} 2319}
2200 2320
2321sub save {
2322 my ($self) = @_;
2323
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2326 $self->_save;
2327}
2328
2201sub swap_out { 2329sub swap_out {
2202 my ($self) = @_; 2330 my ($self) = @_;
2203 2331
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2332 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2333
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2334 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2336 return if $self->players;
2212 2337
2338 # first deactivate the map and "unlink" it from the core
2339 $self->deactivate;
2340 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2341 $self->in_memory (cf::MAP_SWAPPED);
2342
2343 # then atomically save
2344 $self->_save;
2345
2346 # then free the map
2347 $self->clear;
2348}
2349
2350sub reset_at {
2351 my ($self) = @_;
2352
2353 # TODO: safety, remove and allow resettable per-player maps
2354 return 1e99 if $self->{deny_reset};
2355
2356 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2357 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2358
2359 $time + $to
2360}
2361
2362sub should_reset {
2363 my ($self) = @_;
2364
2365 $self->reset_at <= $cf::RUNTIME
2366}
2367
2368sub reset {
2369 my ($self) = @_;
2370
2371 my $lock = cf::lock_acquire "map_data:$self->{path}";
2372
2373 return if $self->players;
2374
2375 cf::trace "resetting map ", $self->path, "\n";
2376
2377 $self->in_memory (cf::MAP_SWAPPED);
2378
2379 # need to save uniques path
2380 unless ($self->{deny_save}) {
2381 my $uniq = $self->uniq_path; utf8::encode $uniq;
2382
2383 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2384 if $uniq;
2385 }
2386
2387 delete $cf::MAP{$self->path};
2214 2388
2215 $self->deactivate; 2389 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2390 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2391 $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 2392
2263 $self->unlink_save; 2393 $self->unlink_save;
2264 $self->destroy; 2394 $self->destroy;
2265} 2395}
2266 2396
… …
2274 2404
2275 delete $cf::MAP{$self->path}; 2405 delete $cf::MAP{$self->path};
2276 2406
2277 $self->unlink_save; 2407 $self->unlink_save;
2278 2408
2279 bless $self, "cf::map"; 2409 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2410 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2411 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2412 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2413 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2414
… …
2514 2644
2515Freezes the player and moves him/her to a special map (C<{link}>). 2645Freezes the player and moves him/her to a special map (C<{link}>).
2516 2646
2517The player should be reasonably safe there for short amounts of time (e.g. 2647The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2648for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2649though, as the player cannot control the character while it is on the link
2520map. 2650map.
2521 2651
2522Will never block. 2652Will never block.
2523 2653
2524=item $player_object->leave_link ($map, $x, $y) 2654=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2675sub cf::object::player::enter_link {
2546 my ($self) = @_; 2676 my ($self) = @_;
2547 2677
2548 $self->deactivate_recursive; 2678 $self->deactivate_recursive;
2549 2679
2680 ++$self->{_link_recursion};
2681
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2682 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2683
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2684 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2685 if $self->map && $self->map->{path} ne "{link}";
2554 2686
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2687 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2688}
2557 2689
2558sub cf::object::player::leave_link { 2690sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2691 my ($self, $map, $x, $y) = @_;
2560 2692
… …
2585 $map->load_neighbours; 2717 $map->load_neighbours;
2586 2718
2587 return unless $self->contr->active; 2719 return unless $self->contr->active;
2588 2720
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2721 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2722 if ($self->enter_map ($map, $x, $y)) {
2591 2723 # entering was successful
2724 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2725 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2726 $self->activate_recursive;
2594} 2727 }
2595 2728
2729}
2730
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2731=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2732
2598Moves the player to the given map-path and coordinates by first freezing 2733Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2734her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2735that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2736the new (success) or old (failed) map position. In either case, $done will
… …
2608 2743
2609our $GOTOGEN; 2744our $GOTOGEN;
2610 2745
2611sub cf::object::player::goto { 2746sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2747 my ($self, $path, $x, $y, $check, $done) = @_;
2748
2749 if ($self->{_link_recursion} >= $MAX_LINKS) {
2750 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2751 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2752 ($path, $x, $y) = @$EMERGENCY_POSITION;
2753 }
2613 2754
2614 # do generation counting so two concurrent goto's will be executed in-order 2755 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2756 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2757
2617 $self->enter_link; 2758 $self->enter_link;
… …
2641 my $map = eval { 2782 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2783 my $map = defined $path ? cf::map::find $path : undef;
2643 2784
2644 if ($map) { 2785 if ($map) {
2645 $map = $map->customise_for ($self); 2786 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2787 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2788 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2789 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2790 }
2650 2791
2651 $map 2792 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2800 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2801 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2802 $self->leave_link ($map, $x, $y);
2662 } 2803 }
2663 2804
2664 $done->() if $done; 2805 $done->($self) if $done;
2665 })->prio (1); 2806 })->prio (1);
2666} 2807}
2667 2808
2668=item $player_object->enter_exit ($exit_object) 2809=item $player_object->enter_exit ($exit_object)
2669 2810
… …
2762 $self->message ("Something went wrong deep within the deliantra server. " 2903 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2904 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2905 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2906 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2907
2767 warn "ERROR in enter_exit: $@"; 2908 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2909 $self->leave_link;
2769 } 2910 }
2770 })->prio (1); 2911 })->prio (1);
2771} 2912}
2772 2913
… …
3085 3226
3086 $ns->ext_reply ($reply, @reply) 3227 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3228 if $reply;
3088 3229
3089 } else { 3230 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3231 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3232 }
3092 3233
3093 cf::override; 3234 cf::override;
3094 }, 3235 },
3095); 3236);
… …
3115 3256
3116 $coro 3257 $coro
3117} 3258}
3118 3259
3119cf::client->attach ( 3260cf::client->attach (
3120 on_destroy => sub { 3261 on_client_destroy => sub {
3121 my ($ns) = @_; 3262 my ($ns) = @_;
3122 3263
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3264 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3265 },
3125); 3266);
… …
3176 decrease split destroy change_exp value msg lore send_msg)], 3317 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3318 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3319 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3320 ["cf::map" => qw(trigger)],
3180) { 3321) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3322 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3323 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3324 for @funs;
3185} 3325}
3186 3326
… …
3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3343 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3204 $qcode =~ s/\n/\\n/g; 3344 $qcode =~ s/\n/\\n/g;
3205 3345
3206 %vars = (_dummy => 0) unless %vars; 3346 %vars = (_dummy => 0) unless %vars;
3207 3347
3348 my @res;
3208 local $_; 3349 local $_;
3209 local @safe::cf::_safe_eval_args = values %vars;
3210 3350
3211 my $eval = 3351 my $eval =
3212 "do {\n" 3352 "do {\n"
3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3353 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214 . "#line 0 \"{$qcode}\"\n" 3354 . "#line 0 \"{$qcode}\"\n"
3215 . $code 3355 . $code
3216 . "\n}" 3356 . "\n}"
3217 ; 3357 ;
3218 3358
3359 if ($CFG{safe_eval}) {
3219 sub_generation_inc; 3360 sub_generation_inc;
3361 local @safe::cf::_safe_eval_args = values %vars;
3220 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3362 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221 sub_generation_inc; 3363 sub_generation_inc;
3364 } else {
3365 local @cf::_safe_eval_args = values %vars;
3366 @res = wantarray ? eval eval : scalar eval $eval;
3367 }
3222 3368
3223 if ($@) { 3369 if ($@) {
3224 warn "$@"; 3370 warn "$@",
3225 warn "while executing safe code '$code'\n"; 3371 "while executing safe code '$code'\n",
3226 warn "with arguments " . (join " ", %vars) . "\n"; 3372 "with arguments " . (join " ", %vars) . "\n";
3227 } 3373 }
3228 3374
3229 wantarray ? @res : $res[0] 3375 wantarray ? @res : $res[0]
3230} 3376}
3231 3377
… …
3245=cut 3391=cut
3246 3392
3247sub register_script_function { 3393sub register_script_function {
3248 my ($fun, $cb) = @_; 3394 my ($fun, $cb) = @_;
3249 3395
3250 no strict 'refs'; 3396 $fun = "safe::$fun" if $CFG{safe_eval};
3251 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3397 *$fun = $safe_hole->wrap ($cb);
3252} 3398}
3253 3399
3254=back 3400=back
3255 3401
3256=cut 3402=cut
… …
3265 # for this (global event?) 3411 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3412 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3413
3268 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3414 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3269 3415
3270 warn "loading facedata from $path\n"; 3416 trace "loading facedata from $path\n";
3271 3417
3272 my $facedata;
3273 0 < aio_load $path, $facedata 3418 0 < aio_load $path, my $facedata
3274 or die "$path: $!"; 3419 or die "$path: $!";
3275 3420
3276 $facedata = Coro::Storable::thaw $facedata; 3421 $facedata = Coro::Storable::thaw $facedata;
3277 3422
3278 $facedata->{version} == 2 3423 $facedata->{version} == 2
3279 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3280 3425
3281 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3282 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3283 type => FT_RSRC, 3429 type => FT_RSRC,
3284 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3285 }; 3432 };
3286 cf::cede_to_tick; 3433 cf::cede_to_tick;
3287 3434
3288 { 3435 {
3289 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
… …
3307 3454
3308 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3309 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3310 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3311 } else { 3458 } else {
3312 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3313 } 3460 }
3314 3461
3315 cf::cede_to_tick; 3462 cf::cede_to_tick;
3316 } 3463 }
3317 } 3464 }
… …
3335 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3336 3483
3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3338 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3339 } else { 3486 } else {
3340 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3341 } 3488 }
3342 3489
3343 cf::cede_to_tick; 3490 cf::cede_to_tick;
3344 } 3491 }
3345 } 3492 }
3346 3493
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348 3495
3349 1 3496 1
3350} 3497}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
3371 3498
3372register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3373 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3374 3501
3375 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
… …
3414sub reload_treasures { 3541sub reload_treasures {
3415 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3416 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3417} 3544}
3418 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3419sub reload_resources { 3569sub reload_resources {
3420 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3421 3571
3572 reload_exp_table;
3573 reload_materials;
3422 reload_facedata; 3574 reload_facedata;
3575 reload_sound;
3423 reload_archetypes; 3576 reload_archetypes;
3424 reload_regions; 3577 reload_regions;
3425 reload_treasures; 3578 reload_treasures;
3426 3579
3427 warn "finished reloading resource files\n"; 3580 trace "finished reloading resource files\n";
3428} 3581}
3429 3582
3430sub reload_config { 3583sub reload_config {
3431 warn "reloading config file...\n"; 3584 trace "reloading config file...\n";
3432 3585
3433 open my $fh, "<:utf8", "$CONFDIR/config" 3586 0 < aio_load "$CONFDIR/config", my $config
3434 or return; 3587 or die "$CONFDIR/config: $!";
3435 3588
3436 local $/; 3589 utf8::decode $config;
3437 *CFG = YAML::XS::Load scalar <$fh>; 3590 *CFG = yaml_load $config;
3438 3591
3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3592 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440 3593
3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3594 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3595 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3443 3596
3444 if (exists $CFG{mlockall}) { 3597 if (exists $CFG{mlockall}) {
… …
3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3599 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3447 and die "WARNING: m(un)lockall failed: $!\n"; 3600 and die "WARNING: m(un)lockall failed: $!\n";
3448 }; 3601 };
3449 warn $@ if $@; 3602 warn $@ if $@;
3450 } 3603 }
3451
3452 warn "finished reloading resource files\n";
3453} 3604}
3454 3605
3455sub pidfile() { 3606sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3470 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3471 print $fh $$; 3622 print $fh $$;
3472} 3623}
3473 3624
3474sub main_loop { 3625sub main_loop {
3475 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3476 if (1) { 3627 if (1) {
3477 EV::loop; 3628 EV::loop;
3478 } 3629 }
3479 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3481} 3632}
3482 3633
3483sub main { 3634sub main {
3484 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3485 3636
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495 3641
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497 3643
3498 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3499 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
… …
3505 }; 3651 };
3506 3652
3507 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3508 3654
3509 cf::sync_job { 3655 cf::sync_job {
3656 cf::incloader::init ();
3657
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3510 cf::load_settings; 3662 cf::load_settings;
3511 cf::load_materials;
3512 3663
3513 reload_resources; 3664 reload_resources;
3514 reload_config; 3665 reload_config;
3515 db_init; 3666 db_init;
3516 3667
3517 cf::init_uuid; 3668 cf::init_uuid;
3518 cf::init_signals; 3669 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3670 cf::init_skills;
3521 3671
3522 cf::init_beforeplay; 3672 cf::init_beforeplay;
3523 3673
3524 atomic; 3674 atomic;
… …
3529 3679
3530 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX (); 3681 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533 3683
3534 (pop @POST_INIT)->(0) while @POST_INIT; 3684 cf::_post_init 0;
3535 }; 3685 };
3536 3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3537 main_loop; 3695 goto &main_loop;
3538} 3696}
3539 3697
3540############################################################################# 3698#############################################################################
3541# initialisation and cleanup 3699# initialisation and cleanup
3542 3700
3543# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3544BEGIN { 3702BEGIN {
3545 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3549 }; 3707 };
3550 } 3708 }
3551} 3709}
3552 3710
3553sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3554 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3556 3716
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3718
3559 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3560 3720
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3722 or return;
3563 3723
3564 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
… …
3579 or return; 3739 or return;
3580 3740
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3742 and return;
3583 3743
3584 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3745
3586 1 3746 1
3587} 3747}
3588 3748
3589our $uuid_lock; 3749our $uuid_lock;
… …
3601 or return; 3761 or return;
3602 3762
3603 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3604 3764
3605 unless ($value) { 3765 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3607 return; 3767 return;
3608 } 3768 }
3609 3769
3610 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0; 3771 $uuid_skip = 0;
… …
3621 or return; 3781 or return;
3622 3782
3623 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3624 and return; 3784 and return;
3625 3785
3626 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3627 3787
3628 1 3788 1
3629 3789
3630} 3790}
3631 3791
… …
3637} 3797}
3638 3798
3639sub emergency_save() { 3799sub emergency_save() {
3640 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3641 3801
3642 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3643 3808
3644 cf::sync_job { 3809 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so 3810 cf::write_runtime_sync; # external watchdog should not bark
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649 3811
3650 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3651 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3652 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3653 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3654 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3655 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3656 $pl->valid or next; 3818 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3658 $pl->save; 3820 $pl->save;
3659 } 3821 }
3660 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3661 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3662 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3663 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3664 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3665 $map->valid or next; 3829 $map->valid or next;
3666 $map->save; 3830 $map->save;
3667 } 3831 }
3668 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3669 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3670 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3671 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3672 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3673 3839
3674 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1; 3841 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3677 }; 3862 };
3678 3863
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3684 warn "emergency_perl_save: leave\n"; 3864 info "emergency_perl_save: leave\n";
3685} 3865}
3686 3866
3687sub post_cleanup { 3867sub post_cleanup {
3688 my ($make_core) = @_; 3868 my ($make_core) = @_;
3689 3869
3870 IO::AIO::flush;
3871
3690 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3691 if $make_core; 3873 if $make_core;
3692 3874
3693 my $fh = pidfile; 3875 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3695} 3877}
… …
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 } 3901 }
3720 warn "cleared package $pkg\n";#d#
3721} 3902}
3722 3903
3723sub do_reload_perl() { 3904sub do_reload_perl() {
3724 # can/must only be called in main 3905 # can/must only be called in main
3725 if ($Coro::current != $Coro::main) { 3906 unless (in_main) {
3726 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3727 return; 3908 return;
3728 } 3909 }
3729 3910
3730 return if $RELOAD++; 3911 return if $RELOAD++;
3731 3912
3732 my $t1 = EV::time; 3913 my $t1 = AE::time;
3733 3914
3734 while ($RELOAD) { 3915 while ($RELOAD) {
3735 warn "reloading..."; 3916 cf::get_slot 0.1, -1, "reload_perl";
3917 info "perl_reload: reloading...";
3736 3918
3737 warn "entering sync_job"; 3919 trace "perl_reload: entering sync_job";
3738 3920
3739 cf::sync_job { 3921 cf::sync_job {
3740 cf::write_runtime_sync; # external watchdog should not bark
3741 cf::emergency_save; 3922 #cf::emergency_save;
3742 cf::write_runtime_sync; # external watchdog should not bark
3743 3923
3744 warn "syncing database to disk";
3745 BDB::db_env_txn_checkpoint $DB_ENV;
3746
3747 # if anything goes wrong in here, we should simply crash as we already saved
3748
3749 warn "flushing outstanding aio requests";
3750 while (IO::AIO::nreqs || BDB::nreqs) {
3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3752 }
3753
3754 warn "cancelling all extension coros"; 3924 trace "perl_reload: cancelling all extension coros";
3755 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3756 %EXT_CORO = (); 3926 %EXT_CORO = ();
3757 3927
3758 warn "removing commands"; 3928 trace "perl_reload: removing commands";
3759 %COMMAND = (); 3929 %COMMAND = ();
3760 3930
3761 warn "removing ext/exti commands"; 3931 trace "perl_reload: removing ext/exti commands";
3762 %EXTCMD = (); 3932 %EXTCMD = ();
3763 %EXTICMD = (); 3933 %EXTICMD = ();
3764 3934
3765 warn "unloading/nuking all extensions"; 3935 trace "perl_reload: unloading/nuking all extensions";
3766 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3767 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3768 3938
3769 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3770 eval { 3940 eval {
3771 $cb->($pkg); 3941 $cb->($pkg);
3772 1 3942 1
3773 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3774 } 3944 }
3775 3945
3776 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3777 clear_package $pkg; 3947 clear_package $pkg;
3778 } 3948 }
3779 3949
3780 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783 3953
3784 warn "... unloading $k"; 3954 trace "... unloading $k";
3785 delete $INC{$k}; 3955 delete $INC{$k};
3786 3956
3787 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3789 3959
… …
3792 } 3962 }
3793 3963
3794 clear_package $k; 3964 clear_package $k;
3795 } 3965 }
3796 3966
3797 warn "getting rid of safe::, as good as possible"; 3967 trace "perl_reload: getting rid of safe::, as good as possible";
3798 clear_package "safe::$_" 3968 clear_package "safe::$_"
3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3800 3970
3801 warn "unloading cf.pm \"a bit\""; 3971 trace "perl_reload: unloading cf.pm \"a bit\"";
3802 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3804 3974
3805 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3806 # and global variables created in xs 3976 # and global variables created in xs
3807 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3808 3978
3809 warn "unload completed, starting to reload now"; 3979 info "perl_reload: unload completed, starting to reload now";
3810 3980
3811 warn "reloading cf.pm"; 3981 trace "perl_reload: reloading cf.pm";
3812 require cf; 3982 require cf;
3813 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3814 3984
3815 warn "loading config and database again"; 3985 trace "perl_reload: loading config and database again";
3816 cf::reload_config; 3986 cf::reload_config;
3817 3987
3818 warn "loading extensions"; 3988 trace "perl_reload: loading extensions";
3819 cf::load_extensions; 3989 cf::load_extensions;
3820 3990
3821 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3822 warn "reattaching attachments to objects/players"; 3992 trace "perl_reload: reattaching attachments to objects/players";
3823 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3824 warn "reattaching attachments to maps"; 3994 trace "perl_reload: reattaching attachments to maps";
3825 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3826 warn "reattaching attachments to players"; 3996 trace "perl_reload: reattaching attachments to players";
3827 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3828 } 3998 }
3829 3999
3830 warn "running post_init jobs"; 4000 cf::_post_init 1;
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832 4001
3833 warn "leaving sync_job"; 4002 trace "perl_reload: leaving sync_job";
3834 4003
3835 1 4004 1
3836 } or do { 4005 } or do {
3837 warn $@; 4006 error $@;
3838 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "perl_reload: error, exiting.";
3839 }; 4008 };
3840 4009
3841 warn "reloaded";
3842 --$RELOAD; 4010 --$RELOAD;
3843 } 4011 }
3844 4012
3845 $t1 = EV::time - $t1; 4013 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 4014 info "perl_reload: completed in ${t1}s\n";
3847}; 4015};
3848 4016
3849our $RELOAD_WATCHER; # used only during reload 4017our $RELOAD_WATCHER; # used only during reload
3850 4018
3851sub reload_perl() { 4019sub reload_perl() {
… …
3853 # coro crashes during coro_state_free->destroy here. 4021 # coro crashes during coro_state_free->destroy here.
3854 4022
3855 $RELOAD_WATCHER ||= cf::async { 4023 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 4024 Coro::AIO::aio_wait cache_extensions;
3857 4025
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4026 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 4027 do_reload_perl;
3860 undef $RELOAD_WATCHER; 4028 undef $RELOAD_WATCHER;
3861 }; 4029 };
3862 }; 4030 };
3863} 4031}
… …
3872 reload_perl; 4040 reload_perl;
3873 }; 4041 };
3874 } 4042 }
3875}; 4043};
3876 4044
3877unshift @INC, $LIBDIR; 4045#############################################################################
3878 4046
3879my $bug_warning = 0; 4047my $bug_warning = 0;
3880 4048
3881our @WAIT_FOR_TICK; 4049our @WAIT_FOR_TICK;
3882our @WAIT_FOR_TICK_BEGIN; 4050our @WAIT_FOR_TICK_BEGIN;
3883 4051
3884sub wait_for_tick { 4052sub wait_for_tick() {
3885 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4053 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3886 4054
3887 my $signal = new Coro::Signal; 4055 my $signal = new Coro::Signal;
3888 push @WAIT_FOR_TICK, $signal; 4056 push @WAIT_FOR_TICK, $signal;
3889 $signal->wait; 4057 $signal->wait;
3890} 4058}
3891 4059
3892sub wait_for_tick_begin { 4060sub wait_for_tick_begin() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4061 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 4062
3895 my $signal = new Coro::Signal; 4063 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK_BEGIN, $signal; 4064 push @WAIT_FOR_TICK_BEGIN, $signal;
3897 $signal->wait; 4065 $signal->wait;
… …
3904 return; 4072 return;
3905 } 4073 }
3906 4074
3907 cf::server_tick; # one server iteration 4075 cf::server_tick; # one server iteration
3908 4076
4077 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4078
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4079 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4080 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911 Coro::async_pool { 4081 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 4082 $Coro::current->{desc} = "runtime saver";
3913 write_runtime_sync 4083 write_runtime_sync
3914 or warn "ERROR: unable to write runtime file: $!"; 4084 or error "ERROR: unable to write runtime file: $!";
3915 }; 4085 };
3916 } 4086 }
3917 4087
3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4088 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3919 $sig->send; 4089 $sig->send;
… …
3927 4097
3928 if (0) { 4098 if (0) {
3929 if ($NEXT_TICK) { 4099 if ($NEXT_TICK) {
3930 my $jitter = $TICK_START - $NEXT_TICK; 4100 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4101 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d# 4102 debug "jitter $JITTER\n";#d#
3933 } 4103 }
3934 } 4104 }
3935} 4105}
3936 4106
3937{ 4107{
3938 # configure BDB 4108 # configure BDB
3939 4109
3940 BDB::min_parallel 8; 4110 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 4111 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 4112 $AnyEvent::BDB::WATCHER->priority (1);
3943 4113
3944 unless ($DB_ENV) { 4114 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 4115 $DB_ENV = BDB::db_env_create;
… …
3982 IO::AIO::min_parallel 8; 4152 IO::AIO::min_parallel 8;
3983 IO::AIO::max_poll_time $TICK * 0.1; 4153 IO::AIO::max_poll_time $TICK * 0.1;
3984 undef $AnyEvent::AIO::WATCHER; 4154 undef $AnyEvent::AIO::WATCHER;
3985} 4155}
3986 4156
3987my $_log_backtrace; 4157our $_log_backtrace;
4158our $_log_backtrace_last;
3988 4159
3989sub _log_backtrace { 4160sub _log_backtrace {
3990 my ($msg, @addr) = @_; 4161 my ($msg, @addr) = @_;
3991 4162
3992 $msg =~ s/\n//; 4163 $msg =~ s/\n$//;
3993 4164
4165 if ($_log_backtrace_last eq $msg) {
4166 LOG llevInfo, "[ABT] $msg\n";
4167 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3994 # limit the # of concurrent backtraces 4168 # limit the # of concurrent backtraces
3995 if ($_log_backtrace < 2) { 4169 } elsif ($_log_backtrace < 2) {
4170 $_log_backtrace_last = $msg;
3996 ++$_log_backtrace; 4171 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg; 4172 my $perl_bt = Carp::longmess $msg;
3998 async { 4173 async {
3999 $Coro::current->{desc} = "abt $msg"; 4174 $Coro::current->{desc} = "abt $msg";
4000 4175
… …
4020 LOG llevInfo, "[ABT] $_\n" for @bt; 4195 LOG llevInfo, "[ABT] $_\n" for @bt;
4021 --$_log_backtrace; 4196 --$_log_backtrace;
4022 }; 4197 };
4023 } else { 4198 } else {
4024 LOG llevInfo, "[ABT] $msg\n"; 4199 LOG llevInfo, "[ABT] $msg\n";
4025 LOG llevInfo, "[ABT] [suppressed]\n"; 4200 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4026 } 4201 }
4027} 4202}
4028 4203
4029# load additional modules 4204# load additional modules
4030require "cf/$_.pm" for @EXTRA_MODULES; 4205require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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