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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines