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.542 by root, Wed May 5 09:05:03 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";
1413 1456
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1458 if exists $v->{meta}{mandatory};
1418 1459
1419 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1420 } 1469 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1470 }
1426 1471
1427 skip: 1472 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1430 } 1480 }
1431 }; 1481 };
1432} 1482}
1433 1483
1434############################################################################# 1484#############################################################################
1518 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1519 } 1569 }
1520 } 1570 }
1521} 1571}
1522 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1523sub save($) { 1586sub save($) {
1524 my ($pl) = @_; 1587 my ($pl) = @_;
1525 1588
1526 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1527 1590
1532 1595
1533 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1535 1598
1536 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1603
1538 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1605 cf::cede_to_tick;
1540} 1606}
1541 1607
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1645
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1581 $pl->deactivate; 1647 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1585 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1586 1651
1587 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1643 \@logins 1708 \@logins
1644} 1709}
1645 1710
1646=item $player->maps 1711=item $player->maps
1647 1712
1713=item cf::player::maps $login
1714
1648Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1649player. May block. 1716player. May block.
1650 1717
1651=cut 1718=cut
1652 1719
1714=cut 1781=cut
1715 1782
1716sub find_by_path($) { 1783sub find_by_path($) {
1717 my ($path) = @_; 1784 my ($path) = @_;
1718 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1719 my ($match, $specificity); 1788 my ($match, $specificity);
1720 1789
1721 for my $region (list) { 1790 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1824
1756 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1826 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1779 1848
1780sub register { 1849sub register {
1781 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1851 my $pkg = caller;
1783 1852
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1854
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1856}
1789 1857
1790# also paths starting with '/' 1858# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1860
1793sub thawer_merge { 1861sub thawer_merge {
1794 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1795 1863
1796 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
2010 2078
2011 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
2012 } 2080 }
2013} 2081}
2014 2082
2015sub pre_load { } 2083sub pre_load { }
2016sub post_load { } 2084#sub post_load { } # XS
2017 2085
2018sub load { 2086sub load {
2019 my ($self) = @_; 2087 my ($self) = @_;
2020 2088
2021 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
2078 } 2146 }
2079 2147
2080 $self->post_load; 2148 $self->post_load;
2081} 2149}
2082 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
2083sub customise_for { 2154sub customise_for {
2084 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2085 2156
2086 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2158 if $self->per_player;
2103 or next; 2174 or next;
2104 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2105 or next; 2176 or next;
2106 $neigh->load; 2177 $neigh->load;
2107 2178
2179 # now find the diagonal neighbours
2108 push @neigh, 2180 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2183 }
2112 2184
2119} 2191}
2120 2192
2121sub find_sync { 2193sub find_sync {
2122 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2123 2195
2124 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2125} 2200}
2126 2201
2127sub do_load_sync { 2202sub do_load_sync {
2128 my ($map) = @_; 2203 my ($map) = @_;
2129 2204
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2132 2207
2133 cf::sync_job { $map->load }; 2208 $map->load;
2134} 2209}
2135 2210
2136our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2138 2213
2164 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2165 2240
2166 () 2241 ()
2167} 2242}
2168 2243
2244# common code, used by both ->save and ->swapout
2169sub save { 2245sub _save {
2170 my ($self) = @_; 2246 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2247
2174 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2175 2249
2176 return unless $self->dirty; 2250 return unless $self->dirty;
2177 2251
2197 } else { 2271 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2273 }
2200} 2274}
2201 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2202sub swap_out { 2284sub swap_out {
2203 my ($self) = @_; 2285 my ($self) = @_;
2204 2286
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2288
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2289 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2290 return if $self->{deny_save};
2291 return if $self->players;
2213 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2214 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2215 2343
2216 $self->deactivate; 2344 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2346 $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 2347
2264 $self->unlink_save; 2348 $self->unlink_save;
2265 $self->destroy; 2349 $self->destroy;
2266} 2350}
2267 2351
2275 2359
2276 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2277 2361
2278 $self->unlink_save; 2362 $self->unlink_save;
2279 2363
2280 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2369
2515 2599
2516Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2517 2601
2518The player should be reasonably safe there for short amounts of time (e.g. 2602The 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, 2603for 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 2604though, as the player cannot control the character while it is on the link
2521map. 2605map.
2522 2606
2523Will never block. 2607Will never block.
2524 2608
2525=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2546sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2547 my ($self) = @_; 2631 my ($self) = @_;
2548 2632
2549 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2550 2634
2635 ++$self->{_link_recursion};
2636
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2638
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2555 2641
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2643}
2558 2644
2559sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2561 2647
2586 $map->load_neighbours; 2672 $map->load_neighbours;
2587 2673
2588 return unless $self->contr->active; 2674 return unless $self->contr->active;
2589 2675
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2592 2678 # entering was successful
2679 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2680 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2681 $self->activate_recursive;
2595} 2682 }
2596 2683
2684}
2685
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2687
2599Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2690that 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 2691the new (success) or old (failed) map position. In either case, $done will
2609 2698
2610our $GOTOGEN; 2699our $GOTOGEN;
2611 2700
2612sub cf::object::player::goto { 2701sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2614 2709
2615 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2712
2618 $self->enter_link; 2713 $self->enter_link;
2642 my $map = eval { 2737 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2644 2739
2645 if ($map) { 2740 if ($map) {
2646 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2743 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2745 }
2651 2746
2652 $map 2747 $map
2660 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2663 } 2758 }
2664 2759
2665 $done->() if $done; 2760 $done->($self) if $done;
2666 })->prio (1); 2761 })->prio (1);
2667} 2762}
2668 2763
2669=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2670 2765
2763 $self->message ("Something went wrong deep within the deliantra server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2862
2768 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2864 $self->leave_link;
2770 } 2865 }
2771 })->prio (1); 2866 })->prio (1);
2772} 2867}
2773 2868
3086 3181
3087 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3183 if $reply;
3089 3184
3090 } else { 3185 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3187 }
3093 3188
3094 cf::override; 3189 cf::override;
3095 }, 3190 },
3096); 3191);
3116 3211
3117 $coro 3212 $coro
3118} 3213}
3119 3214
3120cf::client->attach ( 3215cf::client->attach (
3121 on_destroy => sub { 3216 on_client_destroy => sub {
3122 my ($ns) = @_; 3217 my ($ns) = @_;
3123 3218
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3220 },
3126); 3221);
3142our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
3143 3238
3144$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
3145 3240
3146$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
3149 sort time 3244 sort time
3150)); 3245));
3151 3246
3152# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
3177 decrease split destroy change_exp value msg lore send_msg)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3274 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3181) { 3276) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3279 for @funs;
3186} 3280}
3187 3281
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
3206 3300
3207 %vars = (_dummy => 0) unless %vars; 3301 %vars = (_dummy => 0) unless %vars;
3208 3302
3303 my @res;
3209 local $_; 3304 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3305
3212 my $eval = 3306 my $eval =
3213 "do {\n" 3307 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3310 . $code
3217 . "\n}" 3311 . "\n}"
3218 ; 3312 ;
3219 3313
3314 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
3223 3323
3224 if ($@) { 3324 if ($@) {
3225 warn "$@"; 3325 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3228 } 3328 }
3229 3329
3230 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3231} 3331}
3232 3332
3246=cut 3346=cut
3247 3347
3248sub register_script_function { 3348sub register_script_function {
3249 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3250 3350
3251 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3253} 3353}
3254 3354
3255=back 3355=back
3256 3356
3257=cut 3357=cut
3258 3358
3259############################################################################# 3359#############################################################################
3260# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3261 3403
3262sub load_facedata($) { 3404sub load_facedata($) {
3263 my ($path) = @_; 3405 my ($path) = @_;
3264 3406
3265 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3266 # for this (global event?) 3408 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3410
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3412
3271 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3272 3414
3273 my $facedata; 3415 my $facedata;
3274 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3275 or die "$path: $!"; 3417 or die "$path: $!";
3276 3418
3278 3420
3279 $facedata->{version} == 2 3421 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3423
3282 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3427 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3430 };
3287 cf::cede_to_tick; 3431 cf::cede_to_tick;
3288 3432
3289 { 3433 {
3290 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3292 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3438
3295 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3443
3300 cf::cede_to_tick; 3444 cf::cede_to_tick;
3301 } 3445 }
3302 3446
3303 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3308 3452
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3456 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3458 }
3315 3459
3316 cf::cede_to_tick; 3460 cf::cede_to_tick;
3317 } 3461 }
3318 } 3462 }
3327 3471
3328 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3329 } 3473 }
3330 3474
3331 { 3475 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3335 3477
3336 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3481
3341 if ($info->{type} & 1) { 3482 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}; 3483 cf::face::set_type $idx, $info->{type};
3356 } else { 3484 } else {
3357 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3358 } 3486 }
3359 3487
3360 cf::cede_to_tick; 3488 cf::cede_to_tick;
3361 } 3489 }
3362 } 3490 }
3363 3491
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3493
3366 1 3494 1
3367} 3495}
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 3496
3389register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3391 3499
3392 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3431sub reload_treasures { 3539sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3434} 3542}
3435 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3436sub reload_resources { 3567sub reload_resources {
3437 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3438 3569
3439 reload_facedata; 3570 reload_facedata;
3571 reload_sound;
3440 reload_archetypes; 3572 reload_archetypes;
3441 reload_regions; 3573 reload_regions;
3442 reload_treasures; 3574 reload_treasures;
3443 3575
3444 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3445} 3577}
3446 3578
3447sub reload_config { 3579sub reload_config {
3448 warn "reloading config file...\n"; 3580 trace "reloading config file...\n";
3449 3581
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3451 or return; 3583 or return;
3452 3584
3453 local $/; 3585 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3455 3587
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3589
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $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}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3592
3461 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3597 };
3466 warn $@ if $@; 3598 warn $@ if $@;
3467 } 3599 }
3468 3600
3469 warn "finished reloading resource files\n"; 3601 trace "finished reloading resource files\n";
3470} 3602}
3471 3603
3472sub pidfile() { 3604sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
3487 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3488 print $fh $$; 3620 print $fh $$;
3489} 3621}
3490 3622
3491sub main_loop { 3623sub main_loop {
3492 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3493 if (1) { 3625 if (1) {
3494 EV::loop; 3626 EV::loop;
3495 } 3627 }
3496 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3498} 3630}
3499 3631
3500sub main { 3632sub main {
3501 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3502 3634
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 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 3639
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3641
3515 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3522 }; 3649 };
3523 3650
3524 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3525 3652
3526 cf::sync_job { 3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3527 reload_resources; 3664 reload_resources;
3528 reload_config; 3665 reload_config;
3529 db_init; 3666 db_init;
3530 3667
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3668 cf::init_uuid;
3534 cf::init_signals; 3669 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3670 cf::init_skills;
3537 3671
3538 cf::init_beforeplay; 3672 cf::init_beforeplay;
3539 3673
3540 atomic; 3674 atomic;
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3683
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3684 (pop @POST_INIT)->(0) while @POST_INIT;
3551 }; 3685 };
3552 3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3553 main_loop; 3695 goto &main_loop;
3554} 3696}
3555 3697
3556############################################################################# 3698#############################################################################
3557# initialisation and cleanup 3699# initialisation and cleanup
3558 3700
3559# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3560BEGIN { 3702BEGIN {
3561 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3565 }; 3707 };
3566 } 3708 }
3567} 3709}
3568 3710
3569sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3570 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3572 3716
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3718
3575 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3576 3720
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3722 or return;
3579 3723
3580 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3595 or return; 3739 or return;
3596 3740
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3742 and return;
3599 3743
3600 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3745
3602 1 3746 1
3603} 3747}
3604 3748
3605our $uuid_lock; 3749our $uuid_lock;
3617 or return; 3761 or return;
3618 3762
3619 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3620 3764
3621 unless ($value) { 3765 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3767 return;
3624 } 3768 }
3625 3769
3626 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3771 $uuid_skip = 0;
3637 or return; 3781 or return;
3638 3782
3639 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3640 and return; 3784 and return;
3641 3785
3642 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3643 3787
3644 1 3788 1
3645 3789
3646} 3790}
3647 3791
3653} 3797}
3654 3798
3655sub emergency_save() { 3799sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3657 3801
3658 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3659 3808
3660 cf::sync_job { 3809 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 3810 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 3811
3666 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 3818 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 3820 $pl->save;
3675 } 3821 }
3676 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3677 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3678 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 3829 $map->valid or next;
3682 $map->save; 3830 $map->save;
3683 } 3831 }
3684 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3685 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3686 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3689 3839
3690 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 3841 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3693 }; 3862 };
3694 3863
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"; 3864 info "emergency_perl_save: leave\n";
3701} 3865}
3702 3866
3703sub post_cleanup { 3867sub post_cleanup {
3704 my ($make_core) = @_; 3868 my ($make_core) = @_;
3705 3869
3870 IO::AIO::flush;
3871
3706 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 3873 if $make_core;
3708 3874
3709 my $fh = pidfile; 3875 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3711} 3877}
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3901 }
3736 warn "cleared package $pkg\n";#d#
3737} 3902}
3738 3903
3739sub do_reload_perl() { 3904sub do_reload_perl() {
3740 # can/must only be called in main 3905 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3742 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3743 return; 3908 return;
3744 } 3909 }
3745 3910
3746 return if $RELOAD++; 3911 return if $RELOAD++;
3747 3912
3748 my $t1 = EV::time; 3913 my $t1 = AE::time;
3749 3914
3750 while ($RELOAD) { 3915 while ($RELOAD) {
3751 warn "reloading..."; 3916 info "reloading...";
3752 3917
3753 warn "entering sync_job"; 3918 trace "entering sync_job";
3754 3919
3755 cf::sync_job { 3920 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 3921 cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark
3759 3922
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"; 3923 trace "cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 3925 %EXT_CORO = ();
3773 3926
3774 warn "removing commands"; 3927 trace "removing commands";
3775 %COMMAND = (); 3928 %COMMAND = ();
3776 3929
3777 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3778 %EXTCMD = (); 3931 %EXTCMD = ();
3779 %EXTICMD = (); 3932 %EXTICMD = ();
3780 3933
3781 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3784 3937
3785 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3786 eval { 3939 eval {
3787 $cb->($pkg); 3940 $cb->($pkg);
3788 1 3941 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3790 } 3943 }
3791 3944
3792 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3793 clear_package $pkg; 3946 clear_package $pkg;
3794 } 3947 }
3795 3948
3796 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 3952
3800 warn "... unloading $k"; 3953 trace "... unloading $k";
3801 delete $INC{$k}; 3954 delete $INC{$k};
3802 3955
3803 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3805 3958
3808 } 3961 }
3809 3962
3810 clear_package $k; 3963 clear_package $k;
3811 } 3964 }
3812 3965
3813 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 3967 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 3969
3817 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 3973
3821 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3822 # and global variables created in xs 3975 # and global variables created in xs
3823 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3824 3977
3825 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3826 3979
3827 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3828 require cf; 3981 require cf;
3829 cf::_connect_to_perl_1; 3982 cf::_connect_to_perl_1;
3830 3983
3831 warn "loading config and database again"; 3984 trace "loading config and database again";
3832 cf::reload_config; 3985 cf::reload_config;
3833 3986
3834 warn "loading extensions"; 3987 trace "loading extensions";
3835 cf::load_extensions; 3988 cf::load_extensions;
3836 3989
3837 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3841 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3844 } 3997 }
3845 3998
3846 warn "running post_init jobs"; 3999 trace "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT; 4000 (pop @POST_INIT)->(1) while @POST_INIT;
3848 4001
3849 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3850 4003
3851 1 4004 1
3852 } or do { 4005 } or do {
3853 warn $@; 4006 error $@;
3854 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3855 }; 4008 };
3856 4009
3857 warn "reloaded"; 4010 info "reloaded";
3858 --$RELOAD; 4011 --$RELOAD;
3859 } 4012 }
3860 4013
3861 $t1 = EV::time - $t1; 4014 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 4015 info "reload completed in ${t1}s\n";
3863}; 4016};
3864 4017
3865our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3866 4019
3867sub reload_perl() { 4020sub reload_perl() {
3869 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3870 4023
3871 $RELOAD_WATCHER ||= cf::async { 4024 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 4025 Coro::AIO::aio_wait cache_extensions;
3873 4026
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 4028 do_reload_perl;
3876 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3877 }; 4030 };
3878 }; 4031 };
3879} 4032}
3888 reload_perl; 4041 reload_perl;
3889 }; 4042 };
3890 } 4043 }
3891}; 4044};
3892 4045
3893unshift @INC, $LIBDIR; 4046#############################################################################
3894 4047
3895my $bug_warning = 0; 4048my $bug_warning = 0;
3896 4049
3897our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3899 4052
3900sub wait_for_tick { 4053sub wait_for_tick {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 4055
3903 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 4058 $signal->wait;
3906} 4059}
3907 4060
3908sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 4063
3911 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4066 $signal->wait;
3914} 4067}
3920 return; 4073 return;
3921 } 4074 }
3922 4075
3923 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3924 4077
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4082 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4084 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3931 }; 4086 };
3932 } 4087 }
3933 4088
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4090 $sig->send;
3943 4098
3944 if (0) { 4099 if (0) {
3945 if ($NEXT_TICK) { 4100 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4101 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4103 debug "jitter $JITTER\n";#d#
3949 } 4104 }
3950 } 4105 }
3951} 4106}
3952 4107
3953{ 4108{
3954 # configure BDB 4109 # configure BDB
3955 4110
3956 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4113 $AnyEvent::BDB::WATCHER->priority (1);
3959 4114
3960 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines