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.495 by root, Tue Nov 10 04:38:45 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;
53use Coro::Util (); 51use Coro::Util ();
54 52
55use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
56use BDB (); 54use BDB ();
57use Data::Dumper; 55use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 56use Fcntl;
60use YAML::XS (); 57use YAML::XS ();
61use IO::AIO (); 58use IO::AIO ();
62use Time::HiRes; 59use Time::HiRes;
63use Compress::LZF; 60use Compress::LZF;
78 75
79# strictly for debugging 76# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 78
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
83 82
84our %COMMAND = (); 83our %COMMAND = ();
85our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
86 85
87our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
107our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %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;
113 118
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 121our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
119our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 127our $DB_ENV;
123 128
124our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 130
126our %CFG; 131our %CFG;
127 132
128our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 134our $RUNTIME;
163 168
164our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
165 170
166sub cf::map::normalise; 171sub cf::map::normalise;
167 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
168############################################################################# 177#############################################################################
169 178
170%REFLECT = (); 179%REFLECT = ();
171for (@REFLECT) { 180for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
224from wherever your confdir points to. 233from wherever your confdir points to.
225 234
226=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
227 236
228These 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
229returns 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
230per 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();
231 245
232=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
233 247
234This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
235C<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
243 257
244=back 258=back
245 259
246=cut 260=cut
247 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
248$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 269 my $msg = join "", @_;
250 270
251 $msg .= "\n" 271 $msg .= "\n"
252 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
253 273
254 $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;
255 275
256 LOG llevError, $msg; 276 LOG llevWarn, $msg;
257}; 277};
258 278
259$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
261 281
262 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
263 283
264 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 286 return;#d#
267 }#d# 287 }#d#
268 288
269 # kill coroutine otherwise 289 # kill coroutine otherwise
270 Coro::terminate 290 Coro::terminate
337our $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
338 358
339sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
340sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
341 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
342=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
343 375
344Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
346 378
347The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
348is a reload or not. 380is a reload or not.
349 381
350=cut 382=cut
351 383
352sub post_init(&) { 384sub post_init(&) {
397} 429}
398 430
399=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
400 432
401Like 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
402get spread over timer. 434get spread over time.
403 435
404=cut 436=cut
405 437
406sub periodic($$) { 438sub periodic($$) {
407 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
424 456
425=cut 457=cut
426 458
427our @SLOT_QUEUE; 459our @SLOT_QUEUE;
428our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
429 462
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
433 466
434 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
435 469
436 while () { 470 while () {
437 next_job: 471 next_job:
472
438 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 474
440 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 479 $job->[2]->send;
444 Coro::cede; 480 Coro::cede;
445 goto next_job; 481 goto next_job;
446 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 484 }
448 } 485 }
449 486
450 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 490 $signal->wait;
454 } else { 491 } else {
492 $busy = 0;
455 Coro::schedule; 493 Coro::schedule;
456 } 494 }
457 } 495 }
458}; 496};
459 497
460sub get_slot($;$$) { 498sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
462 500
463 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
464 502
465 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
466 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
467 506
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
496=cut 535=cut
497 536
498sub sync_job(&) { 537sub sync_job(&) {
499 my ($job) = @_; 538 my ($job) = @_;
500 539
501 if ($Coro::current == $Coro::main) { 540 if (in_main) {
502 my $time = EV::time; 541 my $time = AE::time;
503 542
504 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
506 545
507 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
508 547
509 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
510 549
511 my $busy = 1; 550 my $busy = 1;
512 my @res; 551 my @res;
513 552
514 (async { 553 (async {
515 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 555 @res = eval { $job->() };
517 warn $@ if $@; 556 error $@ if $@;
518 undef $busy; 557 undef $busy;
519 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
520 559
521 while ($busy) { 560 while ($busy) {
522 if (Coro::nready) { 561 if (Coro::nready) {
524 } else { 563 } else {
525 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
526 } 565 }
527 } 566 }
528 567
529 my $time = EV::time - $time; 568 my $time = AE::time - $time;
530 569
531 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
532 571
533 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
534 } else { 573 } else {
556 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
557 596
558 $coro 597 $coro
559} 598}
560 599
561=item fork_call { }, $args 600=item fork_call { }, @args
562 601
563Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 605never block itself or use any form of event handling.
567 606
568=cut 607=cut
569 608
609sub post_fork {
610 reset_signals;
611}
612
570sub fork_call(&@) { 613sub fork_call(&@) {
571 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
572 615
573 # 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,
574 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
576 619
577 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
578 reset_signals; 621 cf::post_fork;
579 &$cb 622 &$cb
580 }, @args; 623 } @args;
581 624
582 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 )
583} 637}
584 638
585=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
586 640
587=cut 641=cut
624within each server. 678within each server.
625 679
626=cut 680=cut
627 681
628sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
629 my ($name) = @_; 686 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
631 688
632 eval { 689 eval {
633 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
643} 700}
644 701
645our $DB; 702our $DB;
646 703
647sub db_init { 704sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
650 };
651} 706}
652 707
653sub db_get($$) { 708sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
655 710
656 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
657 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
658 715
659 $! ? () 716 $! ? ()
660 : $data 717 : $data
661 }
662} 718}
663 719
664sub db_put($$$) { 720sub db_put($$$) {
665 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
722 778
723 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 780 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
726 782
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 784
729 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
732 788
742 798
743=cut 799=cut
744 800
745sub datalog($@) { 801sub datalog($@) {
746 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 804}
749 805
750=back 806=back
751 807
752=cut 808=cut
947 1003
948 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1006
951 } elsif (ref $type) { 1007 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
953 1009
954 } else { 1010 } else {
955 shift @arg; 1011 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
957 } 1013 }
958 } 1014 }
959} 1015}
960 1016
961sub _object_attach { 1017sub _object_attach {
971 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
972 } 1028 }
973 1029
974 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
975 } else { 1031 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1033 }
978 1034
979 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
980} 1036}
981 1037
1040 1096
1041 for (@$callbacks) { 1097 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1043 1099
1044 if ($@) { 1100 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1102 override;
1048 } 1103 }
1049 1104
1050 return 1 if $override; 1105 return 1 if $override;
1051 } 1106 }
1130 for (@$attach) { 1185 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1133 } 1188 }
1134 } else { 1189 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1191 }
1137 } 1192 }
1138} 1193}
1139 1194
1140cf::attachable->attach ( 1195cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1168 1223
1169 sync_job { 1224 sync_job {
1170 if (length $$rdata) { 1225 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1174 1230
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1234 if ($cf::USE_FSYNC) {
1200 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1201 1257
1202 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1260 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1206 } 1262 }
1207 } else { 1263 } else {
1208 aio_unlink $filename; 1264 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1210 } 1266 }
1234 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1291 $av = $st->{objs};
1236 } 1292 }
1237 1293
1238 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1241 1298
1242 ($data, $av) 1299 ($data, $av)
1243} 1300}
1244 1301
1245=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1304} 1361}
1305 1362
1306use File::Glob (); 1363use File::Glob ();
1307 1364
1308cf::player->attach ( 1365cf::player->attach (
1309 on_command => sub { 1366 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1311 1368
1312 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1313 or return; 1370 or return;
1314 1371
1337 1394
1338 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1396 if $reply;
1340 1397
1341 } else { 1398 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1400 }
1344 1401
1345 cf::override; 1402 cf::override;
1346 }, 1403 },
1347); 1404);
1358 1415
1359 $grp 1416 $grp
1360} 1417}
1361 1418
1362sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1363 cf::sync_job { 1422 cf::sync_job {
1364 my %todo; 1423 my %todo;
1365 1424
1366 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1426 next unless -r $path;
1385 1444
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1447
1389 $ext{source} = 1448 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1392 . $source 1451 . $source
1393 . "\n};\n1"; 1452 . "\n};\n1";
1394 1453
1395 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1396 } 1455 }
1397 1456
1457 my $pass = 0;
1398 my %done; 1458 my %done;
1399 while (%todo) { 1459 while (%todo) {
1400 my $progress; 1460 my $progress;
1401 1461
1462 ++$pass;
1463
1464 ext:
1402 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1467 next ext
1405 unless exists $done{$_}; 1468 unless exists $done{$_};
1406 } 1469 }
1407 1470
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1472
1410 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1477
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1479 if exists $v->{meta}{mandatory};
1418 1480
1419 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;
1420 } 1490 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1491 }
1426 1492
1427 skip: 1493 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 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 }
1430 } 1501 }
1431 }; 1502 };
1432} 1503}
1433 1504
1434############################################################################# 1505#############################################################################
1518 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1519 } 1590 }
1520 } 1591 }
1521} 1592}
1522 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
1523sub save($) { 1607sub save($) {
1524 my ($pl) = @_; 1608 my ($pl) = @_;
1525 1609
1526 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1527 1611
1532 1616
1533 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1535 1619
1536 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];
1537 1624
1538 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1626 cf::cede_to_tick;
1540} 1627}
1541 1628
1575 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1576 1663
1577 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1578 $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
1579 1666
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1668 $pl->deactivate;
1669
1582 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;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1585 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1586 1675
1587 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1643 \@logins 1732 \@logins
1644} 1733}
1645 1734
1646=item $player->maps 1735=item $player->maps
1647 1736
1737=item cf::player::maps $login
1738
1648Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1649player. May block. 1740player. May block.
1650 1741
1651=cut 1742=cut
1652 1743
1714=cut 1805=cut
1715 1806
1716sub find_by_path($) { 1807sub find_by_path($) {
1717 my ($path) = @_; 1808 my ($path) = @_;
1718 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1719 my ($match, $specificity); 1812 my ($match, $specificity);
1720 1813
1721 for my $region (list) { 1814 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
1754 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
1755 1848
1756 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1850 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1779 1872
1780sub register { 1873sub register {
1781 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1875 my $pkg = caller;
1783 1876
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1878
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1880}
1789 1881
1790# also paths starting with '/' 1882# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1884
1793sub thawer_merge { 1885sub thawer_merge {
1794 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1795 1887
1796 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1801} 1893}
1802 1894
1803sub normalise { 1895sub normalise {
1804 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1805 1897
1806 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1807 1899
1808 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1809 1901
1810 # map plan: 1902 # map plan:
1811 # 1903 #
1850 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1851 return $self; 1943 return $self;
1852 } 1944 }
1853 } 1945 }
1854 1946
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 1948 ()
1857} 1949}
1858 1950
1859sub init { 1951sub init {
1860 my ($self) = @_; 1952 my ($self) = @_;
1982} 2074}
1983 2075
1984sub find; 2076sub find;
1985sub find { 2077sub find {
1986 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
1987 2081
1988 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1989 2083
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
2010 2104
2011 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2012 } 2106 }
2013} 2107}
2014 2108
2015sub pre_load { } 2109sub pre_load { }
2016sub post_load { } 2110#sub post_load { } # XS
2017 2111
2018sub load { 2112sub load {
2019 my ($self) = @_; 2113 my ($self) = @_;
2020 2114
2021 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2078 } 2172 }
2079 2173
2080 $self->post_load; 2174 $self->post_load;
2081} 2175}
2082 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
2083sub customise_for { 2180sub customise_for {
2084 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2085 2182
2086 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2184 if $self->per_player;
2103 or next; 2200 or next;
2104 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2105 or next; 2202 or next;
2106 $neigh->load; 2203 $neigh->load;
2107 2204
2205 # now find the diagonal neighbours
2108 push @neigh, 2206 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2209 }
2112 2210
2119} 2217}
2120 2218
2121sub find_sync { 2219sub find_sync {
2122 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2123 2221
2124 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
2125} 2226}
2126 2227
2127sub do_load_sync { 2228sub do_load_sync {
2128 my ($map) = @_; 2229 my ($map) = @_;
2129 2230
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2132 2233
2133 cf::sync_job { $map->load }; 2234 $map->load;
2134} 2235}
2135 2236
2136our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2138 2239
2164 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2165 2266
2166 () 2267 ()
2167} 2268}
2168 2269
2270# common code, used by both ->save and ->swapout
2169sub save { 2271sub _save {
2170 my ($self) = @_; 2272 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2273
2174 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2175 2275
2176 return unless $self->dirty; 2276 return unless $self->dirty;
2177 2277
2197 } else { 2297 } else {
2198 $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);
2199 } 2299 }
2200} 2300}
2201 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2202sub swap_out { 2310sub swap_out {
2203 my ($self) = @_; 2311 my ($self) = @_;
2204 2312
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2314
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2213 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2214 $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};
2215 2369
2216 $self->deactivate; 2370 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2372 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2373
2264 $self->unlink_save; 2374 $self->unlink_save;
2265 $self->destroy; 2375 $self->destroy;
2266} 2376}
2267 2377
2275 2385
2276 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2277 2387
2278 $self->unlink_save; 2388 $self->unlink_save;
2279 2389
2280 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2395
2515 2625
2516Freezes 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}>).
2517 2627
2518The 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.
2519for 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,
2520though, 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
2521map. 2631map.
2522 2632
2523Will never block. 2633Will never block.
2524 2634
2525=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2546sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2547 my ($self) = @_; 2657 my ($self) = @_;
2548 2658
2549 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2550 2660
2661 ++$self->{_link_recursion};
2662
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2664
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2555 2667
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2669}
2558 2670
2559sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2561 2673
2586 $map->load_neighbours; 2698 $map->load_neighbours;
2587 2699
2588 return unless $self->contr->active; 2700 return unless $self->contr->active;
2589 2701
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2592 2704 # entering was successful
2705 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2706 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2707 $self->activate_recursive;
2595} 2708 }
2596 2709
2710}
2711
2597=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)]])
2598 2713
2599Moves 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
2600her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2601that 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
2602the 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
2609 2724
2610our $GOTOGEN; 2725our $GOTOGEN;
2611 2726
2612sub cf::object::player::goto { 2727sub cf::object::player::goto {
2613 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 }
2614 2735
2615 # 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
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2738
2618 $self->enter_link; 2739 $self->enter_link;
2642 my $map = eval { 2763 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2644 2765
2645 if ($map) { 2766 if ($map) {
2646 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2769 } else {
2649 $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);
2650 } 2771 }
2651 2772
2652 $map 2773 $map
2660 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2663 } 2784 }
2664 2785
2665 $done->() if $done; 2786 $done->($self) if $done;
2666 })->prio (1); 2787 })->prio (1);
2667} 2788}
2668 2789
2669=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2670 2791
2763 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "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. "
2765 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2888
2768 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2890 $self->leave_link;
2770 } 2891 }
2771 })->prio (1); 2892 })->prio (1);
2772} 2893}
2773 2894
3086 3207
3087 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3209 if $reply;
3089 3210
3090 } else { 3211 } else {
3091 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";
3092 } 3213 }
3093 3214
3094 cf::override; 3215 cf::override;
3095 }, 3216 },
3096); 3217);
3116 3237
3117 $coro 3238 $coro
3118} 3239}
3119 3240
3120cf::client->attach ( 3241cf::client->attach (
3121 on_destroy => sub { 3242 on_client_destroy => sub {
3122 my ($ns) = @_; 3243 my ($ns) = @_;
3123 3244
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3246 },
3126); 3247);
3142our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3143 3264
3144$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3145 3266
3146$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3149 sort time 3270 sort time
3150)); 3271));
3151 3272
3152# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3177 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3181) { 3302) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3305 for @funs;
3186} 3306}
3187 3307
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3206 3326
3207 %vars = (_dummy => 0) unless %vars; 3327 %vars = (_dummy => 0) unless %vars;
3208 3328
3329 my @res;
3209 local $_; 3330 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3331
3212 my $eval = 3332 my $eval =
3213 "do {\n" 3333 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3336 . $code
3217 . "\n}" 3337 . "\n}"
3218 ; 3338 ;
3219 3339
3340 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 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 }
3223 3349
3224 if ($@) { 3350 if ($@) {
3225 warn "$@"; 3351 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3228 } 3354 }
3229 3355
3230 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3231} 3357}
3232 3358
3246=cut 3372=cut
3247 3373
3248sub register_script_function { 3374sub register_script_function {
3249 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3250 3376
3251 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3253} 3379}
3254 3380
3255=back 3381=back
3256 3382
3257=cut 3383=cut
3266 # for this (global event?) 3392 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3394
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3396
3271 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3272 3398
3273 my $facedata;
3274 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3275 or die "$path: $!"; 3400 or die "$path: $!";
3276 3401
3277 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3278 3403
3279 $facedata->{version} == 2 3404 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3406
3282 # 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]);
3283 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3410 type => FT_RSRC,
3285 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),
3286 }; 3413 };
3287 cf::cede_to_tick; 3414 cf::cede_to_tick;
3288 3415
3289 { 3416 {
3290 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3292 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3421
3295 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3426
3300 cf::cede_to_tick; 3427 cf::cede_to_tick;
3301 } 3428 }
3302 3429
3303 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3308 3435
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3439 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3441 }
3315 3442
3316 cf::cede_to_tick; 3443 cf::cede_to_tick;
3317 } 3444 }
3318 } 3445 }
3327 3454
3328 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3329 } 3456 }
3330 3457
3331 { 3458 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3335 3460
3336 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3464
3341 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3356 } else { 3467 } else {
3357 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3358 } 3469 }
3359 3470
3360 cf::cede_to_tick; 3471 cf::cede_to_tick;
3361 } 3472 }
3362 } 3473 }
3363 3474
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3476
3366 1 3477 1
3367} 3478}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388 3479
3389register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3391 3482
3392 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3431sub reload_treasures { 3522sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3434} 3525}
3435 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
3436sub reload_resources { 3550sub reload_resources {
3437 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3438 3552
3553 reload_exp_table;
3554 reload_materials;
3439 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3440 reload_archetypes; 3557 reload_archetypes;
3441 reload_regions; 3558 reload_regions;
3442 reload_treasures; 3559 reload_treasures;
3443 3560
3444 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3445} 3562}
3446 3563
3447sub reload_config { 3564sub reload_config {
3448 warn "reloading config file...\n"; 3565 trace "reloading config file...\n";
3449 3566
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3567 0 < aio_load "$CONFDIR/config", my $config
3451 or return; 3568 or die "$CONFDIR/config: $!";
3452 3569
3453 local $/; 3570 utf8::decode $config;
3454 *CFG = YAML::XS::Load scalar <$fh>; 3571 *CFG = yaml_load $config;
3455 3572
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3574
3458 $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};
3459 $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};
3460 3577
3461 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3580 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3581 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3582 };
3466 warn $@ if $@; 3583 warn $@ if $@;
3467 } 3584 }
3468
3469 warn "finished reloading resource files\n";
3470} 3585}
3471 3586
3472sub pidfile() { 3587sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3589 or die "$PIDFILE: $!";
3487 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3488 print $fh $$; 3603 print $fh $$;
3489} 3604}
3490 3605
3491sub main_loop { 3606sub main_loop {
3492 warn "EV::loop starting\n"; 3607 trace "EV::loop starting\n";
3493 if (1) { 3608 if (1) {
3494 EV::loop; 3609 EV::loop;
3495 } 3610 }
3496 warn "EV::loop returned\n"; 3611 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3612 goto &main_loop unless $REALLY_UNLOOP;
3498} 3613}
3499 3614
3500sub main { 3615sub main {
3501 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3502 3617
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 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.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3622
3513 $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
3514 3624
3515 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3522 }; 3632 };
3523 3633
3524 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3525 3635
3526 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
3527 cf::load_settings; 3643 cf::load_settings;
3528 cf::load_materials;
3529 3644
3530 reload_resources; 3645 reload_resources;
3531 reload_config; 3646 reload_config;
3532 db_init; 3647 db_init;
3533 3648
3534 cf::init_uuid; 3649 cf::init_uuid;
3535 cf::init_signals; 3650 cf::init_signals;
3536 cf::init_commands;
3537 cf::init_skills; 3651 cf::init_skills;
3538 3652
3539 cf::init_beforeplay; 3653 cf::init_beforeplay;
3540 3654
3541 atomic; 3655 atomic;
3549 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};
3550 3664
3551 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3552 }; 3666 };
3553 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
3554 main_loop; 3676 goto &main_loop;
3555} 3677}
3556 3678
3557############################################################################# 3679#############################################################################
3558# initialisation and cleanup 3680# initialisation and cleanup
3559 3681
3560# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3561BEGIN { 3683BEGIN {
3562 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3563 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3564 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3565 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3566 }; 3688 };
3567 } 3689 }
3568} 3690}
3569 3691
3570sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3571 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3572 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3573 3697
3574 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3575 3699
3576 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3577 3701
3578 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3579 or return; 3703 or return;
3580 3704
3581 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3582 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3583 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3596 or return; 3720 or return;
3597 3721
3598 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3599 and return; 3723 and return;
3600 3724
3601 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3602 3726
3603 1 3727 1
3604} 3728}
3605 3729
3606our $uuid_lock; 3730our $uuid_lock;
3618 or return; 3742 or return;
3619 3743
3620 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3621 3745
3622 unless ($value) { 3746 unless ($value) {
3623 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3624 return; 3748 return;
3625 } 3749 }
3626 3750
3627 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3628 $uuid_skip = 0; 3752 $uuid_skip = 0;
3638 or return; 3762 or return;
3639 3763
3640 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3641 and return; 3765 and return;
3642 3766
3643 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3644 3768
3645 1 3769 1
3646 3770
3647} 3771}
3648 3772
3654} 3778}
3655 3779
3656sub emergency_save() { 3780sub emergency_save() {
3657 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3658 3782
3659 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;
3660 3789
3661 cf::sync_job { 3790 cf::sync_job {
3662 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3663 # save all maps without fsync, and later call a global sync
3664 # (which in turn might be very very slow)
3665 local $USE_FSYNC = 0;
3666 3792
3667 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3668 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3669 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3670 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3671 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3672 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3673 $pl->valid or next; 3799 $pl->valid or next;
3674 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3675 $pl->save; 3801 $pl->save;
3676 } 3802 }
3677 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3678 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3679 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3680 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3681 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3682 $map->valid or next; 3810 $map->valid or next;
3683 $map->save; 3811 $map->save;
3684 } 3812 }
3685 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3686 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3687 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3688 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3689 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3690 3820
3691 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3692 write_uuid_sync 1; 3822 write_uuid_sync 1;
3693 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
3694 }; 3843 };
3695 3844
3696 warn "emergency_perl_save: starting sync()\n";
3697 IO::AIO::aio_sync sub {
3698 warn "emergency_perl_save: finished sync()\n";
3699 };
3700
3701 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3702} 3846}
3703 3847
3704sub post_cleanup { 3848sub post_cleanup {
3705 my ($make_core) = @_; 3849 my ($make_core) = @_;
3706 3850
3851 IO::AIO::flush;
3852
3707 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3708 if $make_core; 3854 if $make_core;
3709 3855
3710 my $fh = pidfile; 3856 my $fh = pidfile;
3711 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3712} 3858}
3732 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3733 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3734 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3735# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3736 } 3882 }
3737 warn "cleared package $pkg\n";#d#
3738} 3883}
3739 3884
3740sub do_reload_perl() { 3885sub do_reload_perl() {
3741 # can/must only be called in main 3886 # can/must only be called in main
3742 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3743 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3744 return; 3889 return;
3745 } 3890 }
3746 3891
3747 return if $RELOAD++; 3892 return if $RELOAD++;
3748 3893
3749 my $t1 = EV::time; 3894 my $t1 = AE::time;
3750 3895
3751 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3752 warn "reloading..."; 3898 info "reloading...";
3753 3899
3754 warn "entering sync_job"; 3900 trace "entering sync_job";
3755 3901
3756 cf::sync_job { 3902 cf::sync_job {
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 cf::emergency_save; 3903 #cf::emergency_save;
3759 cf::write_runtime_sync; # external watchdog should not bark
3760 3904
3761 warn "syncing database to disk";
3762 BDB::db_env_txn_checkpoint $DB_ENV;
3763
3764 # if anything goes wrong in here, we should simply crash as we already saved
3765
3766 warn "flushing outstanding aio requests";
3767 while (IO::AIO::nreqs || BDB::nreqs) {
3768 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3769 }
3770
3771 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3772 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3773 %EXT_CORO = (); 3907 %EXT_CORO = ();
3774 3908
3775 warn "removing commands"; 3909 trace "removing commands";
3776 %COMMAND = (); 3910 %COMMAND = ();
3777 3911
3778 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3779 %EXTCMD = (); 3913 %EXTCMD = ();
3780 %EXTICMD = (); 3914 %EXTICMD = ();
3781 3915
3782 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3783 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3784 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3785 3919
3786 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3787 eval { 3921 eval {
3788 $cb->($pkg); 3922 $cb->($pkg);
3789 1 3923 1
3790 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3791 } 3925 }
3792 3926
3793 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3794 clear_package $pkg; 3928 clear_package $pkg;
3795 } 3929 }
3796 3930
3797 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3798 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3799 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3800 3934
3801 warn "... unloading $k"; 3935 trace "... unloading $k";
3802 delete $INC{$k}; 3936 delete $INC{$k};
3803 3937
3804 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3805 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3806 3940
3809 } 3943 }
3810 3944
3811 clear_package $k; 3945 clear_package $k;
3812 } 3946 }
3813 3947
3814 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3815 clear_package "safe::$_" 3949 clear_package "safe::$_"
3816 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);
3817 3951
3818 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3819 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3820 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3821 3955
3822 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3823 # and global variables created in xs 3957 # and global variables created in xs
3824 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3825 3959
3826 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3827 3961
3828 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3829 require cf; 3963 require cf;
3830 cf::_connect_to_perl_1; 3964 cf::_connect_to_perl_1;
3831 3965
3832 warn "loading config and database again"; 3966 trace "loading config and database again";
3833 cf::reload_config; 3967 cf::reload_config;
3834 3968
3835 warn "loading extensions"; 3969 trace "loading extensions";
3836 cf::load_extensions; 3970 cf::load_extensions;
3837 3971
3838 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3839 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3840 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3841 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3842 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3843 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3844 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3845 } 3979 }
3846 3980
3847 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3848 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3849 3983
3850 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3851 3985
3852 1 3986 1
3853 } or do { 3987 } or do {
3854 warn $@; 3988 error $@;
3855 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3856 }; 3990 };
3857 3991
3858 warn "reloaded"; 3992 info "reloaded";
3859 --$RELOAD; 3993 --$RELOAD;
3860 } 3994 }
3861 3995
3862 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3863 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3864}; 3998};
3865 3999
3866our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3867 4001
3868sub reload_perl() { 4002sub reload_perl() {
3870 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3871 4005
3872 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3873 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3874 4008
3875 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3876 do_reload_perl; 4010 do_reload_perl;
3877 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3878 }; 4012 };
3879 }; 4013 };
3880} 4014}
3889 reload_perl; 4023 reload_perl;
3890 }; 4024 };
3891 } 4025 }
3892}; 4026};
3893 4027
3894unshift @INC, $LIBDIR; 4028#############################################################################
3895 4029
3896my $bug_warning = 0; 4030my $bug_warning = 0;
3897 4031
3898our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3899our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3900 4034
3901sub wait_for_tick { 4035sub wait_for_tick() {
3902 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3903 4037
3904 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3905 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3906 $signal->wait; 4040 $signal->wait;
3907} 4041}
3908 4042
3909sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3910 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3911 4045
3912 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3913 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3914 $signal->wait; 4048 $signal->wait;
3915} 4049}
3921 return; 4055 return;
3922 } 4056 }
3923 4057
3924 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3925 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $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.;
3928 Coro::async_pool { 4064 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4066 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3932 }; 4068 };
3933 } 4069 }
3934 4070
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4072 $sig->send;
3944 4080
3945 if (0) { 4081 if (0) {
3946 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3950 } 4086 }
3951 } 4087 }
3952} 4088}
3953 4089
3954{ 4090{
3955 # configure BDB 4091 # configure BDB
3956 4092
3957 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3960 4096
3961 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines