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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
53use Coro::Util (); 51use Coro::Util ();
54 52
55use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
56use BDB (); 54use BDB ();
57use Data::Dumper; 55use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 56use Fcntl;
60use YAML::XS (); 57use YAML::XS ();
61use IO::AIO (); 58use IO::AIO ();
62use Time::HiRes; 59use Time::HiRes;
63use Compress::LZF; 60use Compress::LZF;
78 75
79# strictly for debugging 76# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 78
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
83 82
84our %COMMAND = (); 83our %COMMAND = ();
85our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
86 85
87our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
107our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
113 118
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 121our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
119our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 127our $DB_ENV;
123 128
124our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 130
126our %CFG; 131our %CFG;
127 132
128our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 134our $RUNTIME;
163 168
164our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
165 170
166sub cf::map::normalise; 171sub cf::map::normalise;
167 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
168############################################################################# 177#############################################################################
169 178
170%REFLECT = (); 179%REFLECT = ();
171for (@REFLECT) { 180for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
224from wherever your confdir points to. 233from wherever your confdir points to.
225 234
226=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
227 236
228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
229returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
230per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
231 245
232=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
233 247
234This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
243 257
244=back 258=back
245 259
246=cut 260=cut
247 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
248$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 269 my $msg = join "", @_;
250 270
251 $msg .= "\n" 271 $msg .= "\n"
252 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
253 273
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 275
256 LOG llevError, $msg; 276 LOG llevWarn, $msg;
257}; 277};
258 278
259$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
261 281
262 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
263 283
264 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 286 return;#d#
267 }#d# 287 }#d#
268 288
269 # kill coroutine otherwise 289 # kill coroutine otherwise
270 Coro::terminate 290 Coro::terminate
397} 417}
398 418
399=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
400 420
401Like 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
402get spread over timer. 422get spread over time.
403 423
404=cut 424=cut
405 425
406sub periodic($$) { 426sub periodic($$) {
407 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
424 444
425=cut 445=cut
426 446
427our @SLOT_QUEUE; 447our @SLOT_QUEUE;
428our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
429 450
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
433 454
434 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
435 457
436 while () { 458 while () {
437 next_job: 459 next_job:
460
438 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 462
440 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 467 $job->[2]->send;
444 Coro::cede; 468 Coro::cede;
445 goto next_job; 469 goto next_job;
446 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 472 }
448 } 473 }
449 474
450 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 478 $signal->wait;
454 } else { 479 } else {
480 $busy = 0;
455 Coro::schedule; 481 Coro::schedule;
456 } 482 }
457 } 483 }
458}; 484};
459 485
460sub get_slot($;$$) { 486sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
462 488
463 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
464 490
465 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
466 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
467 494
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
496=cut 523=cut
497 524
498sub sync_job(&) { 525sub sync_job(&) {
499 my ($job) = @_; 526 my ($job) = @_;
500 527
501 if ($Coro::current == $Coro::main) { 528 if (in_main) {
502 my $time = EV::time; 529 my $time = AE::time;
503 530
504 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
506 533
507 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
508 535
509 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
510 537
511 my $busy = 1; 538 my $busy = 1;
512 my @res; 539 my @res;
513 540
514 (async { 541 (async {
515 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 543 @res = eval { $job->() };
517 warn $@ if $@; 544 error $@ if $@;
518 undef $busy; 545 undef $busy;
519 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
520 547
521 while ($busy) { 548 while ($busy) {
522 if (Coro::nready) { 549 if (Coro::nready) {
524 } else { 551 } else {
525 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
526 } 553 }
527 } 554 }
528 555
529 my $time = EV::time - $time; 556 my $time = AE::time - $time;
530 557
531 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
532 559
533 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
534 } else { 561 } else {
565Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 593never block itself or use any form of event handling.
567 594
568=cut 595=cut
569 596
597sub post_fork {
598 reset_signals;
599}
600
570sub fork_call(&@) { 601sub fork_call(&@) {
571 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
572 603
573 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
576 607
577 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
578 reset_signals; 609 cf::post_fork;
579 &$cb 610 &$cb
580 }, @args; 611 }, @args;
581 612
582 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
583} 625}
584 626
585=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
586 628
587=cut 629=cut
624within each server. 666within each server.
625 667
626=cut 668=cut
627 669
628sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
629 my ($name) = @_; 674 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
631 676
632 eval { 677 eval {
633 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
643} 688}
644 689
645our $DB; 690our $DB;
646 691
647sub db_init { 692sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
650 };
651} 694}
652 695
653sub db_get($$) { 696sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
655 698
656 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
657 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
658 703
659 $! ? () 704 $! ? ()
660 : $data 705 : $data
661 }
662} 706}
663 707
664sub db_put($$$) { 708sub db_put($$$) {
665 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
722 766
723 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 768 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
726 770
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 772
729 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
732 776
742 786
743=cut 787=cut
744 788
745sub datalog($@) { 789sub datalog($@) {
746 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 792}
749 793
750=back 794=back
751 795
752=cut 796=cut
947 991
948 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 994
951 } elsif (ref $type) { 995 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
953 997
954 } else { 998 } else {
955 shift @arg; 999 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
957 } 1001 }
958 } 1002 }
959} 1003}
960 1004
961sub _object_attach { 1005sub _object_attach {
971 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
972 } 1016 }
973 1017
974 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
975 } else { 1019 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1021 }
978 1022
979 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
980} 1024}
981 1025
1040 1084
1041 for (@$callbacks) { 1085 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1043 1087
1044 if ($@) { 1088 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1090 override;
1048 } 1091 }
1049 1092
1050 return 1 if $override; 1093 return 1 if $override;
1051 } 1094 }
1130 for (@$attach) { 1173 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1133 } 1176 }
1134 } else { 1177 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1179 }
1137 } 1180 }
1138} 1181}
1139 1182
1140cf::attachable->attach ( 1183cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1168 1211
1169 sync_job { 1212 sync_job {
1170 if (length $$rdata) { 1213 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1174 1218
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
1200 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1201 1245
1202 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1248 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1206 } 1250 }
1207 } else { 1251 } else {
1208 aio_unlink $filename; 1252 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1210 } 1254 }
1234 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1279 $av = $st->{objs};
1236 } 1280 }
1237 1281
1238 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1241 1286
1242 ($data, $av) 1287 ($data, $av)
1243} 1288}
1244 1289
1245=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1304} 1349}
1305 1350
1306use File::Glob (); 1351use File::Glob ();
1307 1352
1308cf::player->attach ( 1353cf::player->attach (
1309 on_command => sub { 1354 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1311 1356
1312 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1313 or return; 1358 or return;
1314 1359
1337 1382
1338 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1384 if $reply;
1340 1385
1341 } else { 1386 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1388 }
1344 1389
1345 cf::override; 1390 cf::override;
1346 }, 1391 },
1347); 1392);
1358 1403
1359 $grp 1404 $grp
1360} 1405}
1361 1406
1362sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1363 cf::sync_job { 1410 cf::sync_job {
1364 my %todo; 1411 my %todo;
1365 1412
1366 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1414 next unless -r $path;
1385 1432
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1435
1389 $ext{source} = 1436 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1392 . $source 1439 . $source
1393 . "\n};\n1"; 1440 . "\n};\n1";
1394 1441
1395 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1396 } 1443 }
1397 1444
1445 my $pass = 0;
1398 my %done; 1446 my %done;
1399 while (%todo) { 1447 while (%todo) {
1400 my $progress; 1448 my $progress;
1401 1449
1450 ++$pass;
1451
1452 ext:
1402 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1455 next ext
1405 unless exists $done{$_}; 1456 unless exists $done{$_};
1406 } 1457 }
1407 1458
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1460
1410 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1465
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1467 if exists $v->{meta}{mandatory};
1418 1468
1419 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1420 } 1478 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1479 }
1426 1480
1427 skip: 1481 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1430 } 1489 }
1431 }; 1490 };
1432} 1491}
1433 1492
1434############################################################################# 1493#############################################################################
1518 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1519 } 1578 }
1520 } 1579 }
1521} 1580}
1522 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1523sub save($) { 1595sub save($) {
1524 my ($pl) = @_; 1596 my ($pl) = @_;
1525 1597
1526 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1527 1599
1532 1604
1533 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1535 1607
1536 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1612
1538 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1614 cf::cede_to_tick;
1540} 1615}
1541 1616
1577 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1654
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1581 $pl->deactivate; 1656 $pl->deactivate;
1657
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1585 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1586 1663
1587 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1643 \@logins 1720 \@logins
1644} 1721}
1645 1722
1646=item $player->maps 1723=item $player->maps
1647 1724
1725=item cf::player::maps $login
1726
1648Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1649player. May block. 1728player. May block.
1650 1729
1651=cut 1730=cut
1652 1731
1714=cut 1793=cut
1715 1794
1716sub find_by_path($) { 1795sub find_by_path($) {
1717 my ($path) = @_; 1796 my ($path) = @_;
1718 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1719 my ($match, $specificity); 1800 my ($match, $specificity);
1720 1801
1721 for my $region (list) { 1802 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1836
1756 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1838 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1779 1860
1780sub register { 1861sub register {
1781 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1863 my $pkg = caller;
1783 1864
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1866
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1868}
1789 1869
1790# also paths starting with '/' 1870# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1872
1793sub thawer_merge { 1873sub thawer_merge {
1794 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1795 1875
1796 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1801} 1881}
1802 1882
1803sub normalise { 1883sub normalise {
1804 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1805 1885
1806 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1807 1887
1808 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1809 1889
1810 # map plan: 1890 # map plan:
1811 # 1891 #
1850 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1851 return $self; 1931 return $self;
1852 } 1932 }
1853 } 1933 }
1854 1934
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 1936 ()
1857} 1937}
1858 1938
1859sub init { 1939sub init {
1860 my ($self) = @_; 1940 my ($self) = @_;
1982} 2062}
1983 2063
1984sub find; 2064sub find;
1985sub find { 2065sub find {
1986 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
1987 2069
1988 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1989 2071
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
2010 2092
2011 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2012 } 2094 }
2013} 2095}
2014 2096
2015sub pre_load { } 2097sub pre_load { }
2016sub post_load { } 2098#sub post_load { } # XS
2017 2099
2018sub load { 2100sub load {
2019 my ($self) = @_; 2101 my ($self) = @_;
2020 2102
2021 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2078 } 2160 }
2079 2161
2080 $self->post_load; 2162 $self->post_load;
2081} 2163}
2082 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2083sub customise_for { 2168sub customise_for {
2084 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2085 2170
2086 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2172 if $self->per_player;
2103 or next; 2188 or next;
2104 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2105 or next; 2190 or next;
2106 $neigh->load; 2191 $neigh->load;
2107 2192
2193 # now find the diagonal neighbours
2108 push @neigh, 2194 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2197 }
2112 2198
2119} 2205}
2120 2206
2121sub find_sync { 2207sub find_sync {
2122 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2123 2209
2124 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2125} 2214}
2126 2215
2127sub do_load_sync { 2216sub do_load_sync {
2128 my ($map) = @_; 2217 my ($map) = @_;
2129 2218
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2132 2221
2133 cf::sync_job { $map->load }; 2222 $map->load;
2134} 2223}
2135 2224
2136our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2138 2227
2164 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2165 2254
2166 () 2255 ()
2167} 2256}
2168 2257
2258# common code, used by both ->save and ->swapout
2169sub save { 2259sub _save {
2170 my ($self) = @_; 2260 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2261
2174 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2175 2263
2176 return unless $self->dirty; 2264 return unless $self->dirty;
2177 2265
2197 } else { 2285 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2287 }
2200} 2288}
2201 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2202sub swap_out { 2298sub swap_out {
2203 my ($self) = @_; 2299 my ($self) = @_;
2204 2300
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2302
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2213 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2214 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2215 2357
2216 $self->deactivate; 2358 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2360 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2361
2264 $self->unlink_save; 2362 $self->unlink_save;
2265 $self->destroy; 2363 $self->destroy;
2266} 2364}
2267 2365
2275 2373
2276 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2277 2375
2278 $self->unlink_save; 2376 $self->unlink_save;
2279 2377
2280 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2383
2515 2613
2516Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2517 2615
2518The player should be reasonably safe there for short amounts of time (e.g. 2616The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2618though, as the player cannot control the character while it is on the link
2521map. 2619map.
2522 2620
2523Will never block. 2621Will never block.
2524 2622
2525=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2546sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2547 my ($self) = @_; 2645 my ($self) = @_;
2548 2646
2549 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2550 2648
2649 ++$self->{_link_recursion};
2650
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2652
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2555 2655
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2657}
2558 2658
2559sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2561 2661
2586 $map->load_neighbours; 2686 $map->load_neighbours;
2587 2687
2588 return unless $self->contr->active; 2688 return unless $self->contr->active;
2589 2689
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2592 2692 # entering was successful
2693 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2694 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2695 $self->activate_recursive;
2595} 2696 }
2596 2697
2698}
2699
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2701
2599Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2609 2712
2610our $GOTOGEN; 2713our $GOTOGEN;
2611 2714
2612sub cf::object::player::goto { 2715sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2614 2723
2615 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2726
2618 $self->enter_link; 2727 $self->enter_link;
2642 my $map = eval { 2751 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2644 2753
2645 if ($map) { 2754 if ($map) {
2646 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2757 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2759 }
2651 2760
2652 $map 2761 $map
2660 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2663 } 2772 }
2664 2773
2665 $done->() if $done; 2774 $done->($self) if $done;
2666 })->prio (1); 2775 })->prio (1);
2667} 2776}
2668 2777
2669=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2670 2779
2763 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2876
2768 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2878 $self->leave_link;
2770 } 2879 }
2771 })->prio (1); 2880 })->prio (1);
2772} 2881}
2773 2882
3086 3195
3087 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3197 if $reply;
3089 3198
3090 } else { 3199 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3201 }
3093 3202
3094 cf::override; 3203 cf::override;
3095 }, 3204 },
3096); 3205);
3116 3225
3117 $coro 3226 $coro
3118} 3227}
3119 3228
3120cf::client->attach ( 3229cf::client->attach (
3121 on_destroy => sub { 3230 on_client_destroy => sub {
3122 my ($ns) = @_; 3231 my ($ns) = @_;
3123 3232
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3234 },
3126); 3235);
3142our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3143 3252
3144$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3145 3254
3146$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3149 sort time 3258 sort time
3150)); 3259));
3151 3260
3152# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3177 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3181) { 3290) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3293 for @funs;
3186} 3294}
3187 3295
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3206 3314
3207 %vars = (_dummy => 0) unless %vars; 3315 %vars = (_dummy => 0) unless %vars;
3208 3316
3317 my @res;
3209 local $_; 3318 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3319
3212 my $eval = 3320 my $eval =
3213 "do {\n" 3321 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3324 . $code
3217 . "\n}" 3325 . "\n}"
3218 ; 3326 ;
3219 3327
3328 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3223 3337
3224 if ($@) { 3338 if ($@) {
3225 warn "$@"; 3339 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3228 } 3342 }
3229 3343
3230 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3231} 3345}
3232 3346
3246=cut 3360=cut
3247 3361
3248sub register_script_function { 3362sub register_script_function {
3249 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3250 3364
3251 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3253} 3367}
3254 3368
3255=back 3369=back
3256 3370
3257=cut 3371=cut
3266 # for this (global event?) 3380 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3382
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3384
3271 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3272 3386
3273 my $facedata;
3274 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3275 or die "$path: $!"; 3388 or die "$path: $!";
3276 3389
3277 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3278 3391
3279 $facedata->{version} == 2 3392 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3394
3282 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3398 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3401 };
3287 cf::cede_to_tick; 3402 cf::cede_to_tick;
3288 3403
3289 { 3404 {
3290 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3292 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3409
3295 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3414
3300 cf::cede_to_tick; 3415 cf::cede_to_tick;
3301 } 3416 }
3302 3417
3303 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3308 3423
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3427 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3429 }
3315 3430
3316 cf::cede_to_tick; 3431 cf::cede_to_tick;
3317 } 3432 }
3318 } 3433 }
3327 3442
3328 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3329 } 3444 }
3330 3445
3331 { 3446 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3335 3448
3336 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3452
3341 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3356 } else { 3455 } else {
3357 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3358 } 3457 }
3359 3458
3360 cf::cede_to_tick; 3459 cf::cede_to_tick;
3361 } 3460 }
3362 } 3461 }
3363 3462
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3464
3366 1 3465 1
3367} 3466}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388 3467
3389register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3391 3470
3392 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3431sub reload_treasures { 3510sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3434} 3513}
3435 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3436sub reload_resources { 3538sub reload_resources {
3437 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3438 3540
3541 reload_exp_table;
3542 reload_materials;
3439 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3440 reload_archetypes; 3545 reload_archetypes;
3441 reload_regions; 3546 reload_regions;
3442 reload_treasures; 3547 reload_treasures;
3443 3548
3444 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3445} 3550}
3446 3551
3447sub reload_config { 3552sub reload_config {
3448 warn "reloading config file...\n"; 3553 trace "reloading config file...\n";
3449 3554
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3555 0 < aio_load "$CONFDIR/config", my $config
3451 or return; 3556 or die "$CONFDIR/config: $!";
3452 3557
3453 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3454 *CFG = YAML::XS::Load scalar <$fh>; 3561 *CFG = YAML::XS::Load $config;
3455 3562
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3564
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3567
3461 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3570 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3571 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3572 };
3466 warn $@ if $@; 3573 warn $@ if $@;
3467 } 3574 }
3468
3469 warn "finished reloading resource files\n";
3470} 3575}
3471 3576
3472sub pidfile() { 3577sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3579 or die "$PIDFILE: $!";
3487 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3488 print $fh $$; 3593 print $fh $$;
3489} 3594}
3490 3595
3491sub main_loop { 3596sub main_loop {
3492 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3493 if (1) { 3598 if (1) {
3494 EV::loop; 3599 EV::loop;
3495 } 3600 }
3496 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3498} 3603}
3499 3604
3500sub main { 3605sub main {
3501 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3502 3607
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3612
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3614
3515 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3522 }; 3622 };
3523 3623
3524 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3525 3625
3526 cf::sync_job { 3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3527 reload_resources; 3635 reload_resources;
3528 reload_config; 3636 reload_config;
3529 db_init; 3637 db_init;
3530 3638
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3639 cf::init_uuid;
3534 cf::init_signals; 3640 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3641 cf::init_skills;
3537 3642
3538 cf::init_beforeplay; 3643 cf::init_beforeplay;
3539 3644
3540 atomic; 3645 atomic;
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3654
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3551 }; 3656 };
3552 3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3553 main_loop; 3666 goto &main_loop;
3554} 3667}
3555 3668
3556############################################################################# 3669#############################################################################
3557# initialisation and cleanup 3670# initialisation and cleanup
3558 3671
3559# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3560BEGIN { 3673BEGIN {
3561 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3565 }; 3678 };
3566 } 3679 }
3567} 3680}
3568 3681
3569sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3570 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3572 3687
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3689
3575 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3576 3691
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3693 or return;
3579 3694
3580 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3595 or return; 3710 or return;
3596 3711
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3713 and return;
3599 3714
3600 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3716
3602 1 3717 1
3603} 3718}
3604 3719
3605our $uuid_lock; 3720our $uuid_lock;
3617 or return; 3732 or return;
3618 3733
3619 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3620 3735
3621 unless ($value) { 3736 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3738 return;
3624 } 3739 }
3625 3740
3626 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3742 $uuid_skip = 0;
3637 or return; 3752 or return;
3638 3753
3639 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3640 and return; 3755 and return;
3641 3756
3642 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3643 3758
3644 1 3759 1
3645 3760
3646} 3761}
3647 3762
3653} 3768}
3654 3769
3655sub emergency_save() { 3770sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3657 3772
3658 warn "emergency_perl_save: enter\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3659 3779
3660 cf::sync_job { 3780 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665 3782
3666 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 3789 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 3791 $pl->save;
3675 } 3792 }
3676 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3677 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3678 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 3800 $map->valid or next;
3682 $map->save; 3801 $map->save;
3683 } 3802 }
3684 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3685 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3686 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3689 3810
3690 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 3812 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3693 }; 3833 };
3694 3834
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3700 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3701} 3836}
3702 3837
3703sub post_cleanup { 3838sub post_cleanup {
3704 my ($make_core) = @_; 3839 my ($make_core) = @_;
3705 3840
3841 IO::AIO::flush;
3842
3706 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 3844 if $make_core;
3708 3845
3709 my $fh = pidfile; 3846 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3711} 3848}
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3872 }
3736 warn "cleared package $pkg\n";#d#
3737} 3873}
3738 3874
3739sub do_reload_perl() { 3875sub do_reload_perl() {
3740 # can/must only be called in main 3876 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3742 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3743 return; 3879 return;
3744 } 3880 }
3745 3881
3746 return if $RELOAD++; 3882 return if $RELOAD++;
3747 3883
3748 my $t1 = EV::time; 3884 my $t1 = AE::time;
3749 3885
3750 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3751 warn "reloading..."; 3888 info "reloading...";
3752 3889
3753 warn "entering sync_job"; 3890 trace "entering sync_job";
3754 3891
3755 cf::sync_job { 3892 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 3893 #cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark
3759 3894
3760 warn "syncing database to disk";
3761 BDB::db_env_txn_checkpoint $DB_ENV;
3762
3763 # if anything goes wrong in here, we should simply crash as we already saved
3764
3765 warn "flushing outstanding aio requests";
3766 while (IO::AIO::nreqs || BDB::nreqs) {
3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3768 }
3769
3770 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 3897 %EXT_CORO = ();
3773 3898
3774 warn "removing commands"; 3899 trace "removing commands";
3775 %COMMAND = (); 3900 %COMMAND = ();
3776 3901
3777 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3778 %EXTCMD = (); 3903 %EXTCMD = ();
3779 %EXTICMD = (); 3904 %EXTICMD = ();
3780 3905
3781 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3784 3909
3785 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3786 eval { 3911 eval {
3787 $cb->($pkg); 3912 $cb->($pkg);
3788 1 3913 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3790 } 3915 }
3791 3916
3792 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3793 clear_package $pkg; 3918 clear_package $pkg;
3794 } 3919 }
3795 3920
3796 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 3924
3800 warn "... unloading $k"; 3925 trace "... unloading $k";
3801 delete $INC{$k}; 3926 delete $INC{$k};
3802 3927
3803 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3805 3930
3808 } 3933 }
3809 3934
3810 clear_package $k; 3935 clear_package $k;
3811 } 3936 }
3812 3937
3813 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 3939 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 3941
3817 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 3945
3821 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3822 # and global variables created in xs 3947 # and global variables created in xs
3823 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3824 3949
3825 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3826 3951
3827 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3828 require cf; 3953 require cf;
3829 cf::_connect_to_perl_1; 3954 cf::_connect_to_perl_1;
3830 3955
3831 warn "loading config and database again"; 3956 trace "loading config and database again";
3832 cf::reload_config; 3957 cf::reload_config;
3833 3958
3834 warn "loading extensions"; 3959 trace "loading extensions";
3835 cf::load_extensions; 3960 cf::load_extensions;
3836 3961
3837 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3841 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3844 } 3969 }
3845 3970
3846 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3848 3973
3849 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3850 3975
3851 1 3976 1
3852 } or do { 3977 } or do {
3853 warn $@; 3978 error $@;
3854 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3855 }; 3980 };
3856 3981
3857 warn "reloaded"; 3982 info "reloaded";
3858 --$RELOAD; 3983 --$RELOAD;
3859 } 3984 }
3860 3985
3861 $t1 = EV::time - $t1; 3986 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3863}; 3988};
3864 3989
3865our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3866 3991
3867sub reload_perl() { 3992sub reload_perl() {
3869 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3870 3995
3871 $RELOAD_WATCHER ||= cf::async { 3996 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 3997 Coro::AIO::aio_wait cache_extensions;
3873 3998
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 4000 do_reload_perl;
3876 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3877 }; 4002 };
3878 }; 4003 };
3879} 4004}
3888 reload_perl; 4013 reload_perl;
3889 }; 4014 };
3890 } 4015 }
3891}; 4016};
3892 4017
3893unshift @INC, $LIBDIR; 4018#############################################################################
3894 4019
3895my $bug_warning = 0; 4020my $bug_warning = 0;
3896 4021
3897our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3899 4024
3900sub wait_for_tick { 4025sub wait_for_tick() {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 4027
3903 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 4030 $signal->wait;
3906} 4031}
3907 4032
3908sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 4035
3911 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4038 $signal->wait;
3914} 4039}
3920 return; 4045 return;
3921 } 4046 }
3922 4047
3923 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3924 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4054 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4056 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3931 }; 4058 };
3932 } 4059 }
3933 4060
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4062 $sig->send;
3943 4070
3944 if (0) { 4071 if (0) {
3945 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3949 } 4076 }
3950 } 4077 }
3951} 4078}
3952 4079
3953{ 4080{
3954 # configure BDB 4081 # configure BDB
3955 4082
3956 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3959 4086
3960 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines