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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

… …
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 $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
230 245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
396} 417}
397 418
398=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
399 420
400Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 422get spread over time.
402 423
403=cut 424=cut
404 425
405sub periodic($$) { 426sub periodic($$) {
406 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
502=cut 523=cut
503 524
504sub sync_job(&) { 525sub sync_job(&) {
505 my ($job) = @_; 526 my ($job) = @_;
506 527
507 if ($Coro::current == $Coro::main) { 528 if (in_main) {
508 my $time = AE::time; 529 my $time = AE::time;
509 530
510 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
512 533
513 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
514 535
515 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
516 537
517 my $busy = 1; 538 my $busy = 1;
518 my @res; 539 my @res;
519 540
520 (async { 541 (async {
521 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 543 @res = eval { $job->() };
523 warn $@ if $@; 544 error $@ if $@;
524 undef $busy; 545 undef $busy;
525 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
526 547
527 while ($busy) { 548 while ($busy) {
528 if (Coro::nready) { 549 if (Coro::nready) {
… …
571Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 593never block itself or use any form of event handling.
573 594
574=cut 595=cut
575 596
597sub post_fork {
598 reset_signals;
599}
600
576sub fork_call(&@) { 601sub fork_call(&@) {
577 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
578 603
579 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
582 607
583 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
584 reset_signals; 609 cf::post_fork;
585 &$cb 610 &$cb
586 }, @args; 611 }, @args;
587 612
588 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
589} 625}
590 626
591=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
592 628
593=cut 629=cut
… …
630within each server. 666within each server.
631 667
632=cut 668=cut
633 669
634sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
635 my ($name) = @_; 674 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
637 676
638 eval { 677 eval {
639 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
649} 688}
650 689
651our $DB; 690our $DB;
652 691
653sub db_init { 692sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
656 };
657} 694}
658 695
659sub db_get($$) { 696sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
661 698
662 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
663 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
664 703
665 $! ? () 704 $! ? ()
666 : $data 705 : $data
667 }
668} 706}
669 707
670sub db_put($$$) { 708sub db_put($$$) {
671 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 766
729 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 768 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
732 770
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 772
735 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
738 776
… …
748 786
749=cut 787=cut
750 788
751sub datalog($@) { 789sub datalog($@) {
752 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 792}
755 793
756=back 794=back
757 795
758=cut 796=cut
… …
953 991
954 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 994
957 } elsif (ref $type) { 995 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
959 997
960 } else { 998 } else {
961 shift @arg; 999 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
963 } 1001 }
964 } 1002 }
965} 1003}
966 1004
967sub _object_attach { 1005sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
978 } 1016 }
979 1017
980 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
981 } else { 1019 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1021 }
984 1022
985 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
986} 1024}
987 1025
… …
1046 1084
1047 for (@$callbacks) { 1085 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1049 1087
1050 if ($@) { 1088 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1090 override;
1054 } 1091 }
1055 1092
1056 return 1 if $override; 1093 return 1 if $override;
1057 } 1094 }
… …
1136 for (@$attach) { 1173 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1139 } 1176 }
1140 } else { 1177 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1179 }
1143 } 1180 }
1144} 1181}
1145 1182
1146cf::attachable->attach ( 1183cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1174 1211
1175 sync_job { 1212 sync_job {
1176 if (length $$rdata) { 1213 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1180 1218
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1207 1245
1208 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1248 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1212 } 1250 }
1213 } else { 1251 } else {
1214 aio_unlink $filename; 1252 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1216 } 1254 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1279 $av = $st->{objs};
1242 } 1280 }
1243 1281
1244 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1247 1286
1248 ($data, $av) 1287 ($data, $av)
1249} 1288}
1250 1289
1251=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1343 1382
1344 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1384 if $reply;
1346 1385
1347 } else { 1386 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1388 }
1350 1389
1351 cf::override; 1390 cf::override;
1352 }, 1391 },
1353); 1392);
… …
1364 1403
1365 $grp 1404 $grp
1366} 1405}
1367 1406
1368sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1369 cf::sync_job { 1410 cf::sync_job {
1370 my %todo; 1411 my %todo;
1371 1412
1372 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1414 next unless -r $path;
… …
1391 1432
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1435
1395 $ext{source} = 1436 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1398 . $source 1439 . $source
1399 . "\n};\n1"; 1440 . "\n};\n1";
1400 1441
1401 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1455 next ext
1415 unless exists $done{$_}; 1456 unless exists $done{$_};
1416 } 1457 }
1417 1458
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1460
1420 my $active = eval $v->{source}; 1461 my $active = eval $v->{source};
1421 1462
1422 if (length $@) { 1463 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1464 error "$v->{path}: $@\n";
1424 1465
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1467 if exists $v->{meta}{mandatory};
1468
1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1427 } else { 1471 } else {
1428 $done{$k} = delete $todo{$k}; 1472 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1473 push @EXTS, $v->{pkg};
1430 $progress = 1; 1474 $progress = 1;
1431 1475
1432 warn "$v->{base}: extension inactive.\n" 1476 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1477 unless $active;
1434 } 1478 }
1435 } 1479 }
1436 1480
1437 unless ($progress) { 1481 unless ($progress) {
… …
1608 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1654
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1612 $pl->deactivate; 1656 $pl->deactivate;
1657
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1616 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1617 1663
1618 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1674 \@logins 1720 \@logins
1675} 1721}
1676 1722
1677=item $player->maps 1723=item $player->maps
1678 1724
1725=item cf::player::maps $login
1726
1679Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1680player. May block. 1728player. May block.
1681 1729
1682=cut 1730=cut
1683 1731
… …
1744 1792
1745=cut 1793=cut
1746 1794
1747sub find_by_path($) { 1795sub find_by_path($) {
1748 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1749 1799
1750 my ($match, $specificity); 1800 my ($match, $specificity);
1751 1801
1752 for my $region (list) { 1802 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
… …
1810 1860
1811sub register { 1861sub register {
1812 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1863 my $pkg = caller;
1814 1864
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1866
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1868}
1820 1869
1821# also paths starting with '/' 1870# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1872
1824sub thawer_merge { 1873sub thawer_merge {
1825 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1826 1875
1827 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1832} 1881}
1833 1882
1834sub normalise { 1883sub normalise {
1835 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1836 1885
1837 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1838 1887
1839 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1840 1889
1841 # map plan: 1890 # map plan:
1842 # 1891 #
… …
1881 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1882 return $self; 1931 return $self;
1883 } 1932 }
1884 } 1933 }
1885 1934
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1936 ()
1888} 1937}
1889 1938
1890sub init { 1939sub init {
1891 my ($self) = @_; 1940 my ($self) = @_;
… …
2013} 2062}
2014 2063
2015sub find; 2064sub find;
2016sub find { 2065sub find {
2017 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
2018 2069
2019 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2020 2071
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2137 or next; 2188 or next;
2138 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2139 or next; 2190 or next;
2140 $neigh->load; 2191 $neigh->load;
2141 2192
2193 # now find the diagonal neighbours
2142 push @neigh, 2194 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2197 }
2146 2198
… …
2153} 2205}
2154 2206
2155sub find_sync { 2207sub find_sync {
2156 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2157 2209
2158 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2159} 2214}
2160 2215
2161sub do_load_sync { 2216sub do_load_sync {
2162 my ($map) = @_; 2217 my ($map) = @_;
2163 2218
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2166 2221
2167 cf::sync_job { $map->load }; 2222 $map->load;
2168} 2223}
2169 2224
2170our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2172 2227
… …
2198 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2199 2254
2200 () 2255 ()
2201} 2256}
2202 2257
2258# common code, used by both ->save and ->swapout
2203sub save { 2259sub _save {
2204 my ($self) = @_; 2260 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2261
2208 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2209 2263
2210 return unless $self->dirty; 2264 return unless $self->dirty;
2211 2265
… …
2231 } else { 2285 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2287 }
2234} 2288}
2235 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2236sub swap_out { 2298sub swap_out {
2237 my ($self) = @_; 2299 my ($self) = @_;
2238 2300
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2302
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2247 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2249 2357
2250 $self->deactivate; 2358 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2360 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2361
2298 $self->unlink_save; 2362 $self->unlink_save;
2299 $self->destroy; 2363 $self->destroy;
2300} 2364}
2301 2365
… …
2309 2373
2310 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2311 2375
2312 $self->unlink_save; 2376 $self->unlink_save;
2313 2377
2314 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2383
… …
2549 2613
2550Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2551 2615
2552The player should be reasonably safe there for short amounts of time (e.g. 2616The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2618though, as the player cannot control the character while it is on the link
2555map. 2619map.
2556 2620
2557Will never block. 2621Will never block.
2558 2622
2559=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2581 my ($self) = @_; 2645 my ($self) = @_;
2582 2646
2583 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2584 2648
2649 ++$self->{_link_recursion};
2650
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2652
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2589 2655
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2657}
2592 2658
2593sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2595 2661
… …
2620 $map->load_neighbours; 2686 $map->load_neighbours;
2621 2687
2622 return unless $self->contr->active; 2688 return unless $self->contr->active;
2623 2689
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2626 2692 # entering was successful
2693 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2694 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2695 $self->activate_recursive;
2629} 2696 }
2630 2697
2698}
2699
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2701
2633Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
… …
2643 2712
2644our $GOTOGEN; 2713our $GOTOGEN;
2645 2714
2646sub cf::object::player::goto { 2715sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2648 2723
2649 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2726
2652 $self->enter_link; 2727 $self->enter_link;
… …
2676 my $map = eval { 2751 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2678 2753
2679 if ($map) { 2754 if ($map) {
2680 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2757 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2759 }
2685 2760
2686 $map 2761 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2697 } 2772 }
2698 2773
2699 $done->() if $done; 2774 $done->($self) if $done;
2700 })->prio (1); 2775 })->prio (1);
2701} 2776}
2702 2777
2703=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2704 2779
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2876
2802 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2878 $self->leave_link;
2804 } 2879 }
2805 })->prio (1); 2880 })->prio (1);
2806} 2881}
2807 2882
… …
3120 3195
3121 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3197 if $reply;
3123 3198
3124 } else { 3199 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3201 }
3127 3202
3128 cf::override; 3203 cf::override;
3129 }, 3204 },
3130); 3205);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3215) { 3290) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3293 for @funs;
3220} 3294}
3221 3295
… …
3260 local @cf::_safe_eval_args = values %vars; 3334 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3335 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3336 }
3263 3337
3264 if ($@) { 3338 if ($@) {
3265 warn "$@"; 3339 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3268 } 3342 }
3269 3343
3270 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3271} 3345}
3272 3346
… …
3306 # for this (global event?) 3380 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3382
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3384
3311 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3312 3386
3313 my $facedata;
3314 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3315 or die "$path: $!"; 3388 or die "$path: $!";
3316 3389
3317 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3318 3391
3319 $facedata->{version} == 2 3392 $facedata->{version} == 2
… …
3350 3423
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3427 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3429 }
3357 3430
3358 cf::cede_to_tick; 3431 cf::cede_to_tick;
3359 } 3432 }
3360 } 3433 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3452
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3382 } else { 3455 } else {
3383 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3384 } 3457 }
3385 3458
3386 cf::cede_to_tick; 3459 cf::cede_to_tick;
3387 } 3460 }
3388 } 3461 }
3389 3462
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3464
3392 1 3465 1
3393} 3466}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3467
3415register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3417 3470
3418 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3510sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3460} 3513}
3461 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3462sub reload_resources { 3538sub reload_resources {
3463 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3464 3540
3541 reload_exp_table;
3542 reload_materials;
3465 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3466 reload_archetypes; 3545 reload_archetypes;
3467 reload_regions; 3546 reload_regions;
3468 reload_treasures; 3547 reload_treasures;
3469 3548
3470 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3471} 3550}
3472 3551
3473sub reload_config { 3552sub reload_config {
3474 warn "reloading config file...\n"; 3553 trace "reloading config file...\n";
3475 3554
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3555 0 < aio_load "$CONFDIR/config", my $config
3477 or return; 3556 or die "$CONFDIR/config: $!";
3478 3557
3479 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3480 *CFG = YAML::XS::Load scalar <$fh>; 3561 *CFG = YAML::XS::Load $config;
3481 3562
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3564
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3567
3487 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3570 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3571 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3572 };
3492 warn $@ if $@; 3573 warn $@ if $@;
3493 } 3574 }
3494
3495 warn "finished reloading resource files\n";
3496} 3575}
3497 3576
3498sub pidfile() { 3577sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3579 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3514 print $fh $$; 3593 print $fh $$;
3515} 3594}
3516 3595
3517sub main_loop { 3596sub main_loop {
3518 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3519 if (1) { 3598 if (1) {
3520 EV::loop; 3599 EV::loop;
3521 } 3600 }
3522 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3524} 3603}
3525 3604
3526sub main { 3605sub main {
3527 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3528 3607
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3612
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3614
3541 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
… …
3548 }; 3622 };
3549 3623
3550 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3551 3625
3552 cf::sync_job { 3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3553 cf::load_settings; 3633 cf::load_settings;
3554 cf::load_materials;
3555 3634
3556 reload_resources; 3635 reload_resources;
3557 reload_config; 3636 reload_config;
3558 db_init; 3637 db_init;
3559 3638
… …
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3654
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3656 };
3578 3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3579 main_loop; 3666 goto &main_loop;
3580} 3667}
3581 3668
3582############################################################################# 3669#############################################################################
3583# initialisation and cleanup 3670# initialisation and cleanup
3584 3671
… …
3623 or return; 3710 or return;
3624 3711
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3713 and return;
3627 3714
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3716
3630 1 3717 1
3631} 3718}
3632 3719
3633our $uuid_lock; 3720our $uuid_lock;
… …
3645 or return; 3732 or return;
3646 3733
3647 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3648 3735
3649 unless ($value) { 3736 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3738 return;
3652 } 3739 }
3653 3740
3654 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3742 $uuid_skip = 0;
… …
3665 or return; 3752 or return;
3666 3753
3667 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3668 and return; 3755 and return;
3669 3756
3670 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3671 3758
3672 1 3759 1
3673 3760
3674} 3761}
3675 3762
… …
3681} 3768}
3682 3769
3683sub emergency_save() { 3770sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3685 3772
3686 warn "emergency_perl_save: enter\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3687 3779
3688 cf::sync_job { 3780 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3782
3694 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3789 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3791 $pl->save;
3703 } 3792 }
3704 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3705 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3706 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3800 $map->valid or next;
3710 $map->save; 3801 $map->save;
3711 } 3802 }
3712 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3713 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3717 3810
3718 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3812 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3833 };
3722 3834
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3729} 3836}
3730 3837
3731sub post_cleanup { 3838sub post_cleanup {
3732 my ($make_core) = @_; 3839 my ($make_core) = @_;
3733 3840
3841 IO::AIO::flush;
3842
3734 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3844 if $make_core;
3736 3845
3737 my $fh = pidfile; 3846 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3739} 3848}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3872 }
3764 warn "cleared package $pkg\n";#d#
3765} 3873}
3766 3874
3767sub do_reload_perl() { 3875sub do_reload_perl() {
3768 # can/must only be called in main 3876 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3771 return; 3879 return;
3772 } 3880 }
3773 3881
3774 return if $RELOAD++; 3882 return if $RELOAD++;
3775 3883
3776 my $t1 = AE::time; 3884 my $t1 = AE::time;
3777 3885
3778 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3779 warn "reloading..."; 3888 info "reloading...";
3780 3889
3781 warn "entering sync_job"; 3890 trace "entering sync_job";
3782 3891
3783 cf::sync_job { 3892 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3893 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3894
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3897 %EXT_CORO = ();
3801 3898
3802 warn "removing commands"; 3899 trace "removing commands";
3803 %COMMAND = (); 3900 %COMMAND = ();
3804 3901
3805 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3806 %EXTCMD = (); 3903 %EXTCMD = ();
3807 %EXTICMD = (); 3904 %EXTICMD = ();
3808 3905
3809 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3812 3909
3813 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3911 eval {
3815 $cb->($pkg); 3912 $cb->($pkg);
3816 1 3913 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3818 } 3915 }
3819 3916
3820 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3821 clear_package $pkg; 3918 clear_package $pkg;
3822 } 3919 }
3823 3920
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3924
3828 warn "... unloading $k"; 3925 trace "... unloading $k";
3829 delete $INC{$k}; 3926 delete $INC{$k};
3830 3927
3831 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3833 3930
… …
3836 } 3933 }
3837 3934
3838 clear_package $k; 3935 clear_package $k;
3839 } 3936 }
3840 3937
3841 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3939 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3941
3845 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3945
3849 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3947 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3852 3949
3853 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3854 3951
3855 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3856 require cf; 3953 require cf;
3857 cf::_connect_to_perl_1; 3954 cf::_connect_to_perl_1;
3858 3955
3859 warn "loading config and database again"; 3956 trace "loading config and database again";
3860 cf::reload_config; 3957 cf::reload_config;
3861 3958
3862 warn "loading extensions"; 3959 trace "loading extensions";
3863 cf::load_extensions; 3960 cf::load_extensions;
3864 3961
3865 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3872 } 3969 }
3873 3970
3874 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3876 3973
3877 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3878 3975
3879 1 3976 1
3880 } or do { 3977 } or do {
3881 warn $@; 3978 error $@;
3882 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3883 }; 3980 };
3884 3981
3885 warn "reloaded"; 3982 info "reloaded";
3886 --$RELOAD; 3983 --$RELOAD;
3887 } 3984 }
3888 3985
3889 $t1 = AE::time - $t1; 3986 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3891}; 3988};
3892 3989
3893our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3894 3991
3895sub reload_perl() { 3992sub reload_perl() {
… …
3916 reload_perl; 4013 reload_perl;
3917 }; 4014 };
3918 } 4015 }
3919}; 4016};
3920 4017
3921unshift @INC, $LIBDIR; 4018#############################################################################
3922 4019
3923my $bug_warning = 0; 4020my $bug_warning = 0;
3924 4021
3925our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3927 4024
3928sub wait_for_tick { 4025sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4027
3931 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4030 $signal->wait;
3934} 4031}
3935 4032
3936sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4035
3939 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4038 $signal->wait;
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4054 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4056 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3961 }; 4058 };
3962 } 4059 }
3963 4060
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4062 $sig->send;
… …
3973 4070
3974 if (0) { 4071 if (0) {
3975 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3979 } 4076 }
3980 } 4077 }
3981} 4078}
3982 4079
3983{ 4080{

Diff Legend

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