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.501 by root, Sat Jan 16 23:27:21 2010 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;
… …
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
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
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
… …
1800} 1869}
1801 1870
1802sub normalise { 1871sub normalise {
1803 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1804 1873
1805 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1806 1875
1807 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1808 1877
1809 # map plan: 1878 # map plan:
1810 # 1879 #
… …
1849 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1850 return $self; 1919 return $self;
1851 } 1920 }
1852 } 1921 }
1853 1922
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1924 ()
1856} 1925}
1857 1926
1858sub init { 1927sub init {
1859 my ($self) = @_; 1928 my ($self) = @_;
… …
1981} 2050}
1982 2051
1983sub find; 2052sub find;
1984sub find { 2053sub find {
1985 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
2055
2056 cf::cede_to_tick;
1986 2057
1987 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
1988 2059
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2077 } 2148 }
2078 2149
2079 $self->post_load; 2150 $self->post_load;
2080} 2151}
2081 2152
2153# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath
2082sub customise_for { 2156sub customise_for {
2083 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
2084 2158
2085 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2160 if $self->per_player;
… …
2102 or next; 2176 or next;
2103 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2104 or next; 2178 or next;
2105 $neigh->load; 2179 $neigh->load;
2106 2180
2181 # now find the diagonal neighbours
2107 push @neigh, 2182 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2185 }
2111 2186
… …
2118} 2193}
2119 2194
2120sub find_sync { 2195sub find_sync {
2121 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2122 2197
2123 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2124} 2202}
2125 2203
2126sub do_load_sync { 2204sub do_load_sync {
2127 my ($map) = @_; 2205 my ($map) = @_;
2128 2206
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2131 2209
2132 cf::sync_job { $map->load }; 2210 $map->load;
2133} 2211}
2134 2212
2135our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2137 2215
… …
2163 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2164 2242
2165 () 2243 ()
2166} 2244}
2167 2245
2246# common code, used by both ->save and ->swapout
2168sub save { 2247sub _save {
2169 my ($self) = @_; 2248 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2249
2173 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2174 2251
2175 return unless $self->dirty; 2252 return unless $self->dirty;
2176 2253
… …
2196 } else { 2273 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2275 }
2199} 2276}
2200 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2201sub swap_out { 2286sub swap_out {
2202 my ($self) = @_; 2287 my ($self) = @_;
2203 2288
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2290
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2291 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2292 return if $self->{deny_save};
2293 return if $self->players;
2212 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
2304 $self->clear;
2305}
2306
2307sub reset_at {
2308 my ($self) = @_;
2309
2310 # TODO: safety, remove and allow resettable per-player maps
2311 return 1e99 if $self->{deny_reset};
2312
2313 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2314 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2315
2316 $time + $to
2317}
2318
2319sub should_reset {
2320 my ($self) = @_;
2321
2322 $self->reset_at <= $cf::RUNTIME
2323}
2324
2325sub reset {
2326 my ($self) = @_;
2327
2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2329
2330 return if $self->players;
2331
2332 cf::trace "resetting map ", $self->path, "\n";
2333
2334 $self->in_memory (cf::MAP_SWAPPED);
2335
2336 # need to save uniques path
2337 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339
2340 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2341 if $uniq;
2342 }
2343
2344 delete $cf::MAP{$self->path};
2214 2345
2215 $self->deactivate; 2346 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2348 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2349
2263 $self->unlink_save; 2350 $self->unlink_save;
2264 $self->destroy; 2351 $self->destroy;
2265} 2352}
2266 2353
… …
2274 2361
2275 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2276 2363
2277 $self->unlink_save; 2364 $self->unlink_save;
2278 2365
2279 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2371
… …
2514 2601
2515Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2516 2603
2517The player should be reasonably safe there for short amounts of time (e.g. 2604The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2605for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2606though, as the player cannot control the character while it is on the link
2520map. 2607map.
2521 2608
2522Will never block. 2609Will never block.
2523 2610
2524=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2546 my ($self) = @_; 2633 my ($self) = @_;
2547 2634
2548 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2549 2636
2637 ++$self->{_link_recursion};
2638
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2640
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2554 2643
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2645}
2557 2646
2558sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2560 2649
… …
2585 $map->load_neighbours; 2674 $map->load_neighbours;
2586 2675
2587 return unless $self->contr->active; 2676 return unless $self->contr->active;
2588 2677
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2591 2680 # entering was successful
2681 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2682 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2683 $self->activate_recursive;
2594} 2684 }
2595 2685
2686}
2687
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2689
2598Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2692that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2693the new (success) or old (failed) map position. In either case, $done will
… …
2608 2700
2609our $GOTOGEN; 2701our $GOTOGEN;
2610 2702
2611sub cf::object::player::goto { 2703sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2613 2711
2614 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2714
2617 $self->enter_link; 2715 $self->enter_link;
… …
2641 my $map = eval { 2739 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2643 2741
2644 if ($map) { 2742 if ($map) {
2645 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2745 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2747 }
2650 2748
2651 $map 2749 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2662 } 2760 }
2663 2761
2664 $done->() if $done; 2762 $done->($self) if $done;
2665 })->prio (1); 2763 })->prio (1);
2666} 2764}
2667 2765
2668=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2669 2767
… …
2762 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2864
2767 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2866 $self->leave_link;
2769 } 2867 }
2770 })->prio (1); 2868 })->prio (1);
2771} 2869}
2772 2870
… …
3085 3183
3086 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3185 if $reply;
3088 3186
3089 } else { 3187 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3189 }
3092 3190
3093 cf::override; 3191 cf::override;
3094 }, 3192 },
3095); 3193);
… …
3115 3213
3116 $coro 3214 $coro
3117} 3215}
3118 3216
3119cf::client->attach ( 3217cf::client->attach (
3120 on_destroy => sub { 3218 on_client_destroy => sub {
3121 my ($ns) = @_; 3219 my ($ns) = @_;
3122 3220
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3222 },
3125); 3223);
… …
3176 decrease split destroy change_exp value msg lore send_msg)], 3274 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3276 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
3180) { 3278) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3281 for @funs;
3185} 3282}
3186 3283
… …
3225 local @cf::_safe_eval_args = values %vars; 3322 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval; 3323 @res = wantarray ? eval eval : scalar eval $eval;
3227 } 3324 }
3228 3325
3229 if ($@) { 3326 if ($@) {
3230 warn "$@"; 3327 warn "$@",
3231 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3232 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3233 } 3330 }
3234 3331
3235 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3236} 3333}
3237 3334
… …
3271 # for this (global event?) 3368 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3370
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275 3372
3276 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3277 3374
3278 my $facedata; 3375 my $facedata;
3279 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3280 or die "$path: $!"; 3377 or die "$path: $!";
3281 3378
… …
3315 3412
3316 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3317 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3319 } else { 3416 } else {
3320 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3321 } 3418 }
3322 3419
3323 cf::cede_to_tick; 3420 cf::cede_to_tick;
3324 } 3421 }
3325 } 3422 }
… …
3343 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344 3441
3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3347 } else { 3444 } else {
3348 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3349 } 3446 }
3350 3447
3351 cf::cede_to_tick; 3448 cf::cede_to_tick;
3352 } 3449 }
3353 } 3450 }
3354 3451
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356 3453
3357 1 3454 1
3358} 3455}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379 3456
3380register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3382 3459
3383 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3422sub reload_treasures { 3499sub reload_treasures {
3423 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3424 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3425} 3502}
3426 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
3427sub reload_resources { 3531sub reload_resources {
3428 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3429 3533
3534 reload_exp;
3430 reload_facedata; 3535 reload_facedata;
3536 reload_sound;
3431 reload_archetypes; 3537 reload_archetypes;
3432 reload_regions; 3538 reload_regions;
3433 reload_treasures; 3539 reload_treasures;
3434 3540
3435 warn "finished reloading resource files\n"; 3541 trace "finished reloading resource files\n";
3436} 3542}
3437 3543
3438sub reload_config { 3544sub reload_config {
3439 warn "reloading config file...\n"; 3545 trace "reloading config file...\n";
3440 3546
3441 open my $fh, "<:utf8", "$CONFDIR/config" 3547 open my $fh, "<:utf8", "$CONFDIR/config"
3442 or return; 3548 or return;
3443 3549
3444 local $/; 3550 local $/;
3445 *CFG = YAML::XS::Load scalar <$fh>; 3551 *CFG = YAML::XS::Load scalar <$fh>;
3446 3552
3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448 3554
3449 $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};
3450 $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};
3451 3557
3452 if (exists $CFG{mlockall}) { 3558 if (exists $CFG{mlockall}) {
… …
3455 and die "WARNING: m(un)lockall failed: $!\n"; 3561 and die "WARNING: m(un)lockall failed: $!\n";
3456 }; 3562 };
3457 warn $@ if $@; 3563 warn $@ if $@;
3458 } 3564 }
3459 3565
3460 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3461} 3567}
3462 3568
3463sub pidfile() { 3569sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!"; 3571 or die "$PIDFILE: $!";
… …
3478 seek $fh, 0, 0; 3584 seek $fh, 0, 0;
3479 print $fh $$; 3585 print $fh $$;
3480} 3586}
3481 3587
3482sub main_loop { 3588sub main_loop {
3483 warn "EV::loop starting\n"; 3589 trace "EV::loop starting\n";
3484 if (1) { 3590 if (1) {
3485 EV::loop; 3591 EV::loop;
3486 } 3592 }
3487 warn "EV::loop returned\n"; 3593 trace "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP; 3594 goto &main_loop unless $REALLY_UNLOOP;
3489} 3595}
3490 3596
3491sub main { 3597sub main {
3492 cf::init_globals; # initialise logging 3598 cf::init_globals; # initialise logging
3493 3599
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 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.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503 3604
3504 $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
3505 3606
3506 # we must not ever block the main coroutine 3607 # we must not ever block the main coroutine
3507 local $Coro::idle = sub { 3608 local $Coro::idle = sub {
… …
3513 }; 3614 };
3514 3615
3515 evthread_start IO::AIO::poll_fileno; 3616 evthread_start IO::AIO::poll_fileno;
3516 3617
3517 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
3518 cf::load_settings; 3625 cf::load_settings;
3519 cf::load_materials; 3626 cf::load_materials;
3520 3627
3521 reload_resources; 3628 reload_resources;
3522 reload_config; 3629 reload_config;
3523 db_init; 3630 db_init;
3524 3631
3525 cf::init_uuid; 3632 cf::init_uuid;
3526 cf::init_signals; 3633 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3634 cf::init_skills;
3529 3635
3530 cf::init_beforeplay; 3636 cf::init_beforeplay;
3531 3637
3532 atomic; 3638 atomic;
… …
3540 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};
3541 3647
3542 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3543 }; 3649 };
3544 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
3545 main_loop; 3659 goto &main_loop;
3546} 3660}
3547 3661
3548############################################################################# 3662#############################################################################
3549# initialisation and cleanup 3663# initialisation and cleanup
3550 3664
3551# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3552BEGIN { 3666BEGIN {
3553 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3554 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3555 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3556 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3557 }; 3671 };
3558 } 3672 }
3559} 3673}
3560 3674
3561sub write_runtime_sync { 3675sub write_runtime_sync {
3676 my $t0 = AE::time;
3677
3562 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3564 3680
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 3682
3567 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3568 3684
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 3686 or return;
3571 3687
3572 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
… …
3587 or return; 3703 or return;
3588 3704
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 3706 and return;
3591 3707
3592 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593 3709
3594 1 3710 1
3595} 3711}
3596 3712
3597our $uuid_lock; 3713our $uuid_lock;
… …
3609 or return; 3725 or return;
3610 3726
3611 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3612 3728
3613 unless ($value) { 3729 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3615 return; 3731 return;
3616 } 3732 }
3617 3733
3618 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3629 or return; 3745 or return;
3630 3746
3631 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3632 and return; 3748 and return;
3633 3749
3634 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3635 3751
3636 1 3752 1
3637 3753
3638} 3754}
3639 3755
… …
3645} 3761}
3646 3762
3647sub emergency_save() { 3763sub emergency_save() {
3648 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3649 3765
3650 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;
3651 3772
3652 cf::sync_job { 3773 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657 3775
3658 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3659 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3660 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3661 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3662 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3663 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3664 $pl->valid or next; 3782 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3666 $pl->save; 3784 $pl->save;
3667 } 3785 }
3668 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3669 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3670 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3671 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3672 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3673 $map->valid or next; 3793 $map->valid or next;
3674 $map->save; 3794 $map->save;
3675 } 3795 }
3676 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3677 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3678 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3679 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3680 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3681 3803
3682 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1; 3805 write_uuid_sync 1;
3684 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
3685 }; 3826 };
3686 3827
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3692 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3693} 3829}
3694 3830
3695sub post_cleanup { 3831sub post_cleanup {
3696 my ($make_core) = @_; 3832 my ($make_core) = @_;
3697 3833
3834 IO::AIO::flush;
3835
3698 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3699 if $make_core; 3837 if $make_core;
3700 3838
3701 my $fh = pidfile; 3839 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3703} 3841}
… …
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 } 3865 }
3728 warn "cleared package $pkg\n";#d#
3729} 3866}
3730 3867
3731sub do_reload_perl() { 3868sub do_reload_perl() {
3732 # can/must only be called in main 3869 # can/must only be called in main
3733 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3734 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3735 return; 3872 return;
3736 } 3873 }
3737 3874
3738 return if $RELOAD++; 3875 return if $RELOAD++;
3739 3876
3740 my $t1 = EV::time; 3877 my $t1 = AE::time;
3741 3878
3742 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3743 warn "reloading..."; 3881 info "reloading...";
3744 3882
3745 warn "entering sync_job"; 3883 trace "entering sync_job";
3746 3884
3747 cf::sync_job { 3885 cf::sync_job {
3748 cf::write_runtime_sync; # external watchdog should not bark
3749 cf::emergency_save; 3886 #cf::emergency_save;
3750 cf::write_runtime_sync; # external watchdog should not bark
3751 3887
3752 warn "syncing database to disk";
3753 BDB::db_env_txn_checkpoint $DB_ENV;
3754
3755 # if anything goes wrong in here, we should simply crash as we already saved
3756
3757 warn "flushing outstanding aio requests";
3758 while (IO::AIO::nreqs || BDB::nreqs) {
3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3760 }
3761
3762 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3763 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3764 %EXT_CORO = (); 3890 %EXT_CORO = ();
3765 3891
3766 warn "removing commands"; 3892 trace "removing commands";
3767 %COMMAND = (); 3893 %COMMAND = ();
3768 3894
3769 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3770 %EXTCMD = (); 3896 %EXTCMD = ();
3771 %EXTICMD = (); 3897 %EXTICMD = ();
3772 3898
3773 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3774 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3775 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3776 3902
3777 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3778 eval { 3904 eval {
3779 $cb->($pkg); 3905 $cb->($pkg);
3780 1 3906 1
3781 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3782 } 3908 }
3783 3909
3784 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3785 clear_package $pkg; 3911 clear_package $pkg;
3786 } 3912 }
3787 3913
3788 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791 3917
3792 warn "... unloading $k"; 3918 trace "... unloading $k";
3793 delete $INC{$k}; 3919 delete $INC{$k};
3794 3920
3795 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3797 3923
… …
3800 } 3926 }
3801 3927
3802 clear_package $k; 3928 clear_package $k;
3803 } 3929 }
3804 3930
3805 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3806 clear_package "safe::$_" 3932 clear_package "safe::$_"
3807 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);
3808 3934
3809 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3810 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3812 3938
3813 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3814 # and global variables created in xs 3940 # and global variables created in xs
3815 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3816 3942
3817 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3818 3944
3819 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3820 require cf; 3946 require cf;
3821 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3822 3948
3823 warn "loading config and database again"; 3949 trace "loading config and database again";
3824 cf::reload_config; 3950 cf::reload_config;
3825 3951
3826 warn "loading extensions"; 3952 trace "loading extensions";
3827 cf::load_extensions; 3953 cf::load_extensions;
3828 3954
3829 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3830 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3831 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3832 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3833 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3834 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3835 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3836 } 3962 }
3837 3963
3838 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3839 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3840 3966
3841 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3842 3968
3843 1 3969 1
3844 } or do { 3970 } or do {
3845 warn $@; 3971 error $@;
3846 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3847 }; 3973 };
3848 3974
3849 warn "reloaded"; 3975 info "reloaded";
3850 --$RELOAD; 3976 --$RELOAD;
3851 } 3977 }
3852 3978
3853 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3854 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3855}; 3981};
3856 3982
3857our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3858 3984
3859sub reload_perl() { 3985sub reload_perl() {
… …
3861 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3862 3988
3863 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3865 3991
3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867 do_reload_perl; 3993 do_reload_perl;
3868 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3869 }; 3995 };
3870 }; 3996 };
3871} 3997}
… …
3880 reload_perl; 4006 reload_perl;
3881 }; 4007 };
3882 } 4008 }
3883}; 4009};
3884 4010
3885unshift @INC, $LIBDIR; 4011#############################################################################
3886 4012
3887my $bug_warning = 0; 4013my $bug_warning = 0;
3888 4014
3889our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3890our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
… …
3912 return; 4038 return;
3913 } 4039 }
3914 4040
3915 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3916 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $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.;
3919 Coro::async_pool { 4047 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3921 write_runtime_sync 4049 write_runtime_sync
3922 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3923 }; 4051 };
3924 } 4052 }
3925 4053
3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3927 $sig->send; 4055 $sig->send;
… …
3935 4063
3936 if (0) { 4064 if (0) {
3937 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3938 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3941 } 4069 }
3942 } 4070 }
3943} 4071}
3944 4072
3945{ 4073{
3946 # configure BDB 4074 # configure BDB
3947 4075
3948 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3951 4079
3952 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;

Diff Legend

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