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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
… …
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
… …
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
… …
105our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %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;
111 118
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 121our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
117our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 127our $DB_ENV;
121 128
122our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 130
124our %CFG; 131our %CFG;
125 132
126our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 134our $RUNTIME;
… …
161 168
162our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
163 170
164sub cf::map::normalise; 171sub cf::map::normalise;
165 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
166############################################################################# 177#############################################################################
167 178
168%REFLECT = (); 179%REFLECT = ();
169for (@REFLECT) { 180for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 182 $REFLECT{$reflect->{class}} = $reflect;
172} 183}
173 184
174# this is decidedly evil 185# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 187
177############################################################################# 188#############################################################################
178 189
179=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
180 191
… …
222from wherever your confdir points to. 233from wherever your confdir points to.
223 234
224=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
225 236
226These 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
227returns 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
228per 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.
229 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
230=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
231 247
232This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
233C<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
234that call. 250that call.
235 251
236=item %cf::REFLECT 252=item %cf::REFLECT
237 253
… …
241 257
242=back 258=back
243 259
244=cut 260=cut
245 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
246$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 269 my $msg = join "", @_;
248 270
249 $msg .= "\n" 271 $msg .= "\n"
250 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
251 273
252 $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;
253 275
254 LOG llevError, $msg; 276 LOG llevWarn, $msg;
255}; 277};
256 278
257$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
259 281
260 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
261 283
262 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 286 return;#d#
265 }#d# 287 }#d#
266 288
267 # kill coroutine otherwise 289 # kill coroutine otherwise
268 Coro::terminate 290 Coro::terminate
… …
288)) { 310)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 312}
291 313
292$EV::DIED = sub { 314$EV::DIED = sub {
293 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
294}; 316};
295 317
296############################################################################# 318#############################################################################
297 319
298=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
395} 417}
396 418
397=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
398 420
399Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 422get spread over time.
401 423
402=cut 424=cut
403 425
404sub periodic($$) { 426sub periodic($$) {
405 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
422 444
423=cut 445=cut
424 446
425our @SLOT_QUEUE; 447our @SLOT_QUEUE;
426our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
427 450
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
431 454
432 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
433 457
434 while () { 458 while () {
435 next_job: 459 next_job:
460
436 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 462
438 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 467 $job->[2]->send;
442 Coro::cede; 468 Coro::cede;
443 goto next_job; 469 goto next_job;
444 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 472 }
446 } 473 }
447 474
448 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 478 $signal->wait;
452 } else { 479 } else {
480 $busy = 0;
453 Coro::schedule; 481 Coro::schedule;
454 } 482 }
455 } 483 }
456}; 484};
457 485
458sub get_slot($;$$) { 486sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
460 488
461 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
462 490
463 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
464 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
465 494
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
… …
494=cut 523=cut
495 524
496sub sync_job(&) { 525sub sync_job(&) {
497 my ($job) = @_; 526 my ($job) = @_;
498 527
499 if ($Coro::current == $Coro::main) { 528 if (in_main) {
500 my $time = EV::time; 529 my $time = AE::time;
501 530
502 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
504 533
505 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
506 535
507 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
508 537
509 my $busy = 1; 538 my $busy = 1;
510 my @res; 539 my @res;
511 540
512 (async { 541 (async {
513 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 543 @res = eval { $job->() };
515 warn $@ if $@; 544 error $@ if $@;
516 undef $busy; 545 undef $busy;
517 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
518 547
519 while ($busy) { 548 while ($busy) {
520 if (Coro::nready) { 549 if (Coro::nready) {
… …
522 } else { 551 } else {
523 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
524 } 553 }
525 } 554 }
526 555
527 my $time = EV::time - $time; 556 my $time = AE::time - $time;
528 557
529 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
530 559
531 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
532 } else { 561 } else {
… …
576 reset_signals; 605 reset_signals;
577 &$cb 606 &$cb
578 }, @args; 607 }, @args;
579 608
580 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
610}
611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
581} 621}
582 622
583=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
584 624
585=cut 625=cut
… …
622within each server. 662within each server.
623 663
624=cut 664=cut
625 665
626sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
627 my ($name) = @_; 670 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
629 672
630 eval { 673 eval {
631 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
641} 684}
642 685
643our $DB; 686our $DB;
644 687
645sub db_init { 688sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
648 };
649} 690}
650 691
651sub db_get($$) { 692sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
653 694
654 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
655 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
656 699
657 $! ? () 700 $! ? ()
658 : $data 701 : $data
659 }
660} 702}
661 703
662sub db_put($$$) { 704sub db_put($$$) {
663 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
720 762
721 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 764 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
724 766
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 768
727 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
730 772
… …
740 782
741=cut 783=cut
742 784
743sub datalog($@) { 785sub datalog($@) {
744 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 788}
747 789
748=back 790=back
749 791
750=cut 792=cut
… …
945 987
946 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 990
949 } elsif (ref $type) { 991 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
951 993
952 } else { 994 } else {
953 shift @arg; 995 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
955 } 997 }
956 } 998 }
957} 999}
958 1000
959sub _object_attach { 1001sub _object_attach {
… …
969 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
970 } 1012 }
971 1013
972 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
973 } else { 1015 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1017 }
976 1018
977 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
978} 1020}
979 1021
… …
1038 1080
1039 for (@$callbacks) { 1081 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1041 1083
1042 if ($@) { 1084 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1086 override;
1046 } 1087 }
1047 1088
1048 return 1 if $override; 1089 return 1 if $override;
1049 } 1090 }
… …
1128 for (@$attach) { 1169 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1131 } 1172 }
1132 } else { 1173 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1175 }
1135 } 1176 }
1136} 1177}
1137 1178
1138cf::attachable->attach ( 1179cf::attachable->attach (
… …
1165 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1166 1207
1167 sync_job { 1208 sync_job {
1168 if (length $$rdata) { 1209 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1172 1214
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1218 if ($cf::USE_FSYNC) {
… …
1198 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1199 1241
1200 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1244 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1204 } 1246 }
1205 } else { 1247 } else {
1206 aio_unlink $filename; 1248 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1208 } 1250 }
… …
1232 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1275 $av = $st->{objs};
1234 } 1276 }
1235 1277
1236 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1239 1282
1240 ($data, $av) 1283 ($data, $av)
1241} 1284}
1242 1285
1243=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
… …
1302} 1345}
1303 1346
1304use File::Glob (); 1347use File::Glob ();
1305 1348
1306cf::player->attach ( 1349cf::player->attach (
1307 on_command => sub { 1350 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1309 1352
1310 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1311 or return; 1354 or return;
1312 1355
… …
1335 1378
1336 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1380 if $reply;
1338 1381
1339 } else { 1382 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1384 }
1342 1385
1343 cf::override; 1386 cf::override;
1344 }, 1387 },
1345); 1388);
… …
1356 1399
1357 $grp 1400 $grp
1358} 1401}
1359 1402
1360sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1361 cf::sync_job { 1406 cf::sync_job {
1362 my %todo; 1407 my %todo;
1363 1408
1364 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1410 next unless -r $path;
… …
1383 1428
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1431
1387 $ext{source} = 1432 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1390 . $source 1435 . $source
1391 . "\n};\n1"; 1436 . "\n};\n1";
1392 1437
1393 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1394 } 1439 }
1395 1440
1441 my $pass = 0;
1396 my %done; 1442 my %done;
1397 while (%todo) { 1443 while (%todo) {
1398 my $progress; 1444 my $progress;
1399 1445
1446 ++$pass;
1447
1448 ext:
1400 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1451 next ext
1403 unless exists $done{$_}; 1452 unless exists $done{$_};
1404 } 1453 }
1405 1454
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1456
1408 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1461
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1463 if exists $v->{meta}{mandatory};
1416 1464
1417 warn $msg; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1467 } else {
1468 $done{$k} = delete $todo{$k};
1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1418 } 1474 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1475 }
1424 1476
1425 skip: 1477 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1428 } 1485 }
1429 }; 1486 };
1430} 1487}
1431 1488
1432############################################################################# 1489#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1517 } 1574 }
1518 } 1575 }
1519} 1576}
1520 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1521sub save($) { 1591sub save($) {
1522 my ($pl) = @_; 1592 my ($pl) = @_;
1523 1593
1524 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1525 1595
… …
1530 1600
1531 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1533 1603
1534 cf::get_slot 0.01; 1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1608
1536 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1610 cf::cede_to_tick;
1538} 1611}
1539 1612
… …
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1650
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1579 $pl->deactivate; 1652 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1583 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1584 1656
1585 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1641 \@logins 1713 \@logins
1642} 1714}
1643 1715
1644=item $player->maps 1716=item $player->maps
1645 1717
1718=item cf::player::maps $login
1719
1646Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1647player. May block. 1721player. May block.
1648 1722
1649=cut 1723=cut
1650 1724
… …
1712=cut 1786=cut
1713 1787
1714sub find_by_path($) { 1788sub find_by_path($) {
1715 my ($path) = @_; 1789 my ($path) = @_;
1716 1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1792
1717 my ($match, $specificity); 1793 my ($match, $specificity);
1718 1794
1719 for my $region (list) { 1795 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1797 ($match, $specificity) = ($region, $region->specificity)
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1829
1754 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1831 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1777 1853
1778sub register { 1854sub register {
1779 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1856 my $pkg = caller;
1781 1857
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1859
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1861}
1787 1862
1788# also paths starting with '/' 1863# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1865
1791sub thawer_merge { 1866sub thawer_merge {
1792 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1793 1868
1794 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1799} 1874}
1800 1875
1801sub normalise { 1876sub normalise {
1802 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1803 1878
1804 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1805 1880
1806 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1807 1882
1808 # map plan: 1883 # map plan:
1809 # 1884 #
… …
1848 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1849 return $self; 1924 return $self;
1850 } 1925 }
1851 } 1926 }
1852 1927
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 1929 ()
1855} 1930}
1856 1931
1857sub init { 1932sub init {
1858 my ($self) = @_; 1933 my ($self) = @_;
… …
1980} 2055}
1981 2056
1982sub find; 2057sub find;
1983sub find { 2058sub find {
1984 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
1985 2062
1986 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1987 2064
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2008 2085
2009 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
2010 } 2087 }
2011} 2088}
2012 2089
2013sub pre_load { } 2090sub pre_load { }
2014sub post_load { } 2091#sub post_load { } # XS
2015 2092
2016sub load { 2093sub load {
2017 my ($self) = @_; 2094 my ($self) = @_;
2018 2095
2019 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2153 }
2077 2154
2078 $self->post_load; 2155 $self->post_load;
2079} 2156}
2080 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2081sub customise_for { 2161sub customise_for {
2082 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2083 2163
2084 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2165 if $self->per_player;
… …
2101 or next; 2181 or next;
2102 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2103 or next; 2183 or next;
2104 $neigh->load; 2184 $neigh->load;
2105 2185
2186 # now find the diagonal neighbours
2106 push @neigh, 2187 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2190 }
2110 2191
… …
2117} 2198}
2118 2199
2119sub find_sync { 2200sub find_sync {
2120 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2121 2202
2122 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2123} 2207}
2124 2208
2125sub do_load_sync { 2209sub do_load_sync {
2126 my ($map) = @_; 2210 my ($map) = @_;
2127 2211
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2130 2214
2131 cf::sync_job { $map->load }; 2215 $map->load;
2132} 2216}
2133 2217
2134our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2136 2220
… …
2162 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2163 2247
2164 () 2248 ()
2165} 2249}
2166 2250
2251# common code, used by both ->save and ->swapout
2167sub save { 2252sub _save {
2168 my ($self) = @_; 2253 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2254
2172 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2173 2256
2174 return unless $self->dirty; 2257 return unless $self->dirty;
2175 2258
… …
2195 } else { 2278 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2280 }
2198} 2281}
2199 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2200sub swap_out { 2291sub swap_out {
2201 my ($self) = @_; 2292 my ($self) = @_;
2202 2293
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2295
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2211 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2213 2350
2214 $self->deactivate; 2351 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2353 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2354
2262 $self->unlink_save; 2355 $self->unlink_save;
2263 $self->destroy; 2356 $self->destroy;
2264} 2357}
2265 2358
… …
2273 2366
2274 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2275 2368
2276 $self->unlink_save; 2369 $self->unlink_save;
2277 2370
2278 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2376
… …
2340 : normalise $_ 2433 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2435 ]
2343} 2436}
2344 2437
2438=item cf::map::static_maps
2439
2440Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2441file in the shared directory excluding F</styles> and F</editor>). May
2442block.
2443
2444=cut
2445
2446sub static_maps() {
2447 my @dirs = "";
2448 my @maps;
2449
2450 while (@dirs) {
2451 my $dir = shift @dirs;
2452
2453 next if $dir eq "/styles" || $dir eq "/editor";
2454
2455 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2456 or return;
2457
2458 for (@$files) {
2459 s/\.map$// or next;
2460 utf8::decode $_;
2461 push @maps, "$dir/$_";
2462 }
2463
2464 push @dirs, map "$dir/$_", @$dirs;
2465 }
2466
2467 \@maps
2468}
2469
2345=back 2470=back
2346 2471
2347=head3 cf::object 2472=head3 cf::object
2348 2473
2349=cut 2474=cut
… …
2481 2606
2482Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2483 2608
2484The player should be reasonably safe there for short amounts of time (e.g. 2609The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2611though, as the player cannot control the character while it is on the link
2487map. 2612map.
2488 2613
2489Will never block. 2614Will never block.
2490 2615
2491=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
… …
2512sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2513 my ($self) = @_; 2638 my ($self) = @_;
2514 2639
2515 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2516 2641
2642 ++$self->{_link_recursion};
2643
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2645
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2521 2648
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2650}
2524 2651
2525sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2527 2654
… …
2544 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2546 2673
2547 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2550 2677
2551 $map->load; 2678 $map->load;
2552 $map->load_neighbours; 2679 $map->load_neighbours;
2553 2680
2554 return unless $self->contr->active; 2681 return unless $self->contr->active;
2555 2682
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2558 2685 # entering was successful
2686 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2687 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2688 $self->activate_recursive;
2561} 2689 }
2562 2690
2691}
2692
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2694
2565Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
… …
2575 2705
2576our $GOTOGEN; 2706our $GOTOGEN;
2577 2707
2578sub cf::object::player::goto { 2708sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2580 2716
2581 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2719
2584 $self->enter_link; 2720 $self->enter_link;
… …
2608 my $map = eval { 2744 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2610 2746
2611 if ($map) { 2747 if ($map) {
2612 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2750 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2752 }
2617 2753
2618 $map 2754 $map
… …
2626 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2629 } 2765 }
2630 2766
2631 $done->() if $done; 2767 $done->($self) if $done;
2632 })->prio (1); 2768 })->prio (1);
2633} 2769}
2634 2770
2635=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2636 2772
… …
2729 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2869
2734 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2871 $self->leave_link;
2736 } 2872 }
2737 })->prio (1); 2873 })->prio (1);
2738} 2874}
2739 2875
… …
2751sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2753 2889
2754 utf8::encode $text; 2890 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt)
2895
2896Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required.
2898
2899=cut
2900
2901our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2902
2903sub cf::client::send_big_packet {
2904 my ($self, $pkt) = @_;
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2756} 2917}
2757 2918
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2920
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2921Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2764 2925
2765=cut 2926=cut
2766 2927
2767# non-persistent channels (usually the info channel) 2928# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2769 "c/identify" => { 2936 "c/identify" => {
2770 id => "infobox", 2937 id => "infobox",
2771 title => "Identify", 2938 title => "Identify",
2772 reply => undef, 2939 reply => undef,
2773 tooltip => "Items recently identified", 2940 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2942 "c/examine" => {
2776 id => "infobox", 2943 id => "infobox",
2777 title => "Examine", 2944 title => "Examine",
2778 reply => undef, 2945 reply => undef,
2779 tooltip => "Signs and other items you examined", 2946 tooltip => "Signs and other items you examined",
2947 },
2948 "c/shopinfo" => {
2949 id => "infobox",
2950 title => "Shop Info",
2951 reply => undef,
2952 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2953 },
2781 "c/book" => { 2954 "c/book" => {
2782 id => "infobox", 2955 id => "infobox",
2783 title => "Book", 2956 title => "Book",
2784 reply => undef, 2957 reply => undef,
… …
2900 my $pkt = "msg " 3073 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3074 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3076 );
2904 3077
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3078 $self->send_big_packet ($pkt);
2916} 3079}
2917 3080
2918=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2919 3082
2920Sends an ext event to the client. 3083Sends an ext event to the client.
… …
2923 3086
2924sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2926 3089
2927 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3095 }
2933} 3096}
2934 3097
2935=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2936 3099
… …
2940 3103
2941sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2943 3106
2944 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3110 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3113 }
2951} 3114}
2952 3115
2953=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2954 3117
… …
3025 3188
3026 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3190 if $reply;
3028 3191
3029 } else { 3192 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3194 }
3032 3195
3033 cf::override; 3196 cf::override;
3034 }, 3197 },
3035); 3198);
… …
3055 3218
3056 $coro 3219 $coro
3057} 3220}
3058 3221
3059cf::client->attach ( 3222cf::client->attach (
3060 on_destroy => sub { 3223 on_client_destroy => sub {
3061 my ($ns) = @_; 3224 my ($ns) = @_;
3062 3225
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3227 },
3065); 3228);
… …
3081our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
3082 3245
3083$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
3084 3247
3085$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
3088 sort time 3251 sort time
3089)); 3252));
3090 3253
3091# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
… …
3116 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3120) { 3283) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3286 for @funs;
3125} 3287}
3126 3288
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3145 3307
3146 %vars = (_dummy => 0) unless %vars; 3308 %vars = (_dummy => 0) unless %vars;
3147 3309
3310 my @res;
3148 local $_; 3311 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3312
3151 my $eval = 3313 my $eval =
3152 "do {\n" 3314 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3317 . $code
3156 . "\n}" 3318 . "\n}"
3157 ; 3319 ;
3158 3320
3321 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3162 3330
3163 if ($@) { 3331 if ($@) {
3164 warn "$@"; 3332 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3167 } 3335 }
3168 3336
3169 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3170} 3338}
3171 3339
… …
3185=cut 3353=cut
3186 3354
3187sub register_script_function { 3355sub register_script_function {
3188 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3189 3357
3190 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3192} 3360}
3193 3361
3194=back 3362=back
3195 3363
3196=cut 3364=cut
… …
3205 # for this (global event?) 3373 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3375
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3377
3210 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3211 3379
3212 my $facedata;
3213 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3214 or die "$path: $!"; 3381 or die "$path: $!";
3215 3382
3216 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3217 3384
3218 $facedata->{version} == 2 3385 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3387
3221 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3391 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3394 };
3226 cf::cede_to_tick; 3395 cf::cede_to_tick;
3227 3396
3228 { 3397 {
3229 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3402
3234 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3407
3239 cf::cede_to_tick; 3408 cf::cede_to_tick;
3240 } 3409 }
3241 3410
3242 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
… …
3247 3416
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3420 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3422 }
3254 3423
3255 cf::cede_to_tick; 3424 cf::cede_to_tick;
3256 } 3425 }
3257 } 3426 }
… …
3266 3435
3267 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
3268 } 3437 }
3269 3438
3270 { 3439 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
3274 3441
3275 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3443 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3445
3280 if ($info->{type} & 1) { 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3295 } else { 3448 } else {
3296 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3297 } 3450 }
3298 3451
3299 cf::cede_to_tick; 3452 cf::cede_to_tick;
3300 } 3453 }
3301 } 3454 }
3302 3455
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3457
3305 1 3458 1
3306} 3459}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3460
3328register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3330 3463
3331 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3370sub reload_treasures { 3503sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3373} 3506}
3374 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3375sub reload_resources { 3531sub reload_resources {
3376 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3377 3533
3534 reload_exp_table;
3535 reload_materials;
3378 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3379 reload_archetypes; 3538 reload_archetypes;
3380 reload_regions; 3539 reload_regions;
3381 reload_treasures; 3540 reload_treasures;
3382 3541
3383 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3384} 3543}
3385 3544
3386sub reload_config { 3545sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3388 or return;
3389 3547
3390 local $/; 3548 0 < aio_load "$CONFDIR/config", my $config
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3391 *CFG = YAML::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3392 3555
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3557
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3560
3398 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3422 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3423 print $fh $$; 3586 print $fh $$;
3424} 3587}
3425 3588
3426sub main_loop { 3589sub main_loop {
3427 warn "EV::loop starting\n"; 3590 trace "EV::loop starting\n";
3428 if (1) { 3591 if (1) {
3429 EV::loop; 3592 EV::loop;
3430 } 3593 }
3431 warn "EV::loop returned\n"; 3594 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3595 goto &main_loop unless $REALLY_UNLOOP;
3433} 3596}
3434 3597
3435sub main { 3598sub main {
3436 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3437 3600
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3605
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3607
3450 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
… …
3457 }; 3615 };
3458 3616
3459 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3460 3618
3461 cf::sync_job { 3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3626 cf::load_settings;
3627
3462 reload_resources; 3628 reload_resources;
3463 reload_config; 3629 reload_config;
3464 db_init; 3630 db_init;
3465 3631
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3632 cf::init_uuid;
3469 cf::init_signals; 3633 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3634 cf::init_skills;
3472 3635
3473 cf::init_beforeplay; 3636 cf::init_beforeplay;
3474 3637
3475 atomic; 3638 atomic;
… …
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3647
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3486 }; 3649 };
3487 3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3488 main_loop; 3659 goto &main_loop;
3489} 3660}
3490 3661
3491############################################################################# 3662#############################################################################
3492# initialisation and cleanup 3663# initialisation and cleanup
3493 3664
3494# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3495BEGIN { 3666BEGIN {
3496 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3500 }; 3671 };
3501 } 3672 }
3502} 3673}
3503 3674
3504sub write_runtime_sync { 3675sub write_runtime_sync {
3676 my $t0 = AE::time;
3677
3505 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3507 3680
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3682
3510 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3511 3684
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3686 or return;
3514 3687
3515 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3703 or return;
3531 3704
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3706 and return;
3534 3707
3535 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3709
3537 1 3710 1
3538} 3711}
3539 3712
3540our $uuid_lock; 3713our $uuid_lock;
… …
3552 or return; 3725 or return;
3553 3726
3554 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3555 3728
3556 unless ($value) { 3729 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3731 return;
3559 } 3732 }
3560 3733
3561 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3572 or return; 3745 or return;
3573 3746
3574 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3575 and return; 3748 and return;
3576 3749
3577 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3578 3751
3579 1 3752 1
3580 3753
3581} 3754}
3582 3755
… …
3588} 3761}
3589 3762
3590sub emergency_save() { 3763sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3592 3765
3593 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3594 3772
3595 cf::sync_job { 3773 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3775
3601 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3782 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3784 $pl->save;
3610 } 3785 }
3611 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3612 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3613 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3793 $map->valid or next;
3617 $map->save; 3794 $map->save;
3618 } 3795 }
3619 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3620 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3624 3803
3625 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3805 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3826 };
3629 3827
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3636} 3829}
3637 3830
3638sub post_cleanup { 3831sub post_cleanup {
3639 my ($make_core) = @_; 3832 my ($make_core) = @_;
3640 3833
3834 IO::AIO::flush;
3835
3641 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3837 if $make_core;
3643 3838
3644 my $fh = pidfile; 3839 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3646} 3841}
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3865 }
3671 warn "cleared package $pkg\n";#d#
3672} 3866}
3673 3867
3674sub do_reload_perl() { 3868sub do_reload_perl() {
3675 # can/must only be called in main 3869 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3677 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3678 return; 3872 return;
3679 } 3873 }
3680 3874
3681 return if $RELOAD++; 3875 return if $RELOAD++;
3682 3876
3683 my $t1 = EV::time; 3877 my $t1 = AE::time;
3684 3878
3685 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3686 warn "reloading..."; 3881 info "reloading...";
3687 3882
3688 warn "entering sync_job"; 3883 trace "entering sync_job";
3689 3884
3690 cf::sync_job { 3885 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3886 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3887
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3890 %EXT_CORO = ();
3708 3891
3709 warn "removing commands"; 3892 trace "removing commands";
3710 %COMMAND = (); 3893 %COMMAND = ();
3711 3894
3712 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3713 %EXTCMD = (); 3896 %EXTCMD = ();
3714 %EXTICMD = (); 3897 %EXTICMD = ();
3715 3898
3716 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3719 3902
3720 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3904 eval {
3722 $cb->($pkg); 3905 $cb->($pkg);
3723 1 3906 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3725 } 3908 }
3726 3909
3727 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3728 clear_package $pkg; 3911 clear_package $pkg;
3729 } 3912 }
3730 3913
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3917
3735 warn "... unloading $k"; 3918 trace "... unloading $k";
3736 delete $INC{$k}; 3919 delete $INC{$k};
3737 3920
3738 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3740 3923
… …
3743 } 3926 }
3744 3927
3745 clear_package $k; 3928 clear_package $k;
3746 } 3929 }
3747 3930
3748 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 3932 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 3934
3752 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 3938
3756 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3757 # and global variables created in xs 3940 # and global variables created in xs
3758 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3759 3942
3760 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3761 3944
3762 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3763 require cf; 3946 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3765 3948
3766 warn "loading config and database again"; 3949 trace "loading config and database again";
3767 cf::reload_config; 3950 cf::reload_config;
3768 3951
3769 warn "loading extensions"; 3952 trace "loading extensions";
3770 cf::load_extensions; 3953 cf::load_extensions;
3771 3954
3772 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3776 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3779 } 3962 }
3780 3963
3781 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3783 3966
3784 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3785 3968
3786 1 3969 1
3787 } or do { 3970 } or do {
3788 warn $@; 3971 error $@;
3789 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3790 }; 3973 };
3791 3974
3792 warn "reloaded"; 3975 info "reloaded";
3793 --$RELOAD; 3976 --$RELOAD;
3794 } 3977 }
3795 3978
3796 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3798}; 3981};
3799 3982
3800our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3801 3984
3802sub reload_perl() { 3985sub reload_perl() {
… …
3804 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3805 3988
3806 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3808 3991
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 3993 do_reload_perl;
3811 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3812 }; 3995 };
3813 }; 3996 };
3814} 3997}
… …
3823 reload_perl; 4006 reload_perl;
3824 }; 4007 };
3825 } 4008 }
3826}; 4009};
3827 4010
3828unshift @INC, $LIBDIR; 4011#############################################################################
3829 4012
3830my $bug_warning = 0; 4013my $bug_warning = 0;
3831 4014
3832our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3834 4017
3835sub wait_for_tick { 4018sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 4020
3838 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 4023 $signal->wait;
3841} 4024}
3842 4025
3843sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 4028
3846 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4031 $signal->wait;
3849} 4032}
… …
3855 return; 4038 return;
3856 } 4039 }
3857 4040
3858 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3859 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4047 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4049 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3866 }; 4051 };
3867 } 4052 }
3868 4053
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4055 $sig->send;
… …
3878 4063
3879 if (0) { 4064 if (0) {
3880 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3884 } 4069 }
3885 } 4070 }
3886} 4071}
3887 4072
3888{ 4073{
3889 # configure BDB 4074 # configure BDB
3890 4075
3891 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3894 4079
3895 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
… …
3977 } 4162 }
3978} 4163}
3979 4164
3980# load additional modules 4165# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3982 4168
3983END { cf::emergency_save } 4169END { cf::emergency_save }
3984 4170
39851 41711
3986 4172

Diff Legend

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