ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.495 by root, Tue Nov 10 04:38:45 2009 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 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
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 $_;
243 252
244=back 253=back
245 254
246=cut 255=cut
247 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
248$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 264 my $msg = join "", @_;
250 265
251 $msg .= "\n" 266 $msg .= "\n"
252 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
253 268
254 $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;
255 270
256 LOG llevError, $msg; 271 LOG llevWarn, $msg;
257}; 272};
258 273
259$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
261 276
262 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
263 278
264 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 281 return;#d#
267 }#d# 282 }#d#
268 283
269 # kill coroutine otherwise 284 # kill coroutine otherwise
270 Coro::terminate 285 Coro::terminate
397} 412}
398 413
399=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
400 415
401Like 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
402get spread over timer. 417get spread over time.
403 418
404=cut 419=cut
405 420
406sub periodic($$) { 421sub periodic($$) {
407 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
424 439
425=cut 440=cut
426 441
427our @SLOT_QUEUE; 442our @SLOT_QUEUE;
428our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
429 445
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
433 449
434 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
435 452
436 while () { 453 while () {
437 next_job: 454 next_job:
455
438 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 457
440 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 462 $job->[2]->send;
444 Coro::cede; 463 Coro::cede;
445 goto next_job; 464 goto next_job;
446 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 467 }
448 } 468 }
449 469
450 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 473 $signal->wait;
454 } else { 474 } else {
475 $busy = 0;
455 Coro::schedule; 476 Coro::schedule;
456 } 477 }
457 } 478 }
458}; 479};
459 480
460sub get_slot($;$$) { 481sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
462 483
463 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
464 485
465 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
466 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
467 489
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
496=cut 518=cut
497 519
498sub sync_job(&) { 520sub sync_job(&) {
499 my ($job) = @_; 521 my ($job) = @_;
500 522
501 if ($Coro::current == $Coro::main) { 523 if (in_main) {
502 my $time = EV::time; 524 my $time = AE::time;
503 525
504 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
506 528
507 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
508 530
509 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
510 532
511 my $busy = 1; 533 my $busy = 1;
512 my @res; 534 my @res;
513 535
514 (async { 536 (async {
515 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 538 @res = eval { $job->() };
517 warn $@ if $@; 539 error $@ if $@;
518 undef $busy; 540 undef $busy;
519 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
520 542
521 while ($busy) { 543 while ($busy) {
522 if (Coro::nready) { 544 if (Coro::nready) {
524 } else { 546 } else {
525 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
526 } 548 }
527 } 549 }
528 550
529 my $time = EV::time - $time; 551 my $time = AE::time - $time;
530 552
531 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
532 554
533 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
534 } else { 556 } else {
578 reset_signals; 600 reset_signals;
579 &$cb 601 &$cb
580 }, @args; 602 }, @args;
581 603
582 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 )
583} 616}
584 617
585=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
586 619
587=cut 620=cut
624within each server. 657within each server.
625 658
626=cut 659=cut
627 660
628sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
629 my ($name) = @_; 665 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
631 667
632 eval { 668 eval {
633 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
643} 679}
644 680
645our $DB; 681our $DB;
646 682
647sub db_init { 683sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
650 };
651} 685}
652 686
653sub db_get($$) { 687sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
655 689
656 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
657 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
658 694
659 $! ? () 695 $! ? ()
660 : $data 696 : $data
661 }
662} 697}
663 698
664sub db_put($$$) { 699sub db_put($$$) {
665 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
722 757
723 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 759 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
726 761
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 763
729 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
732 767
742 777
743=cut 778=cut
744 779
745sub datalog($@) { 780sub datalog($@) {
746 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 783}
749 784
750=back 785=back
751 786
752=cut 787=cut
947 982
948 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 985
951 } elsif (ref $type) { 986 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
953 988
954 } else { 989 } else {
955 shift @arg; 990 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
957 } 992 }
958 } 993 }
959} 994}
960 995
961sub _object_attach { 996sub _object_attach {
971 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
972 } 1007 }
973 1008
974 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
975 } else { 1010 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1012 }
978 1013
979 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
980} 1015}
981 1016
1040 1075
1041 for (@$callbacks) { 1076 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1043 1078
1044 if ($@) { 1079 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1081 override;
1048 } 1082 }
1049 1083
1050 return 1 if $override; 1084 return 1 if $override;
1051 } 1085 }
1130 for (@$attach) { 1164 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1133 } 1167 }
1134 } else { 1168 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1170 }
1137 } 1171 }
1138} 1172}
1139 1173
1140cf::attachable->attach ( 1174cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1168 1202
1169 sync_job { 1203 sync_job {
1170 if (length $$rdata) { 1204 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1174 1209
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
1200 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1201 1236
1202 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1239 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1206 } 1241 }
1207 } else { 1242 } else {
1208 aio_unlink $filename; 1243 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1210 } 1245 }
1234 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1270 $av = $st->{objs};
1236 } 1271 }
1237 1272
1238 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1241 1277
1242 ($data, $av) 1278 ($data, $av)
1243} 1279}
1244 1280
1245=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1304} 1340}
1305 1341
1306use File::Glob (); 1342use File::Glob ();
1307 1343
1308cf::player->attach ( 1344cf::player->attach (
1309 on_command => sub { 1345 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1311 1347
1312 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1313 or return; 1349 or return;
1314 1350
1337 1373
1338 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1375 if $reply;
1340 1376
1341 } else { 1377 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1379 }
1344 1380
1345 cf::override; 1381 cf::override;
1346 }, 1382 },
1347); 1383);
1358 1394
1359 $grp 1395 $grp
1360} 1396}
1361 1397
1362sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1363 cf::sync_job { 1401 cf::sync_job {
1364 my %todo; 1402 my %todo;
1365 1403
1366 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1405 next unless -r $path;
1385 1423
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1426
1389 $ext{source} = 1427 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1392 . $source 1430 . $source
1393 . "\n};\n1"; 1431 . "\n};\n1";
1394 1432
1395 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1396 } 1434 }
1397 1435
1436 my $pass = 0;
1398 my %done; 1437 my %done;
1399 while (%todo) { 1438 while (%todo) {
1400 my $progress; 1439 my $progress;
1401 1440
1441 ++$pass;
1442
1443 ext:
1402 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1446 next ext
1405 unless exists $done{$_}; 1447 unless exists $done{$_};
1406 } 1448 }
1407 1449
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1451
1410 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1413 1457
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1459 if exists $v->{meta}{mandatory};
1418 1460
1419 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1420 } 1470 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1471 }
1426 1472
1427 skip: 1473 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1430 } 1481 }
1431 }; 1482 };
1432} 1483}
1433 1484
1434############################################################################# 1485#############################################################################
1518 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1519 } 1570 }
1520 } 1571 }
1521} 1572}
1522 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1523sub save($) { 1587sub save($) {
1524 my ($pl) = @_; 1588 my ($pl) = @_;
1525 1589
1526 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1527 1591
1532 1596
1533 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1535 1599
1536 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1604
1538 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1606 cf::cede_to_tick;
1540} 1607}
1541 1608
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1646
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1581 $pl->deactivate; 1648 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1585 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1586 1652
1587 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1643 \@logins 1709 \@logins
1644} 1710}
1645 1711
1646=item $player->maps 1712=item $player->maps
1647 1713
1714=item cf::player::maps $login
1715
1648Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1649player. May block. 1717player. May block.
1650 1718
1651=cut 1719=cut
1652 1720
1714=cut 1782=cut
1715 1783
1716sub find_by_path($) { 1784sub find_by_path($) {
1717 my ($path) = @_; 1785 my ($path) = @_;
1718 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1719 my ($match, $specificity); 1789 my ($match, $specificity);
1720 1790
1721 for my $region (list) { 1791 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1825
1756 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1827 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1779 1849
1780sub register { 1850sub register {
1781 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1852 my $pkg = caller;
1783 1853
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1855
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1857}
1789 1858
1790# also paths starting with '/' 1859# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1861
1793sub thawer_merge { 1862sub thawer_merge {
1794 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1795 1864
1796 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
2010 2079
2011 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2012 } 2081 }
2013} 2082}
2014 2083
2015sub pre_load { } 2084sub pre_load { }
2016sub post_load { } 2085#sub post_load { } # XS
2017 2086
2018sub load { 2087sub load {
2019 my ($self) = @_; 2088 my ($self) = @_;
2020 2089
2021 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2078 } 2147 }
2079 2148
2080 $self->post_load; 2149 $self->post_load;
2081} 2150}
2082 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2083sub customise_for { 2155sub customise_for {
2084 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2085 2157
2086 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2159 if $self->per_player;
2103 or next; 2175 or next;
2104 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2105 or next; 2177 or next;
2106 $neigh->load; 2178 $neigh->load;
2107 2179
2180 # now find the diagonal neighbours
2108 push @neigh, 2181 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2184 }
2112 2185
2119} 2192}
2120 2193
2121sub find_sync { 2194sub find_sync {
2122 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2123 2196
2124 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2125} 2201}
2126 2202
2127sub do_load_sync { 2203sub do_load_sync {
2128 my ($map) = @_; 2204 my ($map) = @_;
2129 2205
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2132 2208
2133 cf::sync_job { $map->load }; 2209 $map->load;
2134} 2210}
2135 2211
2136our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2138 2214
2164 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2165 2241
2166 () 2242 ()
2167} 2243}
2168 2244
2245# common code, used by both ->save and ->swapout
2169sub save { 2246sub _save {
2170 my ($self) = @_; 2247 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2248
2174 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2175 2250
2176 return unless $self->dirty; 2251 return unless $self->dirty;
2177 2252
2197 } else { 2272 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2274 }
2200} 2275}
2201 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2202sub swap_out { 2285sub swap_out {
2203 my ($self) = @_; 2286 my ($self) = @_;
2204 2287
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2289
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2213 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2214 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2215 2344
2216 $self->deactivate; 2345 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2347 $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 2348
2264 $self->unlink_save; 2349 $self->unlink_save;
2265 $self->destroy; 2350 $self->destroy;
2266} 2351}
2267 2352
2275 2360
2276 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2277 2362
2278 $self->unlink_save; 2363 $self->unlink_save;
2279 2364
2280 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2370
2515 2600
2516Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2517 2602
2518The player should be reasonably safe there for short amounts of time (e.g. 2603The 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, 2604for 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 2605though, as the player cannot control the character while it is on the link
2521map. 2606map.
2522 2607
2523Will never block. 2608Will never block.
2524 2609
2525=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2546sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2547 my ($self) = @_; 2632 my ($self) = @_;
2548 2633
2549 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2550 2635
2636 ++$self->{_link_recursion};
2637
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2639
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2555 2642
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2644}
2558 2645
2559sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2561 2648
2586 $map->load_neighbours; 2673 $map->load_neighbours;
2587 2674
2588 return unless $self->contr->active; 2675 return unless $self->contr->active;
2589 2676
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2592 2679 # entering was successful
2680 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2682 $self->activate_recursive;
2595} 2683 }
2596 2684
2685}
2686
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2688
2599Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2691that 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 2692the new (success) or old (failed) map position. In either case, $done will
2609 2699
2610our $GOTOGEN; 2700our $GOTOGEN;
2611 2701
2612sub cf::object::player::goto { 2702sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2614 2710
2615 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2713
2618 $self->enter_link; 2714 $self->enter_link;
2642 my $map = eval { 2738 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2644 2740
2645 if ($map) { 2741 if ($map) {
2646 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2744 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2746 }
2651 2747
2652 $map 2748 $map
2660 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2663 } 2759 }
2664 2760
2665 $done->() if $done; 2761 $done->($self) if $done;
2666 })->prio (1); 2762 })->prio (1);
2667} 2763}
2668 2764
2669=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2670 2766
2763 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2863
2768 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2865 $self->leave_link;
2770 } 2866 }
2771 })->prio (1); 2867 })->prio (1);
2772} 2868}
2773 2869
3086 3182
3087 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3184 if $reply;
3089 3185
3090 } else { 3186 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3188 }
3093 3189
3094 cf::override; 3190 cf::override;
3095 }, 3191 },
3096); 3192);
3116 3212
3117 $coro 3213 $coro
3118} 3214}
3119 3215
3120cf::client->attach ( 3216cf::client->attach (
3121 on_destroy => sub { 3217 on_client_destroy => sub {
3122 my ($ns) = @_; 3218 my ($ns) = @_;
3123 3219
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3221 },
3126); 3222);
3142our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3143 3239
3144$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3145 3241
3146$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3149 sort time 3245 sort time
3150)); 3246));
3151 3247
3152# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3177 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3181) { 3277) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3280 for @funs;
3186} 3281}
3187 3282
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3206 3301
3207 %vars = (_dummy => 0) unless %vars; 3302 %vars = (_dummy => 0) unless %vars;
3208 3303
3304 my @res;
3209 local $_; 3305 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3306
3212 my $eval = 3307 my $eval =
3213 "do {\n" 3308 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3311 . $code
3217 . "\n}" 3312 . "\n}"
3218 ; 3313 ;
3219 3314
3315 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3223 3324
3224 if ($@) { 3325 if ($@) {
3225 warn "$@"; 3326 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3228 } 3329 }
3229 3330
3230 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3231} 3332}
3232 3333
3246=cut 3347=cut
3247 3348
3248sub register_script_function { 3349sub register_script_function {
3249 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3250 3351
3251 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3253} 3354}
3254 3355
3255=back 3356=back
3256 3357
3257=cut 3358=cut
3258 3359
3259############################################################################# 3360#############################################################################
3260# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3261 3404
3262sub load_facedata($) { 3405sub load_facedata($) {
3263 my ($path) = @_; 3406 my ($path) = @_;
3264 3407
3265 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3266 # for this (global event?) 3409 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3411
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3413
3271 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3272 3415
3273 my $facedata; 3416 my $facedata;
3274 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3275 or die "$path: $!"; 3418 or die "$path: $!";
3276 3419
3278 3421
3279 $facedata->{version} == 2 3422 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3424
3282 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3428 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3431 };
3287 cf::cede_to_tick; 3432 cf::cede_to_tick;
3288 3433
3289 { 3434 {
3290 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3292 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3439
3295 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3444
3300 cf::cede_to_tick; 3445 cf::cede_to_tick;
3301 } 3446 }
3302 3447
3303 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3308 3453
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3457 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3459 }
3315 3460
3316 cf::cede_to_tick; 3461 cf::cede_to_tick;
3317 } 3462 }
3318 } 3463 }
3327 3472
3328 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3329 } 3474 }
3330 3475
3331 { 3476 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3335 3478
3336 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3480 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3482
3341 if ($info->{type} & 1) { 3483 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}; 3484 cf::face::set_type $idx, $info->{type};
3356 } else { 3485 } else {
3357 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3358 } 3487 }
3359 3488
3360 cf::cede_to_tick; 3489 cf::cede_to_tick;
3361 } 3490 }
3362 } 3491 }
3363 3492
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3494
3366 1 3495 1
3367} 3496}
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 3497
3389register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3391 3500
3392 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3431sub reload_treasures { 3540sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3434} 3543}
3435 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3436sub reload_resources { 3568sub reload_resources {
3437 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3438 3570
3439 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3440 reload_archetypes; 3573 reload_archetypes;
3441 reload_regions; 3574 reload_regions;
3442 reload_treasures; 3575 reload_treasures;
3443 3576
3444 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3445} 3578}
3446 3579
3447sub reload_config { 3580sub reload_config {
3448 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3449 3582
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3451 or return; 3584 or return;
3452 3585
3453 local $/; 3586 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3455 3588
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3590
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $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}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3593
3461 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3598 };
3466 warn $@ if $@; 3599 warn $@ if $@;
3467 } 3600 }
3468 3601
3469 warn "finished reloading resource files\n"; 3602 trace "finished reloading resource files\n";
3470} 3603}
3471 3604
3472sub pidfile() { 3605sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
3487 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3488 print $fh $$; 3621 print $fh $$;
3489} 3622}
3490 3623
3491sub main_loop { 3624sub main_loop {
3492 warn "EV::loop starting\n"; 3625 trace "EV::loop starting\n";
3493 if (1) { 3626 if (1) {
3494 EV::loop; 3627 EV::loop;
3495 } 3628 }
3496 warn "EV::loop returned\n"; 3629 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3630 goto &main_loop unless $REALLY_UNLOOP;
3498} 3631}
3499 3632
3500sub main { 3633sub main {
3501 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3502 3635
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 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 3640
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3642
3515 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3522 }; 3650 };
3523 3651
3524 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3525 3653
3526 cf::sync_job { 3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3527 cf::load_settings; 3662 cf::load_settings;
3528 cf::load_materials; 3663 cf::load_materials;
3529 3664
3530 reload_resources; 3665 reload_resources;
3531 reload_config; 3666 reload_config;
3532 db_init; 3667 db_init;
3533 3668
3534 cf::init_uuid; 3669 cf::init_uuid;
3535 cf::init_signals; 3670 cf::init_signals;
3536 cf::init_commands;
3537 cf::init_skills; 3671 cf::init_skills;
3538 3672
3539 cf::init_beforeplay; 3673 cf::init_beforeplay;
3540 3674
3541 atomic; 3675 atomic;
3549 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3550 3684
3551 (pop @POST_INIT)->(0) while @POST_INIT; 3685 (pop @POST_INIT)->(0) while @POST_INIT;
3552 }; 3686 };
3553 3687
3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3554 main_loop; 3696 goto &main_loop;
3555} 3697}
3556 3698
3557############################################################################# 3699#############################################################################
3558# initialisation and cleanup 3700# initialisation and cleanup
3559 3701
3560# install some emergency cleanup handlers 3702# install some emergency cleanup handlers
3561BEGIN { 3703BEGIN {
3562 our %SIGWATCHER = (); 3704 our %SIGWATCHER = ();
3563 for my $signal (qw(INT HUP TERM)) { 3705 for my $signal (qw(INT HUP TERM)) {
3564 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3706 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3565 cf::cleanup "SIG$signal"; 3707 cf::cleanup "SIG$signal";
3566 }; 3708 };
3567 } 3709 }
3568} 3710}
3569 3711
3570sub write_runtime_sync { 3712sub write_runtime_sync {
3713 my $t0 = AE::time;
3714
3571 # first touch the runtime file to show we are still running: 3715 # first touch the runtime file to show we are still running:
3572 # the fsync below can take a very very long time. 3716 # the fsync below can take a very very long time.
3573 3717
3574 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3718 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3575 3719
3576 my $guard = cf::lock_acquire "write_runtime"; 3720 my $guard = cf::lock_acquire "write_runtime";
3577 3721
3578 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3722 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3579 or return; 3723 or return;
3580 3724
3581 my $value = $cf::RUNTIME + 90 + 10; 3725 my $value = $cf::RUNTIME + 90 + 10;
3582 # 10 is the runtime save interval, for a monotonic clock 3726 # 10 is the runtime save interval, for a monotonic clock
3583 # 60 allows for the watchdog to kill the server. 3727 # 60 allows for the watchdog to kill the server.
3596 or return; 3740 or return;
3597 3741
3598 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3599 and return; 3743 and return;
3600 3744
3601 warn "runtime file written.\n"; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3602 3746
3603 1 3747 1
3604} 3748}
3605 3749
3606our $uuid_lock; 3750our $uuid_lock;
3618 or return; 3762 or return;
3619 3763
3620 my $value = uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3621 3765
3622 unless ($value) { 3766 unless ($value) {
3623 warn "cowardly refusing to write zero uuid value!\n"; 3767 info "cowardly refusing to write zero uuid value!\n";
3624 return; 3768 return;
3625 } 3769 }
3626 3770
3627 my $value = uuid_str $value + $uuid_skip; 3771 my $value = uuid_str $value + $uuid_skip;
3628 $uuid_skip = 0; 3772 $uuid_skip = 0;
3638 or return; 3782 or return;
3639 3783
3640 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3641 and return; 3785 and return;
3642 3786
3643 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3644 3788
3645 1 3789 1
3646 3790
3647} 3791}
3648 3792
3654} 3798}
3655 3799
3656sub emergency_save() { 3800sub emergency_save() {
3657 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3658 3802
3659 warn "emergency_perl_save: enter\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3660 3809
3661 cf::sync_job { 3810 cf::sync_job {
3662 # this is a trade-off: we want to be very quick here, so 3811 cf::write_runtime_sync; # external watchdog should not bark
3663 # save all maps without fsync, and later call a global sync
3664 # (which in turn might be very very slow)
3665 local $USE_FSYNC = 0;
3666 3812
3667 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3668 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3669 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3670 warn "emergency_perl_save: begin player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3671 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3672 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3673 $pl->valid or next; 3819 $pl->valid or next;
3674 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3675 $pl->save; 3821 $pl->save;
3676 } 3822 }
3677 warn "emergency_perl_save: end player save\n"; 3823 info "emergency_perl_save: end player save\n";
3678 3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3679 warn "emergency_perl_save: begin map save\n"; 3827 info "emergency_perl_save: begin map save\n";
3680 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3681 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3682 $map->valid or next; 3830 $map->valid or next;
3683 $map->save; 3831 $map->save;
3684 } 3832 }
3685 warn "emergency_perl_save: end map save\n"; 3833 info "emergency_perl_save: end map save\n";
3686 3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3687 warn "emergency_perl_save: begin database checkpoint\n"; 3837 info "emergency_perl_save: begin database checkpoint\n";
3688 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3689 warn "emergency_perl_save: end database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3690 3840
3691 warn "emergency_perl_save: begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3692 write_uuid_sync 1; 3842 write_uuid_sync 1;
3693 warn "emergency_perl_save: end write uuid\n"; 3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3694 }; 3863 };
3695 3864
3696 warn "emergency_perl_save: starting sync()\n";
3697 IO::AIO::aio_sync sub {
3698 warn "emergency_perl_save: finished sync()\n";
3699 };
3700
3701 warn "emergency_perl_save: leave\n"; 3865 info "emergency_perl_save: leave\n";
3702} 3866}
3703 3867
3704sub post_cleanup { 3868sub post_cleanup {
3705 my ($make_core) = @_; 3869 my ($make_core) = @_;
3706 3870
3871 IO::AIO::flush;
3872
3707 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3708 if $make_core; 3874 if $make_core;
3709 3875
3710 my $fh = pidfile; 3876 my $fh = pidfile;
3711 unlink $PIDFILE if <$fh> == $$; 3877 unlink $PIDFILE if <$fh> == $$;
3712} 3878}
3732 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3733 for my $name (keys %$leaf_symtab) { 3899 for my $name (keys %$leaf_symtab) {
3734 _gv_clear *{"$pkg$name"}; 3900 _gv_clear *{"$pkg$name"};
3735# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3736 } 3902 }
3737 warn "cleared package $pkg\n";#d#
3738} 3903}
3739 3904
3740sub do_reload_perl() { 3905sub do_reload_perl() {
3741 # can/must only be called in main 3906 # can/must only be called in main
3742 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3743 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3744 return; 3909 return;
3745 } 3910 }
3746 3911
3747 return if $RELOAD++; 3912 return if $RELOAD++;
3748 3913
3749 my $t1 = EV::time; 3914 my $t1 = AE::time;
3750 3915
3751 while ($RELOAD) { 3916 while ($RELOAD) {
3752 warn "reloading..."; 3917 info "reloading...";
3753 3918
3754 warn "entering sync_job"; 3919 trace "entering sync_job";
3755 3920
3756 cf::sync_job { 3921 cf::sync_job {
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 cf::emergency_save; 3922 cf::emergency_save;
3759 cf::write_runtime_sync; # external watchdog should not bark
3760 3923
3761 warn "syncing database to disk";
3762 BDB::db_env_txn_checkpoint $DB_ENV;
3763
3764 # if anything goes wrong in here, we should simply crash as we already saved
3765
3766 warn "flushing outstanding aio requests";
3767 while (IO::AIO::nreqs || BDB::nreqs) {
3768 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3769 }
3770
3771 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3772 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3773 %EXT_CORO = (); 3926 %EXT_CORO = ();
3774 3927
3775 warn "removing commands"; 3928 trace "removing commands";
3776 %COMMAND = (); 3929 %COMMAND = ();
3777 3930
3778 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3779 %EXTCMD = (); 3932 %EXTCMD = ();
3780 %EXTICMD = (); 3933 %EXTICMD = ();
3781 3934
3782 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3783 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3784 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3785 3938
3786 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3787 eval { 3940 eval {
3788 $cb->($pkg); 3941 $cb->($pkg);
3789 1 3942 1
3790 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3791 } 3944 }
3792 3945
3793 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3794 clear_package $pkg; 3947 clear_package $pkg;
3795 } 3948 }
3796 3949
3797 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3798 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3799 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3800 3953
3801 warn "... unloading $k"; 3954 trace "... unloading $k";
3802 delete $INC{$k}; 3955 delete $INC{$k};
3803 3956
3804 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3805 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3806 3959
3809 } 3962 }
3810 3963
3811 clear_package $k; 3964 clear_package $k;
3812 } 3965 }
3813 3966
3814 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3815 clear_package "safe::$_" 3968 clear_package "safe::$_"
3816 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3817 3970
3818 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3819 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3820 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3821 3974
3822 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3823 # and global variables created in xs 3976 # and global variables created in xs
3824 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3825 3978
3826 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3827 3980
3828 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3829 require cf; 3982 require cf;
3830 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3831 3984
3832 warn "loading config and database again"; 3985 trace "loading config and database again";
3833 cf::reload_config; 3986 cf::reload_config;
3834 3987
3835 warn "loading extensions"; 3988 trace "loading extensions";
3836 cf::load_extensions; 3989 cf::load_extensions;
3837 3990
3838 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3839 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3840 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3841 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3842 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3843 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3844 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3845 } 3998 }
3846 3999
3847 warn "running post_init jobs"; 4000 trace "running post_init jobs";
3848 (pop @POST_INIT)->(1) while @POST_INIT; 4001 (pop @POST_INIT)->(1) while @POST_INIT;
3849 4002
3850 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3851 4004
3852 1 4005 1
3853 } or do { 4006 } or do {
3854 warn $@; 4007 error $@;
3855 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3856 }; 4009 };
3857 4010
3858 warn "reloaded"; 4011 info "reloaded";
3859 --$RELOAD; 4012 --$RELOAD;
3860 } 4013 }
3861 4014
3862 $t1 = EV::time - $t1; 4015 $t1 = AE::time - $t1;
3863 warn "reload completed in ${t1}s\n"; 4016 info "reload completed in ${t1}s\n";
3864}; 4017};
3865 4018
3866our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3867 4020
3868sub reload_perl() { 4021sub reload_perl() {
3870 # coro crashes during coro_state_free->destroy here. 4023 # coro crashes during coro_state_free->destroy here.
3871 4024
3872 $RELOAD_WATCHER ||= cf::async { 4025 $RELOAD_WATCHER ||= cf::async {
3873 Coro::AIO::aio_wait cache_extensions; 4026 Coro::AIO::aio_wait cache_extensions;
3874 4027
3875 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4028 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3876 do_reload_perl; 4029 do_reload_perl;
3877 undef $RELOAD_WATCHER; 4030 undef $RELOAD_WATCHER;
3878 }; 4031 };
3879 }; 4032 };
3880} 4033}
3889 reload_perl; 4042 reload_perl;
3890 }; 4043 };
3891 } 4044 }
3892}; 4045};
3893 4046
3894unshift @INC, $LIBDIR; 4047#############################################################################
3895 4048
3896my $bug_warning = 0; 4049my $bug_warning = 0;
3897 4050
3898our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3899our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
3900 4053
3901sub wait_for_tick { 4054sub wait_for_tick {
3902 return if tick_inhibit || $Coro::current == $Coro::main; 4055 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3903 4056
3904 my $signal = new Coro::Signal; 4057 my $signal = new Coro::Signal;
3905 push @WAIT_FOR_TICK, $signal; 4058 push @WAIT_FOR_TICK, $signal;
3906 $signal->wait; 4059 $signal->wait;
3907} 4060}
3908 4061
3909sub wait_for_tick_begin { 4062sub wait_for_tick_begin {
3910 return if tick_inhibit || $Coro::current == $Coro::main; 4063 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3911 4064
3912 my $signal = new Coro::Signal; 4065 my $signal = new Coro::Signal;
3913 push @WAIT_FOR_TICK_BEGIN, $signal; 4066 push @WAIT_FOR_TICK_BEGIN, $signal;
3914 $signal->wait; 4067 $signal->wait;
3915} 4068}
3921 return; 4074 return;
3922 } 4075 }
3923 4076
3924 cf::server_tick; # one server iteration 4077 cf::server_tick; # one server iteration
3925 4078
4079 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4080
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4083 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4085 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3932 }; 4087 };
3933 } 4088 }
3934 4089
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4091 $sig->send;
3944 4099
3945 if (0) { 4100 if (0) {
3946 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
3950 } 4105 }
3951 } 4106 }
3952} 4107}
3953 4108
3954{ 4109{
3955 # configure BDB 4110 # configure BDB
3956 4111
3957 BDB::min_parallel 8; 4112 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4113 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4114 $AnyEvent::BDB::WATCHER->priority (1);
3960 4115
3961 unless ($DB_ENV) { 4116 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4117 $DB_ENV = BDB::db_env_create;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines