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.499 by root, Sun Jan 10 17:43:46 2010 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 2010 UTC

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

Diff Legend

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