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.537 by root, Sun May 2 19:16: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.
… …
53use Coro::Util (); 53use Coro::Util ();
54 54
55use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
56use BDB (); 56use BDB ();
57use Data::Dumper; 57use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 58use Fcntl;
60use YAML::XS (); 59use YAML::XS ();
61use IO::AIO (); 60use IO::AIO ();
62use Time::HiRes; 61use Time::HiRes;
63use Compress::LZF; 62use Compress::LZF;
… …
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;
… …
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},
… …
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
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3206 3302
3207 %vars = (_dummy => 0) unless %vars; 3303 %vars = (_dummy => 0) unless %vars;
3208 3304
3305 my @res;
3209 local $_; 3306 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3307
3212 my $eval = 3308 my $eval =
3213 "do {\n" 3309 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3312 . $code
3217 . "\n}" 3313 . "\n}"
3218 ; 3314 ;
3219 3315
3316 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
3223 3325
3224 if ($@) { 3326 if ($@) {
3225 warn "$@"; 3327 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3228 } 3330 }
3229 3331
3230 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3231} 3333}
3232 3334
… …
3246=cut 3348=cut
3247 3349
3248sub register_script_function { 3350sub register_script_function {
3249 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3250 3352
3251 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3253} 3355}
3254 3356
3255=back 3357=back
3256 3358
3257=cut 3359=cut
… …
3266 # for this (global event?) 3368 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3370
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3372
3271 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3272 3374
3273 my $facedata; 3375 my $facedata;
3274 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3275 or die "$path: $!"; 3377 or die "$path: $!";
3276 3378
… …
3278 3380
3279 $facedata->{version} == 2 3381 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3383
3282 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3387 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3390 };
3287 cf::cede_to_tick; 3391 cf::cede_to_tick;
3288 3392
3289 { 3393 {
3290 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3398
3295 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3403
3300 cf::cede_to_tick; 3404 cf::cede_to_tick;
3301 } 3405 }
3302 3406
3303 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
… …
3308 3412
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3416 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3418 }
3315 3419
3316 cf::cede_to_tick; 3420 cf::cede_to_tick;
3317 } 3421 }
3318 } 3422 }
… …
3327 3431
3328 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3329 } 3433 }
3330 3434
3331 { 3435 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3335 3437
3336 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3441
3341 if ($info->{type} & 1) { 3442 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}; 3443 cf::face::set_type $idx, $info->{type};
3356 } else { 3444 } else {
3357 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3358 } 3446 }
3359 3447
3360 cf::cede_to_tick; 3448 cf::cede_to_tick;
3361 } 3449 }
3362 } 3450 }
3363 3451
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3453
3366 1 3454 1
3367} 3455}
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 3456
3389register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3391 3459
3392 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3431sub reload_treasures { 3499sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3434} 3502}
3435 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3436sub reload_resources { 3527sub reload_resources {
3437 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3438 3529
3439 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3440 reload_archetypes; 3532 reload_archetypes;
3441 reload_regions; 3533 reload_regions;
3442 reload_treasures; 3534 reload_treasures;
3443 3535
3444 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3445} 3537}
3446 3538
3447sub reload_config { 3539sub reload_config {
3448 warn "reloading config file...\n"; 3540 trace "reloading config file...\n";
3449 3541
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3451 or return; 3543 or return;
3452 3544
3453 local $/; 3545 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3455 3547
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3549
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3552
3461 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
… …
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3557 };
3466 warn $@ if $@; 3558 warn $@ if $@;
3467 } 3559 }
3468 3560
3469 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3470} 3562}
3471 3563
3472sub pidfile() { 3564sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
… …
3487 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3488 print $fh $$; 3580 print $fh $$;
3489} 3581}
3490 3582
3491sub main_loop { 3583sub main_loop {
3492 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3493 if (1) { 3585 if (1) {
3494 EV::loop; 3586 EV::loop;
3495 } 3587 }
3496 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3498} 3590}
3499 3591
3500sub main { 3592sub main {
3501 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
3502 3594
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3598 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 3599
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3601
3515 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
… …
3522 }; 3609 };
3523 3610
3524 evthread_start IO::AIO::poll_fileno; 3611 evthread_start IO::AIO::poll_fileno;
3525 3612
3526 cf::sync_job { 3613 cf::sync_job {
3614 cf::init_experience;
3615 cf::init_anim;
3616 cf::init_attackmess;
3617 cf::init_dynamic;
3618
3619 cf::load_settings;
3620 cf::load_materials;
3621
3527 reload_resources; 3622 reload_resources;
3528 reload_config; 3623 reload_config;
3529 db_init; 3624 db_init;
3530 3625
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3626 cf::init_uuid;
3534 cf::init_signals; 3627 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3628 cf::init_skills;
3537 3629
3538 cf::init_beforeplay; 3630 cf::init_beforeplay;
3539 3631
3540 atomic; 3632 atomic;
… …
3547 use POSIX (); 3639 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3641
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3551 }; 3643 };
3644
3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3552 3647
3553 main_loop; 3648 main_loop;
3554} 3649}
3555 3650
3556############################################################################# 3651#############################################################################
… …
3558 3653
3559# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3560BEGIN { 3655BEGIN {
3561 our %SIGWATCHER = (); 3656 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3565 }; 3660 };
3566 } 3661 }
3567} 3662}
3568 3663
3569sub write_runtime_sync { 3664sub write_runtime_sync {
3665 my $t0 = AE::time;
3666
3570 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3572 3669
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3671
3575 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3576 3673
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3675 or return;
3579 3676
3580 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
… …
3595 or return; 3692 or return;
3596 3693
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3695 and return;
3599 3696
3600 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3698
3602 1 3699 1
3603} 3700}
3604 3701
3605our $uuid_lock; 3702our $uuid_lock;
… …
3617 or return; 3714 or return;
3618 3715
3619 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3620 3717
3621 unless ($value) { 3718 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3720 return;
3624 } 3721 }
3625 3722
3626 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3724 $uuid_skip = 0;
… …
3637 or return; 3734 or return;
3638 3735
3639 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3640 and return; 3737 and return;
3641 3738
3642 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3643 3740
3644 1 3741 1
3645 3742
3646} 3743}
3647 3744
… …
3653} 3750}
3654 3751
3655sub emergency_save() { 3752sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3657 3754
3658 warn "emergency_perl_save: enter\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3659 3761
3660 cf::sync_job { 3762 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 3763 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 3764
3666 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 3768 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 3771 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 3773 $pl->save;
3675 } 3774 }
3676 warn "emergency_perl_save: end player save\n"; 3775 info "emergency_perl_save: end player save\n";
3677 3776
3777 cf::write_runtime_sync; # external watchdog should not bark
3778
3678 warn "emergency_perl_save: begin map save\n"; 3779 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 3782 $map->valid or next;
3682 $map->save; 3783 $map->save;
3683 } 3784 }
3684 warn "emergency_perl_save: end map save\n"; 3785 info "emergency_perl_save: end map save\n";
3685 3786
3787 cf::write_runtime_sync; # external watchdog should not bark
3788
3686 warn "emergency_perl_save: begin database checkpoint\n"; 3789 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 3791 info "emergency_perl_save: end database checkpoint\n";
3689 3792
3690 warn "emergency_perl_save: begin write uuid\n"; 3793 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 3794 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 3795 info "emergency_perl_save: end write uuid\n";
3796
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3799 trace "emergency_perl_save: syncing database to disk";
3800 BDB::db_env_txn_checkpoint $DB_ENV;
3801
3802 info "emergency_perl_save: starting sync\n";
3803 IO::AIO::aio_sync sub {
3804 info "emergency_perl_save: finished sync\n";
3805 };
3806
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3809 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3693 }; 3815 };
3694 3816
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"; 3817 info "emergency_perl_save: leave\n";
3701} 3818}
3702 3819
3703sub post_cleanup { 3820sub post_cleanup {
3704 my ($make_core) = @_; 3821 my ($make_core) = @_;
3705 3822
3823 IO::AIO::flush;
3824
3706 warn Carp::longmess "post_cleanup backtrace" 3825 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 3826 if $make_core;
3708 3827
3709 my $fh = pidfile; 3828 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 3829 unlink $PIDFILE if <$fh> == $$;
3711} 3830}
… …
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3850 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3851 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3852 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3853# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3854 }
3736 warn "cleared package $pkg\n";#d#
3737} 3855}
3738 3856
3739sub do_reload_perl() { 3857sub do_reload_perl() {
3740 # can/must only be called in main 3858 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3859 if (in_main) {
3742 warn "can only reload from main coroutine"; 3860 error "can only reload from main coroutine";
3743 return; 3861 return;
3744 } 3862 }
3745 3863
3746 return if $RELOAD++; 3864 return if $RELOAD++;
3747 3865
3748 my $t1 = EV::time; 3866 my $t1 = AE::time;
3749 3867
3750 while ($RELOAD) { 3868 while ($RELOAD) {
3751 warn "reloading..."; 3869 info "reloading...";
3752 3870
3753 warn "entering sync_job"; 3871 trace "entering sync_job";
3754 3872
3755 cf::sync_job { 3873 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 3874 cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark
3759 3875
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"; 3876 trace "cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 3877 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 3878 %EXT_CORO = ();
3773 3879
3774 warn "removing commands"; 3880 trace "removing commands";
3775 %COMMAND = (); 3881 %COMMAND = ();
3776 3882
3777 warn "removing ext/exti commands"; 3883 trace "removing ext/exti commands";
3778 %EXTCMD = (); 3884 %EXTCMD = ();
3779 %EXTICMD = (); 3885 %EXTICMD = ();
3780 3886
3781 warn "unloading/nuking all extensions"; 3887 trace "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 3888 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 3889 trace "... unloading $pkg";
3784 3890
3785 if (my $cb = $pkg->can ("unload")) { 3891 if (my $cb = $pkg->can ("unload")) {
3786 eval { 3892 eval {
3787 $cb->($pkg); 3893 $cb->($pkg);
3788 1 3894 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 3895 } or error "$pkg unloaded, but with errors: $@";
3790 } 3896 }
3791 3897
3792 warn "... clearing $pkg"; 3898 trace "... clearing $pkg";
3793 clear_package $pkg; 3899 clear_package $pkg;
3794 } 3900 }
3795 3901
3796 warn "unloading all perl modules loaded from $LIBDIR"; 3902 trace "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 3903 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3904 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 3905
3800 warn "... unloading $k"; 3906 trace "... unloading $k";
3801 delete $INC{$k}; 3907 delete $INC{$k};
3802 3908
3803 $k =~ s/\.pm$//; 3909 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 3910 $k =~ s/\//::/g;
3805 3911
… …
3808 } 3914 }
3809 3915
3810 clear_package $k; 3916 clear_package $k;
3811 } 3917 }
3812 3918
3813 warn "getting rid of safe::, as good as possible"; 3919 trace "getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 3920 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3921 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 3922
3817 warn "unloading cf.pm \"a bit\""; 3923 trace "unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 3924 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3925 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 3926
3821 # don't, removes xs symbols, too, 3927 # don't, removes xs symbols, too,
3822 # and global variables created in xs 3928 # and global variables created in xs
3823 #clear_package __PACKAGE__; 3929 #clear_package __PACKAGE__;
3824 3930
3825 warn "unload completed, starting to reload now"; 3931 info "unload completed, starting to reload now";
3826 3932
3827 warn "reloading cf.pm"; 3933 trace "reloading cf.pm";
3828 require cf; 3934 require cf;
3829 cf::_connect_to_perl_1; 3935 cf::_connect_to_perl_1;
3830 3936
3831 warn "loading config and database again"; 3937 trace "loading config and database again";
3832 cf::reload_config; 3938 cf::reload_config;
3833 3939
3834 warn "loading extensions"; 3940 trace "loading extensions";
3835 cf::load_extensions; 3941 cf::load_extensions;
3836 3942
3837 if ($REATTACH_ON_RELOAD) { 3943 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 3944 trace "reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 3945 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 3946 trace "reattaching attachments to maps";
3841 reattach $_ for values %MAP; 3947 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 3948 trace "reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 3949 reattach $_ for values %PLAYER;
3844 } 3950 }
3845 3951
3846 warn "running post_init jobs"; 3952 trace "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT; 3953 (pop @POST_INIT)->(1) while @POST_INIT;
3848 3954
3849 warn "leaving sync_job"; 3955 trace "leaving sync_job";
3850 3956
3851 1 3957 1
3852 } or do { 3958 } or do {
3853 warn $@; 3959 error $@;
3854 cf::cleanup "error while reloading, exiting."; 3960 cf::cleanup "error while reloading, exiting.";
3855 }; 3961 };
3856 3962
3857 warn "reloaded"; 3963 info "reloaded";
3858 --$RELOAD; 3964 --$RELOAD;
3859 } 3965 }
3860 3966
3861 $t1 = EV::time - $t1; 3967 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 3968 info "reload completed in ${t1}s\n";
3863}; 3969};
3864 3970
3865our $RELOAD_WATCHER; # used only during reload 3971our $RELOAD_WATCHER; # used only during reload
3866 3972
3867sub reload_perl() { 3973sub reload_perl() {
… …
3869 # coro crashes during coro_state_free->destroy here. 3975 # coro crashes during coro_state_free->destroy here.
3870 3976
3871 $RELOAD_WATCHER ||= cf::async { 3977 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 3978 Coro::AIO::aio_wait cache_extensions;
3873 3979
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3980 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 3981 do_reload_perl;
3876 undef $RELOAD_WATCHER; 3982 undef $RELOAD_WATCHER;
3877 }; 3983 };
3878 }; 3984 };
3879} 3985}
… …
3896 4002
3897our @WAIT_FOR_TICK; 4003our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 4004our @WAIT_FOR_TICK_BEGIN;
3899 4005
3900sub wait_for_tick { 4006sub wait_for_tick {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 4007 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 4008
3903 my $signal = new Coro::Signal; 4009 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 4010 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 4011 $signal->wait;
3906} 4012}
3907 4013
3908sub wait_for_tick_begin { 4014sub wait_for_tick_begin {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 4016
3911 my $signal = new Coro::Signal; 4017 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4018 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4019 $signal->wait;
3914} 4020}
… …
3920 return; 4026 return;
3921 } 4027 }
3922 4028
3923 cf::server_tick; # one server iteration 4029 cf::server_tick; # one server iteration
3924 4030
4031 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4032
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4033 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4034 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4035 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4036 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4037 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4038 or error "ERROR: unable to write runtime file: $!";
3931 }; 4039 };
3932 } 4040 }
3933 4041
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4042 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4043 $sig->send;
… …
3943 4051
3944 if (0) { 4052 if (0) {
3945 if ($NEXT_TICK) { 4053 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4054 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4055 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4056 debug "jitter $JITTER\n";#d#
3949 } 4057 }
3950 } 4058 }
3951} 4059}
3952 4060
3953{ 4061{
3954 # configure BDB 4062 # configure BDB
3955 4063
3956 BDB::min_parallel 8; 4064 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4065 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4066 $AnyEvent::BDB::WATCHER->priority (1);
3959 4067
3960 unless ($DB_ENV) { 4068 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4069 $DB_ENV = BDB::db_env_create;

Diff Legend

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