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.493 by root, Mon Oct 26 02:34:37 2009 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
53use Coro::Util (); 51use Coro::Util ();
54 52
55use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
56use BDB (); 54use BDB ();
57use Data::Dumper; 55use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 56use Fcntl;
60use YAML::XS (); 57use YAML::XS ();
61use IO::AIO (); 58use IO::AIO ();
62use Time::HiRes; 59use Time::HiRes;
63use Compress::LZF; 60use Compress::LZF;
78 75
79# strictly for debugging 76# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 78
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
83 82
84our %COMMAND = (); 83our %COMMAND = ();
85our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
86 85
87our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
107our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
113 118
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 121our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
119our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 127our $DB_ENV;
123 128
124our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 130
126our %CFG; 131our %CFG;
127 132
128our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 134our $RUNTIME;
163 168
164our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
165 170
166sub cf::map::normalise; 171sub cf::map::normalise;
167 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
168############################################################################# 177#############################################################################
169 178
170%REFLECT = (); 179%REFLECT = ();
171for (@REFLECT) { 180for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
243 252
244=back 253=back
245 254
246=cut 255=cut
247 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
248$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 264 my $msg = join "", @_;
250 265
251 $msg .= "\n" 266 $msg .= "\n"
252 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
253 268
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 270
256 LOG llevError, $msg; 271 LOG llevWarn, $msg;
257}; 272};
258 273
259$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
261 276
262 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
263 278
264 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 281 return;#d#
267 }#d# 282 }#d#
268 283
269 # kill coroutine otherwise 284 # kill coroutine otherwise
270 Coro::terminate 285 Coro::terminate
397} 412}
398 413
399=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
400 415
401Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 417get spread over time.
403 418
404=cut 419=cut
405 420
406sub periodic($$) { 421sub periodic($$) {
407 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
424 439
425=cut 440=cut
426 441
427our @SLOT_QUEUE; 442our @SLOT_QUEUE;
428our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
429 445
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
433 449
434 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
435 452
436 while () { 453 while () {
437 next_job: 454 next_job:
455
438 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 457
440 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 462 $job->[2]->send;
444 Coro::cede; 463 Coro::cede;
445 goto next_job; 464 goto next_job;
446 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 467 }
448 } 468 }
449 469
450 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 473 $signal->wait;
454 } else { 474 } else {
475 $busy = 0;
455 Coro::schedule; 476 Coro::schedule;
456 } 477 }
457 } 478 }
458}; 479};
459 480
460sub get_slot($;$$) { 481sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
462 483
463 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
464 485
465 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
466 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
467 489
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
496=cut 518=cut
497 519
498sub sync_job(&) { 520sub sync_job(&) {
499 my ($job) = @_; 521 my ($job) = @_;
500 522
501 if ($Coro::current == $Coro::main) { 523 if (in_main) {
502 my $time = EV::time; 524 my $time = AE::time;
503 525
504 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
506 528
507 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
508 530
509 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
510 532
511 my $busy = 1; 533 my $busy = 1;
512 my @res; 534 my @res;
513 535
514 (async { 536 (async {
515 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 538 @res = eval { $job->() };
517 warn $@ if $@; 539 error $@ if $@;
518 undef $busy; 540 undef $busy;
519 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
520 542
521 while ($busy) { 543 while ($busy) {
522 if (Coro::nready) { 544 if (Coro::nready) {
524 } else { 546 } else {
525 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
526 } 548 }
527 } 549 }
528 550
529 my $time = EV::time - $time; 551 my $time = AE::time - $time;
530 552
531 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
532 554
533 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
534 } else { 556 } else {
578 reset_signals; 600 reset_signals;
579 &$cb 601 &$cb
580 }, @args; 602 }, @args;
581 603
582 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
583} 616}
584 617
585=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
586 619
587=cut 620=cut
624within each server. 657within each server.
625 658
626=cut 659=cut
627 660
628sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
629 my ($name) = @_; 665 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
631 667
632 eval { 668 eval {
633 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
643} 679}
644 680
645our $DB; 681our $DB;
646 682
647sub db_init { 683sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
650 };
651} 685}
652 686
653sub db_get($$) { 687sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
655 689
656 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
657 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
658 694
659 $! ? () 695 $! ? ()
660 : $data 696 : $data
661 }
662} 697}
663 698
664sub db_put($$$) { 699sub db_put($$$) {
665 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
722 757
723 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 759 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
726 761
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 763
729 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
732 767
742 777
743=cut 778=cut
744 779
745sub datalog($@) { 780sub datalog($@) {
746 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 783}
749 784
750=back 785=back
751 786
752=cut 787=cut
947 982
948 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 985
951 } elsif (ref $type) { 986 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
953 988
954 } else { 989 } else {
955 shift @arg; 990 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
957 } 992 }
958 } 993 }
959} 994}
960 995
961sub _object_attach { 996sub _object_attach {
971 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
972 } 1007 }
973 1008
974 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
975 } else { 1010 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1012 }
978 1013
979 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
980} 1015}
981 1016
1040 1075
1041 for (@$callbacks) { 1076 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1043 1078
1044 if ($@) { 1079 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1081 override;
1048 } 1082 }
1049 1083
1050 return 1 if $override; 1084 return 1 if $override;
1051 } 1085 }
1130 for (@$attach) { 1164 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1133 } 1167 }
1134 } else { 1168 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1170 }
1137 } 1171 }
1138} 1172}
1139 1173
1140cf::attachable->attach ( 1174cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1168 1202
1169 sync_job { 1203 sync_job {
1170 if (length $$rdata) { 1204 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1174 1209
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
1200 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1201 1236
1202 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1239 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1206 } 1241 }
1207 } else { 1242 } else {
1208 aio_unlink $filename; 1243 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1210 } 1245 }
1234 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1270 $av = $st->{objs};
1236 } 1271 }
1237 1272
1238 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1241 1277
1242 ($data, $av) 1278 ($data, $av)
1243} 1279}
1244 1280
1245=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1304} 1340}
1305 1341
1306use File::Glob (); 1342use File::Glob ();
1307 1343
1308cf::player->attach ( 1344cf::player->attach (
1309 on_command => sub { 1345 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1311 1347
1312 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1313 or return; 1349 or return;
1314 1350
1337 1373
1338 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1375 if $reply;
1340 1376
1341 } else { 1377 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1379 }
1344 1380
1345 cf::override; 1381 cf::override;
1346 }, 1382 },
1347); 1383);
1358 1394
1359 $grp 1395 $grp
1360} 1396}
1361 1397
1362sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1363 cf::sync_job { 1401 cf::sync_job {
1364 my %todo; 1402 my %todo;
1365 1403
1366 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1405 next unless -r $path;
1385 1423
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1426
1389 $ext{source} = 1427 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1392 . $source 1430 . $source
1393 . "\n};\n1"; 1431 . "\n};\n1";
1394 1432
1395 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1396 } 1434 }
1397 1435
1436 my $pass = 0;
1398 my %done; 1437 my %done;
1399 while (%todo) { 1438 while (%todo) {
1400 my $progress; 1439 my $progress;
1401 1440
1441 ++$pass;
1442
1443 ext:
1402 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1446 next ext
1405 unless exists $done{$_}; 1447 unless exists $done{$_};
1406 } 1448 }
1407 1449
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1451
1410 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1456
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1458 if exists $v->{meta}{mandatory};
1418 1459
1419 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1420 } 1469 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1470 }
1426 1471
1427 skip: 1472 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1430 } 1480 }
1431 }; 1481 };
1432} 1482}
1433 1483
1434############################################################################# 1484#############################################################################
1518 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1519 } 1569 }
1520 } 1570 }
1521} 1571}
1522 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1523sub save($) { 1586sub save($) {
1524 my ($pl) = @_; 1587 my ($pl) = @_;
1525 1588
1526 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1527 1590
1532 1595
1533 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1535 1598
1536 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1603
1538 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1605 cf::cede_to_tick;
1540} 1606}
1541 1607
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1645
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1581 $pl->deactivate; 1647 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1585 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1586 1651
1587 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1643 \@logins 1708 \@logins
1644} 1709}
1645 1710
1646=item $player->maps 1711=item $player->maps
1647 1712
1713=item cf::player::maps $login
1714
1648Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1649player. May block. 1716player. May block.
1650 1717
1651=cut 1718=cut
1652 1719
1714=cut 1781=cut
1715 1782
1716sub find_by_path($) { 1783sub find_by_path($) {
1717 my ($path) = @_; 1784 my ($path) = @_;
1718 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1719 my ($match, $specificity); 1788 my ($match, $specificity);
1720 1789
1721 for my $region (list) { 1790 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1824
1756 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1826 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1779 1848
1780sub register { 1849sub register {
1781 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1851 my $pkg = caller;
1783 1852
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1854
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1856}
1789 1857
1790# also paths starting with '/' 1858# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1860
1793sub thawer_merge { 1861sub thawer_merge {
1794 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1795 1863
1796 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1801} 1869}
1802 1870
1803sub normalise { 1871sub normalise {
1804 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1805 1873
1806 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1807 1875
1808 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1809 1877
1810 # map plan: 1878 # map plan:
1811 # 1879 #
1850 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1851 return $self; 1919 return $self;
1852 } 1920 }
1853 } 1921 }
1854 1922
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 1924 ()
1857} 1925}
1858 1926
1859sub init { 1927sub init {
1860 my ($self) = @_; 1928 my ($self) = @_;
1982} 2050}
1983 2051
1984sub find; 2052sub find;
1985sub find { 2053sub find {
1986 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
2055
2056 cf::cede_to_tick;
1987 2057
1988 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
1989 2059
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
2010 2080
2011 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
2012 } 2082 }
2013} 2083}
2014 2084
2015sub pre_load { } 2085sub pre_load { }
2016sub post_load { } 2086#sub post_load { } # XS
2017 2087
2018sub load { 2088sub load {
2019 my ($self) = @_; 2089 my ($self) = @_;
2020 2090
2021 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
2078 } 2148 }
2079 2149
2080 $self->post_load; 2150 $self->post_load;
2081} 2151}
2082 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
2083sub customise_for { 2156sub customise_for {
2084 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
2085 2158
2086 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2160 if $self->per_player;
2103 or next; 2176 or next;
2104 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2105 or next; 2178 or next;
2106 $neigh->load; 2179 $neigh->load;
2107 2180
2181 # now find the diagonal neighbours
2108 push @neigh, 2182 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2185 }
2112 2186
2119} 2193}
2120 2194
2121sub find_sync { 2195sub find_sync {
2122 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2123 2197
2124 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
2125} 2202}
2126 2203
2127sub do_load_sync { 2204sub do_load_sync {
2128 my ($map) = @_; 2205 my ($map) = @_;
2129 2206
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2132 2209
2133 cf::sync_job { $map->load }; 2210 $map->load;
2134} 2211}
2135 2212
2136our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2138 2215
2164 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2165 2242
2166 () 2243 ()
2167} 2244}
2168 2245
2246# common code, used by both ->save and ->swapout
2169sub save { 2247sub _save {
2170 my ($self) = @_; 2248 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2249
2174 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2175 2251
2176 return unless $self->dirty; 2252 return unless $self->dirty;
2177 2253
2197 } else { 2273 } else {
2198 $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);
2199 } 2275 }
2200} 2276}
2201 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2202sub swap_out { 2286sub swap_out {
2203 my ($self) = @_; 2287 my ($self) = @_;
2204 2288
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2290
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2291 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2292 return if $self->{deny_save};
2293 return if $self->players;
2213 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2214 $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};
2215 2345
2216 $self->deactivate; 2346 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2348 $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 2349
2264 $self->unlink_save; 2350 $self->unlink_save;
2265 $self->destroy; 2351 $self->destroy;
2266} 2352}
2267 2353
2275 2361
2276 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2277 2363
2278 $self->unlink_save; 2364 $self->unlink_save;
2279 2365
2280 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2371
2515 2601
2516Freezes 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}>).
2517 2603
2518The 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.
2519for 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,
2520though, 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
2521map. 2607map.
2522 2608
2523Will never block. 2609Will never block.
2524 2610
2525=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
2546sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2547 my ($self) = @_; 2633 my ($self) = @_;
2548 2634
2549 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2550 2636
2637 ++$self->{_link_recursion};
2638
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2640
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2555 2643
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2645}
2558 2646
2559sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2561 2649
2586 $map->load_neighbours; 2674 $map->load_neighbours;
2587 2675
2588 return unless $self->contr->active; 2676 return unless $self->contr->active;
2589 2677
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2592 2680 # entering was successful
2681 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2682 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2683 $self->activate_recursive;
2595} 2684 }
2596 2685
2686}
2687
2597=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)]])
2598 2689
2599Moves 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
2600her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2601that 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
2602the 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
2609 2700
2610our $GOTOGEN; 2701our $GOTOGEN;
2611 2702
2612sub cf::object::player::goto { 2703sub cf::object::player::goto {
2613 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 }
2614 2711
2615 # 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
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2714
2618 $self->enter_link; 2715 $self->enter_link;
2642 my $map = eval { 2739 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2644 2741
2645 if ($map) { 2742 if ($map) {
2646 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2745 } else {
2649 $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);
2650 } 2747 }
2651 2748
2652 $map 2749 $map
2660 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2663 } 2760 }
2664 2761
2665 $done->() if $done; 2762 $done->($self) if $done;
2666 })->prio (1); 2763 })->prio (1);
2667} 2764}
2668 2765
2669=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2670 2767
2763 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "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. "
2765 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2864
2768 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2866 $self->leave_link;
2770 } 2867 }
2771 })->prio (1); 2868 })->prio (1);
2772} 2869}
2773 2870
2785sub cf::client::send_drawinfo { 2882sub cf::client::send_drawinfo {
2786 my ($self, $text, $flags) = @_; 2883 my ($self, $text, $flags) = @_;
2787 2884
2788 utf8::encode $text; 2885 utf8::encode $text;
2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2886 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2887}
2888
2889=item $client->send_big_packet ($pkt)
2890
2891Like C<send_packet>, but tries to compress large packets, and fragments
2892them as required.
2893
2894=cut
2895
2896our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2897
2898sub cf::client::send_big_packet {
2899 my ($self, $pkt) = @_;
2900
2901 # try lzf for large packets
2902 $pkt = "lzf " . Compress::LZF::compress $pkt
2903 if 1024 <= length $pkt and $self->{can_lzf};
2904
2905 # split very large packets
2906 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2907 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2908 $pkt = "frag";
2909 }
2910
2911 $self->send_packet ($pkt);
2790} 2912}
2791 2913
2792=item $client->send_msg ($channel, $msg, $color, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2793 2915
2794Send a drawinfo or msg packet to the client, formatting the msg for the 2916Send a drawinfo or msg packet to the client, formatting the msg for the
2946 my $pkt = "msg " 3068 my $pkt = "msg "
2947 . $self->{json_coder}->encode ( 3069 . $self->{json_coder}->encode (
2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2949 ); 3071 );
2950 3072
2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2954
2955 # split very large packets
2956 if (8192 < length $pkt and $self->{can_lzf}) {
2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2958 $pkt = "frag";
2959 }
2960
2961 $self->send_packet ($pkt); 3073 $self->send_big_packet ($pkt);
2962} 3074}
2963 3075
2964=item $client->ext_msg ($type, @msg) 3076=item $client->ext_msg ($type, @msg)
2965 3077
2966Sends an ext event to the client. 3078Sends an ext event to the client.
2969 3081
2970sub cf::client::ext_msg($$@) { 3082sub cf::client::ext_msg($$@) {
2971 my ($self, $type, @msg) = @_; 3083 my ($self, $type, @msg) = @_;
2972 3084
2973 if ($self->extcmd == 2) { 3085 if ($self->extcmd == 2) {
2974 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2975 } elsif ($self->extcmd == 1) { # TODO: remove 3087 } elsif ($self->extcmd == 1) { # TODO: remove
2976 push @msg, msgtype => "event_$type"; 3088 push @msg, msgtype => "event_$type";
2977 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2978 } 3090 }
2979} 3091}
2980 3092
2981=item $client->ext_reply ($msgid, @msg) 3093=item $client->ext_reply ($msgid, @msg)
2982 3094
2986 3098
2987sub cf::client::ext_reply($$@) { 3099sub cf::client::ext_reply($$@) {
2988 my ($self, $id, @msg) = @_; 3100 my ($self, $id, @msg) = @_;
2989 3101
2990 if ($self->extcmd == 2) { 3102 if ($self->extcmd == 2) {
2991 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2992 } elsif ($self->extcmd == 1) { 3104 } elsif ($self->extcmd == 1) {
2993 #TODO: version 1, remove 3105 #TODO: version 1, remove
2994 unshift @msg, msgtype => "reply", msgid => $id; 3106 unshift @msg, msgtype => "reply", msgid => $id;
2995 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2996 } 3108 }
2997} 3109}
2998 3110
2999=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
3000 3112
3071 3183
3072 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3073 if $reply; 3185 if $reply;
3074 3186
3075 } else { 3187 } else {
3076 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";
3077 } 3189 }
3078 3190
3079 cf::override; 3191 cf::override;
3080 }, 3192 },
3081); 3193);
3101 3213
3102 $coro 3214 $coro
3103} 3215}
3104 3216
3105cf::client->attach ( 3217cf::client->attach (
3106 on_destroy => sub { 3218 on_client_destroy => sub {
3107 my ($ns) = @_; 3219 my ($ns) = @_;
3108 3220
3109 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3110 }, 3222 },
3111); 3223);
3127our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
3128 3240
3129$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
3130 3242
3131$safe->permit_only (Opcode::opset qw( 3243$safe->permit_only (Opcode::opset qw(
3132 :base_core :base_mem :base_orig :base_math 3244 :base_core :base_mem :base_orig :base_math :base_loop
3133 grepstart grepwhile mapstart mapwhile 3245 grepstart grepwhile mapstart mapwhile
3134 sort time 3246 sort time
3135)); 3247));
3136 3248
3137# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
3162 decrease split destroy change_exp value msg lore send_msg)], 3274 decrease split destroy change_exp value msg lore send_msg)],
3163 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
3164 ["cf::player" => qw(peaceful send_msg)], 3276 ["cf::player" => qw(peaceful send_msg)],
3165 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
3166) { 3278) {
3167 no strict 'refs';
3168 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3170 for @funs; 3281 for @funs;
3171} 3282}
3172 3283
3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3190 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3191 3302
3192 %vars = (_dummy => 0) unless %vars; 3303 %vars = (_dummy => 0) unless %vars;
3193 3304
3305 my @res;
3194 local $_; 3306 local $_;
3195 local @safe::cf::_safe_eval_args = values %vars;
3196 3307
3197 my $eval = 3308 my $eval =
3198 "do {\n" 3309 "do {\n"
3199 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3200 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3201 . $code 3312 . $code
3202 . "\n}" 3313 . "\n}"
3203 ; 3314 ;
3204 3315
3316 if ($CFG{safe_eval}) {
3205 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3206 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3207 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 }
3208 3325
3209 if ($@) { 3326 if ($@) {
3210 warn "$@"; 3327 warn "$@",
3211 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3212 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3213 } 3330 }
3214 3331
3215 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3216} 3333}
3217 3334
3231=cut 3348=cut
3232 3349
3233sub register_script_function { 3350sub register_script_function {
3234 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3235 3352
3236 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3237 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3238} 3355}
3239 3356
3240=back 3357=back
3241 3358
3242=cut 3359=cut
3251 # for this (global event?) 3368 # for this (global event?)
3252 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3253 3370
3254 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3255 3372
3256 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3257 3374
3258 my $facedata; 3375 my $facedata;
3259 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3260 or die "$path: $!"; 3377 or die "$path: $!";
3261 3378
3263 3380
3264 $facedata->{version} == 2 3381 $facedata->{version} == 2
3265 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3266 3383
3267 # 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]);
3268 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3269 type => FT_RSRC, 3387 type => FT_RSRC,
3270 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),
3271 }; 3390 };
3272 cf::cede_to_tick; 3391 cf::cede_to_tick;
3273 3392
3274 { 3393 {
3275 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3277 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3278 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279 3398
3280 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3281 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3282 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3283 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3284 3403
3285 cf::cede_to_tick; 3404 cf::cede_to_tick;
3286 } 3405 }
3287 3406
3288 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3293 3412
3294 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3295 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3296 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3297 } else { 3416 } else {
3298 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3299 } 3418 }
3300 3419
3301 cf::cede_to_tick; 3420 cf::cede_to_tick;
3302 } 3421 }
3303 } 3422 }
3312 3431
3313 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3314 } 3433 }
3315 3434
3316 { 3435 {
3317 # TODO: for gcfclient pleasure, we should give resources
3318 # that gcfclient doesn't grok a >10000 face index.
3319 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3320 3437
3321 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3323 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3324 my $data;
3325 3441
3326 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3327 # prepend meta info
3328
3329 my $meta = $enc->encode ({
3330 name => $name,
3331 %{ $info->{meta} || {} },
3332 });
3333
3334 $data = pack "(w/a*)*", $meta, $info->{data};
3335 } else {
3336 $data = $info->{data};
3337 }
3338
3339 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3340 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3341 } else { 3444 } else {
3342 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3343 } 3446 }
3344 3447
3345 cf::cede_to_tick; 3448 cf::cede_to_tick;
3346 } 3449 }
3347 } 3450 }
3348 3451
3349 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3350 3453
3351 1 3454 1
3352} 3455}
3353
3354cf::global->attach (on_resource_update => sub {
3355 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3356 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3357
3358 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3359 my $sound = $soundconf->{compat}[$_]
3360 or next;
3361
3362 my $face = cf::face::find "sound/$sound->[1]";
3363 cf::sound::set $sound->[0] => $face;
3364 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3365 }
3366
3367 while (my ($k, $v) = each %{$soundconf->{event}}) {
3368 my $face = cf::face::find "sound/$v";
3369 cf::sound::set $k => $face;
3370 }
3371 }
3372});
3373 3456
3374register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3375 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3376 3459
3377 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3416sub reload_treasures { 3499sub reload_treasures {
3417 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3418 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3419} 3502}
3420 3503
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3421sub reload_resources { 3531sub reload_resources {
3422 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3423 3533
3534 reload_exp;
3424 reload_facedata; 3535 reload_facedata;
3536 reload_sound;
3425 reload_archetypes; 3537 reload_archetypes;
3426 reload_regions; 3538 reload_regions;
3427 reload_treasures; 3539 reload_treasures;
3428 3540
3429 warn "finished reloading resource files\n"; 3541 trace "finished reloading resource files\n";
3430} 3542}
3431 3543
3432sub reload_config { 3544sub reload_config {
3433 warn "reloading config file...\n"; 3545 trace "reloading config file...\n";
3434 3546
3435 open my $fh, "<:utf8", "$CONFDIR/config" 3547 open my $fh, "<:utf8", "$CONFDIR/config"
3436 or return; 3548 or return;
3437 3549
3438 local $/; 3550 local $/;
3439 *CFG = YAML::XS::Load scalar <$fh>; 3551 *CFG = YAML::XS::Load scalar <$fh>;
3440 3552
3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3442 3554
3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3555 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3556 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3445 3557
3446 if (exists $CFG{mlockall}) { 3558 if (exists $CFG{mlockall}) {
3449 and die "WARNING: m(un)lockall failed: $!\n"; 3561 and die "WARNING: m(un)lockall failed: $!\n";
3450 }; 3562 };
3451 warn $@ if $@; 3563 warn $@ if $@;
3452 } 3564 }
3453 3565
3454 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3455} 3567}
3456 3568
3457sub pidfile() { 3569sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!"; 3571 or die "$PIDFILE: $!";
3472 seek $fh, 0, 0; 3584 seek $fh, 0, 0;
3473 print $fh $$; 3585 print $fh $$;
3474} 3586}
3475 3587
3476sub main_loop { 3588sub main_loop {
3477 warn "EV::loop starting\n"; 3589 trace "EV::loop starting\n";
3478 if (1) { 3590 if (1) {
3479 EV::loop; 3591 EV::loop;
3480 } 3592 }
3481 warn "EV::loop returned\n"; 3593 trace "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP; 3594 goto &main_loop unless $REALLY_UNLOOP;
3483} 3595}
3484 3596
3485sub main { 3597sub main {
3486 cf::init_globals; # initialise logging 3598 cf::init_globals; # initialise logging
3487 3599
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497 3604
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3605 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499 3606
3500 # we must not ever block the main coroutine 3607 # we must not ever block the main coroutine
3501 local $Coro::idle = sub { 3608 local $Coro::idle = sub {
3507 }; 3614 };
3508 3615
3509 evthread_start IO::AIO::poll_fileno; 3616 evthread_start IO::AIO::poll_fileno;
3510 3617
3511 cf::sync_job { 3618 cf::sync_job {
3619 cf::incloader::init ();
3620
3621 cf::init_anim;
3622 cf::init_attackmess;
3623 cf::init_dynamic;
3624
3625 cf::load_settings;
3626 cf::load_materials;
3627
3512 reload_resources; 3628 reload_resources;
3513 reload_config; 3629 reload_config;
3514 db_init; 3630 db_init;
3515 3631
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid; 3632 cf::init_uuid;
3519 cf::init_signals; 3633 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills; 3634 cf::init_skills;
3522 3635
3523 cf::init_beforeplay; 3636 cf::init_beforeplay;
3524 3637
3525 atomic; 3638 atomic;
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534 3647
3535 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3536 }; 3649 };
3537 3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3538 main_loop; 3659 goto &main_loop;
3539} 3660}
3540 3661
3541############################################################################# 3662#############################################################################
3542# initialisation and cleanup 3663# initialisation and cleanup
3543 3664
3544# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3545BEGIN { 3666BEGIN {
3546 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3547 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3548 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3549 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3550 }; 3671 };
3551 } 3672 }
3552} 3673}
3553 3674
3554sub write_runtime_sync { 3675sub write_runtime_sync {
3676 my $t0 = AE::time;
3677
3555 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3556 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3557 3680
3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3559 3682
3560 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3561 3684
3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3563 or return; 3686 or return;
3564 3687
3565 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3566 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3567 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
3580 or return; 3703 or return;
3581 3704
3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3583 and return; 3706 and return;
3584 3707
3585 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3586 3709
3587 1 3710 1
3588} 3711}
3589 3712
3590our $uuid_lock; 3713our $uuid_lock;
3602 or return; 3725 or return;
3603 3726
3604 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3605 3728
3606 unless ($value) { 3729 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3608 return; 3731 return;
3609 } 3732 }
3610 3733
3611 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3612 $uuid_skip = 0; 3735 $uuid_skip = 0;
3622 or return; 3745 or return;
3623 3746
3624 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3625 and return; 3748 and return;
3626 3749
3627 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3628 3751
3629 1 3752 1
3630 3753
3631} 3754}
3632 3755
3638} 3761}
3639 3762
3640sub emergency_save() { 3763sub emergency_save() {
3641 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3642 3765
3643 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3644 3772
3645 cf::sync_job { 3773 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650 3775
3651 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3652 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3653 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3654 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3655 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3656 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3657 $pl->valid or next; 3782 $pl->valid or next;
3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3659 $pl->save; 3784 $pl->save;
3660 } 3785 }
3661 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3662 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3663 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3664 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3665 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3666 $map->valid or next; 3793 $map->valid or next;
3667 $map->save; 3794 $map->save;
3668 } 3795 }
3669 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3670 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3671 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3672 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3673 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3674 3803
3675 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3676 write_uuid_sync 1; 3805 write_uuid_sync 1;
3677 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3678 }; 3826 };
3679 3827
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3685 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3686} 3829}
3687 3830
3688sub post_cleanup { 3831sub post_cleanup {
3689 my ($make_core) = @_; 3832 my ($make_core) = @_;
3690 3833
3834 IO::AIO::flush;
3835
3691 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3692 if $make_core; 3837 if $make_core;
3693 3838
3694 my $fh = pidfile; 3839 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3696} 3841}
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 } 3865 }
3721 warn "cleared package $pkg\n";#d#
3722} 3866}
3723 3867
3724sub do_reload_perl() { 3868sub do_reload_perl() {
3725 # can/must only be called in main 3869 # can/must only be called in main
3726 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3727 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3728 return; 3872 return;
3729 } 3873 }
3730 3874
3731 return if $RELOAD++; 3875 return if $RELOAD++;
3732 3876
3733 my $t1 = EV::time; 3877 my $t1 = AE::time;
3734 3878
3735 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3736 warn "reloading..."; 3881 info "reloading...";
3737 3882
3738 warn "entering sync_job"; 3883 trace "entering sync_job";
3739 3884
3740 cf::sync_job { 3885 cf::sync_job {
3741 cf::write_runtime_sync; # external watchdog should not bark
3742 cf::emergency_save; 3886 #cf::emergency_save;
3743 cf::write_runtime_sync; # external watchdog should not bark
3744 3887
3745 warn "syncing database to disk";
3746 BDB::db_env_txn_checkpoint $DB_ENV;
3747
3748 # if anything goes wrong in here, we should simply crash as we already saved
3749
3750 warn "flushing outstanding aio requests";
3751 while (IO::AIO::nreqs || BDB::nreqs) {
3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3753 }
3754
3755 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3756 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3757 %EXT_CORO = (); 3890 %EXT_CORO = ();
3758 3891
3759 warn "removing commands"; 3892 trace "removing commands";
3760 %COMMAND = (); 3893 %COMMAND = ();
3761 3894
3762 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3763 %EXTCMD = (); 3896 %EXTCMD = ();
3764 %EXTICMD = (); 3897 %EXTICMD = ();
3765 3898
3766 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3768 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3769 3902
3770 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3771 eval { 3904 eval {
3772 $cb->($pkg); 3905 $cb->($pkg);
3773 1 3906 1
3774 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3775 } 3908 }
3776 3909
3777 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3778 clear_package $pkg; 3911 clear_package $pkg;
3779 } 3912 }
3780 3913
3781 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784 3917
3785 warn "... unloading $k"; 3918 trace "... unloading $k";
3786 delete $INC{$k}; 3919 delete $INC{$k};
3787 3920
3788 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3790 3923
3793 } 3926 }
3794 3927
3795 clear_package $k; 3928 clear_package $k;
3796 } 3929 }
3797 3930
3798 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3799 clear_package "safe::$_" 3932 clear_package "safe::$_"
3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3801 3934
3802 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3803 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3805 3938
3806 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3807 # and global variables created in xs 3940 # and global variables created in xs
3808 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3809 3942
3810 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3811 3944
3812 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3813 require cf; 3946 require cf;
3814 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3815 3948
3816 warn "loading config and database again"; 3949 trace "loading config and database again";
3817 cf::reload_config; 3950 cf::reload_config;
3818 3951
3819 warn "loading extensions"; 3952 trace "loading extensions";
3820 cf::load_extensions; 3953 cf::load_extensions;
3821 3954
3822 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3823 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3824 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3825 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3826 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3827 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3828 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3829 } 3962 }
3830 3963
3831 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3833 3966
3834 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3835 3968
3836 1 3969 1
3837 } or do { 3970 } or do {
3838 warn $@; 3971 error $@;
3839 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3840 }; 3973 };
3841 3974
3842 warn "reloaded"; 3975 info "reloaded";
3843 --$RELOAD; 3976 --$RELOAD;
3844 } 3977 }
3845 3978
3846 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3847 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3848}; 3981};
3849 3982
3850our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3851 3984
3852sub reload_perl() { 3985sub reload_perl() {
3854 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3855 3988
3856 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3858 3991
3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3860 do_reload_perl; 3993 do_reload_perl;
3861 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3862 }; 3995 };
3863 }; 3996 };
3864} 3997}
3873 reload_perl; 4006 reload_perl;
3874 }; 4007 };
3875 } 4008 }
3876}; 4009};
3877 4010
3878unshift @INC, $LIBDIR; 4011#############################################################################
3879 4012
3880my $bug_warning = 0; 4013my $bug_warning = 0;
3881 4014
3882our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3883our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3884 4017
3885sub wait_for_tick { 4018sub wait_for_tick {
3886 return if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3887 4020
3888 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3889 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3890 $signal->wait; 4023 $signal->wait;
3891} 4024}
3892 4025
3893sub wait_for_tick_begin { 4026sub wait_for_tick_begin {
3894 return if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3895 4028
3896 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3897 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3898 $signal->wait; 4031 $signal->wait;
3899} 4032}
3905 return; 4038 return;
3906 } 4039 }
3907 4040
3908 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3909 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3910 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3912 Coro::async_pool { 4047 Coro::async_pool {
3913 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3914 write_runtime_sync 4049 write_runtime_sync
3915 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3916 }; 4051 };
3917 } 4052 }
3918 4053
3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3920 $sig->send; 4055 $sig->send;
3928 4063
3929 if (0) { 4064 if (0) {
3930 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3931 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3932 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3933 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3934 } 4069 }
3935 } 4070 }
3936} 4071}
3937 4072
3938{ 4073{
3939 # configure BDB 4074 # configure BDB
3940 4075
3941 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3942 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3943 $AnyEvent::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3944 4079
3945 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3946 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines