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.485 by root, Mon Oct 12 14:12:54 2009 UTC vs.
Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC

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

Diff Legend

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